gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /sys-apps
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
257 files changed, 4599 insertions, 5419 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 89ec6f9a281c..fbcc17fa1f13 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 715d40b98feb..1c59e0873323 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,3 +1,3 @@
 DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
-EBUILD acl-2.3.1.ebuild 1346 BLAKE2B 5270fed16c2fadaff921731337936b0827883cc23b55cf06567cbe5bcf2d99db9461870f96a147754afee0e2854342c4aacfafc2a7aabb1b56743f475a3aeca6 SHA512 d058a34c71748ba1fc015eeb585b2221380d7ac532dbf1d8a7750c5e80c997c17ba4cc6f4d16c31a62265e917672b99db32312099debf0ea31a9e4dcd4091019
+EBUILD acl-2.3.1.ebuild 1353 BLAKE2B afbfd054f1c164665618ee2e1a7373c5158751262b3a7614799b9aaa866d9e214e8fe187f661f98d3699f670664beed2887e9689d7a4f060ddbeaa4a70ce2a74 SHA512 18575c9bcf34335fd3441d4ad9f58cfd4423d625206a40e337cadf9baf4322e953703e9fce3fc30d614f72c7d4a27072267e8af113d43caec789bb49cf4a0a2d
 MISC metadata.xml 294 BLAKE2B f6827801a85f1509d29af1d248c5fa42bed4b445e4af08506afc8851a9777645ced2d5e6960257a421d793dc2c0e92b0cf485c2a855b83789c57e3b5eff0ee1b SHA512 b5a85ca1e4d407937d73ccbe5415e7ae9828ad67ce33455b1ad71e76aabaf9f51807967709c4f4b3b5b51c05181568bc26f9c00f34afa22d749a327f63077a56
diff --git a/sys-apps/acl/acl-2.3.1.ebuild b/sys-apps/acl/acl-2.3.1.ebuild
index 02c3ea044708..521af3d45354 100644
--- a/sys-apps/acl/acl-2.3.1.ebuild
+++ b/sys-apps/acl/acl-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 738b891ee07d..23fdcad33ba1 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,5 +1,5 @@
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.5.1.tar.xz 318188 BLAKE2B 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04 SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932
-EBUILD attr-2.5.1.ebuild 2488 BLAKE2B a8eede33b92e897bc4a6f4d095c8c9e10883b666436377857c45cb1848fe4193a2dd18d4570df50e961da6b9a5671440dc7b87c3d3e044cf7d570d8fef48648e SHA512 634f7c1180fe5abee1bcd3031209246c17965a7ca84f4a4352953ccca82a38580c470ab9f515b10f36ee1f0d4aa5f67e16e8a26c387a6a0d898f3b24ab22f634
-EBUILD attr-9999.ebuild 2496 BLAKE2B 70cef07eef67e16a6a5797c1fe4d8de1f70e020dfd382c751ac0dd7438c8b356c6bf1c9af3756581391d12cb78a8d1c79e692d97e521d0276f300c75daa5f70a SHA512 08b471eeb09ff42be9e9fde2dc708343e5777a8d69bf84df13d00c115410a2940e14f9ae92463b5e30ee595157eb429edcaaedd45aec724c26e6d99a7bbb97f4
+EBUILD attr-2.5.1.ebuild 2495 BLAKE2B 290d82c439e0096b6ac5be07258d87d3c05b56500fa81b4cf610e322505a5cb302c3e5900f59b363c7cfd3ae1bf315f19bfeed7968c95d3c9cc222b8639c5498 SHA512 201868f12414b9662b5edfdc19827c84a9cd967295b6752eeb38e4c52472ea73cc5caf04bba52c08d55b15570d71cb730e283b8f3ebebbfbc159cf0f27c20eb4
+EBUILD attr-9999.ebuild 2503 BLAKE2B 03468ca994e77b80cf198d02f4273a7ff63295b8efd0c0c1bea44ef245cd61dfb5658ecefe4662689de86f7a2c8d36ccd5c4bfd864b0f2c6cbd494e0f96a21a8 SHA512 06ca8ad0c749749a2ec94443f1862f43529e95b20e0b7eadc20ff9957c15ecf804d4bd78aef0f946a671d474a6337ded4a3c64fa29485291ed2c9553d69600d0
 MISC metadata.xml 337 BLAKE2B c04cc7c99b3d9d39870605354acd4f0a4b03d47e79228f444e915ce17abd2eb075418919dc3272903fdd524f56588ef194d7cdbd43f2b040c4f6a9d5fa2eebee SHA512 e9ba5573c84dd1b2cdce5b74e53b731c1ba4b3e72bca569f3febc77e431b96982cd83a71720e021ba23e8d6fd23f9dbea43a6c8d94b2b6ce1b3d26fda038d6de
diff --git a/sys-apps/attr/attr-2.5.1.ebuild b/sys-apps/attr/attr-2.5.1.ebuild
index 3b56e970bec5..0d212005d512 100644
--- a/sys-apps/attr/attr-2.5.1.ebuild
+++ b/sys-apps/attr/attr-2.5.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 fi
 
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index d133ed272c1e..58d5e41c2738 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 fi
 
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index e7efe2d8ae5a..a94f01b818eb 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,5 @@
 DIST baobab-41.0.tar.xz 586228 BLAKE2B 8c06dd4c62dd377e2338df280dd1f78dcd6e0c13713f06bb126f96e658e42b9ed5f1cffa9f7445f2d854cf42c09b93d72f4ff82a80df5dd4a4d395978fe2ecff SHA512 4f41cac42491afb98855771a621573689f2b35c0a2602799af9f88adf901a5c62c9f8e4b70be43ed27024deba860b128bc22b8a7782ac207a5746b4df6b65aa0
 DIST baobab-42.0.tar.xz 588392 BLAKE2B ec2525b6643a9ab2ecedcbb7b7a54419859116808d9287bfcc694cf22d314b5dc34e71483718353685f3a246c87b4b492e7c3fb69c7044dea605ae3e8737d0f1 SHA512 21837bfe901034ed3450f6937d3ede1e567d16a5ae308db91029dc2ff4bb523b36f9408f7489c6798140de039e928f49969a1ed741027da0ae8377be6352ba08
 EBUILD baobab-41.0.ebuild 854 BLAKE2B 6e723adedb979773babe606eb4ed3052d84219d787b770048811f2740219ed5404860ee7e91d4cd97a963168e3a313d3f9135c4190e43d44a6c141fbfb2bc005 SHA512 b38a58f149cd86dbf2b34a9c541cc5d1c0dc310895792a6f86e25cf651c15667f279610826e56d7289313b46a561061af102d2392d65946abd1065a6e4956f03
-EBUILD baobab-42.0.ebuild 837 BLAKE2B 9274209175ef80755f1c296be4e3ca25d2da8aba22a7c8bcd9008e7f8f01878bee534ed2c8fcf7f720877237f89938e374cf977c50b79e7ca29bbec029d43d42 SHA512 ccaed8b56697d3744720e457836781dbaf818df68090f53fc2fbaf07c65ca7286b93e6a2e899481cad8338c9a759c0d5d6c5f3e31cf75ba3aaa5f9ddf82c2fe3
+EBUILD baobab-42.0.ebuild 855 BLAKE2B 5d0b27b95e14e5bccb26592992185bc88d7028e6cc03375133e55ff7b6f75227b89fb8fa5ddbdf9a94df012197a8a574a69d728e13207b60e4abe850de13bf3c SHA512 7a2a042f49645e0f8008dc0c44020b03648cd7426ea2bbe6b08186019742e682575187494ed51c313d7513139c495137d73223fa4c3b020e25d127be95d16e6b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sys-apps/baobab/baobab-42.0.ebuild b/sys-apps/baobab/baobab-42.0.ebuild
index 8f6502db0c7c..9418689524c1 100644
--- a/sys-apps/baobab/baobab-42.0.ebuild
+++ b/sys-apps/baobab/baobab-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/sys-apps/baselayout-java/Manifest b/sys-apps/baselayout-java/Manifest
index ee4b4cb2956a..cfd0689d12b7 100644
--- a/sys-apps/baselayout-java/Manifest
+++ b/sys-apps/baselayout-java/Manifest
@@ -1,3 +1,3 @@
 DIST baselayout-java-0.1.0.tar.gz 72571 BLAKE2B 3a41752b1bdc3980fe8690e499738e19ba9c390164fba04d16eba8f85a73557c7f9c15e311fcd738c250ed1226cc143bc933eef14edad0546b27eb5b41cf3bd3 SHA512 6f5b6ff1ed07406711e15a768f5abdf9f7edef1b31e094760f265863aa8991bf60ff71c8b10003265d8ec1aa7c94a611bede96980d25c819908b705b4d2d1062
-EBUILD baselayout-java-0.1.0-r1.ebuild 1388 BLAKE2B 02fa9ef849828d1db96c70479febcd108667639e9bbd07a9c82e754725750fe20baa628412e1334b0766586472a4f37de81450672c7c29df6020884e1f24d274 SHA512 a3c561646acb355884b824260b4f80d11dc9ae6bdb894edc71c6073f4203569e7bacf9780d4c94c9dd09c5dd62b1c0093bcceaf9ddd76139bc97cf7ebcbcfa83
+EBUILD baselayout-java-0.1.0-r1.ebuild 1395 BLAKE2B 43f913e32a6bf7a37fb9679c1840c84b90d50891bb849c0b372290631872267625a6431ca9f75bf0246dc091df94b8bb45790ceac5ff5d6802d48a28d0255611 SHA512 c74801400d7a3813079b75c439ede5a104bffa6cbfacdb42fe1495887b24f9ad0b7398e4eccf643729ee559efd88cee780ed0b7d46178db1febd550f77dd4d22
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
index 22c2420159bb..2430e388efd0 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 1a25a933c3dd..49fd620ddc91 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -4,6 +4,6 @@ EBUILD baselayout-2.7-r1.ebuild 10142 BLAKE2B d5fcfe38f93a7b021d8f47d2ca9b486d82
 EBUILD baselayout-2.7-r2.ebuild 10129 BLAKE2B a0686d516c4cdb93d71fd7fe31608ed876e7151b260a67f7632fded30249480466719cdd4b6b47b7089e85b08e4397de77cbc1dfe13b495aaab89c9af2adb2c2 SHA512 c7eab722aa5b3772fff5b6b3afcfc1895401d380a91cc2dbd27a392397efa43baa1ced9bcf195bb05c2fa990ac7b1113df5f6af094189105a7ec2692ef19ade5
 EBUILD baselayout-2.7-r3.ebuild 11228 BLAKE2B 347ce18e044de38deea4d85f5409bb6987a81abea68f1cf0a4fc6374c698f4b2ffebd1fbb5becb0ac0c7c1f8572be908bde71600008246c59450e07fe5d9fe28 SHA512 768412405896189e96a4ac59303bc6e96208c04d0518e0f980714d07db25389b97c4b84c2b070623765c3be6e6e609989267a306389d32da4c420dc3d329203c
 EBUILD baselayout-2.7.ebuild 9969 BLAKE2B 36c160b617b7cc4ee7e71d193dae0af3728533c5500e02f3278946932fdbbbee7c7f613ac681fa8abb8f249f7b4b4589e531ebf550002735acc7f08a23175c78 SHA512 e9c61341751b7fd67e49e4d4dbd9317ff606b15f143be1e40ba571a36ec2fb029ef3166b50f5b5da58ed2140718f23287709a950000ee151724d4914440fc1fb
-EBUILD baselayout-2.8.ebuild 10849 BLAKE2B e9cb3a4a05c4f128886fb7a0a10fbc0e1cc8f57ee9da1473b5560f664f5ad561103c5e08ad9979e10865cfbf0c9a136dce84a4ed224831a22df86666ce8406e6 SHA512 10fcfaffff8ce37bcd0a6385d2e3efcdbd7bd476571d09c75877aab384ad0af7e8cdeffcf79096b28bc62b101b7b71199e791f765c0968ee6cf796b746b75a88
+EBUILD baselayout-2.8.ebuild 10856 BLAKE2B 5a48e3831d7127d7f9ad7e02547f29dd7b37f970a6ce72a395acec62c29b67863ef0a9a0b84cea456f07213bdcb2e6c65b1b4aecff3bbbc57ca1b923c793bc99 SHA512 d8e720850b97ab53c6576e1b554c6ee41b4b42fdda1bb550092392b8d4042abdec8736ccfc3101578b13def0d6ba191f2a4d97f82cab35d4448649eab52db16b
 EBUILD baselayout-9999.ebuild 10849 BLAKE2B e9cb3a4a05c4f128886fb7a0a10fbc0e1cc8f57ee9da1473b5560f664f5ad561103c5e08ad9979e10865cfbf0c9a136dce84a4ed224831a22df86666ce8406e6 SHA512 10fcfaffff8ce37bcd0a6385d2e3efcdbd7bd476571d09c75877aab384ad0af7e8cdeffcf79096b28bc62b101b7b71199e791f765c0968ee6cf796b746b75a88
 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193
diff --git a/sys-apps/baselayout/baselayout-2.8.ebuild b/sys-apps/baselayout/baselayout-2.8.ebuild
index 089e43e1cb8c..d237814a2a9d 100644
--- a/sys-apps/baselayout/baselayout-2.8.ebuild
+++ b/sys-apps/baselayout/baselayout-2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index b150a409e2c5..51443e967cad 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -1,78 +1,31 @@
-DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
-DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
-DIST ansi_colours-1.0.2.crate 10512 BLAKE2B b4acd4c2fb61e68711a5abfdbe04fc3a2778df29c4665637dc8413fb364842e8703054cfc119cf9e431a56ba4fd7d3a7d7c3dee6d7db648458e9bb26dddd650a SHA512 3f28117e804f82f194024ea502ca9a86cc458b55f705f643a8ab2a90a189ec21501708df5fca1f3ef204b57861b7cca3c21f7ca9537eaf4208086b0ec7652976
-DIST ansi_colours-1.0.4.crate 10525 BLAKE2B f71ef0dc730cb35e634623cbf6888abb72519fa53b40aba49ad1151a37d98bf3ff93652ad67d276243c7ef9435a19b839a43a4122e451a2defc96231fba145e9 SHA512 36eef5c4c84f7f8bf3adb65eca5d7d2da48190c127cd76b78b7bb035cf98afbf2534b82bb293cc1e472eaeb08d541fe28a87b99ebd53dbae8a50026898b043b3
 DIST ansi_colours-1.1.1.crate 18739 BLAKE2B 4939e1c45e1a22548bb5adcc1ae7c4ee657ea6c5c0e3d2d3fb8abb45d4fb172de1bffafb037dbb387f7bbe7417d8f37d2a3a2dfb77d4575935d6963dcfd82cc9 SHA512 eee698867adee7e4fe5d14885f91f9d71aa58db06d795dd0f03a8d4c99f6f39dcb11d3871dd2b8f019c443fbdd880888df1e0869202cbb8bde79fe20d60c1c57
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
-DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
-DIST assert_cmd-1.0.1.crate 24575 BLAKE2B e204b79da44a27b9c70be8dbf53356714ac994b4e5daced1b4f570c9e6c4a422572e825a54387df25292bd27e9ae11fa57d803bcfe4643382a2f739859dd42fd SHA512 969e1f6ba28edc0d4d25a10390f8e94578562602d303e9a9e402f29655cb9d67edc1040b283e1bc9fb4a88a5817814d88e85b77944204288aabcfb6da69bbdbf
-DIST assert_cmd-1.0.3.crate 26323 BLAKE2B 97fa287db425901474b2e9c4e0b9c500209e6ae23de73d079458ef21e8d1f6a49837683c543ce05ed79b0a07a4e1075d02630789760b52956f16e2f629e3d439 SHA512 3205f9eac594113996287dab2a641115e5fdb4e92734fa34e12d99b3808597e13371658857896c76449ab1fdca4cf4e675d812ea120602e16024409483b60bf2
-DIST assert_cmd-1.0.5.crate 26641 BLAKE2B 9d4129cbaed044c556bb041954dfc8b0857381b46cd3513e3ce727f465e361999555d8535a5a7b2a978be179a0114c44ebff38ef66cba7a1db272e408af1ca08 SHA512 fc261e4411cc5113c63c2e6c12c81dd97e924eb961e5851ec84c43c76d1271c08a6c36798e1951a0ceaa54acd91a75575cefa7fbfad8123fd4652192c0ebc396
-DIST assert_cmd-2.0.2.crate 29433 BLAKE2B d9f2a97bd81d1423afb6bddbc5fcf6e2cb334502c009368ed623015131d2795d705147e2ad347541a276712b45aa9b95ccb333c52b26aa85dbf58707160f68f5 SHA512 346268f1ff00416eb04ce9307bc6261a05edac4a9c10745f428c6a7c35edc7fa8f6b6c8f7fe66befe5b508e60c2763b8bc8acfcefca4b24a9d3e3e1ea85a9935
 DIST assert_cmd-2.0.4.crate 22581 BLAKE2B 7fc9fe4577e486f26d07b2b4419c331022ca61923d0664f4e8a25abbe6d6305600b47c739f9f065ef778bdeb59b6309ab73df2be11e5f8387cac2e7e8c70a4a2 SHA512 c389e0210153e9a6ccbba4dbc6a6c7a23533e5fe76e717dbc36415be2adbabfbc0de33a2e6d05e3d70779b7a278580edba400c688c9a6b446403b59a78d93720
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
-DIST bat-0.17.1.tar.gz 1302347 BLAKE2B b46fdbf088d9033ae3e34155a774d3436ab0753ccfb5a8128aee2e6d5859a38cca27f5a01fa4146a0e8a17ecd66274a352ccdfb9111b4d169cb48edf5e62f732 SHA512 22222bb19cfa0804165d599e491fe2b1ad9220c5ea79c0cccd3292edca024963d6dc435c576bac19214849a1ffcc2b826488c6995758c4773af64ef945c2e460
-DIST bat-0.18.1.tar.gz 1367858 BLAKE2B f2a233e31f41b2143168d50c49c439f2842ff70e8f3c084b903011587fa62c23f08004312a9e0e04e79eeb54aaa1a536da00c26e2bc100981c59462c0d11debe SHA512 39369e456fe27b4b78b41dc754127a21e5a692ac90857c6c23486255f8d2a62bc399f2a52a4f94a6004ea37e5842c47a2b436013e2590d9e0089993aff9701bc
-DIST bat-0.18.3.tar.gz 1486928 BLAKE2B d0cc28d80e364f8b33a6d77f35729d4f8d99dedd103cb5a0acc32f658304654af8e1f39018c75171895aa53b7f6b31e179806e2d54f1225bf0304f85e4e71b15 SHA512 b3608b385ab1959d5c84c8a823cec59adc005ec079ec5e6020bd119669f5a6e64975a498af3a5ffb707a76e230606e4a34183110900264caa85af1e0ca03f2a5
-DIST bat-0.19.0.tar.gz 1690009 BLAKE2B c5b9b298b8dcbf6203b555387ebf728e16195d2e19643d2f9ec293d13998817ae578ec18518297f617fd12f05eb533b14a5ad31d104008929e9448104cdd10c8 SHA512 6c3fdf524c797eb1e58c97ab53f51a2799d87626b147563289932130b33488634cf8cc411c58435d50cfb13bf44105c05f270af7c6f69fa0336cd14ac3e8648c
 DIST bat-0.20.0.tar.gz 1698850 BLAKE2B 99d150010b40246af8529490411a781aebeb06730dadbc10969e25a4825bf30402b2ae75a2c752b199d8212ea48a19cbb7cb5afceaf9fe0b42e3845030729d33 SHA512 22b4ad8f8a5ba55cb8b16aefda29e95fd55e60ed8c2d3f0de36f6a00b770d9ee7f86f4e5ca35bee4e9f22772ab4b3c327d21ebbec25dc0350d9fb89a9f9f22e7
-DIST bincode-1.3.1.crate 26121 BLAKE2B 7bccc02071a11944e787fdb4c86b082827834df31f3fb751ed32720d4c44e4a26977838e311580ed330d9f6bc5ad76632e0af5530a3f8781ee739d9dc1ff218b SHA512 75e62caef54a58ea5d24acbdef70b55893b11706400ad423919084a4723f5ea60e337447221171c4cd86d764db1f9f767c303b4cf5cd8f27318519db77fb82b4
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
-DIST bit-vec-0.6.2.crate 19630 BLAKE2B 84580a6f99393e507f3fd76b543fd357fc018745e029ebb6b3e71ac3b91b6f760a0474b4d90506e36581ec432ad336be6dc67c07be206917ba2af2322e15b867 SHA512 27cafa198a55853585d76c89490878c43bccdb0fe7dd68b0b4809497be2d497056e7ca6fbef321d71dfbe18272a2571b33d79e2a1458891a420eb7a1910ff383
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
-DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
-DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
-DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
-DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
-DIST bugreport-0.4.0.crate 13237 BLAKE2B 3de42f43252427cfb8a295611a0924ada6dad7121b0989bdaf1f9fdf253c23ffaeb4a418137a97f8a5a259fba566588db7f296058b7dbd6330d396521d1b71d1 SHA512 e46bbdfff4567b1916a99149d1062aa2e658686eb3d0252d206310a5e87f18cd068ad615bc05e832d518f11a54b1f2e1a6308ab2c3459414ca0422ab3c644627
 DIST bugreport-0.4.1.crate 13793 BLAKE2B 00f622bec629edf8744ca3e5cf8097ef4b6bea2516d8de5c0cc9f6aa819424e3ab49573dd7f3d00f6d406ddc077413c045d08a0d9092e44854dd2d91164d0220 SHA512 ad54c8f52169594ae010093b818255cf16b44741db6802ffb9eb4c1fe699a59183f3505f553f8345aecfe3afd518c4272625adee0e880990a38b0bd9a9db6eed
-DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST bytemuck-1.7.3.crate 27879 BLAKE2B b231e200fa8925f71e457a6ae3a6677366cf6a5b1a6c19845b6973f385fdaaa86b6a3d4e8b38356dbc824cde70e8f1120008d21a3d77d06575fd036b0bf20678 SHA512 03569cb6b6532ff62f406f8f6c80ea5cc3a4fc36ebe28f5a4bab32000862192eed2d26163062c62c0749d2f96ebed6968ce76d2e95a6430d9147c3648aff1f64
-DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
-DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytesize-1.1.0.crate 9370 BLAKE2B 38fcddbdb862e82a076b7ae1339b48c776f704d25be78935d08637351ade725e86e00e07e62868e76a1a2db894f223e1f8309f8b362a46405ec6c06f6e421a96 SHA512 36f35cf53c468cf011b231d3fc5d00c5224fa3d917854e347daeaaae53ae7ee36c4d8ba26788460d56c922c9ffb0eeebc60655fef7366ae42e221950d03f6715
-DIST cc-1.0.60.crate 53351 BLAKE2B 95fec29226818496e56c132d45eaf728df17f3ab1b939842dc228febe7bdfabc9b0b407fab65a6a7d308a1e57a40702a2810516882f712319de119ca7cad4b52 SHA512 3aaeb5f6b0fed31dd65f8c884252d8a6f8f79cd801edf7626aebf4f2843a414cf45ec72b4d6f88f9e9fdd959e0547b9ee5da817b7c34235196113cdbe915b888
-DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
-DIST clircle-0.1.3.crate 8026 BLAKE2B 33c18a0f9ed204597fad1720b8e361ca4d1beb2dc2db82eb0fe6632ea7fd1213ca55d5fb88f84c099aacb8c14dd2468f07d9563512b8ef4e1c2fe38b6590bc86 SHA512 1a51fd8a35b4179748d654916e0713c31dde2a96627c08a82cadcc05dcf816f8266ccd4fe75af2532dcb92dcd0043942c2150c76264a39760cc2d4e8e5455836
 DIST clircle-0.3.0.crate 9837 BLAKE2B adeb2d11238c343363475f9e517d01c9b596fa61b7d520f9c92de038f0a106e48263d06045e7f9d0cb5538384d4b2cffc2c969e9a129045b8839bf04ab1bad75 SHA512 a4db35d05ea4ca03155c7308a79b529091dddd4d2d579d787fc3770d80cb7c22ca4a239bcfe7b6a2a85870249754991f8dc960846b80ee7a46b763edfb084b2b
-DIST console-0.13.0.crate 22451 BLAKE2B a02b87a53b5f6e3adc88b0369e9e5b786fb60741263d5441752c51164562704d93c8954ecabc2ddf7a999139aa236cfbb0e9b8baa27901837f731591636044a8 SHA512 b687031ebfec1ee705c47e147239b602ffc147eec021ce7c9a4f400db7e3e0b1cf124b4c1664f9ffd1f3719f13a5d65c67bb15146bf42dccc5733373bd10b20c
-DIST console-0.14.1.crate 22844 BLAKE2B 2e7a1480fc10ba92d4d5c601b87a0dac840b71c6c44679acf0a90667f37a40528ff2155130aa72be2ade1fdef4e6512dfb404b0eff181d77fbafb00c25dd6c5c SHA512 2c85d1938faca5163dd7eede2a8a07569e536c92fd0fbc7f6e6ed91c60fa7f947f0ae101817ed943b0668c4d98ddfd3149033c83614786b5d841b19a8b011c91
 DIST console-0.15.0.crate 23507 BLAKE2B 49694683baddb53e0f35584403aa93616164c2d3b94b39e0e35ebc4f915c37c8e794619d57b44ac0ea460ddbf7ec43323adecf657cc6f2869f313b3cdbf3a46a SHA512 70bd6abfafa533903f273ec3b34da6783856bd1abedaf139fddafac0dbb03fa9154f8e1e1bef01fd8de3c53100bbaa93313518c42f8ce51217c23ef34d3f9d62
-DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
-DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
-DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crc32fast-1.3.0.crate 38565 BLAKE2B 4191cbfdf05964a39933f66453752c5f14b177c43fa5fa44de02d74b6fb4e4d874218f5a369c4a1d1ea71461cd541203f42afee259343ea139e305043e155ee7 SHA512 6ff361acfc0bb134672b30fb438f6d3ac93841d06332a6ff156025620b23870a79a4ceacf57d4b14ea1744838cffcfb77b413352d055809e74acd853ae912673
-DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
-DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
-DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
-DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
-DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
-DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e
@@ -82,257 +35,112 @@ DIST encoding-index-simpchinese-1.20141219.5.crate 130962 BLAKE2B 3c1e498c170eda
 DIST encoding-index-singlebyte-1.20141219.5.crate 14950 BLAKE2B 89faf849452f0fe78b82616614f43bffaf658dd81063ae5d130ad6eb64d38e0ee8a26ab078f8c992f0c7f3e1db768e73920482f5e3bd56b0d7370c72fc93755f SHA512 648a5b9dcbdd40184b6026f6d0593df3b75c5eed554c19a199810c99aba857fccbab2acbf5b047ff42a75a6a3f6e8211a07e70e6fa4048f07144f9132af7d17a
 DIST encoding-index-tradchinese-1.20141219.5.crate 120862 BLAKE2B 727a26b32f2bdec20dfeda482fad4235ca3ded489a002c27d0c26cbb9f37ea81f93f7e46ee4750dfcd7385dfc8bc55669a0a21b3acdba2a1fe91b855edd2decb SHA512 3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d
 DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e68065ecd6ab602e8fbf8b0f68a5e2af3f34858d363e5f0602f58e4ad3169ddea83d02a0f19a6d635584521397bee63587c9fd9 SHA512 0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6
-DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
-DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
-DIST fancy-regex-0.3.5.crate 64304 BLAKE2B b0da0024bd7dba0a574109859984919102d02044ed7c389a3ba1f10aceaf5fc908094e865eee829a1ad65de6f0d9a6d8c1bf59091d35bf8637ef7c55f21bb593 SHA512 0edf91221f7088719607492accb71158d7ff445a2893eec90fef402df30ded30fdf388fe05f0d334577b642d5c5b724bc4a1724359dc4738c9bc34823dbe33f2
 DIST fancy-regex-0.7.1.crate 78178 BLAKE2B c5887ef60d0427b5964cb296696749c5dff6877c0348c646c97c318739e9f1c0f517b01229de11656cc50ef702240526248ffb67e9aad91d892a39ebaec5035c SHA512 533cd4eb50a1a9665f42dfb0c6f4e8c7bbf4f45eb50abe023e44f0dee66a9e40ff82784b10dc9e1f4aebd652efebe3472fd3ba92996dec0932465cd2cfc932c5
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
-DIST flate2-1.0.18.crate 74164 BLAKE2B 7defdf3f084f18c9e7776edda9bb3cea5692de0d9d2d006bcba0895ae3555f4ca006c76733175e4982932c67e6c65fd59b21275f19572e23dc2eed8f331eafbd SHA512 3695e7de578da3bc935988fdc67b22ded26f00bcae6818eaa6313c47628a19b66ad589b06e164ddc4c30c49eeec2011e41031287071a43460a8c5bf8e7cb5cef
-DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
 DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
-DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
-DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
-DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
-DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
-DIST git-version-0.3.4.crate 3237 BLAKE2B f324d21e90f09ad7d3a35e78223e96c9988f289da10e6b9f6de8377b471afd401e07e5f8cc7621d463b57527b6a1b58c06947a4f4b0f4dabdee8dc2549795dfc SHA512 5fdac1c1b2580e42cbf15b1caf5b077f48f921b21371d02d1954443843fc075bc1c218e112fee0878a41bdf6e528b2969c9cff76808a01996a56b3e046ec3dea
 DIST git-version-0.3.5.crate 3203 BLAKE2B f73d2f076c79c10c7395e584d811b6fffc7f348954c2c142099c48ba4440d257eb1be59ff26c3a61f37a6bc119afd82105a1697c37f8d7b973f3a43108f099f6 SHA512 7017d59ec7eef1d69c333ce8bcdee355dced8e912c4b5eabcb2abb93f6075ef3d1fd9486661d472c29787b75d7866fc49835d1faf5d06e42837c95c856398629
-DIST git-version-macro-0.3.4.crate 3608 BLAKE2B 251bfa7999664cccdcfff709825d7a27c3cc66b1e785b5009076a84d46ffe7e13029919d35fa2dd2cc4ace12ef859b83dc7755e2659bb4977d828c78cb1910e3 SHA512 8e73a084b7929e3b3f6b608f442b15bd0eb76c35ec04b3e254310c7cfa8f09ad3477ac4445ba38e571b530155a0e79274feb39d0e6ed943fe210b9146911ebb2
 DIST git-version-macro-0.3.5.crate 4302 BLAKE2B 39173a36199b34cec11a1924faed795334586b21e3042bb91f3d38cee2d8b97ffb5bb4dd45a3c192d8c1b8d2b2a5bf4e0d3b23927b6f4212cfeb7cb9dbb16d4e SHA512 319729646469ab6508e16e6f3b88f588580fe7089479f70522edd6ac7eadb3c4576f0a57863bd3927d1ada693c3fe3706dc6a75e6cd75723db7f23199dc69ae0
-DIST git2-0.13.12.crate 175580 BLAKE2B 18321da8e89b18dbec31bbee75cd779994363ff6e9f2dd15e6d85b301e495d769fd66ba4dc4ee5edd9c806d8acad94336e403899f2da147430c89cc984ab03c1 SHA512 aab4564c385e378d5df34b8b8aab12107bc9e4b3b1cec1b5206e32fe72fbd0a7a2fd4c40d0ce75deed6ee9a51edb0383f26af2a53e59a5384c74dac4162f312b
-DIST git2-0.13.19.crate 190136 BLAKE2B 82d95c8bcc41b5c7b95c7d9d6cc1870cfd0a9f230ea07d8ca85bb343bcbbc9f70e1a97d59a316014f262045bb4d67c993cdefb74bb5773d80275da95b79df3fe SHA512 b313a7cbd8c9427149bdb50232b1022d278c493f61be131d73daaa983ff6df4bca635f7f8eb97c8b1bc179184f6b741941a3b4304d53fad0747a2244a85177a1
-DIST git2-0.13.20.crate 190365 BLAKE2B c4f3420f19cdfb420576bc8c38dc45d1c7f3b74b5a2d23c85154dec35916d3d588c86aaa50eca52b427e5d044a07ede7cd1445ef1ba53ce08c70ff39f7ac56bc SHA512 2c0a9cf3391f4ea5eaa48c8fcc08a1cf27b877cc4960332bfdbb95620f9b161f720c35f87bf98e3771749a01444bf8e2337e6d8fc1a34962d4b041473115293f
 DIST git2-0.13.25.crate 194192 BLAKE2B 7286ce8f37421e5cb626c3b3d4f0005d4ddbf4f893fa4885a9bad28ba3f0e24d4b2161df8788430d909394ceff77eae586b26ffe343d6b0ca287ea0b63087068 SHA512 666f11464f34d82abd994f00a0b81e960551c4c524b4f00d28e5c728172dfa894fec65050767cc96d18d1d5de57f1e901154fe8d70e2e31b93b93790bce021ab
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
 DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
 DIST grep-cli-0.1.6.crate 18949 BLAKE2B fe0c1c615cd2b1dbb8b7ad3980292308d9f06390ead08f42719b835805efed8a8243a7ab9e5bbf3cc6aa5c2890aa2bd53366a0bf65d66c19ec706f76beb58cbc SHA512 ffacb90586bb28afc3ab2a780be10c78f32b83c5ef5b28c7729ed61353ff5197bdafa485e87371d5ea10198bc9c28c46a22172a9fdb0adad0119274c503214ab
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
-DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
-DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9
-DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
-DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
-DIST indexmap-1.6.0.crate 47565 BLAKE2B 4b2c50788be5c5416973133c10caf092468444af6c101eceb5d2f53ec3502d73c034205186974efb335a1d8aa9a797b191a871fcfd573251c95ad1d13c0c47cc SHA512 f91c0d3588da037a2dc728c9cd823b4acf7edfbe7d59b28dbe1f5802294f2677eacf0ccea41235daa30b3d8187a97938653a040d8c9d2d38513440b2e82fd85e
-DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
 DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
-DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
-DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
-DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
-DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
 DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9ebb0a1fa48f707d3cdf603880b78ac6a2ec2239658a220e70924ed1612dc19ad90fcef883f21972a1df4f67d57 SHA512 0feade0f1f0a458bdbcedafce8fc39f44adeb56772ea94a59f16f038a743f506db1405a7c8deae65a6a5c1695bfb363c19aeea1c82c41c7f4d1101469f32e42e
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
-DIST libc-0.2.78.crate 508428 BLAKE2B 0bb5545c24cc14f8831edd69785e43f169afdbe0343d480a76d4784b1784a68ab26e7d049418cb09643af61cac47a6d19f7658227e5e23c195389bb915e3651e SHA512 91cb2cd8541082822480e248c373f3320bca99483174aef295b373e6d051190bc5b100350cf680e1d48bda442b3e450741314dd9cf4f8536adbd2c6d7e869cd4
-DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
-DIST libc-0.2.95.crate 515341 BLAKE2B 5bbb10917433ac9b305e4eadd4626a31149ec46aaef91f7d360bea8b5956499c55066339ea63102e71976a3aa969744c871c0683eb137e3c8ad2f8d62570cea0 SHA512 40ba9908c202f3d40c1bd7d7bf516f3b236e7751020bad0007f185802fada64fc5e959b68a33aa1f59de76d5a649f62bcce7eea671fd420852e0bb902544ebbf
-DIST libgit2-sys-0.12.14+1.1.0.crate 1603930 BLAKE2B 8fd9366e09a8d6ab9f3df865aea3d9ecd43e4c2a339597c939a09cc36c28146e6ca6cd94656a9d17519b008fe65bbf6901ed639308b857a68977de4695f477e5 SHA512 d0fe6243b07c0d0711e832f4efdd69701c27fafb7df82d6010f24f79393c80bff3fc5639707863f2a8073c57bbc9fdfa0eab32c64eb053799c1c1e08de5c9854
-DIST libgit2-sys-0.12.20+1.1.0.crate 1443453 BLAKE2B ea35adedcb54d21fffa4ed357e2eb2d642904a1b1975f7415a82e06905d8a47adca50bb03e2b61eae6291039b0bd9197d5d5b9ac1cb339d1a8fe67811ea7db17 SHA512 03f8493ce60fa2d6553605c52642917f8c69b9e8cf962880218eb63459e24b02b041339927fde1c9b3fcb27d97e3c9e99dda66f8e7124dc72720e91948ff2676
-DIST libgit2-sys-0.12.21+1.1.0.crate 1443245 BLAKE2B 794ff535a97d051cd12993f135e61e391e1d8406f8346dc9d1417a1ba433c0e1400f17d7e5bd90674110a3502ba7a38fffac8da008ee350a47061846ed2764f7 SHA512 fd6acaaec704fb2d159cbaf0bd1b81c7afe4d22aecd836b174001b017ed8421507739fd99da968cfb1d46db16a64fe6568f53e872aa5f9a9dd7fb2cb51b02d74
 DIST libgit2-sys-0.12.26+1.3.0.crate 1476836 BLAKE2B 953756b4ed1e6f90d9eabf03dd9f3db50a085ecee4018c6f5e598b2b030e3332a6281f5e033810134356a48b92a4b910fd534813f2111cefc6de3bbf2954e1c8 SHA512 de30865b3d4ab0288e090381e5646e3e8028c341fac93014168fcfa5f166f7fbad9fc4ebd285919247cc6bac178658eb936ea1fdf168068248be07ad34ecc54d
-DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
-DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
-DIST lock_api-0.4.4.crate 20356 BLAKE2B 1b4a648467eba49232df5c595d7c5a0444018269a67db1768c7711d9d1a903a1dd00f99d8654c30186a470c035abdcec9994c8b1a347fc559c684b1792ec7f49 SHA512 655c8a1503b6e7f833b4c62109e1c5005727054847bff81e17d4159f91c02ac97512da0673ab227d17bc9ed0342fe3476247daf74cbc9a0b470e68c648ba706e
 DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
-DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
-DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
-DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
-DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
-DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
-DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
-DIST miniz_oxide-0.4.2.crate 46206 BLAKE2B 0da9fd14549b88dafd5d53e997034cdad99a424bb19bb78061527f4dbf27d1dc258d618955f894564a1676adc75a49d5bc9d562f26ace4e61634693e7db6b8ff SHA512 e33c81926e7a78ad68014f3e89471755c20bb594b11c94f214094bdb65000b5ec71369a537f12e7956f55cbcae1d7752bf954aac527e41b9878503dd6ad3e95c
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
-DIST nix-0.19.0.crate 212652 BLAKE2B a9d3f87fac9591111e1977b9d8cc38d57b560ddd3cf27ce06342c97e10113c8a8e548096d537577267152467883e9ae82618b24b02b2ee355a8689f7147335aa SHA512 db31253c4520448156be3b3e8eb234236a33012b2933710d772f19a14ee83c856f5426057e2f8b87e19fb52d18302d1f8345036ed5dcb7f10e6e961d8e6cf238
-DIST nix-0.20.0.crate 216983 BLAKE2B cb7dc3a6b61abb66645613f16a22b5f127fef38bff5ad40fa99ef50019bc40da7f40457af9dac08af5dd67644c2a102ee6ca99425077ac7e2024c89387587752 SHA512 4efb0a6147870aca6b5612428216f36cd826320b75f4f12fb0c75140d47561834695db7745908a23d08ac7114d69848cdafcf87830718da1f03aa6f2c664c5d5
-DIST nix-0.21.0.crate 220596 BLAKE2B 9a9c8bc8c1161b4a642eaae2dca8dee7635168249ea724d59e425253895236a1edebdc82828ccebc577edad2c7920cd918ffab1725c89068c9ef21386208714f SHA512 a3f96ba6eb976867017bf372d8e804b8048a29d32cce962d75199f10621719fe9ed3019bc40f4c8e7a683b6dc82cf818476ec9481c927a5e14b09a738cfe74a7
 DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
-DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
-DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
-DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
-DIST onig-6.1.0.crate 30287 BLAKE2B 1b8b4539432ddf128381212fe9fb705fc2e9ca366b09bc7e2d109486a95e3f51e29c81c879fd45f3986b05a73dee42d8e9cc86f732de0ce73371f123722b8f65 SHA512 8f08ddbb48ea0e75a8dd8d788dfcc6f88773c5cb44a93f42df8b32bcef8279e6d8280314a096950aa5cfeef17c881b509d5136de69fd805604a0ebce69921475
-DIST onig-6.1.1.crate 30790 BLAKE2B ee5b49def2318cdc1fa7123484eef48551faba5be52659403e7c037e84a9d2c786afdadd44812b1a478762ae582fe24f46425f9d70f1adecc870020bdcb58b29 SHA512 4d754f05a3612486f6730f850956a041f1fb8ff723fd512acd0a8a0a4a2c8be2b98cd6f7b6a882947d3b368bdb5822241e55a87eef331de80c375433d326a864
 DIST onig-6.3.1.crate 30879 BLAKE2B e371f003ee19bdbb9cf9fa0e5f18ef14841cbae40f66bfbb367401c15b1eb50b3661accc0609a43dce41f8272ffad8a4b41f75ea23267ab8c7cdf4556d67a7cd SHA512 5c487063b669532e31acce0788b690c53a8d95eb628cea970dd335bb721fa99e67bb6c531b0a9a388354b7e1a6e1621cc953e029f1791dde43736a577002d955
-DIST onig_sys-69.5.1.crate 615126 BLAKE2B 964ddfffb677a8dd384a0ba5cf2096fb931eb73f48fd1f1ed6767402dd186343a83d68c06f834bd279e929121ead39a8860644dcffda08c52cf627e84c2682b6 SHA512 d85005612206a383af1a00ea508d076d27e31109659a9741e55deaa8423aa649a90af6cdaead67143943f3f9e1db212d5a88597b600a116067f7a5d855a9a379
-DIST onig_sys-69.6.0.crate 620817 BLAKE2B 294bc78ba0aa31743ec12c1cd2c29c3566fc960f64788681cfc3b333e942efc367c1721efdad06bba218a48b3eb1893b28daac163f76cb28a3f872e940ccdf02 SHA512 79903461da8cdacf3f50c7f4d7a1babb200a883a3fa6515119a6d2a82c15eb64b7f758932a2a8c46f89acd052d8f2ab84cf87bf16a3ec9c570667232f54418f5
 DIST onig_sys-69.7.1.crate 631301 BLAKE2B 4c593f3b7a83d32edc92db67d6f2f0460e43bf34611751f8a5941ad3cded459cdd582e9067291d1fa1e2dfc316b276080b99f85f0a98dc9bfcc531af2f289b7e SHA512 5be8c31049ad741fa06247bd22813374f71397481cea22be3d83bed720b512b9cb10d6028072fd92cc09ac0e9ca8fb977ca49fb59d934dd61f84c4634d28ffb3
-DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
-DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
-DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
-DIST path_abs-0.5.0.crate 31108 BLAKE2B 5c6d52f445ffa2f1e87e5ee078b79bcc9dc709fa97a4246759ae1ca476842d87943610ea441b504212bbd9d5f23dcf9482d747294722df7dbdcd93ee187fba75 SHA512 978a3a4d769ebf870ac619f10615cc2375f740b6d329f89bf9af26dcf3e361b4779e95483b4ae11d3ab4440dd6392f7cf9fd5a94dcfd434f9a77a8cb880bf2e1
 DIST path_abs-0.5.1.crate 31072 BLAKE2B 5f7041fc98db906183a42523ff6ed3ae23c1a8119c61860f71dc3b496845a9a0cd172151ba21c2cbb9933b0e2fa3e08ddf467700f4d2aef934d101e090b50fb9 SHA512 fd382fb0233b4029b9c6208b0b574c619cba8c3e6b6ffe39f63ff9e1cfd55240acd061d1aa82180987d72c8499802171f074eb35b9b0c60bc11cb48e248ee0ca
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
-DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
-DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
-DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
-DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
-DIST pkg-config-0.3.18.crate 14674 BLAKE2B a03292e97a195f8eef0cb74f2f640193b2045846b7d79a898927d6b6849b65a7e6bbd45fcd4103d3152e64c6f9c0316f2abf1c86a8a24c0467564894e1d45b54 SHA512 b4cae39a11bb80f6df96262ed77844270c0a02793ace5dd255820e9ce52a5f3a43b36bd6296ab9428253e96f9b991bb6a7090d7b749db1ecb0b03aa721813d8a
-DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
-DIST plist-1.0.0.crate 39489 BLAKE2B b7a968fdf07cab728f64f60a002b1cbf14946431e42f39af4e851469834c58b20b6555d80b51325552368cdacbba27d62c34f7c02da599eb1d06153e52b22de9 SHA512 e8d5e70fe882ce0c471f6a13ea0db897e10594ca28c8113814d7c38a3ed92c90f734ea45646ea12bd6f59c17e060d2269229d191ba9fc3d514e0fa7ce2bfb855
-DIST plist-1.1.0.crate 40173 BLAKE2B dc689529f09dc5370e4e98129bed5580a7d8dcc8b588d4acd66aea9c13d49ec67f449c26dbeb300016585f707267c03fbcb1310b033f423d3a03ea93026bb8f5 SHA512 11617001327b310978bfc114cb4549586af2f25d03563adcaba062d78f34ef2ccf72b4779877f206a06d0a7aed62253fa853c4544285542b6ee88331845c28c9
 DIST plist-1.3.1.crate 44772 BLAKE2B 2e2b869b4543d06830b54a873d6d5da572502ff0409aa723a5beda5121b0ea8c8aa3656aa70299ef32532f948ed82ccde05f4bbcc9cec6a7288e7fc79eb27536 SHA512 4cf962af14b4218502eb4aae5507d93c58c4a0b716f923c3f0e53e37225940c5ab6847d7d9ad5004f77dc2dbbd28f73412cc114fd231e515f23a4ade3f969e86
-DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
-DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
-DIST predicates-1.0.5.crate 26097 BLAKE2B 4adc79981c706796bef11e75e4a87cdfc5ff7f5066869f8d26f5ba0f3699c292edd6e5dd1be8854ff9e8b2604bf24904f1242056719e1d863951ca6f5ad042ae SHA512 696890cb9ed83b6ebd1b46e42bde95b148fe067174b0057e4ae83d9b3a4d2043dcedf0cc58b78e88b36a460402cd6359580356018986b4a136cba9e1afde55b6
-DIST predicates-1.0.8.crate 26996 BLAKE2B 0e45f2de536395c001475654c5ec2327c66151999ac00fba34abe637c4a2cd10e380597745de0e0bd85b3b088d09d171ec21d40664d878e100cc5d73f3eb5c6b SHA512 a6d8278c331223c24a7189e9dfeddd11a20e7e9010e647a8fbc554f4847b72a13aba2ad22d4e0fedfb2ed4490fd11b05fb2d0e7fda373794b7c0a70094998a6a
 DIST predicates-2.1.0.crate 23141 BLAKE2B 32dc6455d74e4188385e196f9b9042411c0c1278d12121b4aeaffd58d5adbd201ee4a3e51d908dd59528928f5751f53a125b53e1b15542ed6064c753cd8cfe52 SHA512 824cc99e8e904e5257223bba104cc705fb2e1c93ec6b638cd898dd53fb29217978de1a61c2f11caf1e4a0e076a37efbd09a2998457bcf4af1c2e7eb3c089e0af
-DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4
 DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
-DIST predicates-tree-1.0.0.crate 6251 BLAKE2B 00da28f7de9a7abb386c6a4425d8a2285d1ef22032476b0ac1bab4b8d34d2af69948f80d8f0498e2356caea3fe92ce352b58539413a8f0f052e9dbc26c96cc12 SHA512 29e1818b7cbcb7195dedc78e6a1436e8e8c88b61d43469952c4bba5bef7dbfd5b7f0dfbd9fd31f71e71cefe7c7b8c44ef361bff1a86f40c945caf48cbd87cf05
-DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
 DIST predicates-tree-1.0.4.crate 7682 BLAKE2B 10e32e4d316bd3bb7015a6ef6d8391381d441acdce0b54a7da2ae4f741175dad7bf92c2488809e233da45360388908f200c2a2756f17210641b0e503728cf150 SHA512 f4d4f3d58c13c9b0344832709709a677d0d1f32e80a2c1e7f38a6f214efaabfc2b8e12d4bb4ac8f0c57def9a44cfe94ce9144132cacc2b6f84002a57aeb4ae5e
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
-DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
-DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST quote-1.0.14.crate 27252 BLAKE2B c744f787e311f9c42b2678f88978d68eaeae87324f07cb28042152a77244ff973e3bc93b8a277f590abe1b6b7c37f6b095ac4a75c96ef9590f7d9d397382b62f SHA512 b2879fa8ae5ca80fb8aba56da016d9b8aab0f1014cc67fe597f42999e8042b2178b98dcb09109edc74b6bd1dc542341a72d11e4880273ffaaf766da243e687e4
-DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
-DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
-DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
-DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
-DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
-DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
-DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
-DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
-DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
-DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
-DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
-DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
-DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
-DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
-DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
-DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
-DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
-DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rgb-0.8.31.crate 16087 BLAKE2B c597b0961803685c80bc154b7d2fabeeb88c36bdc6f79fe6c6d99b9069bf3a3914eff0433cd6b068aa87ca608e90e408dca18a9f2deb900c1a8e5592462058a9 SHA512 a9b307c88dbe24b383e38311a411365a709d4d7fe8d5e0e35f29200af3f2b912e1251a68b268c383a2f00538a93fffd05f0bdf1ca15e5bd3f56000c789ecc144
-DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b
-DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
-DIST semver-parser-0.10.0.crate 20247 BLAKE2B 0352445eefc48dc9b34ce51a89e98215b48135e594db28d72c7729789b738c109b462e8ccf915c098a9b00c4cb3ef2182c1f3e8c4e8b64d85af042b752b607b2 SHA512 5477b586de589fe7e908291a30208c0e1d68f2d19fc932f81903233616a5e21fffaa5e6560f329ba07e4007182997ed90e1c9d34fae310aa6ccf47ee42e49b6f
-DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
-DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
-DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
-DIST serde-1.0.133.crate 75566 BLAKE2B c6f9334c6a3f722fc3f8b75a031f3c34acf81de1488953addce546ed1dbfeb2350a2a2b25b6088920f47172e2cc9e755c4ef682c19c579a2b70e7f4ae4a7ffb1 SHA512 53f6027a23688a5a303ad9ad169a333c02272ff9c0dc827705c75c162b70040ddf676428f38d04b9aaa49ddd4cee96b5ea5e1dc03f09b90d5f12d8ad22dced0a
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
-DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
-DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
-DIST serde_derive-1.0.133.crate 54726 BLAKE2B c59d71b857513be8b7377b4b9182b7f60e441f7fa5428939ff8a25567ab645eab8ed54178dbb4b41967b7b9073b51cdae68f5a910c91a26cfc2baad0c0344b9a SHA512 d8c18ab50c1b500dc49eed1b5ea26bb46b9adf98b3b3c6c97f9c5d11324368342188ffbfef4c8a092c69577622ec85e672341a49853a957b10bf8dcbc6c0f441
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
-DIST serde_json-1.0.58.crate 114933 BLAKE2B eda53fe830e539b760ad968191077aab05512f33d613796856cd3df7cd7ce21e9b704f30a6748e9622bd47e9c0c69310edc12bbb1dbe90547eb3b7b97b93a475 SHA512 377a067b1aad851fe7056c080b7a3d07cf6d2c75122766f25b2bf30d6023e70a6f7b5211200019983bfb1f0ac9cf09da4a8c74aef45c819a785818a6ce33ca0a
-DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST serde_json-1.0.74.crate 115919 BLAKE2B 230d205687c29f361705f80192e26a15e97c5dc1497a02bd56fa8399a4d562d087461729d17fbefe61af9662886381f8674aee91471b10f11f29e9ad9c14a39d SHA512 da070221e805495b9b8c56a203ded1b2651b81851ae473a73dbf46656c44375cd5ef7db01272792684abb4d7836e193c85a622e83c59125a393fb484431fb061
-DIST serde_yaml-0.8.14.crate 37928 BLAKE2B 58b5fe3678e022667696811fb0979081e50727f6efb288f97510eecacf86ad0ad1c6ae98a3916df574cfa73c9825414623f0a75e623e149048adf94369560c08 SHA512 de4b18f1e9bda434b93b32c8b3c8135ec3163ebf6f734920dc88c8736e40c05dd75f314d730c5c0c92eb259b85c5fa9263f5d0f3e78a7e214a9258e28c5ec06a
-DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
 DIST serde_yaml-0.8.23.crate 42140 BLAKE2B 49d28913954173d1c062fe4668c2228286adde3d3e210befd09e04f8e43dcde469c6aeb86349a7a604188343d0c211078c9520c079249780923a4d70e3132d9b SHA512 7831299cedf0fa9155a76b61436ec1cbc06adfe672a102973e8cffc8b277d99b4104d70951ed16b18283f3291c8047d6af413e0438da3e6bc6745bfb6816628a
 DIST serial_test-0.5.1.crate 2993 BLAKE2B c72cfcfe441d1d23128d442a3d24e83858e598dd95bccef0a462c675793db0aa1ad2cd03daa73441e84c8389b8dcef9b4698cb8eba8bb5dfbf69e524331950d7 SHA512 e1a0f7a24981698eaa6bcce8f951863f76e8a2750aff3191104d092a06021c39d4eb2e9b74e6690b0dba0d674a216ea170efe0a5367d22bdef72c2006f644a4e
 DIST serial_test_derive-0.5.1.crate 3609 BLAKE2B 54e408dc15f15c26e116157046ac609356b6d92d3e5bd27e08c31da537ec526eef8e6e52df1f06521b98c6c0695197b0b2ed654f0e46a45cf15156db82688d08 SHA512 e3f4b3c2eed1b284dbff7447c2f912343f9b95cbd88f3387c0136ca42698b38a607c752277ee4590ded9f73f475325d2652ba67ba029ddd54711d9070ac5f43e
-DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
 DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
 DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
-DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 DIST std_prelude-0.2.12.crate 5066 BLAKE2B 06e592e98a78e7d4f0d40075d5c77041019264cbfb50ff2f5ac2a22655787d3f70e4b270aadaa5508e965c9a8615b98b7f3307ddc42e62de708406f2fce14980 SHA512 c929e6eed305c337c4eb52caee63c5c016394ccaf2cb36268a289bf0bc74b0a20d3e739b3b7ca87e30eb45eab503203e04399c04d48f2d69a94da75cfd5804ae
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.42.crate 225244 BLAKE2B 814e7f8fcef54ffb87710fb271bf711b7d463d75e10cd0a686097d73d49767fbfdf3d84a09bc64b520d243db1b0be367ceb5900812a987fba48abec597ac629d SHA512 c758c4175fc9e48418224a02142f045eb0fcbb9ca6732a9ac36c55f075ec70268cc729f6b8002238d6c79a8ac4c3a9ef8c3ff69f78db9434fc9866152a2932eb
-DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
 DIST syn-1.0.85.crate 235056 BLAKE2B f72302314edc7a4040cc6e0c95a4b8a7105d81da0cd1788703067b01437a3cad216569d96e6871e5c26ec99bac23eaa077d871f2163ee4b501b4d57eba8502b3 SHA512 f12ac93bfc8f24b2a567485fc738a40ae8c9649515783003e07bc5d0f3e377bc324a4f649d66c7fa2d1272cb0a2fb884ecfb06f8aed98dc3c03329f62d03a44e
-DIST syntect-4.4.0.crate 751314 BLAKE2B 4d70ea137ba28e733e2bf505f547e1caa8a38dec33497e092d5efa77e321bc468ef955a0957ec949a0c68df31684e33234838f177f201e77d5e70aec8337829b SHA512 018fc26a99cad799446dfda0e406af87fb63e35cc5684fe2928f42f1b0a1199606a25b9ee4f1bd138abebc40f365c26407716856376f1ed6d3352c879a1689f4
-DIST syntect-4.5.0.crate 752883 BLAKE2B 9c9ff2cc63ea421c0b8928a0578b278883d0a86be7f7c256820120a858f8c02b1d292e2474e5f2b63486e45cf5387e1a8ba4db2a5c9e7a2b0cf4eb687b42ffad SHA512 17653ae9baa4da049c899820f6033b3e7d71b96ab70b9c12e57a1ab305d155b12acec470167be2a0a37ea9c89ec4d19850f72d456e6857a7cf4dee65fc288273
 DIST syntect-4.6.0.crate 750938 BLAKE2B 9c53e142093f6d9fb703f4fe3f56db15c0bb7eba92cba9f31e567e9de2bcb129b7b415cbaf692c1e1021b12184bb3b064ed1996654581aab3d5f09e992c0eb5d SHA512 9e320afaf4c2adf41dd7e20c5d95e3063fe8d2774d8deec7e0df3debab050e96a1a5c85d1732c661ee4022dc5bf1abfed2982f13269689b527f35efb2c82beba
-DIST sys-info-0.9.0.crate 20287 BLAKE2B 1a6ce4ac9d57d41160c145f7c5ecd671d306ecd56be6b0de49fb6e6de72c01288b863c71c64fdcda5bf828dbbcf288fb11a7289686de0154e81151cf808a06bd SHA512 847556f3e25f2e0a97c76b2b00f350230cb234be0f93bc5506d0e3a7ff3365deb439c7aea4f0722ab3d2f53ad76e7d05aab2167a5be44cad1e85ebdcb39d7842
 DIST sys-info-0.9.1.crate 20589 BLAKE2B fb3c43a1368c9206393b28064b38a1560aeb863b9b0bc89c9bf6ccc344a46a590296df3596f421218d78c26ae90d3f869ef0457c8c34e8e8dcb9bbd92fee0450 SHA512 52e23efd5bba1ce07d7fffb8c2d6864a8056b1e8ce1b85c4d2d4b37b9d57dfa5a6c0eae9e2018e07af47469c3f7812ccbd27351cbd6c95a7b788ec87cd544b2e
-DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
-DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
-DIST terminal_size-0.1.13.crate 8094 BLAKE2B b46de1f0dfdd6f4dd44c21a5cd7936cd9fef67d96be44775c29f3850e39b94f200c719bd0c0c31727725f1741ee9640a83c1f3083a45ed665db7f03e50793826 SHA512 75efac1092c6919efc7d427e3cf7d4c36a4d12b3d5c38ee35f94ddf2fb0efcc16fb92e608382905475d5de3078e9c64a29ec77816572797fdfb53a6708eaf266
-DIST terminal_size-0.1.16.crate 8755 BLAKE2B 33cfd9a62bdb77bd096563330ee5f07465d69c16659294a9e6ebeccf3d49e17473185fb84c2a4b50d29b084da0633b2ac4bf41801b0bd17f5c927d9bf68fdce7 SHA512 afefb529a80249ec398b444f593b6010b2a85e65e29557373cec72ee18bac5a5359aa2da3cda28d494f34c8eaddfc8a82029fb936d49726261ae0c5557bd5c17
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
 DIST termtree-0.2.3.crate 6926 BLAKE2B 390aad5f90602785674fddf6dd5ffe5ddb37b5f2eea7cfd330e04e4b3f482c8ab3bca63fa595ee409a8bed3ffd27684bc6a1227ca679763f94cf5a75ad55ee93 SHA512 183a99ece5ba686e6fc9884c3dc702083a6f7918514a20e3af460195d8f171d9ec91fccb8e2a93319f844ca7164455c9490e4a6478ef096f44c1b57e532a7a76
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
-DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST time-0.3.5.crate 72732 BLAKE2B 7e7e90cdaca05f60e79b0858826fc59ea6a6e3113051c0a2cb7e0b7e7963e6c410595c8c524a97281f754008f5ad3090c7cb2a5098b00b922c0e898441f02171 SHA512 751afd33abf9879b7bc524b50c63ca4722aa39d5bef3ddb371ec4d6efc9acbee9033c5813ec7d31e5e627e3c7fcd491ad4e7016130b7b09f931023e2bf395574
-DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c
-DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
-DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
-DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
-DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
-DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
-DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
-DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
-DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
-DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
-DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
-DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141
-DIST vcpkg-0.2.12.crate 15530 BLAKE2B 23ee1a34064f19b67232c417a11093f01624b1ddb6aa572ac67ec125dd3f784036e68b58078607e028028e7c7e787c40a158d99cf120b8b80fd8d18c18a07a74 SHA512 33076b42cc83fa614fde2cbcfe1bc5426c99fe3707c129e6c2b7aa16afe3bbf6ada027ac35cc70bc432df25e6a4f6086d251effceae373b6efc23c6a6fb2ff46
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
-DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
-DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
-DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wild-2.0.4.crate 7068 BLAKE2B 4f2846b44c5cb34de67688afb74af36b5f435e314b4a5312fe33eaa8378a218354bde2355f6ef53ef1444abcfeaafc150f76f155aa97850d09fff469e3bd1fc5 SHA512 a0c7d27891064d7455c3abf8aaecbd744e7fdd3b4e11bd8e7becb8917585410828fe45f2077e90d81608d230d8a31eaaf2ac818d4ad3225e1f9d3ffd27495453
 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 xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
-DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD bat-0.17.1-r1.ebuild 3825 BLAKE2B 0e3129e4e0a406384f96b0669836708e20c655b782bc8cdf31772c3adb487018c89f794a319092901b3497e85625260db3680a5b7dd813b7461fd58c3d20ed63 SHA512 3d4d476f9c020c583c681752c0d039fc7abbc31c9ecfe5ef4fef04786e3b77a27ae619f2231c4fb54de4c60bc79d2b74668bca5fd45d5111f916f5e18df6d4dc
-EBUILD bat-0.18.1.ebuild 4216 BLAKE2B 7242e6acaba30ecd35dcc0ed855c362016804e14e6dbd1eed62c3a038a9034b1a37c231cef490a99a114a7f4bb0da5631ce2b1bcea3e9814b5a730fe73891fa1 SHA512 5a4442df4a899821261324a486b38882ede10b8d88b5c3846d0600f545de53df0f9ae8fd66f94012eee47cbb480b29a01f50df53a78d4d0e4a1c1ae9c7343f2c
-EBUILD bat-0.18.3-r1.ebuild 4233 BLAKE2B 92840b7422b9c925a31858bd2623d8a0419326cf662f31e2f234b44a2fd22758e4d974a0c60afa145d9bf708981f5092661b9894f6b80531153c1ff9781ad975 SHA512 6e1db27c524fda9dcf2949dccb2c015a4147b8640e2e82a1c101473ba909fb8d88a6ba62f773d174daffa4b7e08852f151417ebfc735d5a3dab341da55e90809
-EBUILD bat-0.19.0.ebuild 4016 BLAKE2B 1ddd578a54f3a1e809b4fddf3da39ac76df5f2fd15fdb26ffe6e9197a0b23f9287264865281710f27db101b3fa5247cb1265f8222558cecbc34f2af04befe316 SHA512 de36214942088fb5ca92188d7b1e66866c0d0d25c8f2e6eedc08db42258e0c0af96309b333e9f606d57efdc8cf47d11526d731ae06d8e08a15008bc821811635
-EBUILD bat-0.20.0.ebuild 3994 BLAKE2B e2872729c45a93dbf3128ebf570b5e38532be6b94906217a8dad94353b0c720c0a671cffa8ff5bca9bf6ff20f93af6517fd67f9d43cf6f1a2afcd849ca61ecd8 SHA512 a5b00ecf90c71d40847b98023c399d2841d92081ab505f66ce239dba7fac4ead96cb99766c3293ec23bb5c94c4be590147ae4918134b81edb367b591d9103804
+EBUILD bat-0.20.0.ebuild 3993 BLAKE2B fd883b59fb863de36b6ede7c2fbc3a26efdb4d22f561eaeadf08f3b333f03eebed403eae16e95a51844da8e60278501094af6ab1216f514140d15d8e76a5acb3 SHA512 d157c54dc2c89021d30c97162703d1a8bc1ba59a29f55350ccd598470c9cca14553c90bd32f1d99e2705f9821c6cd2c57958d13cbd82f85689ed8bc95ae3f36a
 MISC metadata.xml 849 BLAKE2B 5c57de94ef22a5be55abec3a0fe429b40d24605bbc49322cd607baf4a3efcb34edd4ac4370ae60c377055800134722166d70d1f39a4a959f3c5f6844b2444e93 SHA512 18a02a2d6a13c23415d57c7303170413b4466c4f35138b3d9ceeba0acae94bea9b7d7443feda1d9611d8812665d915007e13fca5df3051073905050734a8b626
diff --git a/sys-apps/bat/bat-0.17.1-r1.ebuild b/sys-apps/bat/bat-0.17.1-r1.ebuild
deleted file mode 100644
index a3647111ee7a..000000000000
--- a/sys-apps/bat/bat-0.17.1-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-adler-0.2.3
-aho-corasick-0.7.13
-ansi_colours-1.0.1
-ansi_term-0.11.0
-ansi_term-0.12.1
-arrayref-0.3.6
-arrayvec-0.5.1
-assert_cmd-1.0.1
-atty-0.2.14
-autocfg-1.0.1
-base64-0.12.3
-bincode-1.3.1
-bitflags-1.2.1
-bit-set-0.5.2
-bit-vec-0.6.2
-blake2b_simd-0.5.10
-block-buffer-0.7.3
-block-padding-0.1.5
-bstr-0.2.13
-byteorder-1.3.4
-byte-tools-0.3.1
-cc-1.0.60
-cfg-if-0.1.10
-chrono-0.4.19
-clap-2.33.3
-clircle-0.1.3
-console-0.13.0
-constant_time_eq-0.1.5
-content_inspector-0.2.4
-crc32fast-1.2.0
-crossbeam-utils-0.7.2
-difference-2.0.0
-digest-0.8.1
-dirs-3.0.1
-dirs-sys-0.3.5
-doc-comment-0.3.3
-dtoa-0.4.6
-encode_unicode-0.3.6
-encoding-0.2.33
-encoding-index-japanese-1.20141219.5
-encoding-index-korean-1.20141219.5
-encoding-index-simpchinese-1.20141219.5
-encoding-index-singlebyte-1.20141219.5
-encoding_index_tests-0.1.4
-encoding-index-tradchinese-1.20141219.5
-error-chain-0.12.4
-fake-simd-0.1.2
-fancy-regex-0.3.5
-flate2-1.0.18
-float-cmp-0.8.0
-fnv-1.0.7
-fuchsia-cprng-0.1.1
-generic-array-0.12.3
-getrandom-0.1.15
-git2-0.13.12
-glob-0.3.0
-globset-0.4.6
-hashbrown-0.9.1
-hermit-abi-0.1.16
-idna-0.2.0
-indexmap-1.6.0
-itoa-0.4.6
-jobserver-0.1.21
-lazycell-1.3.0
-lazy_static-1.4.0
-libc-0.2.78
-libgit2-sys-0.12.14+1.1.0
-libz-sys-1.1.2
-line-wrap-0.1.1
-linked-hash-map-0.5.3
-log-0.4.11
-maplit-1.0.2
-matches-0.1.8
-memchr-2.3.3
-miniz_oxide-0.4.2
-nix-0.19.0
-normalize-line-endings-0.3.0
-num-integer-0.1.43
-num-traits-0.2.12
-onig-6.1.0
-onig_sys-69.5.1
-opaque-debug-0.2.3
-path_abs-0.5.0
-percent-encoding-2.1.0
-pest-2.1.3
-pest_derive-2.1.0
-pest_generator-2.1.3
-pest_meta-2.1.3
-pkg-config-0.3.18
-plist-1.0.0
-predicates-1.0.5
-predicates-core-1.0.0
-predicates-tree-1.0.0
-proc-macro2-1.0.24
-quote-1.0.7
-rand-0.4.6
-rand_core-0.3.1
-rand_core-0.4.2
-rdrand-0.4.0
-redox_syscall-0.1.57
-redox_users-0.3.5
-regex-1.3.9
-regex-syntax-0.6.18
-remove_dir_all-0.5.3
-rust-argon2-0.8.2
-ryu-1.0.5
-safemem-0.3.3
-same-file-1.0.6
-semver-0.11.0
-semver-parser-0.10.0
-serde-1.0.117
-serde_derive-1.0.117
-serde_json-1.0.58
-serde_yaml-0.8.14
-sha-1-0.8.2
-shell-words-1.0.0
-std_prelude-0.2.12
-strsim-0.8.0
-syn-1.0.42
-syntect-4.4.0
-tempdir-0.3.7
-terminal_size-0.1.13
-term_size-0.3.2
-textwrap-0.11.0
-thread_local-1.0.1
-tinyvec-0.3.4
-treeline-0.1.0
-typenum-1.12.0
-ucd-trie-0.1.3
-unicode-bidi-0.3.4
-unicode-normalization-0.1.13
-unicode-width-0.1.8
-unicode-xid-0.2.1
-url-2.1.1
-vcpkg-0.2.10
-vec_map-0.8.2
-version_check-0.9.2
-wait-timeout-0.2.0
-walkdir-2.3.1
-wasi-0.9.0+wasi-snapshot-preview1
-wild-2.0.4
-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
-xml-rs-0.8.3
-yaml-rust-0.4.4
-"
-
-inherit cargo
-
-DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
-HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/libgit2-1.1.0:=[threads]
-	dev-libs/oniguruma:=
-	sys-libs/zlib
-"
-# >app-backup/bacula-9.2[qt5] has file collisions, #686118
-RDEPEND="${DEPEND}
-	!>app-backup/bacula-9.2[qt5]
-"
-
-DOCS=( README.md doc/alternatives.md )
-
-QA_FLAGS_IGNORED="/usr/bin/bat"
-
-src_configure() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-
-	doman target/release/build/bat-*/out/assets/manual/bat.1
-
-	insinto /usr/share/fish/vendor_completions.d/
-	doins target/release/build/bat-*/out/assets/completions/bat.fish
-
-	insinto /usr/share/zsh/site-functions/
-	newins target/release/build/bat-*/out/assets/completions/bat.zsh _${PN}
-}
diff --git a/sys-apps/bat/bat-0.18.1.ebuild b/sys-apps/bat/bat-0.18.1.ebuild
deleted file mode 100644
index ca85a16743f6..000000000000
--- a/sys-apps/bat/bat-0.18.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-	adler-1.0.2
-	aho-corasick-0.7.18
-	ansi_colours-1.0.2
-	ansi_term-0.11.0
-	ansi_term-0.12.1
-	assert_cmd-1.0.3
-	atty-0.2.14
-	autocfg-1.0.1
-	base64-0.13.0
-	bincode-1.3.3
-	bit-set-0.5.2
-	bit-vec-0.6.3
-	bitflags-1.2.1
-	bstr-0.2.16
-	bugreport-0.4.0
-	byteorder-1.4.3
-	cc-1.0.67
-	cfg-if-1.0.0
-	chrono-0.4.19
-	clap-2.33.3
-	clircle-0.3.0
-	console-0.14.1
-	content_inspector-0.2.4
-	crc32fast-1.2.1
-	difference-2.0.0
-	dirs-next-2.0.0
-	dirs-sys-next-0.1.2
-	doc-comment-0.3.3
-	dtoa-0.4.8
-	encode_unicode-0.3.6
-	encoding-0.2.33
-	encoding-index-japanese-1.20141219.5
-	encoding-index-korean-1.20141219.5
-	encoding-index-simpchinese-1.20141219.5
-	encoding-index-singlebyte-1.20141219.5
-	encoding-index-tradchinese-1.20141219.5
-	encoding_index_tests-0.1.4
-	error-chain-0.12.4
-	fancy-regex-0.3.5
-	flate2-1.0.20
-	float-cmp-0.8.0
-	fnv-1.0.7
-	form_urlencoded-1.0.1
-	getrandom-0.2.2
-	git-version-0.3.4
-	git-version-macro-0.3.4
-	git2-0.13.19
-	glob-0.3.0
-	globset-0.4.6
-	hashbrown-0.9.1
-	hermit-abi-0.1.18
-	idna-0.2.3
-	indexmap-1.6.2
-	instant-0.1.9
-	itoa-0.4.7
-	jobserver-0.1.22
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	libc-0.2.94
-	libgit2-sys-0.12.20+1.1.0
-	libz-sys-1.1.3
-	line-wrap-0.1.1
-	linked-hash-map-0.5.4
-	lock_api-0.4.4
-	log-0.4.14
-	matches-0.1.8
-	memchr-2.4.0
-	miniz_oxide-0.4.4
-	nix-0.20.0
-	normalize-line-endings-0.3.0
-	num-integer-0.1.44
-	num-traits-0.2.14
-	onig-6.1.1
-	onig_sys-69.6.0
-	parking_lot-0.11.1
-	parking_lot_core-0.8.3
-	path_abs-0.5.1
-	percent-encoding-2.1.0
-	pest-2.1.3
-	pkg-config-0.3.19
-	plist-1.1.0
-	ppv-lite86-0.2.10
-	predicates-1.0.8
-	predicates-core-1.0.2
-	predicates-tree-1.0.2
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.26
-	quote-1.0.9
-	rand-0.8.3
-	rand_chacha-0.3.0
-	rand_core-0.6.2
-	rand_hc-0.3.0
-	redox_syscall-0.2.8
-	redox_users-0.4.0
-	regex-1.5.4
-	regex-automata-0.1.9
-	regex-syntax-0.6.25
-	remove_dir_all-0.5.3
-	ryu-1.0.5
-	safemem-0.3.3
-	same-file-1.0.6
-	scopeguard-1.1.0
-	semver-0.11.0
-	semver-parser-0.10.2
-	serde-1.0.126
-	serde_derive-1.0.126
-	serde_json-1.0.64
-	serde_yaml-0.8.17
-	serial_test-0.5.1
-	serial_test_derive-0.5.1
-	shell-escape-0.1.5
-	shell-words-1.0.0
-	smallvec-1.6.1
-	std_prelude-0.2.12
-	strsim-0.8.0
-	syn-1.0.72
-	syntect-4.5.0
-	sys-info-0.9.0
-	tempfile-3.2.0
-	term_size-0.3.2
-	terminal_size-0.1.16
-	textwrap-0.11.0
-	tinyvec-1.2.0
-	tinyvec_macros-0.1.0
-	treeline-0.1.0
-	ucd-trie-0.1.3
-	unicode-bidi-0.3.5
-	unicode-normalization-0.1.17
-	unicode-width-0.1.8
-	unicode-xid-0.2.2
-	url-2.2.2
-	vcpkg-0.2.12
-	vec_map-0.8.2
-	version_check-0.9.3
-	wait-timeout-0.2.0
-	walkdir-2.3.2
-	wasi-0.10.2+wasi-snapshot-preview1
-	wild-2.0.4
-	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
-	xml-rs-0.8.3
-	yaml-rust-0.4.5
-"
-
-inherit cargo
-
-DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
-# Double check the homepage as the cargo_metadata crate
-# does not provide this value so instead repository is used
-HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/libgit2-1.1.0:=[threads]
-	dev-libs/oniguruma:=
-"
-# >app-backup/bacula-9.2[qt5] has file collisions, #686118
-RDEPEND="${DEPEND}
-	!>app-backup/bacula-9.2[qt5]
-"
-
-DOCS=( README.md doc/alternatives.md )
-
-QA_FLAGS_IGNORED="/usr/bin/bat"
-
-src_configure() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-
-	doman target/release/build/bat-*/out/assets/manual/bat.1
-
-	insinto /usr/share/fish/vendor_completions.d/
-	doins target/release/build/bat-*/out/assets/completions/bat.fish
-
-	# Hack to find/install generated zsh completions files as it can be present in
-	# multiple directories
-	local BUILD_DIR="$(dirname $(find target/release -name bat.zsh -print -quit || die) || die)"
-	insinto /usr/share/zsh/site-functions/
-	newins "${BUILD_DIR}"/bat.zsh _${PN}
-}
diff --git a/sys-apps/bat/bat-0.18.3-r1.ebuild b/sys-apps/bat/bat-0.18.3-r1.ebuild
deleted file mode 100644
index 97b8c7d47f4b..000000000000
--- a/sys-apps/bat/bat-0.18.3-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 2017-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adler-1.0.2
-	aho-corasick-0.7.18
-	ansi_colours-1.0.4
-	ansi_term-0.11.0
-	ansi_term-0.12.1
-	assert_cmd-1.0.5
-	atty-0.2.14
-	autocfg-1.0.1
-	base64-0.13.0
-	bincode-1.3.3
-	bit-set-0.5.2
-	bit-vec-0.6.3
-	bitflags-1.2.1
-	bstr-0.2.16
-	bugreport-0.4.1
-	byteorder-1.4.3
-	cc-1.0.67
-	cfg-if-1.0.0
-	chrono-0.4.19
-	clap-2.33.3
-	clircle-0.3.0
-	console-0.14.1
-	content_inspector-0.2.4
-	crc32fast-1.2.1
-	difference-2.0.0
-	dirs-next-2.0.0
-	dirs-sys-next-0.1.2
-	doc-comment-0.3.3
-	dtoa-0.4.8
-	encode_unicode-0.3.6
-	encoding-0.2.33
-	encoding-index-japanese-1.20141219.5
-	encoding-index-korean-1.20141219.5
-	encoding-index-simpchinese-1.20141219.5
-	encoding-index-singlebyte-1.20141219.5
-	encoding-index-tradchinese-1.20141219.5
-	encoding_index_tests-0.1.4
-	error-chain-0.12.4
-	fancy-regex-0.3.5
-	flate2-1.0.20
-	float-cmp-0.8.0
-	fnv-1.0.7
-	form_urlencoded-1.0.1
-	getrandom-0.2.2
-	git-version-0.3.4
-	git-version-macro-0.3.4
-	git2-0.13.20
-	glob-0.3.0
-	globset-0.4.8
-	grep-cli-0.1.6
-	hashbrown-0.9.1
-	hermit-abi-0.1.18
-	idna-0.2.3
-	indexmap-1.6.2
-	instant-0.1.9
-	itoa-0.4.7
-	jobserver-0.1.22
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	libc-0.2.95
-	libgit2-sys-0.12.21+1.1.0
-	libz-sys-1.1.3
-	line-wrap-0.1.1
-	linked-hash-map-0.5.4
-	lock_api-0.4.4
-	log-0.4.14
-	matches-0.1.8
-	memchr-2.4.0
-	memoffset-0.6.4
-	miniz_oxide-0.4.4
-	nix-0.21.0
-	normalize-line-endings-0.3.0
-	num-integer-0.1.44
-	num-traits-0.2.14
-	onig-6.1.1
-	onig_sys-69.6.0
-	parking_lot-0.11.1
-	parking_lot_core-0.8.3
-	path_abs-0.5.1
-	percent-encoding-2.1.0
-	pest-2.1.3
-	pkg-config-0.3.19
-	plist-1.1.0
-	ppv-lite86-0.2.10
-	predicates-1.0.8
-	predicates-core-1.0.2
-	predicates-tree-1.0.2
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.26
-	quote-1.0.9
-	rand-0.8.3
-	rand_chacha-0.3.0
-	rand_core-0.6.2
-	rand_hc-0.3.0
-	redox_syscall-0.2.8
-	redox_users-0.4.0
-	regex-1.5.4
-	regex-automata-0.1.9
-	regex-syntax-0.6.25
-	remove_dir_all-0.5.3
-	ryu-1.0.5
-	safemem-0.3.3
-	same-file-1.0.6
-	scopeguard-1.1.0
-	semver-0.11.0
-	semver-parser-0.10.2
-	serde-1.0.126
-	serde_derive-1.0.126
-	serde_json-1.0.64
-	serde_yaml-0.8.17
-	serial_test-0.5.1
-	serial_test_derive-0.5.1
-	shell-escape-0.1.5
-	shell-words-1.0.0
-	smallvec-1.6.1
-	std_prelude-0.2.12
-	strsim-0.8.0
-	syn-1.0.72
-	syntect-4.5.0
-	sys-info-0.9.0
-	tempfile-3.2.0
-	term_size-0.3.2
-	termcolor-1.1.2
-	terminal_size-0.1.16
-	textwrap-0.11.0
-	tinyvec-1.2.0
-	tinyvec_macros-0.1.0
-	treeline-0.1.0
-	ucd-trie-0.1.3
-	unicode-bidi-0.3.5
-	unicode-normalization-0.1.17
-	unicode-width-0.1.8
-	unicode-xid-0.2.2
-	url-2.2.2
-	vcpkg-0.2.12
-	vec_map-0.8.2
-	version_check-0.9.3
-	wait-timeout-0.2.0
-	walkdir-2.3.2
-	wasi-0.10.2+wasi-snapshot-preview1
-	wild-2.0.4
-	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
-	xml-rs-0.8.3
-	yaml-rust-0.4.5
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
-# Double check the homepage as the cargo_metadata crate
-# does not provide this value so instead repository is used
-HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/libgit2-1.1.0:=[threads]
-	dev-libs/oniguruma:=
-"
-# >app-backup/bacula-9.2[qt5] has file collisions, #686118
-RDEPEND="${DEPEND}
-	!>app-backup/bacula-9.2[qt5]
-"
-
-DOCS=( README.md doc/alternatives.md )
-
-QA_FLAGS_IGNORED="/usr/bin/bat"
-
-src_configure() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-
-	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
-	cd ${build_dir[0]} || die "Cannot change directory to ${PN} build"
-
-	doman assets/manual/bat.1
-
-	newbashcomp assets/completions/${PN}.bash ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins assets/completions/${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins assets/completions/${PN}.fish
-}
diff --git a/sys-apps/bat/bat-0.19.0.ebuild b/sys-apps/bat/bat-0.19.0.ebuild
deleted file mode 100644
index 4c51f48017e3..000000000000
--- a/sys-apps/bat/bat-0.19.0.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 2017-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adler-1.0.2
-	aho-corasick-0.7.18
-	ansi_colours-1.0.4
-	ansi_term-0.12.1
-	assert_cmd-2.0.2
-	atty-0.2.14
-	autocfg-1.0.1
-	base64-0.13.0
-	bincode-1.3.3
-	bit-set-0.5.2
-	bit-vec-0.6.3
-	bitflags-1.3.2
-	bstr-0.2.17
-	bugreport-0.4.1
-	cc-1.0.72
-	cfg-if-1.0.0
-	clap-2.34.0
-	clircle-0.3.0
-	console-0.15.0
-	content_inspector-0.2.4
-	crc32fast-1.3.0
-	difflib-0.4.0
-	dirs-next-2.0.0
-	dirs-sys-next-0.1.2
-	doc-comment-0.3.3
-	either-1.6.1
-	encode_unicode-0.3.6
-	encoding-0.2.33
-	encoding-index-japanese-1.20141219.5
-	encoding-index-korean-1.20141219.5
-	encoding-index-simpchinese-1.20141219.5
-	encoding-index-singlebyte-1.20141219.5
-	encoding-index-tradchinese-1.20141219.5
-	encoding_index_tests-0.1.4
-	fancy-regex-0.7.1
-	flate2-1.0.22
-	float-cmp-0.9.0
-	fnv-1.0.7
-	form_urlencoded-1.0.1
-	getrandom-0.2.3
-	git-version-0.3.5
-	git-version-macro-0.3.5
-	git2-0.13.25
-	glob-0.3.0
-	globset-0.4.8
-	grep-cli-0.1.6
-	hashbrown-0.11.2
-	hermit-abi-0.1.19
-	idna-0.2.3
-	indexmap-1.7.0
-	instant-0.1.12
-	itertools-0.10.3
-	itoa-0.4.8
-	itoa-1.0.1
-	jobserver-0.1.24
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	libc-0.2.112
-	libgit2-sys-0.12.26+1.3.0
-	libz-sys-1.1.3
-	line-wrap-0.1.1
-	linked-hash-map-0.5.4
-	lock_api-0.4.5
-	log-0.4.14
-	matches-0.1.9
-	memchr-2.4.1
-	memoffset-0.6.5
-	miniz_oxide-0.4.4
-	nix-0.23.1
-	normalize-line-endings-0.3.0
-	num-traits-0.2.14
-	once_cell-1.9.0
-	onig-6.3.1
-	onig_sys-69.7.1
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	path_abs-0.5.1
-	percent-encoding-2.1.0
-	pkg-config-0.3.24
-	plist-1.3.1
-	ppv-lite86-0.2.16
-	predicates-2.1.0
-	predicates-core-1.0.2
-	predicates-tree-1.0.4
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.36
-	quote-1.0.14
-	rand-0.8.4
-	rand_chacha-0.3.1
-	rand_core-0.6.3
-	rand_hc-0.3.1
-	redox_syscall-0.2.10
-	redox_users-0.4.0
-	regex-1.5.4
-	regex-automata-0.1.10
-	regex-syntax-0.6.25
-	remove_dir_all-0.5.3
-	ryu-1.0.9
-	safemem-0.3.3
-	same-file-1.0.6
-	scopeguard-1.1.0
-	semver-1.0.4
-	serde-1.0.133
-	serde_derive-1.0.133
-	serde_json-1.0.74
-	serde_yaml-0.8.23
-	serial_test-0.5.1
-	serial_test_derive-0.5.1
-	shell-escape-0.1.5
-	shell-words-1.0.0
-	smallvec-1.7.0
-	std_prelude-0.2.12
-	strsim-0.8.0
-	syn-1.0.85
-	syntect-4.6.0
-	sys-info-0.9.1
-	tempfile-3.2.0
-	term_size-0.3.2
-	termcolor-1.1.2
-	terminal_size-0.1.17
-	termtree-0.2.3
-	textwrap-0.11.0
-	thiserror-1.0.30
-	thiserror-impl-1.0.30
-	time-0.3.5
-	tinyvec-1.5.1
-	tinyvec_macros-0.1.0
-	unicode-bidi-0.3.7
-	unicode-normalization-0.1.19
-	unicode-width-0.1.9
-	unicode-xid-0.2.2
-	url-2.2.2
-	vcpkg-0.2.15
-	vec_map-0.8.2
-	wait-timeout-0.2.0
-	walkdir-2.3.2
-	wasi-0.10.2+wasi-snapshot-preview1
-	wild-2.0.4
-	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
-	xml-rs-0.8.4
-	yaml-rust-0.4.5
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
-HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="
-	https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)
-"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 LGPL-3+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/libgit2-1.1.0:=[threads]
-	dev-libs/oniguruma:=
-"
-# >app-backup/bacula-9.2[qt5] has file collisions, #686118
-RDEPEND="${DEPEND}
-	!>app-backup/bacula-9.2[qt5]
-"
-
-DOCS=( README.md CHANGELOG.md doc/alternatives.md )
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_configure() {
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-
-	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
-	cd ${build_dir[0]} || die "Cannot change directory to ${PN} build"
-
-	doman assets/manual/bat.1
-
-	newbashcomp assets/completions/${PN}.bash ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins assets/completions/${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins assets/completions/${PN}.fish
-}
diff --git a/sys-apps/bat/bat-0.20.0.ebuild b/sys-apps/bat/bat-0.20.0.ebuild
index 3fd720b9ac04..4c3a41400a38 100644
--- a/sys-apps/bat/bat-0.20.0.ebuild
+++ b/sys-apps/bat/bat-0.20.0.ebuild
@@ -160,7 +160,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 LGPL-3+ MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 33e7bd9766c6..fc0aa681a2cb 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,5 +1,8 @@
+AUX bubblewrap-0.6.1-clang-printf.patch 849 BLAKE2B 6bbe5259c1e6e80ca8547dda8df92ebc63a9807a4bafcbce02601afe1e625661a7f2f95222be72853e53d57c6e7704084641acf4644731a04fd791753cd4de6a SHA512 8c2a26a5a0814b8d1d69aa0d0790c99bde2b170dc72751b6edf6515b6457a5b7b9fa25e7f5d6fa35340f094ee125eaeec2ea0ae5273ed0d267cedc9623c17023
 DIST bubblewrap-0.5.0.tar.xz 137796 BLAKE2B 36aef94335d61ae55076a0a94cd6f2c335a87f8df9900c0c603c7ee870cf84c617a0c2ad99a5979cc1dd22740d652155fa6049e717eb210c9a83afe516daa107 SHA512 b1f5bde9562bf3176c51fdc22304b901e00e1de5189d9b5479aed7b651b84bed5539fc5bb3b1db58a05da4a57d69c9f41c40e15aa5a575746630e015674a02b7
 DIST bubblewrap-0.6.1.tar.xz 145500 BLAKE2B 8f8f69c5314843be1ac8c52d462ce2b17fc88760274b71837793a3e8dbf87623b80b7ae094131cee896644b53f4761388638d21b1575d1887eb755880bb05845 SHA512 68e07812ff5e01de2b7a0ce66e8386ca3662fd071d4e9b4c4afa611c1589c0ed116e0ebb4c03eae3f707f908d86945e157f8b26ff872c2814889dde92df9c60b
+DIST bubblewrap-0.6.2.tar.xz 146312 BLAKE2B bf02e9095cd1e80b84e0439d14ce57fc9bb08f9f0d3596a19eb34a55bd03b9d371368eda75f2b2106d47db29d1c2d9845fe2a12f5d0c554bbb532c9e0e53d368 SHA512 235da019cb370ea6d9328352acb38e6ff368f02f71db1ae85f2dd37655757975bd5b57bbe15f7b419b53a26b8ec3edd81b55893b420d5f42d6a9dab3471d0096
 EBUILD bubblewrap-0.5.0.ebuild 1062 BLAKE2B 9ba535294ccb822020fbf22e435ca43cc5634e3da93e7075d243a6cc5d9635d4a153a45bddfb222a43b225cc2d1f8371882e5fb69002a0155836ded53122b87f SHA512 80325583f448ead83579c1c76daa25532066c6596ca0b3b75636e30323093aa751fe12e682c440c71d0521ef68a6ed0365a9123b0bc0b721eb59cff43c04f550
-EBUILD bubblewrap-0.6.1.ebuild 1169 BLAKE2B 940bb12e461f7701c6300b634ea505d5a31f5ed9f8e8615cdc01d4df2b0ae231c92272d7f41b0ca784b8fd9bdc2b34c8eb75bc2ca28c074acd767b8aea74064d SHA512 17abf8ba4a3c6bc2faa6e4c5dbc9e31184b9f2b493b151b304986b69638c80614dea413487ebbd1431bf789211a66e5271d91961501b22c3549f977bdc152647
+EBUILD bubblewrap-0.6.1.ebuild 1221 BLAKE2B 5e8c71cb6940903495fab06e9aaf0695bac8d90a2d6faf502f1579fe826c9b1f6fa1bf713fc4889e3adcff5867ec3b8f50fea23a02dbc8c30f92e1736e14ae70 SHA512 fb0ce3dc2d2f2f6f659f4c2daf337bd052de4dfa3885063783da97b985a17bf3b9e024b72c207fc2cba6f9b996bd5a5d7a51995c581a7d2f865e4843a6615400
+EBUILD bubblewrap-0.6.2.ebuild 1158 BLAKE2B a9be2f08496b1260d304dac11fb2a066ec7dc6cddaf8b3f4383c6794440e9c5a4b6b3e0c3b6e0e5f3cc4f73e8d2223dfdaca2002b03efc2cdbde37f25510afbf SHA512 30576d630d9b62e0a19590721bbdf3c84696a59bedd571e15da7121dd8371ebbd06c308c0687cb0ef00b3b0959aa62983c68f61599ad3c588421834c9ea54d2c
 MISC metadata.xml 453 BLAKE2B 69f1ca03c4b84f4adc2db8bbed8bf57852719c136778747e2679517afe63b1a0621ab486121b71d78c8ae235c2cd7e3077e85ed8d3ad51cc16f1838eb94bd448 SHA512 486775a479174ad72dbcd7f6a89c8001af1a8a4c5b73620153fed4da28b15fb1c481003ffd96ef68d2b49569ed0c1a9d445bc03a9901056cd29b77b3cf13a1ef
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
index cc06208a257a..388a422db4d4 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
 # tests require root priviledge
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-clang-printf.patch
+)
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
new file mode 100644
index 000000000000..a7941bb7f15f
--- /dev/null
+++ b/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson
+
+DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
+HOMEPAGE="https://github.com/containers/bubblewrap/"
+SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="selinux +suid"
+
+RDEPEND="
+	sys-libs/libseccomp
+	sys-libs/libcap
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+# tests require root privileges
+RESTRICT="test"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbash_completion=enabled
+		-Dman=enabled
+		-Dtests=false
+		-Dzsh_completion=enabled
+		$(meson_feature selinux)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use suid; then
+		chmod u+s "${ED}"/usr/bin/bwrap
+	fi
+}
diff --git a/sys-apps/bubblewrap/files/bubblewrap-0.6.1-clang-printf.patch b/sys-apps/bubblewrap/files/bubblewrap-0.6.1-clang-printf.patch
new file mode 100644
index 000000000000..7c7e0ff29988
--- /dev/null
+++ b/sys-apps/bubblewrap/files/bubblewrap-0.6.1-clang-printf.patch
@@ -0,0 +1,30 @@
+https://github.com/containers/bubblewrap/commit/08dc2bb54658e003724f570224541a674645d87f.patch
+https://bugs.gentoo.org/834912
+
+From 08dc2bb54658e003724f570224541a674645d87f Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Fri, 18 Mar 2022 10:25:51 +0100
+Subject: [PATCH] tests: properly tag ok as being printf-like
+
+Avoids breaking warning with clang
+
+Fixes #478
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ tests/test-utils.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test-utils.c b/tests/test-utils.c
+index c9b859d2..41874a15 100644
+--- a/tests/test-utils.c
++++ b/tests/test-utils.c
+@@ -25,6 +25,8 @@
+ 
+ /* A small implementation of TAP */
+ static unsigned int test_number = 0;
++
++__attribute__((format(printf, 1, 2)))
+ static void
+ ok (const char *format, ...)
+ {
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 97443a9360e0..75b9dcc69925 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,9 +16,11 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd
 DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
 DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
+DIST busybox-1.35.0.tar.bz2 2480624 BLAKE2B c08656bc863cd3fa8f7269032e808a30832215c36414c12f8233ab00503636ed1979541b7df42df654f1dfdfdd46fc00c8fe790bf0bed629a915b4c806c643b9 SHA512 62b2e718b6669271380445ed6db249618d777a4e8d5e6d879fa39ffee43887b6a2e93ceef874c615c565ad492deb772b03a19b7475c403202741579fb151e16a
 EBUILD busybox-1.32.1-r1.ebuild 9458 BLAKE2B 2f23e64aed42ab56411e6b000c33aeaf9008bc0077d0039b412f3d94db41a9f3954922c7a00068f221177d254f0e2478c84f59002004403a444be70ed37291f2 SHA512 d6c2b162d3bb23f63e701108250dde39d613ecd5f62183cab64e9ba2803789533d6beb0efd1fb960c946afa9c5a0c43aab5194a164bb040c0bf309a318fd3482
 EBUILD busybox-1.33.1-r2.ebuild 9815 BLAKE2B eed0b930aeb82af04d2685a3a355b9fbef9bab402659a558dc38ac90d56159ab7eccc99c63a4aeb1a311ea8d48a4d7159791e3ed95667b2e3a6b89d5c177d495 SHA512 bacf3b935be115edb9b6bad09ad47316e7eb5821bc079cdf86f9441fecf73cc47bbd825fc0e70e9e859bea65368584671952159b7d3dd6e18818982e4dfcaa18
 EBUILD busybox-1.33.1.ebuild 9466 BLAKE2B 81dad4531ac36a23e88646ccd3f19a26d6ae199d46313f9b9b792fdd2139f4ad5710fb9bb611fc773cbd5ffd20fc76cea09785b5581c6dc95f16817c6f01e60a SHA512 b8cfc1a8d4a14cdaf3265acf8ce4e9880c391bf00cd35d9a2cf6c94a56e3d7869fe7fec49a756b81ac4fb9a2c8977fdc9e3312b625cdaa274d1b818c58f805c8
-EBUILD busybox-1.34.1.ebuild 9747 BLAKE2B 77ff2f04e7fad4645630ef1ac927b0da8c26613b090c67656782c84464d44749aa4ee1a68eaa314706da4a0ee33dae5588a5908033f81263624ef0b931d3045b SHA512 9d26e2d9e9a3b9ff54fe60e6e1e906e93e0fa491a9b0d933bf9d7b583439892e63829d4fd7cc09b2cfd72b5af924658330861608dedb8087e1dd7e06cee140c3
-EBUILD busybox-9999.ebuild 9755 BLAKE2B 033117820f02f5410f1ad401200e3cad41c923cacbcaae25f76fff135704d59afda1fd3c40718f7aca3b4bd1e09c4d5bd8eed34669461bf41b9e850d3e3f62d3 SHA512 c4356aa2c0b3b317e005c653476c19ca31215491b4604720b59183d58cbe16997c09abedc0d397b9b2e4ade220e23e4bbc969b9edb8f8e09f7ea0ef08c014108
+EBUILD busybox-1.34.1.ebuild 9269 BLAKE2B 59a8175829486b5380ee5f5b28cbab39cf65042329391e8d5d3a561ef37c09b020bede8da131268f3db670d71669ab1ce6de123373f8bd597bc65e9668e6d0ca SHA512 90ce4e384662f3d526cbf168e40a9d1743704ac10ebfbccbe3ef3299c4166badd0644aa8dd85a1193caef8076eb8912f6ba257aca1decbd696a4c42535528772
+EBUILD busybox-1.35.0.ebuild 9313 BLAKE2B 7f600ddda357dee3f5d17c0970bf7fc015771a82cfd982df754bdf4e93c3fb215a11679589caf2f717ef3fd52877d6c9806512774e04c4f209d36aa81f73c5a5 SHA512 ac656a8411d03e79283f72b72e976983fd3e3fb4d57680cf658ffb98c93ba331579936c1e7ab86d0e211e50355dc84f56b324f60cd7a6e7350f85c64c7cb1fe4
+EBUILD busybox-9999.ebuild 9277 BLAKE2B 6ec26199443a6b86edf07bfb28811308d2d14ebf857ac59f824c9a7f78af6d56d4d85da63c03718dfc76a1d07f39c806093d6f00a063f20bcf4dfbb6a9707ba1 SHA512 bce1af5586f3f3aca8762f77a898fcf72fb6ccf8e30447b3276b30a298702527f9e04f9ac2d05293cc565a4028493cec4d69d9f8b091bb3c8682e043199fef5a
 MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild
index 693ba522154c..502b590fd4ae 100644
--- a/sys-apps/busybox/busybox-1.34.1.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
@@ -310,14 +310,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
 	if use make-symlinks ; then
 		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
 	fi
diff --git a/sys-apps/busybox/busybox-1.35.0.ebuild b/sys-apps/busybox/busybox-1.35.0.ebuild
new file mode 100644
index 000000000000..24f99089f847
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.35.0.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI=7
+
+inherit flag-o-matic savedconfig toolchain-funcs
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P="${P}"
+	EGIT_REPO_URI="https://git.busybox.net/busybox"
+	inherit git-r3
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	# unstable release - no keywords
+	# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+# TODO: Could make pkgconfig conditional on selinux? bug #782829
+RDEPEND="
+	virtual/libcrypt:=
+	!static? ( selinux? ( sys-libs/libselinux ) )
+	pam? ( sys-libs/pam )
+"
+DEPEND="${RDEPEND}
+	static? (
+		virtual/libcrypt[static-libs]
+		selinux? ( sys-libs/libselinux[static-libs(+)] )
+	)
+	sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	local expr
+	while [[ $# -gt 0 ]] ; do
+		case ${flag} in
+		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
+		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
+		esac
+		sed -i -e "${expr}" .config || die
+		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+# patches go here!
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	# "${FILESDIR}"/${P}-*.patch
+)
+
+src_prepare() {
+	default
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 -s oldconfig >/dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 -s allyesconfig >/dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 -s oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_2_4_MODULES #607548
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+	# triming the BSS size may be dangerous
+	busybox_config_option n FEATURE_USE_BSS_TAIL
+
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
+	# Disable standalone shell mode when using make-symlinks, else Busybox calls its
+	# applets by default without looking up in PATH.
+	# This also enables users to disable a builtin by deleting the corresponding symlink.
+	if use make-symlinks; then
+		busybox_config_option n FEATURE_PREFER_APPLETS
+		busybox_config_option n FEATURE_SH_STANDALONE
+	fi
+
+	# If these are not set and we are using a busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option y SH_IS_ASH
+	busybox_config_option n HUSH
+	busybox_config_option n SH_IS_HUSH
+
+	busybox_config_option '"/run"' PID_FILE_PATH
+	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+		busybox_config_option n UDHCPC6
+	fi
+
+	busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG_SANITIZE
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+	busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# glibc-2.26 and later does not ship RPC implientation
+	busybox_config_option n FEATURE_HAVE_RPC
+	busybox_config_option n FEATURE_INETD_RPC
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+
+	# bug #701512
+	emake V=1 doc
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.initd mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd
+		newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}"/syslogd.confd busybox-syslogd
+		newinitd "${FILESDIR}"/syslogd.initd busybox-syslogd
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}"/klogd.confd busybox-klogd
+		newinitd "${FILESDIR}"/klogd.initd busybox-klogd
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog
+		newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog
+	fi
+	if busybox_config_enabled UDHCPC; then
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox || die
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin || die
+	ln -s /bin/env _install/usr/bin/env || die
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs || die
+	doman busybox.1
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	docinto html
+	dodoc *.html
+
+	cd ../examples || die
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 9cca9167e60a..490896632feb 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_/-}"
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
@@ -310,14 +310,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
 	if use make-symlinks ; then
 		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
 	fi
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 50a76cf7453d..353894846780 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -2,6 +2,7 @@ AUX coreutils-8.32-ls-restore-8.31-behavior.patch 2824 BLAKE2B 7df44f4e330225a42
 AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174ad6dd3157be16a28c527b37d1c58b421538a6238e93317689e6cd35b7dc5a0f480a4322c432986697a9e0af60019650eae92c0a SHA512 fd3573cf5a4b4fbba132d0fac5ad6eb4af5aa548a8c0c747653e47acfb97c01e31d7430db543df47d9a2680792d2583de70e1f1d49b2feb75887e9f8638527b7
 AUX coreutils-9.0-fix-chmod-symlink-exit.patch 1133 BLAKE2B 28a3adfb2c8b4e8d557a713d9e83fb61672e74dbc7dc8a8f7adf497825be0e53e1c08bff37122750a6144da70737af558dc018a06816e279879f31daf746a4d1 SHA512 392b94d55c5864e5de637567f7207e5c789a722710c29bead72c41b9f85f535f96f84f4abc64b35ee218c5ec5bc129837a65ec95cbb88113877b302823491991
 AUX coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch 4718 BLAKE2B a4a8ab721a277fd3eaac7d64c8a8cf1918c14c6d494f5ea35646d737299c7d2a84d177667984cf7ed8bb860388571f847a3f0cbb45c661eb114b378596f83259 SHA512 bb425eaae25b1035e9e4899801f3735804404fab2392d2545ff8213201c5f7dffc112cfab63e650e6b86cefccec661c8d991b5fd2310ae4a442abf9be7d27398
+AUX coreutils-9.1-fix-rename-simple-backups.patch 1343 BLAKE2B b284b2b7d33fe7650a4ac8723ca5566e819cd4f4740394cc549562a03fe7ed95d29cfb688a9e5513edcea1f9d5f7b72f1a530f9bf5093ad4dc6534a494e9f91c SHA512 900128c08b096c39302193855fdbb980c54597acf3349b9014ced500e344b7f47438722342e3a7d68f8c4588632769a11165c5c06796993d3b9aca019de8468a
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03
@@ -10,8 +11,7 @@ DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca98556807196607829
 DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
 DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
 EBUILD coreutils-8.32-r1.ebuild 5967 BLAKE2B e4111bbbcd2c83ee5f25783434a8d841f75bb14dd9cbeb223558bf6c3d22f93ec7ba3d6c4ec740243473c53575776e9700004a0f9695b91a5468837a62b6c4c6 SHA512 adbd3c99b3e3e126e13a468bc66109005a1abdd603c11ea02bf8d8c2c8232ea48f6e2da768439ce4480789df0aa412eaff3849a24f3c81def5efd4479c87c27c
-EBUILD coreutils-9.0-r1.ebuild 6067 BLAKE2B 3d35f7334effe9b7f913168d37139d26b96e553eaadd7ae309d4ea525a55632ae6bb9d66947553b6d24f8aea95cdb8913cc1cc1c37e9f12a07003c9951f11924 SHA512 e90e144a12fa05c19bdba824846f6f2e659ebf4bd97725f4d8e7592d8cf2b6c19a5846ccfcfeab78a3c7c117a5533a7b008ae86f506951e96f755fc07e9d22bd
 EBUILD coreutils-9.0-r2.ebuild 6543 BLAKE2B d8df4d40534c22482176f488be76b5f5905a527531b812b1eb34cd0a91ef3a4a1bd888676cd70b26e794584ea2d289af889b06bb5ce9775e9c4df39e01d9b2e7 SHA512 dc7cac6990f45cb1556fc59ae4d4fe01b35b701fec64e8d240d093b0771ea196144f148452d5b5d953804a3c126e2918676750c41698c8f3dae73bbb35a6fb54
-EBUILD coreutils-9.0.ebuild 5919 BLAKE2B d77953c6649536031894dfb4dc7464c1d23639848dfbed13a86e2a742e9070cbc58058904dbce008555eeeaca9141e058e544645e88707e41f27fd7e9f7e9fa4 SHA512 a7193dec152d0674e4fb4333597694b2063efff6a4d020cc6ce3090f1d65398dc30aa9ef32de9b6cbfc98ec61611f66c3c6eaa1001055838d187088fb1025a17
-EBUILD coreutils-9.1.ebuild 6770 BLAKE2B d8ce51e2ea87aa59fe30d5b3acf9025b6d638515e3bb88ddd8f978b6d2b642f89316bcb20a28d5c48412583cc7eebb93dd38c77d0c0fe8353dd85054f37ef4ac SHA512 14d87a18f95b7f6ad0204a993dcc0c9f41aaa9466f31218f05278099997c6e7e3e06593c124f406e6ce84b1e0c8e5039b889ff86bdcfeeca2f317ccf758e3899
+EBUILD coreutils-9.1-r1.ebuild 7044 BLAKE2B 810aef3fc79e73b87f9e73648c66a0481559327bce74c7703cc58cf448a67a345f43821571262bedf602f02f602b45c3b49a2b28be1c6c09cb1a05bd575dd6f8 SHA512 f47c76eb2a8ef6b8517179d2b49b680ee8d70323feb20a8b420bcf36819c85fec61e98cfd84fa912133343ea647ead0eba0e60d105473c02de6ee6d684e9cc3d
+EBUILD coreutils-9.1.ebuild 6777 BLAKE2B 4cbc8d7d2cac38d7a4308e5148d49cea96827a0507428b90c4f78cda3df451a21a22a86b3b2072b319a0040e2d4ef0881f81059584eb707bb83de7fd366a2c08 SHA512 7c4fc8adfb36c12b1b824f6a59091c7a9a9e26ab831ad530f9f3dea750c5e353a67dedacc4d940791ac350ae724e3f9a42d6761159d226c16c378cc937e37aaa
 MISC metadata.xml 959 BLAKE2B 7db7eff5a6e1c45c37e20d66e299b44b7a8334b20f970eac2bb7dbf0f8e149784bb19f28c0baa228bdbfbfe0335793080a99aee7f92a9976864ae53a35fc0ac8 SHA512 c69fdd7a27b7980c6e537387a510cfab65d0b252492576ffae3caac930bd2efad29edb604f654c194cc0a485894c8fbd3a5dc63e44359c95fc62fd055066b595
diff --git a/sys-apps/coreutils/coreutils-9.0.ebuild b/sys-apps/coreutils/coreutils-9.0.ebuild
deleted file mode 100644
index ecfbcd3f4be6..000000000000
--- a/sys-apps/coreutils/coreutils-9.0.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-PATCH="${PN}-8.30-patches-01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	!vanilla? (
-		mirror://gentoo/${PATCH}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
-	)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	xattr? ( sys-apps/attr[static-libs] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	app-arch/xz-utils
-	dev-lang/perl
-	test? (
-		dev-lang/perl
-		dev-perl/Expect
-		dev-util/strace
-		${PYTHON_DEPS}
-	)
-"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!<sys-apps/sandbox-2.10-r4
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	local PATCHES=(
-	)
-
-	if ! use vanilla ; then
-		PATCHES+=( "${WORKDIR}"/patch )
-		PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
-	fi
-
-	default
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	#
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1} || die
-
-	# Avoid perl dep for compiled in dircolors default (bug #348642)
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h || die
-		touch ${@/%x/1} || die
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		# kill/uptime - procps
-		# groups/su   - shadow
-		# hostname    - net-tools
-		--enable-install-program="arch,$(usev hostname),$(usev kill)"
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
-		$(usex caps '' --disable-libcap)
-		$(use_enable nls)
-		$(use_enable acl)
-		$(use_enable multicall single-binary)
-		$(use_enable xattr)
-		$(use_with gmp libgmp)
-	)
-
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		# bug #311569
-		export fu_cv_sys_stat_statfs2_bsize=yes
-		# bug #416629
-		export gl_cv_func_realpath_works=yes
-	fi
-
-	# bug #409919
-	export gl_cv_func_mknod_works=yes
-
-	if use static ; then
-		append-ldflags -static
-		# bug #321821
-		sed -i '/elf_sys=yes/s:yes:no:' configure || die
-	fi
-
-	if ! use selinux ; then
-		# bug #301782
-		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}" || die
-	chmod a+rx "${WORKDIR}" || die
-
-	# coreutils tests like to do `mount` and such with temp dirs,
-	# so make sure:
-	# - /etc/mtab is writable (bug #265725)
-	# - /dev/loop* can be mounted (bug #269758)
-	mkdir -p "${T}"/mount-wrappers || die
-	mkwrap() {
-		local w ww
-		for w in "${@}" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
-			EOF
-			chmod a+rx "${ww}" || die
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" \
-	emake -j1 -k check
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if use split-usr ; then
-		cd "${ED}"/usr/bin || die
-		dodir /bin
-
-		# Move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
-
-		if use hostname ; then
-			mv hostname ../../bin/ || die
-		fi
-
-		if use kill ; then
-			mv kill ../../bin/ || die
-		fi
-
-		# Move critical binaries into /bin (common scripts)
-		# (Why are these required for booting?)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "Could not move common bins!"
-
-		# Create a symlink for uname in /usr/bin/ since autotools require it.
-		# (Other than uname, we need to figure out why we are
-		# creating symlinks for these in /usr/bin instead of leaving
-		# the files there in the first place...)
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-}
diff --git a/sys-apps/coreutils/coreutils-9.0-r1.ebuild b/sys-apps/coreutils/coreutils-9.1-r1.ebuild
index 6f7eccb90d52..4594d9dae0bb 100644
--- a/sys-apps/coreutils/coreutils-9.0-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.1-r1.ebuild
@@ -3,22 +3,36 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
+# The upstream coreutils maintianers also maintain the package in Fedora and may
+# backport fixes which we want to pick up.
 
-inherit flag-o-matic python-any-r1 toolchain-funcs
+PYTHON_COMPAT=( python3_{8..10} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
+inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
 
-PATCH="${PN}-8.30-patches-01"
+MY_PATCH="${PN}-9.0_p20220409-patches-01"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
 HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	!vanilla? (
-		mirror://gentoo/${PATCH}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
-	)"
+
+if [[ ${PV} == *_p* ]] ; then
+	# Note: could put this in devspace, but if it's gone, we don't want
+	# it in tree anyway. It's just for testing.
+	MY_SNAPSHOT="$(ver_cut 1-2).193-54bec"
+	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
+	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+fi
+
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
 RESTRICT="!test? ( test )"
 
@@ -42,6 +56,7 @@ BDEPEND="
 		dev-util/strace
 		${PYTHON_DEPS}
 	)
+	verify-sig? ( sec-keys/openpgp-keys-coreutils )
 "
 RDEPEND+="
 	hostname? ( !sys-apps/net-tools[hostname] )
@@ -64,15 +79,23 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
 src_prepare() {
 	local PATCHES=(
 		# Upstream patches
-		"${FILESDIR}"/${P}-fix-chmod-symlink-exit.patch
+		"${FILESDIR}"/${P}-fix-rename-simple-backups.patch
 	)
 
 	if ! use vanilla ; then
 		PATCHES+=( "${WORKDIR}"/patch )
-		PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
 	fi
 
 	default
@@ -176,8 +199,7 @@ src_test() {
 	addwrite /dev/full
 	#export RUN_EXPENSIVE_TESTS="yes"
 	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" \
-	emake -j1 -k check
+	env PATH="${T}/mount-wrappers:${PATH}" emake -k check VERBOSE=yes
 }
 
 src_install() {
diff --git a/sys-apps/coreutils/coreutils-9.1.ebuild b/sys-apps/coreutils/coreutils-9.1.ebuild
index 776a67104587..7b78b8fa9d13 100644
--- a/sys-apps/coreutils/coreutils-9.1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.1.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
diff --git a/sys-apps/coreutils/files/coreutils-9.1-fix-rename-simple-backups.patch b/sys-apps/coreutils/files/coreutils-9.1-fix-rename-simple-backups.patch
new file mode 100644
index 000000000000..33b5f391ab2a
--- /dev/null
+++ b/sys-apps/coreutils/files/coreutils-9.1-fix-rename-simple-backups.patch
@@ -0,0 +1,38 @@
+https://src.fedoraproject.org/rpms/coreutils/raw/f672fec4364e71c6e5a30d4026d6bdb7cf332eed/f/gnulib-simple-backup-fix.patch
+https://bugs.gnu.org/55029
+
+commit 7347caeb9d902d3fca2c11f69a55a3e578d93bfe
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date:   Wed Apr 20 19:34:57 2022 -0700
+
+    backupfile: fix bug when renaming simple backups
+    
+    * lib/backupfile.c (backupfile_internal): Fix bug when RENAME
+    and when doing simple backups.  Problem reported by Steve Ward in:
+    https://bugs.gnu.org/55029
+
+--- a/lib/backupfile.c
++++ b/lib/backupfile.c
+@@ -332,7 +332,7 @@ backupfile_internal (int dir_fd, char const *file,
+     return s;
+ 
+   DIR *dirp = NULL;
+-  int sdir = AT_FDCWD;
++  int sdir = dir_fd;
+   idx_t base_max = 0;
+   while (true)
+     {
+@@ -371,10 +371,9 @@ backupfile_internal (int dir_fd, char const *file,
+       if (! rename)
+         break;
+ 
+-      int olddirfd = sdir < 0 ? dir_fd : sdir;
+-      idx_t offset = sdir < 0 ? 0 : base_offset;
++      idx_t offset = backup_type == simple_backups ? 0 : base_offset;
+       unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
+-      if (renameatu (olddirfd, file + offset, sdir, s + offset, flags) == 0)
++      if (renameatu (sdir, file + offset, sdir, s + offset, flags) == 0)
+         break;
+       int e = errno;
+       if (! (e == EEXIST && extended))
+
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 0e522bb95f56..e6dbecad5690 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,3 +1,4 @@
+AUX dbus-broker-30-user-free-assertion.patch 2310 BLAKE2B 593d949c95f70ba97e1e3a7b1d809a0c27f7036d424a54f622b7a0778f41a8651e152ff91d5c93f294d02d829ef7694c5e0ccadb81ac14a9f9234ed87e935811 SHA512 f2a4da8d558c422d2b6f62a9802af233513305625d8d9d1d5902b473da3017dbe9827761a47d7f32f3d26c35f1e785d9eef5ef05226a7ffc2b2991bc0f1eb0e9
 DIST c-dvar-c8ea9712a94186512c22c32f32c421d6a2db6feb.tar.gz 25212 BLAKE2B 37f02df4f0a4c7372826cd9db37de883cf40027b12f72f0d43cf08f08682d90e6c7e8c3756f90a9e6184713c98e331ad2b2c9cd3373a148b05e2a3a2305db413 SHA512 c134892b43a1b572c45f0f24d7c9c7e70b1326c8bc896995b491d86271a000e83707e5d5eeff631b66be31f3980df7146cd18c385263a3a8bd07f30840cf829c
 DIST c-ini-204410a08d3a6c8221f6f0baf0355ce5af0232ed.tar.gz 13952 BLAKE2B 42c34e4ebe17d4c0904c395c72e56b0587c5f6b2cdf422cb800678844cf8516f9645718a04e9a10f6e747d1f56b2f1e563d1fa07db078e745761ae1e40ad395a SHA512 72eeaecbe0b9434b48d2ca9674dd1e722e612a730fd07ef27babb346a10ed7311b11c9d85f2aaf0cd84ddca7f926a78d76d066f453289bcbe849c4cacf72ec58
 DIST c-list-a0970f12f1f406a5578a5dedf3580cd682e55812.tar.gz 10124 BLAKE2B adb0face335aaa8206e597e404dcfea2b9d22035d4297442473918878ff9928ff5d614b20cb96de8a50c1418da83da5a49837c0677fe2a5f3db4e78cf3f2bfdb SHA512 51958b4c35acd84da89e694fc58a045b28d265f77043d302fe98f3507432363d20bfa611948fad37d0e5feb36b6232f742cde80e6243bafa3cd976c8b11cfc4e
@@ -6,6 +7,8 @@ DIST c-shquote-83ccc2893385fcca1424b188f0f6c45a62f2b38d.tar.gz 10622 BLAKE2B 1c7
 DIST c-stdaux-8652c488b8f1c29629a5179d4551d0a691ae5901.tar.gz 13075 BLAKE2B ef08451574ea695151cbfdad2060324423c8abcf46ac8a86b3216b85017c9b4dd8399d0561cb4f2c731e9eb2883481db59292769560cbcbfc3e96823ceb70e9a SHA512 bb669b659955ea62734f401c9745059349b23e6ddbca56e72437929b9527647ff7ac6bba4bb06506e4d8d35f3a1e7c4eacd2d5b1e7cb21098faa144c932f2bb0
 DIST c-utf8-0837214a9780b7d771a3b3ce9a49196ac0a9d52f.tar.gz 9340 BLAKE2B 4bfa39c39aa8db8b7d797d78081b5f3104c659e2ceefef65aa2d3c03ffb5889d772cb78328473e3557c943b2487b7bcb7b68d7dc7f2b95940b0448b3479f1b23 SHA512 2df368af5023fac6c7f2e018c0cbfd73225bf1c4e0d0387931352909323175652bcd3739e9e6b76a099aea5d3f0290198aa70c69ecc5e9ef22df214f8c75da79
 DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
+DIST dbus-broker-30.tar.xz 238688 BLAKE2B 716bdeac726e0168e09a5893f1906888c0dc63e4c5f377f2d5ba100f1a07da17bb0379053ac079e7c55e7af09c3d382368dd317df52e04eb0fe96af03aba7441 SHA512 8b7f614e18d15baa558de2c77fc65526011e75f9592d06ddb3cafa211ec9a1c45aa42a0e32122cb16bdfce8bc34407241080f37891fe5ccb6c4577f1cd4bc66c
 EBUILD dbus-broker-29.ebuild 1847 BLAKE2B 8d6fb46de8ff8d95c3ea0ec5e08ac4958cff7862d2db7db767d4e722fc5c3f736607b01dfdbb1f567701a38f9d20b33a8fd44684967bce8bac57fc5d63c9dc89 SHA512 779128c4987833c4773bf37d5c0d3716c2cd4e2d7c3933883b87d198155b29145485bba2ebc21dcd3fb25562613e6b577e2001a15b8c3b84711395e2b4bc26c1
-EBUILD dbus-broker-9999.ebuild 1844 BLAKE2B e5c9b414888fec78b1c501ee06c7723c270155488f0a3ac13d443ba35b8b40f5c8456c78d3c35b9f427b47d4160669f6dda0ae43b68f3c5c5a3e3e4075b11581 SHA512 c3c78aab0bbe62030fce880aceb4aabd3eb56cd9782ad83ae08e5dfa5e6d73f1bf56e8139a6b90abd39e35a7ebe5aabcf87fcd96c99c4b1222f26d674bfd2a6f
+EBUILD dbus-broker-30.ebuild 968 BLAKE2B 7665df74eb518cf4463af1a595da22127a4c02630b189341c903bf819b690938e5208758ecc8c10ccc65dcc47a87a17228d4b87f73c604b9b57b572ffbeaddf0 SHA512 973d7eb03e9c77712e9da9381f8afa023ebfc13830abe42a21f90144c03f4d309f43f62b82418143d89038701759283bc289213a66b922063d0445658cdfcf89
+EBUILD dbus-broker-9999.ebuild 1067 BLAKE2B d11477ac58576aca16f896134433666e20fa3d7f53324c9fba4e6f700ce5b9046324d72eb38e500807c36ac36e72ffbe8553eaeba18d80914c18e2f70f302699 SHA512 25181a668d2cc8114041dd1fdbfef5d17eff13c7f0e212b47b25dcedf4f26cf67dcc2a630c272698cf9ca203967105ca8142ed47a0c07136c45cf001043054b6
 MISC metadata.xml 328 BLAKE2B 8d8eea6a3d5e3309106ec3e6f248c4b5cad557ccd5095794bd153cd270c5f43de508363646afce491d5e6cc3bff1dca1ca024c2e87e656401432ac2d833cca90 SHA512 971b4214d0a9f9a68ca12a309096b7345014d2e0f57e85e6e10ff0a09b533d5cafe153fa8082ac01609e3417a31afc319cb285a822194c9c672a57ce316340c4
diff --git a/sys-apps/dbus-broker/dbus-broker-30.ebuild b/sys-apps/dbus-broker/dbus-broker-30.ebuild
new file mode 100644
index 000000000000..6f7873290392
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-30.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2017-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
+DESCRIPTION="Linux D-Bus Message Broker"
+HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="audit doc +launcher selinux"
+
+DEPEND="
+	audit? (
+		>=sys-process/audit-3.0
+		>=sys-libs/libcap-ng-0.6
+	)
+	launcher? (
+		>=dev-libs/expat-2.2
+		>=sys-apps/systemd-230:0=
+	)
+	selinux? ( >=sys-libs/libselinux-3.2 )
+"
+RDEPEND="${DEPEND}
+	launcher? ( sys-apps/dbus )"
+BDEPEND="
+	doc? ( dev-python/docutils )
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-user-free-assertion.patch )
+
+src_configure() {
+	local emesonargs=(
+		-Daudit=$(usex audit true false)
+		-Ddocs=$(usex doc true false)
+		-Dlauncher=$(usex launcher true false)
+		-Dselinux=$(usex selinux true false)
+	)
+	meson_src_configure
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index 83f7734dc680..073a8c8c8388 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -10,21 +10,6 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
-	declare -Ag SUBPROJECTS=(
-		[c-dvar]=9e1a5b4363aaece7169df2b2852944a1434b2df5
-		[c-ini]=43f379396a320940d0661c15780f618f84d29348
-		[c-list]=b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3
-		[c-rbtree]=fa97402c3faa18c2ddd8325eb66e2bd58a224477
-		[c-shquote]=1d171fe52c23944c3c0be1f2603595f2488a9ff8
-		[c-stdaux]=d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4
-		[c-utf8]=1f7e2ff1164bd2161cb480532b2b34cb2074bde1
-	)
-	for sp in "${!SUBPROJECTS[@]}"; do
-		commit=${SUBPROJECTS[${sp}]}
-		SRC_URI+=" https://github.com/c-util/${sp}/archive/${commit}/${sp}-${commit}.tar.gz"
-	done
-	unset sp commit
 fi
 
 DESCRIPTION="Linux D-Bus Message Broker"
@@ -36,14 +21,14 @@ IUSE="audit doc +launcher selinux"
 
 DEPEND="
 	audit? (
-		>=sys-process/audit-2.7
+		>=sys-process/audit-3.0
 		>=sys-libs/libcap-ng-0.6
 	)
 	launcher? (
 		>=dev-libs/expat-2.2
 		>=sys-apps/systemd-230:0=
 	)
-	selinux? ( sys-libs/libselinux )
+	selinux? ( >=sys-libs/libselinux-3.2 )
 "
 RDEPEND="${DEPEND}
 	launcher? ( sys-apps/dbus )"
@@ -52,17 +37,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		local sp commit
-		for sp in "${!SUBPROJECTS[@]}"; do
-			commit=${SUBPROJECTS[${sp}]}
-			rmdir "subprojects/${sp}" || die
-			mv "${WORKDIR}/${sp}-${commit}" "subprojects/${sp}" || die
-		done
-	fi
-	default
+if [[ ${PV} == 9999 ]]; then
+src_unpack() {
+	git-r3_src_unpack
+	cd "${P}" || die
+	meson subprojects download || die
 }
+fi
 
 src_configure() {
 	local emesonargs=(
diff --git a/sys-apps/dbus-broker/files/dbus-broker-30-user-free-assertion.patch b/sys-apps/dbus-broker/files/dbus-broker-30-user-free-assertion.patch
new file mode 100644
index 000000000000..278de1821b87
--- /dev/null
+++ b/sys-apps/dbus-broker/files/dbus-broker-30-user-free-assertion.patch
@@ -0,0 +1,64 @@
+From 608b259e25ef1348b9e4a8e022c35b5c68d3df98 Mon Sep 17 00:00:00 2001
+From: David Rheinsberg <david.rheinsberg@gmail.com>
+Date: Wed, 11 May 2022 08:41:48 +0200
+Subject: [PATCH] util/user: keep reference to user in each usage table
+
+Keep a reference to an owning user in each usage table. We want to allow
+callers to hold charges without holding on to any user references.
+
+Also fix the peer-deinitialization to be ordered correctly and free the
+user references last (in particular, after the charges). This is not
+strictly necessary, but now follows our coding style and would have
+avoided possible failures.
+
+This fixes an assertion failure when disconnecting entire groups of
+peers of the same user, due to the recent fix that actually made
+peer-accounting do something.
+
+Reported-by: Torge Matthies
+Reported-by: Mel34
+Signed-off-by: David Rheinsberg <david.rheinsberg@gmail.com>
+---
+ src/bus/peer.c  | 2 +-
+ src/util/user.c | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/bus/peer.c b/src/bus/peer.c
+index 18bd1947..69ed0fde 100644
+--- a/src/bus/peer.c
++++ b/src/bus/peer.c
+@@ -358,12 +358,12 @@ Peer *peer_free(Peer *peer) {
+         name_owner_deinit(&peer->owned_names);
+         policy_snapshot_free(peer->policy);
+         connection_deinit(&peer->connection);
+-        user_unref(peer->user);
+         user_charge_deinit(&peer->charges[2]);
+         user_charge_deinit(&peer->charges[1]);
+         user_charge_deinit(&peer->charges[0]);
+         free(peer->seclabel);
+         free(peer->gids);
++        user_unref(peer->user);
+         free(peer);
+ 
+         close(fd);
+diff --git a/src/util/user.c b/src/util/user.c
+index 7856b768..d0edb5e8 100644
+--- a/src/util/user.c
++++ b/src/util/user.c
+@@ -48,7 +48,7 @@ static int user_usage_new(UserUsage **usagep, User *user, uid_t uid) {
+                 return error_origin(-ENOMEM);
+ 
+         usage->n_refs = REF_INIT;
+-        usage->user = user;
++        usage->user = user_ref(user);
+         usage->uid = uid;
+         usage->user_node = (CRBNode)C_RBNODE_INIT(usage->user_node);
+ 
+@@ -64,6 +64,7 @@ static void user_usage_free(_Atomic unsigned long *n_refs, void *userdata) {
+                 c_assert(!usage->slots[i]);
+ 
+         user_usage_unlink(usage);
++        user_unref(usage->user);
+         free(usage);
+ }
+ 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index e5c6c9081bd8..0df627e8290d 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,5 +1,6 @@
 AUX 80-dbus 341 BLAKE2B 20849eb7c526475d3ff96766ac7183608aa51e5c069f07cf282a2b4d884b2a8580aa88cff182d54ef75aaa747848f3dbcc0bd0bd5da124e4a259851878c73b00 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89
 AUX dbus-1.12.22-check-fd.patch 1055 BLAKE2B a4889677a778fe0698128b2399273adb5373a11927a5610e6a9757237226fa866ce33bb603a89c44b8c2d3e2fccd4131637821ba1bb14782276223d5fa5db337 SHA512 667e76237868c177b9299eb0259dee2a5f820fde15fed0a21823b435e34ad734ec9e850f1a1b5408a6b099a78f77564b2396c38b82d931f3b0b5b93c0e5b8c4e
+AUX dbus-1.14.0-oom_score_adj.patch 3882 BLAKE2B 9b5c55d8660c7de77976026b39b76dddbc88ddc3c4810bc6114faf038401faaf162f50f8014d26182a5d5a8b6a6ba44e517a864919152ae96e7b352ab8255df4 SHA512 353beed17bf788396828c1817703bed09f8e1fe48772dce6eb1f3c601859c593c23044e4e61ec503596790a56c64e0b4bdcd2be10e337ef9ad1ec9de0dbe027c
 AUX dbus-1.14.0-x-autoconf-fixes.patch 5171 BLAKE2B 6b7453397e467da695b3efd70e53f6a50dad44c44130f973037a4cb4139d62c7adab758a495ddebb97a35d068333417051adb5eb17bae86df31c998137eb6052 SHA512 e74b09c7da445c02fe84148b43ca61b21a95b67edbde4dc9f1916a9a628182097630336010f15f366063dc1432da7b1ae52e73b04185493b48ce28bf79873e54
 AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a032c31ec1860c38c7a54910b3fe8da2a9bce175d01fab1c224008ba38e1981dfc161fde80f725096e644495740052e SHA512 6d07220d8c80c49057396dc76d808cad2c995cce259544e8435d0c8fe328f85ac3a7da5a88209f80a127a04b48591ac20fe661683665adca2af75fedd2563bf2
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
@@ -8,6 +9,6 @@ DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29c
 DIST dbus-1.12.22.tar.gz 2108231 BLAKE2B 40c30ad9e48d8ac6b5f1c67726015eb17cb3501372ef2c8ffcd8ad73e4a2f186b80a7bbba094460d4093d1d0a3f1bbb8d83a27724397a8f5312bb8542237e6b7 SHA512 0a716022f9d693fcaf871b6dfb5f242b49a8dd05d3316ec3e530f5129f1d81a2fa9caec795fa62cfdcba6ed21549fdd2f896f9bf1cc9a96e2a7d04f2c7ec7be6
 DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf SHA512 9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f
 EBUILD dbus-1.12.20-r4.ebuild 7533 BLAKE2B 19b9f34046bea0cbef61a641255f56bf98005c96aa61de9212e9e6ddca1957b02a217f8ff28b23b51fee6337b3fa7b48d4aebe707589bf0452ec4f987af8081e SHA512 0369f3de41131f9ea8fa6577a5fc992f62c16f3a995017fe1becf65bdbe6c9676f02a99d11e706ae9afc63dc2202a850543d69fd3bc2cd4d4d9545c73432375b
-EBUILD dbus-1.12.22.ebuild 7654 BLAKE2B ac43f49c5079ed47a73c4447738b90ca9b5fa8f62a891e7724892ae195cfe24212fbe58949d747c9a7c28dfd0d2713ef08ec8eefb73eb8aa7c77c16820a2cdd0 SHA512 eeac6c8ad9a7e1da9c3603d4ea9a205b2fef70a8484258b349fa3a502e8f6f7a955149e0a251aa3486166d989ed8da7acf8e6e99d0e19113ed326256d92eb42e
-EBUILD dbus-1.14.0.ebuild 7862 BLAKE2B a2e4d2adc0b5d4a6d766091be9ce2bf8ccef55a689055b5c6187368fa0161674d813313f6c3ff35f36aa7f7917ddbf5dc20b66204844515cb7908b5244c01b20 SHA512 bbb4bd2d2844f60bb1492777c691b1010bd95e3401587faba07e18d004a282a818b70efd744fd86cf51a72035de402bc9d2be9f49deb1e93aa8f71ef08106c3c
+EBUILD dbus-1.12.22-r1.ebuild 7658 BLAKE2B cafe8f95f6c8504e7cee03a14f226a0be3d8797f11e8fd8c711af3b8c249a446c99a8bed4815b3473cf150b00f6bf8accce5bca553f2798bf1424ed6431a014d SHA512 581303e1052c776ce50007825e500e69bf16d616ae7e3ea011e247b1e382b4b2211d4ba18ddf50713509cb5b7453cf2d07c7a2d8a76caa4e409125b56d308b79
+EBUILD dbus-1.14.0-r1.ebuild 7882 BLAKE2B 90cb99471a5e1a6e67031b4c5948ada9b58a267755e282c2811304a797cc777f89f12580fe47d987b7381465bd4ef82d8b5a42d1d41e8123e51476b5dd46baba SHA512 664deae60dd1f9117691749cc814a69b8559999a5eac8398f9dcf02e4c529ff0f04d9f66f06b258956969df63d6d516f9e027ede6364430f6c995f86d9538b81
 MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.12.22.ebuild b/sys-apps/dbus/dbus-1.12.22-r1.ebuild
index f4d09190728e..68513fcf1e9d 100644
--- a/sys-apps/dbus/dbus-1.12.22.ebuild
+++ b/sys-apps/dbus/dbus-1.12.22-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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 )"
 
@@ -64,6 +64,9 @@ PATCHES=(
 	"${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
 
 	"${FILESDIR}/dbus-1.12.22-check-fd.patch"
+
+	# https://bugs.gentoo.org/836560
+	"${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
 )
 
 pkg_setup() {
@@ -207,9 +210,6 @@ multilib_src_compile() {
 }
 
 src_test() {
-	# https://bugs.gentoo.org/836560
-	addwrite /proc/self/oom_score_adj
-
 	DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
 }
 
diff --git a/sys-apps/dbus/dbus-1.14.0.ebuild b/sys-apps/dbus/dbus-1.14.0-r1.ebuild
index 07da8e03b737..075aeffd6de9 100644
--- a/sys-apps/dbus/dbus-1.14.0.ebuild
+++ b/sys-apps/dbus/dbus-1.14.0-r1.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 ~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 )"
 
@@ -68,6 +68,9 @@ PATCHES=(
 
 	"${FILESDIR}/dbus-1.14.0-x-autoconf-fixes.patch"
 	"${FILESDIR}/dbus-1.12.22-check-fd.patch"
+
+	# https://bugs.gentoo.org/836560
+	"${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
 )
 
 pkg_setup() {
@@ -207,12 +210,10 @@ multilib_src_compile() {
 }
 
 src_test() {
-	# https://bugs.gentoo.org/836560
-	addwrite /proc/self/oom_score_adj
-
 	# DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
 	# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
 	DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+
 }
 
 multilib_src_install() {
diff --git a/sys-apps/dbus/files/dbus-1.14.0-oom_score_adj.patch b/sys-apps/dbus/files/dbus-1.14.0-oom_score_adj.patch
new file mode 100644
index 000000000000..094529708088
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-1.14.0-oom_score_adj.patch
@@ -0,0 +1,115 @@
+From 499cdfde1b3f5d812912e89b1a1a0d7a4fb83306 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Fri, 1 Apr 2022 18:58:34 +0100
+Subject: [PATCH 1/2] activation-helper: Never crash if unable to write
+ oom_score_adj
+
+_dbus_warn() normally only logs a warning, but can be made fatal by
+environment variables. In particular, we do that during unit testing,
+which can result in a build-time test failure if dbus is built in a
+sandbox environment that prevents write access.
+
+_dbus_log() does only the logging part of _dbus_warn(), which seems
+more appropriate here.
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+---
+ bus/activation-helper.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bus/activation-helper.c b/bus/activation-helper.c
+index 8a4fd732..df0472ce 100644
+--- a/bus/activation-helper.c
++++ b/bus/activation-helper.c
+@@ -348,7 +348,7 @@ exec_for_correct_user (char *exec, char *user, DBusError *error)
+   /* Resetting the OOM score adjustment is best-effort, so we don't
+    * treat a failure to do so as fatal. */
+   if (!_dbus_reset_oom_score_adj (&error_str))
+-    _dbus_warn ("%s: %s", error_str, strerror (errno));
++    _dbus_log (DBUS_SYSTEM_LOG_WARNING, "%s: %s", error_str, strerror (errno));
+ 
+   if (!switch_user (user, error))
+     return FALSE;
+-- 
+GitLab
+
+
+From 5c8e5b7140c4f1f88684c7a83ce9587fff2def0c Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Fri, 1 Apr 2022 18:56:26 +0100
+Subject: [PATCH 2/2] sysdeps: Only open oom_score_adj read/write if we need to
+ write it
+
+If we're running in a sandbox, we might not have write access to
+oom_score_adj. In the common case where we don't have any special
+protection from the OOM-killer, we can detect that with only read
+access, and skip the part where we open it for writing.
+
+(We would also not have write access to oom_score_adj if we're running
+with elevated Linux capabilities while not root, but that should never
+actually happen for dbus-daemon-launch-helper, which is setuid root
+for production use or has no capabilities during unit-testing.)
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+---
+ dbus/dbus-sysdeps-util-unix.c | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
+index 8f079cbf..ca130cff 100644
+--- a/dbus/dbus-sysdeps-util-unix.c
++++ b/dbus/dbus-sysdeps-util-unix.c
+@@ -1627,12 +1627,12 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
+   const char *error_str = NULL;
+ 
+ #ifdef O_CLOEXEC
+-  fd = open ("/proc/self/oom_score_adj", O_RDWR | O_CLOEXEC);
++  fd = open ("/proc/self/oom_score_adj", O_RDONLY | O_CLOEXEC);
+ #endif
+ 
+   if (fd < 0)
+     {
+-      fd = open ("/proc/self/oom_score_adj", O_RDWR);
++      fd = open ("/proc/self/oom_score_adj", O_RDONLY);
+       if (fd >= 0)
+         _dbus_fd_set_close_on_exec (fd);
+     }
+@@ -1680,6 +1680,26 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
+           goto out;
+         }
+ 
++      close (fd);
++#ifdef O_CLOEXEC
++      fd = open ("/proc/self/oom_score_adj", O_WRONLY | O_CLOEXEC);
++
++      if (fd < 0)
++#endif
++        {
++          fd = open ("/proc/self/oom_score_adj", O_WRONLY);
++          if (fd >= 0)
++            _dbus_fd_set_close_on_exec (fd);
++        }
++
++      if (fd < 0)
++        {
++          ret = FALSE;
++          error_str = "open(/proc/self/oom_score_adj) for writing";
++          saved_errno = errno;
++          goto out;
++        }
++
+       if (pwrite (fd, "0", sizeof (char), 0) < 0)
+         {
+           ret = FALSE;
+@@ -1700,7 +1720,7 @@ _dbus_reset_oom_score_adj (const char **error_str_p)
+   else
+     {
+       ret = FALSE;
+-      error_str = "open(/proc/self/oom_score_adj)";
++      error_str = "open(/proc/self/oom_score_adj) for reading";
+       saved_errno = errno;
+       goto out;
+     }
+-- 
+GitLab
+
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index ee8cbfced4a0..b28c412529e9 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -2,5 +2,5 @@ AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3
 DIST debianutils_5.5.orig.tar.xz 104448 BLAKE2B 707c9072ddf1fa0c61fc66f84aea26bac7bf6f31948880ad4711e89f8f4a665ae4104e998f27e53e288b3453a71876ef44038f8e954f19055ed1049eb9b9981c SHA512 230310428ee7c145c74bb666ae729754352295230f38ef4e22f7566970c5186d607cd827a5603a678815bd48d4a1eb2716f55c32494ec75eb665651da6a56e6a
 DIST debianutils_5.7.orig.tar.gz 257231 BLAKE2B 61d2e7abcd359c5dc87b7f91e510e91e1926183c15a572c7d87cf4a590dded2e2ee8c9b4e06f7f478353139870c808927575de233200ad69e084a6f971c4bd24 SHA512 79acd8885abca93842d696167171a359011c49a40f38deeb25bc94d62905f95afa3a7b2540d3bd4b0ffd363c5c48a439a1a68139a29d6c033980b019cea75d92
 EBUILD debianutils-5.5.ebuild 1163 BLAKE2B ed67f92b1f451f64691c5f844a21ede614b9b3e9d76db478f318a47725651a006f8b0234458e287cb9a2e5ffc38307b71ba48d466fae3a824af51b677a0797a0 SHA512 340ba67bc916cce705023e6b1ec9fdbb2be02a7b42e955fd7a83817d95f69dd505896cf0a8f5b9bb3a4b17d529feb0954ab43f26bfd3f581196ef94cedf725ec
-EBUILD debianutils-5.7.ebuild 1045 BLAKE2B 43d1ccd50787fd6287b901d749e87d381fbdfb0bf2fc43f9d9026061880ff7038b9f7d7abeeea187b9ee14296ece0374e5582f269b003f35aa42ed0a3142c21c SHA512 151ee45d276b52a9a0471a51f30766debf60fcc563671b2c11d30e253d7fdd246f5329b99f27adaa0a2882f823698222186c099d18d225f95afa32e32625475f
+EBUILD debianutils-5.7.ebuild 1052 BLAKE2B 65812a0006a3a8d8561cf7cfd12e9ef884955d11fb31425e02f39a6befb52230d32bc7c56964c492d4b3b6885c39e0f273771818a86d58cbae507715c1ddd6dc SHA512 014498872eb18c5017199c4ee67142459c01f1611d7b1a841b46ff40dca748d726ee61a686ed6659d21113215949ae03b337764e105fb80ebe04194fbcfe3a42
 MISC metadata.xml 446 BLAKE2B a681b76916f27a5d016fa34c6c6ce4abe887c1f46232cb6cd759ba699eca0cba865ff7b0d33900b1f9e858e016532815b18bf86cc211b97f57a1c0a56580d125 SHA512 c080d8ae5511a0870aa778f744518a2482e7d61ff9e653a808b3959571b8bb47dc90b1b1f2feaccc323df0521f4ae91efb43fa31bd6c8a72075c8b2e9dfeb829
diff --git a/sys-apps/debianutils/debianutils-5.7.ebuild b/sys-apps/debianutils/debianutils-5.7.ebuild
index 484f32f6c429..ab18df1fe69b 100644
--- a/sys-apps/debianutils/debianutils-5.7.ebuild
+++ b/sys-apps/debianutils/debianutils-5.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="+installkernel static"
 
 PDEPEND="
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 7ae370cdf63f..1249e219f531 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,5 +1,6 @@
+AUX loong-fix-build.patch 859 BLAKE2B 11e48762d8112d3c56947d0f9db196d84c142775d5abab0dc1a6593a4f0eeecbf7cbf72d589a0db1623d3a4f85559bc95f17260b94041d6eb625401e784852c3 SHA512 1d87a407196ebbfd22b1b14504a5ec61eff9cc8a4d11a4f7d15c1a7aea1ff338c9bc18e6298ea6e29898a0753201cda6bb90023a5dda817e78a0980e846a68d3
 AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
 DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
-EBUILD diffutils-3.8.ebuild 1352 BLAKE2B 76944ad0577d45dd3528ec923b5e69a4647ebb08bfe24c10ff2a8711d37b4acaa13ea8cf71c5c82d81d56ed7e131ce4589996945ae456285ca17026ae9f141d0 SHA512 ae3e2d17b091c5011e69aaff57df191caa711fe02c02acb4f79f746997087595ad17fab87d848544c5d52435878d55fcf42e41f47418f34237b508460fbebcf6
+EBUILD diffutils-3.8.ebuild 1673 BLAKE2B e1af83d87e166a3d60f87ed13870240f9216ff72ffb99508780c7020fa466da05b2e3b8eeaaf8dbf244ee873059a004273bfb2e2ab6ddb4cf4f0e16542497f3b SHA512 17925dde918dc25fde6a42891b45c7a8f242aa5a81bf67974b01d03785f16251496912fb5ccfe0927cde4908432cf36532341d7b11f16b2ae5033169f466018f
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild b/sys-apps/diffutils/diffutils-3.8.ebuild
index df2a985392fb..1591a6a87921 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -17,13 +17,26 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )
 	verify-sig? ( sec-keys/openpgp-keys-diffutils )"
 
-PATCHES=( "${FILESDIR}/ppc-musl.patch" )
+PATCHES=(
+	"${FILESDIR}/ppc-musl.patch"
+	"${FILESDIR}/loong-fix-build.patch"
+)
+
+src_prepare() {
+	default
+
+	# touch generated files after patching m4, to avoid activating maintainer
+	# mode
+	# remove when loong-fix-build.patch is no longer necessary
+	touch ./aclocal.m4 lib/config.hin ./configure || die
+	find . -name Makefile.in -exec touch {} + || die
+}
 
 src_configure() {
 	use static && append-ldflags -static
diff --git a/sys-apps/diffutils/files/loong-fix-build.patch b/sys-apps/diffutils/files/loong-fix-build.patch
new file mode 100644
index 000000000000..2b16b47b7ee7
--- /dev/null
+++ b/sys-apps/diffutils/files/loong-fix-build.patch
@@ -0,0 +1,30 @@
+[xen0n: this is https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch with change to generated file added as well.]
+From: Sun Haiyong <youbest@sina.com>
+Date: Tue, 31 Aug 2021 11:11:52 +0800
+Subject: [PATCH] stack-direction: Add support for loongarch CPU
+
+* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch,
+set "sv_cv_stack_direction" to "-1" .
+--- a/m4/stack-direction.m4
++++ b/m4/stack-direction.m4
+@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
+       i?86 | x86_64 | \
+       i860 | \
+       ia64 | \
++      loongarch* | \
+       m32r | \
+       m68* | \
+       m88k | \
+--- a/configure
++++ b/configure
+@@ -34088,6 +34088,7 @@ else $as_nop
+       i?86 | x86_64 | \
+       i860 | \
+       ia64 | \
++      loongarch* | \
+       m32r | \
+       m68* | \
+       m88k | \
+-- 
+2.17.2
+
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 0864f186956b..50d6e522300b 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,3 +1,3 @@
 DIST dmidecode-3.3.tar.xz 56372 BLAKE2B 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e SHA512 dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
-EBUILD dmidecode-3.3.ebuild 1122 BLAKE2B ac3b243573cc85574af32bf8b8ccff7e5a81813eca335da495b62e3ec2f2584e900380269af9cf15f76a4d67e569713de8a685df7e28d5c5d0de37b5cc7ad314 SHA512 738a5c95c73076a4be2ac6f977ab970013986b192fc6748ed3859cd2f37409d57ff054b3877f679144f3bdf64de530e73dfb962c6394c0f4afc5a187c2dc55ea
+EBUILD dmidecode-3.3.ebuild 1129 BLAKE2B 2250e46392331311e6470b694bcba68479efdbe0a125f95bea2a77a9dd95122046519c8c3c4d10593c89a69af984a39895ed52cdc07844421b6a3b8fbc68c099 SHA512 c91ebabbafa40f364017f37de15ec862056b62647183dcaefe2a2ff78fae8e8c649d5c715a5f5faf2ca268c98d27805a8c12c23da3cae80b7430497e704dcbce
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/dmidecode/dmidecode-3.3.ebuild b/sys-apps/dmidecode/dmidecode-3.3.ebuild
index 1625ce216b6c..4bf9154f283b 100644
--- a/sys-apps/dmidecode/dmidecode-3.3.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86 ~x86-solaris"
+KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv x86 ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index da6537782bb6..3801a9aee9e4 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -2,5 +2,5 @@ DIST ed-1.17.tar.xz 68516 BLAKE2B 975e6547f0062dc980bf4490bbbc98e0ac77fc18b2960e
 DIST ed-1.18.tar.lz 66019 BLAKE2B 9f2b6f00e65dc8a13dd9eba4dfae5ad1e6e3c3ffe623c8b2cc2db78e221ba140595658fd710e4651165a2475a9ed673c9f230fab64f22a7a9488973b5e227198 SHA512 e5dac94697d63fb90cc17e3e653fa56309e9652cc25b2e98a0e21f1ed41e38c48bc33b5fc746275a59e702d1644d3af88f3d82598b482f7309f4e68aab783286
 DIST ed-1.18.tar.lz.sig 72 BLAKE2B 9b498f1604d625c6b32ded636e0841ef384bf59c10ff00722e03dcd890c5c1d1ccc5d99545a6c132a9ccc61b9f8da8f70a94f514db4a417d8c52128be720481a SHA512 f3df77755ac2b47825102b7c6d1774c8aee3f93e0824cebb6d7ea6cda50c1233673ed4c56c4ed135438e993399685cf45616c1fbeb85b2a8501059abe818908d
 EBUILD ed-1.17.ebuild 989 BLAKE2B 697a8d5dc80ba44a0d3b2fe6f2187f930d5c5d2100113dcb84e037872a5757884c14a38e566c01491dc55a8a0aed4ce41b7da843279c7e1b3221c7703be739c8 SHA512 227498282c7d3f349617e11e6c809e79c8eb20292fe6dc07ea68a388099d82a50f82ec157c88d5fcb704c5302278d4d001795103af5181e9a39f62566b507869
-EBUILD ed-1.18.ebuild 1184 BLAKE2B 616a2b04980d7e0a19aaede72aa06e70a96132dafd28882234e07e1607f4225e1310cf1420572ac88bbca3e1d1eea4020d6e50216cae181c2aa04c00673318c2 SHA512 39c47f9add453aa298c2533d7333d3e03b141ee41ec98f15ba1c9e0d07dd3a3dfd7fcd21e1297b4d29e1a5c396ce11b75c95440ffa2d124f2ab7d90115c6567a
+EBUILD ed-1.18.ebuild 1191 BLAKE2B 5cd37862ccb15c336d0e5f97fdc7fafdd3cba9626d1de4598397894f9ec230cbb92d9ace9ea5ed76501b4f1322ada2a6465dd3709d4652a40e278d9d6ff7c74a SHA512 c3ab31c445bc524b5e935aff583bff4a7d441f16411ef827c1a45e56b61fba6a611346ede00c4f17e248e4a4a6ba05c542784a32ba4c4d64f5789a424ae5f96a
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/ed/ed-1.18.ebuild b/sys-apps/ed/ed-1.18.ebuild
index b60804cf143c..22ec395fd4dc 100644
--- a/sys-apps/ed/ed-1.18.ebuild
+++ b/sys-apps/ed/ed-1.18.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-2+"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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
 
 BDEPEND="sys-apps/texinfo
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index e82b1d9a8d57..811147a5b4d2 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,6 +1,4 @@
-DIST edid-decode-0_pre20211012.tar.gz 130090 BLAKE2B 22fcfeee726cf33c22ebeac38648145735d493fa211ef5e8536198549ea80e31fa676a9aa4c55db21019f255426be67a1123524ffa92f44e1a7efa541c8ea24f SHA512 276047a626569e0fc3e8a21764cc580a0b9fb210be1c924cf8a7bec34a436f0cfab5d84b324cb31723bced66ce44e08f99ae58a2c5b09dc2bc4b8084114b915b
 DIST edid-decode-0_pre20220319.tar.gz 135715 BLAKE2B 3ca70f7147463ec586d9b28e4e68327c5b2e8075dcf6f57f0be40288f87a4b498998654333321b3d3ca7e7d38926befc53094250b2953cd2b33b686f5cd878cc SHA512 5f3f285b898ae1a47abf06e787e097c8aebb558e3efbc6e80bdd4ed5505ea4f59f723d5a0a820bbc0c575d25f686f03aa33fe424e1b3a1b2c1be1ef13b6508c2
-EBUILD edid-decode-0_pre20211012.ebuild 676 BLAKE2B 660ff24353cc29c561a0f2fc47613005c0cc780f23bf47235d19e53902f7722bc28a873b501a76f2d750029adea6868cfbb713356973cd2559bfe82b2a7d54cb SHA512 39aebac135e544a5a0f2cb10b0272b5f723cdd1ff26b06daed5216a586c56253f3154ed29ef8bca43ec83cd129acea5705af06f7bd64a2061f6cbc4f71435582
-EBUILD edid-decode-0_pre20220319.ebuild 678 BLAKE2B 872872cea2efd99fdeb33959c98da587e242cd41f25fcecc6b548390eb866e816e4193da61b39f7149ac62c734ced90c460fff224c10991ca4c504bea019534e SHA512 bf17e7bc107b75e9cf263388334cad03dfd9d616ab605ae0cad77ba2686b7df8ab0c7e4964d0e138b7831f0f2a87eb5e9799f918b618f1044b1288badd4de54d
+EBUILD edid-decode-0_pre20220319.ebuild 676 BLAKE2B 24b12550cea4f8bdc2d24aeca29eea88fc6311c833f23d8bf2d484e1338f9534dc2fde388deb4343f52c74d69e137681accef07981bdb54d81e6d222cd4b5cb3 SHA512 b8e6fc02163f9f1e6b921051211e299d18c8ad1f9046a726856d263b2fb8073ee8bffbe6357106b21a60130ee30454b6d0d7f4d2f7221219fc5e2149a56ce745
 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 775a90997efcdbe276451be45fb7533e5132864ec6bebf44172d708c328e0acb9ecb58c66e6402642c0b3dc7a8da71715b8592f4e86975f8c538946cdf53cd21 SHA512 0fcd19bdb9b1bfb54db0140b96efdbd6058648c2dc663f617a9823e453255844a377dbff3ddbe98557ca514ed0ee4d54cbb68f5859d1a060d5f5202a86c25c5f
 MISC metadata.xml 647 BLAKE2B 42d8d41db31a4748f5ffad976c0ad35ff483073c286236d77f3c6fc91e854844e519bc8d4761a02880e116faca88c43c16bea37c008719c8adb8f55f4226ac83 SHA512 c7c46f576fd17b42a06a6b241d3a5b6f5dfb9597e824f00ff311feba48a587ecd821285ecc3fb46d3533b6bdd352b34a69ec8886e0e7e8da38dbd29055effbad
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild
deleted file mode 100644
index dc3cb528ade9..000000000000
--- a/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-EGIT_COMMIT="985024f0ccb7eb0014397f2d562ecebfdd340c3b"
-MY_P="${PN}-${EGIT_COMMIT}"
-
-DESCRIPTION="Decode EDID data in a human-readable format"
-HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
-SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-KEYWORDS="amd64 ~arm64 x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-src_compile() {
-	tc-export CXX
-	default
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	einstalldocs
-
-	if use examples; then
-		insinto /usr/share/edid-decode/examples
-		doins data/*
-	fi
-}
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20220319.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20220319.ebuild
index 4e2a8c135680..ed99cdb3764f 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20220319.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20220319.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
 SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index dd7c8e803ece..8355577910f4 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -4,5 +4,5 @@ AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8
 AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6
 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
 DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
-EBUILD etckeeper-1.18.16-r1.ebuild 2116 BLAKE2B 787cbd98c74dc9164b176e9c125e80b7b7bdeb7c6aa6ab3405eab323272ab256fcbcdf9c7885450a95838c083f8affa2bf47fe89e0b8d8d911cf687af2deb65d SHA512 41a4c4b697f4d45e0b35a65c5f137cbdf0e3b9eaff2fdc2c869bb9794e170f5468f8a97662ecd89677178a66f54ad4607d324edb3ca352fa3f3fa1f76f072696
+EBUILD etckeeper-1.18.16-r1.ebuild 2115 BLAKE2B b248c6c5c6f9965becb299df408b93598984867faec4c24db9303fe6f4a82b3bb0b7f5525a939a28115f9683ec31af9c54a3109240077711a40bebbd2102ecda SHA512 d3c8e2a9d7ce65836d699261ad51e5083f033b3147275412b774de2d385e0fafa07f7bedd33e1e4d94687a6aa977e180af0398372afd1967b09ce02b3c65ad60
 MISC metadata.xml 785 BLAKE2B 7a93b0ed9e98d9e3512a2be8fb0a1f9b1790ab563d6865e46348be6b05c8965937548890ff312d90cc52052c6a177922faacc53fa1eea6f35bec6924bdb69aa9 SHA512 47adfa4031df7a657b55fdf529f4465c704f278804fb9b08ab334e0f44e714b3f106c94a73cd6e0c903c2d2633243d23c93374a35a0ec15686248da6dbd33fde
diff --git a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
index 7dc98bd98df4..e42c1c08f094 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 SLOT="0"
 IUSE="cron test"
 
diff --git a/sys-apps/exa/Manifest b/sys-apps/exa/Manifest
index 84e04ccb29b4..858c61ab0f47 100644
--- a/sys-apps/exa/Manifest
+++ b/sys-apps/exa/Manifest
@@ -1,124 +1,69 @@
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
-DIST ansi_term-0.12.0.crate 22762 BLAKE2B 4612905fc52d4aa67b9443f49f2e967e63688df1dbd3c3fe40c19774ee214bba6dccdd185deae40ee97b5c4913d2849b5bb202a90e6ce91c75d10d4081041af2 SHA512 ca41f0a8ff75fdd5a1033589d95a52e89bbc7bc8a23aba161cb8f7d32f85d909171483917dfcfe7db2b65b00221e026380286fbd2baa735666b6793a1ecb5d7f
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-0.1.4.crate 10937 BLAKE2B 272fc9d216749941cb73d37d5233d1df4bde5abcf9a6e75ed928ee6493e9011922a06551dac1f6b1d0c34dce587c6ce1442ea62e88457c0cecf985e7a3d5e47e SHA512 811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
-DIST cc-1.0.35.crate 44369 BLAKE2B e74583fd826dcda590d7d6b853f751a3f18b10705f62a35a954bfba2a38768870b43046d98b6e8535143cb40950bfd8daa21c86b1a24d30c3cab485b7bebeaea SHA512 6d2c2708d696598e403027b3ee3e4cda4d7119185bdc2ab8c825e36bb2b9f48f40b84392b708100b812ed4a74626b7fef5b3698a9f5513de8f00ff6d922a3f04
 DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
-DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST datetime-0.4.7.crate 117378 BLAKE2B c841917a4c8c46dd53c5ba18555b7ed385e80e0a5a71f6fd6433ca9c6c4ce7ffc78733590d020314cc9c17d2a43e64503f61e9aa9a9cd323ac233d0653233966 SHA512 c7b0503cae21628f64ba8740ffdf5798a7289ab7f6bb31fa02410bf36d7c5a0ace156ccbcb51fe57d7918e4885e608652af859b1e137a06b1a3b2d4a9a46bcc8
 DIST datetime-0.5.2.crate 113732 BLAKE2B e9461220ae45b67fd20b925f1c8e0b3b66d980340fc01d4a36fbba2007100d5d3904b3307eb2e5e75b84bb182dd702e9a274cfe7c5a6f382c053beb7131fdd32 SHA512 7578d839bf8d673d15f1caf84266c45c42bc1efaca9067a4ca22c25bc4ad14b7fd8eb73425f5178e188485872a20f1fe153665331d409302bb1cb4aab6cff623
-DIST env_logger-0.6.1.crate 28567 BLAKE2B a7302e44a807dcb1b523e1dde683a040837b1de2fbda5e8e7347478f77d4b7a39521aadd1d6d42dffbb6229e0dd6bd1b2b9fc47b860db45281a95612dd78faab SHA512 7e5142fa24e46aeb246515f42f9fc561364f266a693ec9f8c45dbe96d31174bf5663ef6233f41a5f96849dd19b61e2a97ab7ca1a7a55c51f741f4efa5af371c5
 DIST env_logger-0.8.3.crate 32543 BLAKE2B 513790f39c63eb096b0fb62687c74262b42b0edc3e6fc2e2f2fdd44463eb4cfbf67560136ec206e252afa1477fabf66917f4fc0e8192e040670f98f3d7c4bb51 SHA512 7f6c3c79b8f4efb8d1d4e4b879c1c78a427f15669244ce1eca869aea9bcad950ffa5b59f3f8e4513e085c2daf1f5857313b374e238fc78b731bba2646ec895ff
 DIST exa-0.10.1.crate 136562 BLAKE2B 343cfebbff8ed30f39da365fec5efb2fa24e36e9186016ee58f8feb3305dda9f01cbaf9c26632d26bf7e3243d539b7d951e3ab64f80465560e3c783453b84ddf SHA512 c10097e6ad8352d08893bf7d03a7eb0620dd92082aac488b08c93b5b9c15040e84c8b2c231e621e2767015050d46ba8a1c971c5c577492b1d5357a3af7e2ed41
-DIST exa-0.9.0.crate 118381 BLAKE2B 9844e5145add04d806165a74253ebcab1f1d86db9e6f0ad713001155539f6309075d8d391f428eb2c8a2b22e20179a5bea42ec1d7cc8eff6224874ac6b894744 SHA512 fa798e962e4a70f98fc78ccc8eb4ae7dfd4c3c0fabca2d7f6627301ffa5042f4437c98c5698f3b4ddc77acc4162b9141e6dc2e7d2f2818ff4f03ba755a6278d6
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST git2-0.13.17.crate 181726 BLAKE2B be159d2f3602a65b133d6bdb3d949a48b34029b7a491961469d7a5a6dd8d471b0460ea53e802f69a216ed6111d0329e8a8ee29024af3753a185258f1268b5ead SHA512 5d95ff8d5c62df55b9995f2319dc350dfc9c44b90bb594f6b90df4985f8ebed50211e380885826251aa4e86eef1cfac99f648fba5f91cd4b725b0d05b3800fc9
-DIST git2-0.9.1.crate 151280 BLAKE2B d0c08fbfeb2928e3986cdf57baccc44f75454b2bbb4470593903391d552369a0daeaaf1a64038e4dfab2194c2a3255579ddd4700cc0ebfe881023855521beb1b SHA512 293a8d3c284bde2636ca600f5fcb460a6077783a15c4c3b4e5472d4486233d0c5aa18968cc4d0e9e019fa8a1706e04000c858f8c87e2d92d0114ad0f18f136b2
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
-DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
-DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST idna-0.2.2.crate 271070 BLAKE2B 3a07d53ea832d53a2e99ed3345d748b6299f6b4e6d4c33de17fd5ed70b9a46727272c9facf1bbb79e2981a4ad1953cabeb53d71cefcdc2a1e9e9f57c4a9f0d22 SHA512 71be89a626b087ca3a33576857799c15634263e2bbe43290750eaa6b074088cb6b54b3f778930e3dcc796a883daf662c0935178d4f096c751027bbe727124212
-DIST iso8601-0.1.1.crate 7770 BLAKE2B 59f11b56722e612bb95ae80c3f666c5df656dedd4988bff4a9de6a6749dd49e68dc8944eb029afd4d133c3c3ac57608903a886ce34704a32598b637bff884cfe SHA512 c2c53777a69df5bb4bbc37e377dc064aa8f285a7532797cb9da278ed2b4766843583fb5535ae482335cd21ee67db176701e8c6e5d38c3a6ebdb8b05e82ed2aa0
 DIST iso8601-0.4.0.crate 15776 BLAKE2B e863e761994a211c2fc2a083270e327c26d5702c2cc25fc94381eb62a0d1054185ad9023b07bf9728c73eedf2d68bb106e377c992b2d20e9520330f36b8d4703 SHA512 76343792549c218aec791ffa11a08c335105e2fefb68a170273a6bee7ca7b1ba76fdd433c365541c0f70c7732ac07408e26e7dc3e7b7148c211dc090f6f05f0e
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.51.crate 397323 BLAKE2B 51306c2ab8eed6de1fabd4d59b7618ee74d8d699eaec776d21fa5df20c63cdd743a50ace3a37334b282e3050dd718faa9f95d359abd2495a2bb8de0384738b15 SHA512 d05693e7106e1887d94b23ddff5692111c2164e7ce59d9c60995af2a49fcf03ea8723e837370867c1177315aecdf25be82bf723c5e798ada66f5cc7886c22857
 DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c14309eed4c98a56be97aab6512d6b8b7574fdbf5a453f1400c9120eeb12e4f90970819f5c19ee544a975f5 SHA512 e82bd56c282b7473de50ec730646ae64384661e533f78b19bdd737d7a637cc93ca6f4e0b576d901576413a48d274635b917ec4b0c5144b5196155b04015ca94e
 DIST libgit2-sys-0.12.18+1.1.0.crate 1434936 BLAKE2B f283177caa941757388042ca4578394e160ea8e5776f6b4d842f778218286ccf65ce2febbfc780606d7624660224b11a470849b4d61302dbc11b3ba5e8d1b49f SHA512 3d9be57074e15bb0dbed151804d401d4688a77f1d46eee171e39b00815a983c103b614509ea0bcbe3c1355fc6c47738fe9da7ef6b8ee2d040fc30062db701233
-DIST libgit2-sys-0.8.1.crate 1264574 BLAKE2B a060ba4a460f345169c1ca3de30ddffd888197ce9b046b55b28ab92e7350d31a1aeb24f06c88d83b68a4bbc6be1b965cb9b51c91d1074f8f854bfebb37719713 SHA512 15cc37fde84725195441c066294392263a8cead13439c02a114b031c41dc6c508fe440b0866c4e70c6bac5060921629432d92cbb767429a75f8462a6854a6e72
-DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST locale-0.2.2.crate 18910 BLAKE2B f34c69403d81c86c6b178f8f28271e39ddec59696d11eb17c40bdbbcfe9be697184237f2ee3fa4c7b703067cc8c6dbb999a60884f81378b394994c53426e11fc SHA512 ae542f8811405fac032029885a59d39c922da7c1b59e69f5e0d73047d05ed803475b3aa9b486cce47abfdac03f5892013b822e896794e6dd80329b4f105be28f
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
-DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST natord-1.0.9.crate 3866 BLAKE2B 8e8f576af50121e7571a1d919557ddc14a3c1511c12154a9cb74fa34cb5c2279406e1ae7ffb120242689e34d4f237d9548631f5a35f4f5d4369bafd8a728fcc6 SHA512 bf58eda54c759fecca1fd310bece370f26555bde1096081adc5bb1e9446a538f1652fb3049a52f898f4f62a2608805b72cb72dd52ff3fc9b88fe0a7c9071025a
-DIST nom-1.2.4.crate 68547 BLAKE2B 87ed1c1770772beed7e2b5faf9a63ce4ab506913ee104a7e36bd64a69ebd47b7a7bea2ebfe1cd14a54e87cc671340b6768cdd47de68f163e48253f02283a13ed SHA512 4a1000f56dedfd71b1f91d44c27c07519f81629f5fc24b469d179d59e8b3305c8ae1a418fa60193be1cb4289887af2ad9b9791dcbf1f6e7a5eda36171a314539
 DIST nom-6.1.2.crate 147539 BLAKE2B fbee4797e91662a8c255ff80598fd50f62fbdacb3b734ef6a54ea115e6411ca73002c2766deb88ac8ccb698c481763594472204871e7096613137582afc9740e SHA512 f9a12a6c523c1c3202f3c45a514d02c40c600c835b83a1f94fd8e51ab462fdb89de3b32ad11630813d8e3cf4c8bc76acc620781568dbf2eb12469dcd9d3d0b19
-DIST num-traits-0.1.43.crate 7659 BLAKE2B 313221a4364b18eb29e2d4c480209766c56b1ca2587a0ab8f668c71cfdefcd733d64be1430bea1846a77f075a26137fbe71f2f4d9be79688374cdbe9e0274ba4 SHA512 35ee0a41f8ae33b1e6656935585f540956a8155045992e7b488b9fdbcf0eb9c9adc90ed8128d45f248b9ac583114cf518c4c7de719b8c6627b29f2fbbac91f17
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
-DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
-DIST number_prefix-0.3.0.crate 6291 BLAKE2B 24b232d965aa08a092d6bd65f0d28e5a93c7948b4831ad42bae067387908513a67a81dd85dcc8a2ae7d829abd6232409abd2ed4a15c993176b1c056351177998 SHA512 014c37c477b1c99c20461dfa6deb1692d93f10c592387bdb757d9220347ec7bfce5861e82029286cf3a64e9d53427cbfc40549e358c3fbaaebeb73e91b598107
 DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df
 DIST openssl-src-111.15.0+1.1.1k.crate 5087962 BLAKE2B 50a7528ca83e30434f14aeddbc83c434c74962faa106c597794a5c5a9d43d4c37de524f657cea9d3c87ca3f605bc59cde0273d64149954526ddffe96bb9c2093 SHA512 0adee57c5a9dc12b7a2c438f838a5d26286f9e885500708a6945a53c96708838071ee7a521e7dd9f18f5de59c5c3e66880ea99f64669daee442766471c8c2898
-DIST openssl-src-111.3.0+1.1.1c.crate 5106252 BLAKE2B bc7bbcd8d9d43cb8d5dfdc5de2ee8beb506d4a1132337625a87481975bb8d7284224c05d16ea63504b0be72e0444da5dff0226ad461037ff201c4e57b66bef5e SHA512 4c7f0d5badb5d62e73cc324f069343f60a3431751e9b3adf4de1a474bba48767513508ce65019dfcc16433e0dc62fd36eaf1c6294b48e064f4575b40a847a64a
-DIST openssl-sys-0.9.47.crate 44276 BLAKE2B 021996a0f385d3f1a917a5404fb1112b6c6fac7e3aa38e7c37292a843a8b50d0218870f6724efbfcce3fea9e687385b1c94e7efa6badb734cd492e01b3270dea SHA512 8d3a38a5f403cbd957b069c60d80f790f2030490847113b3050afbe769b4c692b581ec763656042973167dee6ca70939fe0f15cc1150db67731fb3808d98b6cf
 DIST openssl-sys-0.9.61.crate 52010 BLAKE2B 4746fdfffb1f0cf626ff0fe93e3057bafd8277c6469f577e37370010d5267b0f9bde8a91279e9f8d0ca0b93cad2231153ca07d667fb3b7c8feb637a04dbc352c SHA512 0ef36b2483163af083465ba9e84586ac0c2068285a8b3f1ad1e6a2831361722132d1d008791d969be669ab1131500416852813bb431307a484c1a277b5ab9abd
-DIST pad-0.1.5.crate 4853 BLAKE2B 62db785d1805f1db76515fa588ddc1be344fdc89092f0a5575e5ac1c7fa66284894dbf4f9c8fe21f0da0b9f9245fa113f9e45f7b5bcc860b6bddbe2fdfc2eed7 SHA512 ebfdd66fa6a9dcf5f627dc7c469deb72870678bb6579877122534aad450618307ff345014cf777c5bd67306ac50de0a59bced3578951f661cace8e70c237f4ba
 DIST pad-0.1.6.crate 4963 BLAKE2B 38e02652f89b3020e1b5161c73053c060eb83142869f297bc8d21f3a193106f1c3565116c7c3ffaa6a30da5ccc2db3c702c14a20b13eed13cf33a358aebece6f SHA512 712b402d76512dd074862c719ff3b066b4ec4e7c56f37cf3b9359ddf45cb21eba3bad55d4e26b6c61c5b982c5adecfdc6fccee7939004329b7b12c8ecb997132
-DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
-DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
-DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
-DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST redox_termios-0.1.2.crate 3268 BLAKE2B 5f3f4e2b7e7a8172f92e8161eb1dcd208b86320868ec351e2f7b47d8ed170b3f44ad8180e44ea7a554de0e53fc268365e683244ad59e4afabd11a09ae378d2b0 SHA512 d8624b2c78d02c5d3afcbecea9ad8d218bff508703cb50684d6ae05614a9f41bf2aa8c47440fbb7d964f01eb9085364222833fbf9c45984508e9d755dac563c1
-DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
-DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
 DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
-DIST smallvec-0.6.9.crate 21548 BLAKE2B 465f70349baa54a3b0ec1b21e732fc6b79362c866e24cb15acd09c753c4e4469a9f085859b5cc33c5a24849d64554dd64d6c66410c221c4c4bb6f3fae4b55dd9 SHA512 2bfd96b6c07a740b77c9d3221604e108bb730770970e7428a2a38d29711dff16eea08251e826d2d511d13a887c3256ec3a689e3c481ddb9029f47452fb2877e2
 DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST term_grid-0.1.7.crate 7353 BLAKE2B eb4d11b84995d8ca831c32c3b0c781244d7d97367aa6b877f1aaa21e6b10edad5a4597ab06d5c1b6a9cc00fbecd62fa3f28b9970119dec98c0eb5d0c74948b5f SHA512 12196d1f2579b6d593a7cdd34d74635b93fad710bcd682dd438143a9e814759346dc263dc8a65628b7ed8fc1dbcaa60fd9cec543d0cdae000cc5dc6fbb199bca
-DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
-DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
-DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c
-DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST ucd-util-0.1.8.crate 26948 BLAKE2B 9e0e650588dfefa4300505c4c76db45758775c9e6a9e821c3f7cdc01b3b2e4e8461ddad065bbf0471270f19b790861e39c5cc8844957dc313c05eb604aed0fc3 SHA512 b1ea29d005c9ddc55b72769da61f1855e3838222e20b4a3423d344acd61463a4bdcb233c437f0fa2c1ef975dc72ccd679570354b9ad615a3bafaf18616884e7d
-DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
 DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
-DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
-DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
 DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
-DIST users-0.9.1.crate 20456 BLAKE2B 49a2dd188f8d944d361a4e58f3f437718af7510c2b684e22209058e97dfd9d5ecec2c901cbe2cef36ab74d11091b1280de8b94135da523f57b02372ed5571fe0 SHA512 e372f8402d241e924c77a13621053836a1a36a6a6b9b66d5e187a582be0a85638270ea140c048e07f6739ed228711095fc98705303c499f2b542fd548df0819a
-DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST utf8-ranges-1.0.4.crate 8575 BLAKE2B 686bfd854cdcb7510b07751630089f4f0cb0884017792288a63a4a8fa00e6cf1a10b38c39142e57d5b4d1f494c95f3445f343f1b34fc1883dbacfd708d8c13b6 SHA512 acd7008c92ed23cc0ad3fbacecfba2169781687c6aaa475ef5388fe416391cd209218a2cb19b9d4fc87a2a616f1dd67129d39978fe1b58be134a013f90cd53d4
 DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
-DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 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 wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 DIST wincolor-1.0.3.crate 5030 BLAKE2B 165e38a7d234241081d3fed3477854c5241e2d6ea685230c9e44b64601f77953f1e65e9166a3e843e7bf5bc23c9af427d6e9718579f683e7ac1c96e14ed3618c SHA512 0fc5dc7f1c57bbf1a8a6d5342ca363384a14a464b53ce92ef08544925e7a9e8d031a457045233148ba10355e3c3f0cd34b08e12d54d2fcb10b3ed60ad678a492
-DIST zoneinfo_compiled-0.4.8.crate 7959 BLAKE2B 06b41aa69298319760eef3959c9447d9078ced6ea409b95bc0a3de5d9ddc1006d022caa23a64f46a9c6abf1eb077681ffaa3e03af0d533ec65d3351a4ecb3ac7 SHA512 e5337233b464cb97501a2694972a5707f6762ee567416bae876e0ee72aa0bb9cfd152a9253ba97c9fcb24a59e6b2fd5417d5567f7e17336ddc8dee121ba76589
 DIST zoneinfo_compiled-0.5.1.crate 8837 BLAKE2B 1d513b145a391ccb22d2110cce06dc1fc91e109d93cc7f2a056ceb5056a5a480b98ed3471cf8ff8fb8011f2d9c037b3bbd4f47dcedc0a56499e324ea5d7849da SHA512 4ad46983742ed37246f3ba5538fdf3a4dfc444ec635ffaa51d5daffa70c14e1876e703cd0a1f077e6b324e0d44d4b5e1e710b3543636fa9f33d509fa8bce333c
 EBUILD exa-0.10.1.ebuild 2692 BLAKE2B 131f2219734d56809e45b96145c7b87eaac5080c910c5bf22a9a4334599592f628eb31be64e11d326208d309377d438995a630786cf6dc69a1e0e62191e09bf7 SHA512 5a0ed31d3c97eff545c52b02d42911269050dc73474f987bafe8e7ecef949b136d614e324d6879ea12b6e55ee9bdc57ed3182a912ec9bdae3cc5dcdff7b84637
-EBUILD exa-0.9.0-r1.ebuild 2036 BLAKE2B 5344785f721a35548a99edfba4ff6fd3ad679a3eb57c9b94a0d10aea6b37744e0cf47a7ff4026d1e2eb4d07a8c9228800fb1fdaeba13b99733220d6e467abaed SHA512 4ac3694ebbc396f806d9b7b195a1a1fae0a0848d3794249c0830c71b37ef4d9212cd5e7a3e084114b90214be89401c925de440edd782873501e3d41f5be1ac9c
 MISC metadata.xml 718 BLAKE2B 4e2934573aa13eca3e25e2878b3e24cce6ba4d4edf77d33d18093a3d865a29e7493014a0b6b046204bf171315fefbb4157298b4c9c3c5f3f09b12d40a2362c66 SHA512 a4c1e97e87464da41fec5408d6dcb4f8538e163453c8a3c497663e0def2800c7621bfddccf211a97d4cc5cf8ab7c7e5009c5d44e6fc32c8a84125203e87b013f
diff --git a/sys-apps/exa/exa-0.9.0-r1.ebuild b/sys-apps/exa/exa-0.9.0-r1.ebuild
deleted file mode 100644
index 01d6850ecc92..000000000000
--- a/sys-apps/exa/exa-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.3
-ansi_term-0.12.0
-atty-0.2.11
-autocfg-0.1.4
-bitflags-1.0.4
-byteorder-1.3.2
-cc-1.0.35
-cfg-if-0.1.7
-datetime-0.4.7
-env_logger-0.6.1
-exa-0.9.0
-git2-0.9.1
-glob-0.3.0
-humantime-1.2.0
-idna-0.1.5
-iso8601-0.1.1
-kernel32-sys-0.2.2
-lazy_static-1.3.0
-libc-0.2.51
-libgit2-sys-0.8.1
-libz-sys-1.0.25
-locale-0.2.2
-log-0.4.6
-matches-0.1.8
-memchr-2.2.0
-natord-1.0.9
-nom-1.2.4
-num-traits-0.1.43
-num-traits-0.2.6
-num_cpus-1.10.0
-number_prefix-0.3.0
-openssl-src-111.3.0+1.1.1c
-openssl-sys-0.9.47
-pad-0.1.5
-percent-encoding-1.0.1
-pkg-config-0.3.14
-quick-error-1.2.2
-redox_syscall-0.1.54
-redox_termios-0.1.1
-regex-1.1.6
-regex-syntax-0.6.6
-scoped_threadpool-0.1.9
-smallvec-0.6.9
-term_grid-0.1.7
-term_size-0.3.1
-termcolor-1.0.4
-termion-1.5.1
-thread_local-0.3.6
-ucd-util-0.1.3
-unicode-bidi-0.3.4
-unicode-normalization-0.1.8
-unicode-width-0.1.5
-url-1.7.2
-users-0.9.1
-utf8-ranges-1.0.2
-vcpkg-0.2.6
-winapi-0.2.8
-winapi-0.3.7
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.1
-zoneinfo_compiled-0.4.8
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A modern replacement for 'ls' written in Rust"
-HOMEPAGE="https://the.exa.website/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 MIT Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-IUSE="+git"
-
-DEPEND="git? ( dev-libs/libgit2:= )"
-RDEPEND="${DEPEND}"
-
-# some tests fail on tmpfs/zfs/btrfs
-RESTRICT="test"
-
-QA_FLAGS_IGNORED="/usr/bin/exa"
-
-src_compile() {
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-	cargo_src_compile $(usex git "" --no-default-features)
-}
-
-src_install() {
-	cargo_src_install $(usex git "" --no-default-features)
-
-	newbashcomp contrib/completions.bash exa
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/completions.zsh _exa
-
-	insinto /usr/share/fish/vendor_completions.d
-	newins contrib/completions.fish exa.fish
-
-	doman contrib/man/*
-}
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 6e4c136da05e..beaea7259e83 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -2,7 +2,9 @@ AUX fakeroot-1.25.3-glibc-2.33.patch 13646 BLAKE2B 1a83706a9e26f9c11d9851c246590
 DIST fakeroot_1.25.3.orig.tar.gz 126884 BLAKE2B a6a860a8714bb2a43f2820bc586cac38d25df8b8cb32b219064618c845d0308b57929108bd582b46c15b2fe4b2fc00d662ba72458a9e9ffcf7d035dce515eb55 SHA512 b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346ff72e857087243ab0efe9fa82faaa9f9c3309cac4b5af0ea00908c2e5eb6e
 DIST fakeroot_1.26.orig.tar.gz 549685 BLAKE2B d9177403d9c2be88c0949c891cde5742a405027714b07ca2c7e72813dba049157c3d994f30b9c634016a74c74745f8391ee51035cbf385ef63364d0a31291d43 SHA512 dad193b283b48a25806c5bcd06d1f5bbd183ccd40a3fc25f3e7bb88fd6579024f958321f8336654348a1d0a547d4ad19ed11aab5ec9441d6ef493ee6e4c78081
 DIST fakeroot_1.27.orig.tar.gz 544301 BLAKE2B 5e887d43c8bedaecbe51eb7f606d6bace3a9f191a7cf4be32362e1ba97e438413f04ed644532d3a386a46f3a569bf0104c4f38272e5ff46e3705c17896fef972 SHA512 cd98b8cd1064a5a11c6f25bc1d9cb1fb1bf0787f50772fead301470d1769c08a89a1510402b099af334d9f126cea5d3bd5d73e27fb91b5afc1ceebeb9ec3f926
+DIST fakeroot_1.28.orig.tar.gz 546234 BLAKE2B 1182ce0d382511c92bd0d414fc43150db86753ade8ca09a371fce404afc271458626b89c5df329a5aa8911a97cac9eb4132a8f20c9ab2e4e8196c92c8f42c08e SHA512 cd55007014da5741ff336d005a80633a2f1ed856e075162acb9a4a1edd5c6d17ec74457c8a1e31edb02ae70920904c53e69365d55bd9beb7e8c6211aa8cfca8b
 EBUILD fakeroot-1.25.3-r1.ebuild 1414 BLAKE2B 91a267692babc8b0abbe427e4134da68568b4cb80394d56137e344279f372b652124d42a6f5ac62ee044588ba676a6d31f11a4d239ef67b6476eb7d3490d47f5 SHA512 64abe5083b325ee134758a0b51e25a3371757523317daffcded913024eec4b702d7c886bff4c7780605ef82d1b6ebdc005949b24780c4f3103a25d1cb9a037a6
 EBUILD fakeroot-1.26-r1.ebuild 1879 BLAKE2B 2e9df91ce0cbbe00cb6db58fcdbe40002d52b0e9078f1fe227d708d77a96a92e8444d5bde975705f14df0ab2ab86b4fd857dffe959b89879fd59530fa65d0166 SHA512 2aa0caf2cdcf10e1cfda448825800738d50682a2f52b86090638f1833e01245d79e47493787a3e0e0f49f7b6da4b218d2144f752704346af0da4387b10485d77
 EBUILD fakeroot-1.27.ebuild 1879 BLAKE2B 2e9df91ce0cbbe00cb6db58fcdbe40002d52b0e9078f1fe227d708d77a96a92e8444d5bde975705f14df0ab2ab86b4fd857dffe959b89879fd59530fa65d0166 SHA512 2aa0caf2cdcf10e1cfda448825800738d50682a2f52b86090638f1833e01245d79e47493787a3e0e0f49f7b6da4b218d2144f752704346af0da4387b10485d77
+EBUILD fakeroot-1.28.ebuild 1878 BLAKE2B c554e13742632e7e9daceeb6ee876237cca103913f2bd1c20c63df96b5c7bf48a192a8688ccc612c47ae39ba1f39d048e2e400bfe9a1da27eec879f5dfdaee8b SHA512 8a7527b6cb32ae88345b479fbfa8daf3a673b73c3d79cd980eac7871a6eded926f5925c2a90d04a90441fbe93a8f96e3a332de431efb584bd78dffae1a4f075e
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/sys-apps/fakeroot/fakeroot-1.28.ebuild b/sys-apps/fakeroot/fakeroot-1.28.ebuild
new file mode 100644
index 000000000000..8d511343efba
--- /dev/null
+++ b/sys-apps/fakeroot/fakeroot-1.28.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="de es fr nl pt sv"
+inherit autotools flag-o-matic plocale
+
+DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
+HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug nls test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/libcap
+	acl? ( sys-apps/acl )
+	test? ( app-arch/sharutils )"
+BDEPEND="nls? ( app-text/po4a )"
+
+DOCS=( AUTHORS BUGS DEBUG README doc/README.saving )
+
+src_prepare() {
+	default
+
+	disable_locale() {
+		local locale=${1}
+
+		sed -i -e "s: ${locale}::" doc/po4a/po4a.cfg doc/Makefile.am || die
+	}
+
+	plocale_find_changes doc/po4a/po '' '.po'
+	plocale_for_each_disabled_locale disable_locale
+
+	# We could make this conditional and disable the autodependency in
+	# autotools.eclass but it'd make it too easy for NLS builds to be broken
+	# and us not realise.
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_header_sys_acl_h=$(usex acl)
+	use acl || export ac_cv_search_acl_get_fd=no # bug 759568
+	use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING
+
+	# https://bugs.gentoo.org/834445
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101270
+	filter-flags -fno-semantic-interposition
+
+	econf --disable-static
+}
+
+src_compile() {
+	local enabled_locales=$(plocale_get_locales)
+
+	if use nls && [[ -n ${enabled_locales} ]] ; then
+		# Create translated man pages
+		pushd doc >/dev/null || die
+		po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die
+		popd >/dev/null || die
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index d17709d21606..ec08faec59b2 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,6 +1,6 @@
 AUX file-5.39-portage-sandbox.patch 604 BLAKE2B d755d85ae85826df5d2beb2d05f570e230af671c23f27bb1e3e811d1f2f710ae3d4f14d271f9dc4da4d1aa4e71070561d1121deaccf8781de72ff9aec059caa3 SHA512 a65368ed9225b0ca6e7341283a20b308c5d5ca38838849d5228be762d4d87de0438084af8f7cd7b6ee1a707125226940490a80cc1eafc2c817fc865a6211c890
 AUX file-5.40-seccomp-fstatat64-musl.patch 723 BLAKE2B cb6e5151b863328a4764f38f49cf42420eb13444783301af5f5e380e67da932d298ed94fb64a2a1a50ca349b43d73b77d6495df090d8b3adddc2b236b7fe3a42 SHA512 b25110ca59be28ca67a972c9737315efe357c2bbb8dbae4e6ecf80283bb0e9db4184574bfef2d965087493ede4979f649a762fa9bef2415d2359db117dfdb04f
 DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
-EBUILD file-5.41.ebuild 3340 BLAKE2B bbb550c4fb782299757a2d8628e0e3ea830e5165055fe2aa78bb84846c868f6427a253ea0c8540b9b681663be20b61958093dfa9ce40d829fcb682c99d33facd SHA512 72d9d212b1d1a1a234612a7361f217e50c4172877fffdd1f60847b4ad691d9ceb8955930f28f61665cffcba06008d7957d11b765725cc2932a019deded25bfb8
+EBUILD file-5.41.ebuild 3347 BLAKE2B 4f89900b47ae417d70818d42601e25ff9977165d63f24ad47ef477a3400f73cd70496f29a60bb082a24e7c3cea6386e39b3b4101ff536c418af357babe41eb79 SHA512 3ccab3db4de1facb4cde7faf16a8186820727de98d34af0294ccbf4a913f785e931c7b5cf87baf1f4f955079aa3df0efc51076938383ec8b556d657c8b499fd6
 EBUILD file-9999.ebuild 3266 BLAKE2B 967412ca3e0b7dfff1e2104e0d859c5376f3221a8b27b7c270c38f76c02b57bee0b3dac01387f8fc006a19bac875afabfc08eec1773ef419ff33679cf911cbf9 SHA512 2575765252b959a63833187ced7094bda200a5c3fa2cb69f0135e5028fd71358c9c2aae2a685ad27731437e2aebacd23df9766f39d539ad232e92195c3a6b3a2
 MISC metadata.xml 382 BLAKE2B 204b7440b6a18907045d7eae05e8c99d017fa57b5178462125b998d8b3af3e2be656353f5c69823f3b5ea4d86e7e6c028229af27abaf2f7ace6f181f9ebf4153 SHA512 0e56117ac1957f2393ab47dc875e5f07851f3866014388418f84668f5f9767f6ca83963547442606e1c637ed3bcbb81b317cf994de4a04cd28725d8f6cb49b5e
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index b64e9a3a0156..8e64edcfcd6d 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index c2a9463adb47..1011a482a696 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,7 +1,6 @@
 DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e
 DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9
 DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc
-EBUILD findutils-4.8.0-r1.ebuild 1846 BLAKE2B 78cc2bbfc0c05c13bcc4772692d15ebe2e0780cb5a5fd8b5689b10777530e9901e8af14688fac6b135ee57d69e4e9ac4f521ccda6d16c1db0d1679db852e8a75 SHA512 a71c349ea7075efc7c4149b917a84ded5b8e0e400f2373aa0b7fdce817593c7db00efd5670bd3acf82b8d01d77f11092fa54300119c2e1bc2ec0e9d6b2805709
-EBUILD findutils-4.8.0.ebuild 1784 BLAKE2B ac28cb4d32588549ae9201d665ed03b84eae7ce20f333fa3b952eb404fdf71d4dfb548c2d41a167c729031c2e051f6f69b0f9d45a87738a3b69a70a97f8c5f5a SHA512 d9d2ec21b79b742f411e8d94ad8c5b605fdb1c0113a7885fd0f10acd562d1a1afbb6fd55e9156bcec7920326593b35c4dcb751eeb90bcd95085e767fb255c9c3
-EBUILD findutils-4.9.0.ebuild 1986 BLAKE2B cb01cfd914e660be19e729f34bad8539905b7c6712c251fb428663b144d27495eaa34232e60080fa29243d13d8fb3dfd7fa3fda561d0de1a638c17f9ff94a2dc SHA512 a4fae26e2962a813b9b906d9a75a50cd73793c2e2ebb0e05956610cd236e80902736d13662a9a74da27e89d1d7899b84e5ad382dc6514c6e83d5771be0cfb627
+EBUILD findutils-4.8.0-r1.ebuild 1930 BLAKE2B 603aa026102ebfbd9857c7b6a53750d501a021bd537ae30ecf3d6494fbc628738326bffb78a26a65efb108ee48940965890ad6bfa5e6cd6ddd4a497876eb3722 SHA512 e9aafbee0cce1b9ef2bc032126c53adafcfcbc4fe0e9e81cdfff7c964354ce7c5ef6386088eb97b8120dcb027aaddaf819d643329f735594515daa18899bf4f2
+EBUILD findutils-4.9.0.ebuild 2078 BLAKE2B ce250e20b0168e6c5c204aa5c588fa6628b438aec4c838a0a80daa2248d98180d5e3c2692613149368f09e84fce2601ec02a0d34ac498e83a8414c1347e878c2 SHA512 6f57b27ae12a49f31f7d754919621392f16499130e3c89365fe59cd42c4520a28a84e802f25bb622502f0d7fa48114ed4dc396a17e8f0e1eb0e6dde52c81cdb4
 MISC metadata.xml 333 BLAKE2B 321643b5c847879de4e8c0a4abebd5534e91fc7e58313ec3258520fc1f1266f98cc1892b57589cd1427ad4a0cea39b3c03ce12741b04f75290346fddc6c245fe SHA512 b36dfd42e3af70bc1ef3c7629297a390dced3edb1dc3d7d10d7672ff532da743453d9382cb15d3102885150c2440bd85019865d61c4e4342004db2dcf993f0a2
diff --git a/sys-apps/findutils/findutils-4.8.0-r1.ebuild b/sys-apps/findutils/findutils-4.8.0-r1.ebuild
index 6d35f0a1ca08..0edfed04e0ee 100644
--- a/sys-apps/findutils/findutils-4.8.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.8.0-r1.ebuild
@@ -67,6 +67,12 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+	default
+}
+
 src_compile() {
 	# We don't build locate, but the docs want a file in there.
 	emake -C locate dblocation.texi
diff --git a/sys-apps/findutils/findutils-4.8.0.ebuild b/sys-apps/findutils/findutils-4.8.0.ebuild
deleted file mode 100644
index b4570b8b0f65..000000000000
--- a/sys-apps/findutils/findutils-4.8.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls selinux static test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't build or install locate because it conflicts with mlocate,
-	# which is a secure version of locate.  See bug 18729
-	sed \
-		-e '/^SUBDIRS/s@locate@@' \
-		-e '/^built_programs/s@ frcode locate updatedb@@' \
-		-i Makefile.in || die
-
-	default
-}
-
-src_configure() {
-	if use static; then
-		append-flags -pthread
-		append-ldflags -static
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html
-		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html
-		append-cppflags '-D__nonnull\(X\)='
-	fi
-
-	local myeconfargs=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		$(use_enable nls)
-		$(use_with selinux)
-		--libexecdir='$(libdir)'/find
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# We don't build locate, but the docs want a file in there.
-	emake -C locate dblocation.texi
-	default
-}
diff --git a/sys-apps/findutils/findutils-4.9.0.ebuild b/sys-apps/findutils/findutils-4.9.0.ebuild
index d973a4fbd790..8cfe270bc20e 100644
--- a/sys-apps/findutils/findutils-4.9.0.ebuild
+++ b/sys-apps/findutils/findutils-4.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/findutils.asc
 inherit flag-o-matic python-any-r1 verify-sig
 
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
@@ -63,6 +63,12 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+	default
+}
+
 src_compile() {
 	# We don't build locate, but the docs want a file in there.
 	emake -C locate dblocation.texi
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 129ec1fc2c91..f8904951983b 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,5 +1,5 @@
 AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f7023338b0bffe775c61be9f7c253d6d8343833ec64ff86dc3b4733e90e67435e3cc0d52e6ae11c8d368fe2f21b6a85bc59 SHA512 a0e30c2a87775342302fabfd594c91015b6ea9fba71a7d1b294c399a8336167f85b07fdcc2ff80174cc43362ef5ca28965571ca52e1a76922ef59dcb15991664
 AUX flashrom-1.2_meson-install-manpage.patch 1208 BLAKE2B a4290c046d82a7c8b8dbfba0d58abed2384506d761272929ca7972c68a92a314de2ad17af5bd49cb86af5fea119d36fb126c45febdd5ac99210949158d33fc75 SHA512 1345bc880317e37d028bc3d40c98e5b5b4b17c7cde18d3b17762c9792cf0e4ac19613702ae1d367937f86dd3dbb02732851774d91ef1372e5bbb8f998346526d
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
-EBUILD flashrom-1.2-r3.ebuild 4348 BLAKE2B f1df27a4ad207fbb91a7a599b6d2a08357d5a3060774bc11916b4f5d1380765f0c5301c987cf68440ffbc50533a79c17b0087139f0eff106c487a1b085ce8ef7 SHA512 a9460ba8104096b4abe257211a321ae824c71c2e7aef5f064ef16088f6f4592472da8ce969688ec695c2e9420a85187a8111fb055af3b7f307e5b42afb7e75d3
+EBUILD flashrom-1.2-r3.ebuild 3883 BLAKE2B 0c6a79622f8631f41debe934a520317506f4f6d0cf230c44405d40073959ae33f8b2d46afe19f47cf83f0af2e275ae06289edb60565b71bd6182a8a001cdfdf0 SHA512 eb52483d6375b339e27c95403cbf6632e1e6342ba6231ff161aafd9eaa1aea2b3fad589bc5deb3930ea8ab5b045422df626f69c813e172404f0cc3947de24adf
 MISC metadata.xml 4515 BLAKE2B ed7a5069b47796b2464794d904412b2ad6ed27e2ce82e8bca3336626006ae0e575f7cb48d6ad002f9758ea7fff177c810bd2eaa1f27a13f3401abbeadd3500c4 SHA512 743b3c2f4f345771241a4d326559658b89d1a5881099a6f468fff32f6ae8b38fcc883e798d0e429fdbae08449e5285926891e9b9b7e9c4ab9b7db9eb77bf7b20
diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
index 6465f20a4497..a1aee5e77b38 100644
--- a/sys-apps/flashrom/flashrom-1.2-r3.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,35 +59,32 @@ IUSE_PROGRAMMERS="
 "
 IUSE="${IUSE_PROGRAMMERS} +internal-dmi tools"
 
-LIB_DEPEND="
-	atahpt? ( sys-apps/pciutils[static-libs(+)] )
-	atapromise? ( sys-apps/pciutils[static-libs(+)] )
-	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a-spi? ( virtual/libusb:1[static-libs(+)] )
-	dediprog? ( virtual/libusb:1[static-libs(+)] )
-	developerbox-spi? ( virtual/libusb:1[static-libs(+)] )
-	digilent-spi? ( virtual/libusb:1[static-libs(+)] )
-	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
-	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
-	internal? ( sys-apps/pciutils[static-libs(+)] )
-	it8212? ( sys-apps/pciutils[static-libs(+)] )
-	jlink-spi? ( dev-embedded/libjaylink[static-libs(+)] )
-	nic3com? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-spi? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel? ( sys-apps/pciutils[static-libs(+)] )
-	nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
-	nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
-	ogp-spi? ( sys-apps/pciutils[static-libs(+)] )
-	pickit2-spi? ( virtual/libusb:0[static-libs(+)] )
-	rayer-spi? ( sys-apps/pciutils[static-libs(+)] )
-	satamv? ( sys-apps/pciutils[static-libs(+)] )
-	satasii? ( sys-apps/pciutils[static-libs(+)] )
-	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
-	usbblaster-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
-"
-RDEPEND="${LIB_DEPEND//\[static-libs(+)]}"
+RDEPEND="atahpt? ( sys-apps/pciutils )
+	atapromise? ( sys-apps/pciutils )
+	atavia? ( sys-apps/pciutils )
+	ch341a-spi? ( virtual/libusb:1 )
+	dediprog? ( virtual/libusb:1 )
+	developerbox-spi? ( virtual/libusb:1 )
+	digilent-spi? ( virtual/libusb:1 )
+	drkaiser? ( sys-apps/pciutils )
+	ft2232-spi? ( dev-embedded/libftdi:1= )
+	gfxnvidia? ( sys-apps/pciutils )
+	internal? ( sys-apps/pciutils )
+	it8212? ( sys-apps/pciutils )
+	jlink-spi? ( dev-embedded/libjaylink )
+	nic3com? ( sys-apps/pciutils )
+	nicintel-eeprom? ( sys-apps/pciutils )
+	nicintel-spi? ( sys-apps/pciutils )
+	nicintel? ( sys-apps/pciutils )
+	nicnatsemi? ( sys-apps/pciutils )
+	nicrealtek? ( sys-apps/pciutils )
+	ogp-spi? ( sys-apps/pciutils )
+	pickit2-spi? ( virtual/libusb:0 )
+	rayer-spi? ( sys-apps/pciutils )
+	satamv? ( sys-apps/pciutils )
+	satasii? ( sys-apps/pciutils )
+	stlinkv3-spi? ( virtual/libusb:1 )
+	usbblaster-spi? ( dev-embedded/libftdi:1= )"
 DEPEND="${RDEPEND}
 	sys-apps/diffutils"
 RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 0873db24d20e..3f9f032738b6 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,8 +1,8 @@
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31
-DIST fwupd-1.7.6.tar.gz 4054269 BLAKE2B dea4a37aea406e933f312fb809ee2ea972e3b017e5267d51bed835b6d440c15ca1d589f76a6c1906e616acc7cdd6c0f6dcec034e1460427057d8a1168583c4ce SHA512 f04ee78a6ec9e73ce0f3eb9c2dcbfc471ac88264451a378f1b0010fa528596052b4d3a63f5303074dd4fad55bf153fe5642d77adebd4ed805d74f57fbbff5b2b
 DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a
+DIST fwupd-1.8.0.tar.gz 4103239 BLAKE2B 15d06a261be1f529573a0f3b21a54066b1b286e1d1c68ac24f3862f7e3a8855661775b369016d67fbc9797fd13dea88000e78d1a6973e489ecaa6f7f6855b3cf SHA512 8977e0b0878e46480565a32935cc008d57d3978609c01877e3a90dc594b122bed0c94613a53f0f2d3f50d8a039b09cb93787aaf7e0b5d8cf1ec1a6247fe1610b
 EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9ea522da715e4ffa5359e2dc23315a79b823f016723b3f68507bf272fca29a8471e5c2388b1a1f1c6146231b SHA512 1899b4041033e23d658cc7991aed0c94252186a737616baa8d09595e97cf4cf16369478286ab2947441b81779227f48bf10b490ce3faae821e489f29a25053c2
-EBUILD fwupd-1.7.6.ebuild 4691 BLAKE2B c83b7b98d97fecc4696447cd9988620e041a4868c33484fd838f594fd5ba093cee24b8d4808bc26fa07d221293b6d6a8005df90995deb85ba7e2a496a8ba95e4 SHA512 3341d357d1622e65ef810c0c130e2ca42ae9c908d4b9ef73ebb3715498eb8cc3afb343d140423d4f2b6bc954bbaff9dfd1cd98ce5bef038a4c03aefb79941bb5
-EBUILD fwupd-1.7.7-r1.ebuild 4684 BLAKE2B 5dc38d1d040b856211d56fe82cfd3da57e02313d82ba1d41aee6c3fbe17af91c770e461f4e0b45fec53e86830c4103fcc309f459e29c6b71180d91f1279420f1 SHA512 215c70588d4f4b59b98394af472c0a7e3273ba849fa4917811258ea781dcc4a905912ecc63d9d8f6891cf640317635da654c42366b31b8e46049b573d8aad26c
-MISC metadata.xml 1432 BLAKE2B 02b0b170e7d8ecd293457ed8e1f9fffe2aecb4bb4e1be91869b638445d98c9e5824baf0ef497fe19aced0c1b80d747e7c41643a159edbaf7bca6f845bb5baa18 SHA512 aa650a07d777ba5a3816f6f3fd6ff6fadea149b29a7c1633acec56149de99c072493965724d33d8a76ac0221bb665ee6bf2ddc35f61967798cedbe02f79bcfbb
+EBUILD fwupd-1.7.7-r2.ebuild 4686 BLAKE2B 91d1fc46a6e98eef134dc5e461ac120082720b32d2e01850ccd17f97862d74a0cfd794c82b2c57f901a746634d4755e0f87209e94fc9ac33ce12162a81aefd7a SHA512 d656fec93da9c68f998a6577be04bb88449dacf8ba5e43b805b16fe6e9d46d4b7bf36f1d1a2201fd7d1081fc6314ffa09c83c4e728a3293335b0e1a07592406d
+EBUILD fwupd-1.8.0-r1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
+MISC metadata.xml 1532 BLAKE2B 0b3409cd11a20e2e2d18b42bef7fee3e14b5a8c20574345ae99de9e188b91226bf07f0fd44a7e538d07750ab6b6cf2da30df2b54729d0eb405ee280aa3816f5c SHA512 36cc547eeaaf7dc325ac5c609d48f11949650353a4d4cf7b37454cdd849d58de324f718514665ff47e6d4775a318b6142a958e1de243e43ea5446f82971a4c87
diff --git a/sys-apps/fwupd/fwupd-1.7.7-r1.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
index 9982065f894a..ad22abe7fcd1 100644
--- a/sys-apps/fwupd/fwupd-1.7.7-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
@@ -66,7 +66,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	policykit? ( >=sys-auth/polkit-0.103 )
 	sqlite? ( dev-db/sqlite )
 	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
+	tpm? ( app-crypt/tpm2-tss:= )
 	uefi? (
 		sys-apps/fwupd-efi
 		sys-boot/efibootmgr
diff --git a/sys-apps/fwupd/fwupd-1.7.6.ebuild b/sys-apps/fwupd/fwupd-1.8.0-r1.ebuild
index e020b391df93..cc9c6194035c 100644
--- a/sys-apps/fwupd/fwupd-1.7.6.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
+IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
@@ -28,6 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 BDEPEND="$(vala_depend)
+	>=dev-util/meson-0.60.0
 	virtual/pkgconfig
 	gtk-doc? ( dev-util/gtk-doc )
 	bash-completion? ( >=app-shells/bash-completion-2.0 )
@@ -55,7 +56,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	net-misc/curl
 	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
+	cbor? ( dev-libs/libcbor )
+	dell? (
+		>=app-crypt/tpm2-tss-2.0
+		>=sys-libs/libsmbios-2.4.0
+	)
 	elogind? ( >=sys-auth/elogind-211 )
 	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
 	gnutls? ( net-libs/gnutls )
@@ -63,10 +68,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	logitech? ( dev-libs/protobuf-c:= )
 	lzma? ( app-arch/xz-utils )
 	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.103 )
+	policykit? ( >=sys-auth/polkit-0.114 )
 	sqlite? ( dev-db/sqlite )
 	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
+	tpm? ( app-crypt/tpm2-tss:= )
 	uefi? (
 		sys-apps/fwupd-efi
 		sys-boot/efibootmgr
@@ -74,9 +79,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		sys-libs/efivar
 	)
 "
-# Block sci-chemistry/chemical-mime-data for bug #701900
 RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
 	${COMMON_DEPEND}
 	sys-apps/dbus
 "
@@ -88,6 +91,7 @@ DEPEND="
 
 pkg_setup() {
 	python-single-r1_pkg_setup
+	vala_setup
 	if use nvme ; then
 		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
 	fi
@@ -104,53 +108,53 @@ src_prepare() {
 
 	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
 		-i data/builder/meson.build || die
-
-	vala_src_prepare
 }
 
 src_configure() {
 	local plugins=(
-		-Dplugin_gpio="true"
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use fastboot plugin_fastboot)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_uf2)
-		$(meson_use logitech plugin_logitech_bulkcontroller)
-		$(meson_use modemmanager plugin_modem_manager)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use sqlite)
+		-Dplugin_gpio="enabled"
+		$(meson_feature amt plugin_amt)
+		$(meson_feature dell plugin_dell)
+		$(meson_feature fastboot plugin_fastboot)
+		$(meson_feature flashrom plugin_flashrom)
+		$(meson_feature gusb plugin_uf2)
+		$(meson_feature logitech plugin_logitech_bulkcontroller)
+		$(meson_feature modemmanager plugin_modem_manager)
+		$(meson_feature nvme plugin_nvme)
 		$(meson_use spi plugin_intel_spi)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_feature synaptics plugin_synaptics_mst)
+		$(meson_feature synaptics plugin_synaptics_rmi)
+		$(meson_feature thunderbolt plugin_thunderbolt)
+		$(meson_feature tpm plugin_tpm)
+		$(meson_feature uefi plugin_uefi_capsule)
 		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_use uefi plugin_uefi_pk)
+		$(meson_feature uefi plugin_uefi_pk)
 	)
-	use ppc64 && plugins+=( -Dplugin_msr="false" )
-	use riscv && plugins+=( -Dplugin_msr="false" )
+	if use ppc64 || use riscv ; then
+		plugins+=( -Dplugin_msr="disabled" )
+	fi
 
 	local emesonargs=(
 		--localstatedir "${EPREFIX}"/var
 		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="false"
-		-Dcurl="true"
+		-Dconsolekit="disabled"
+		-Dcurl="enabled"
 		-Ddocs="$(usex gtk-doc gtkdoc none)"
 		-Defi_binary="false"
-		-Dsupported_build="true"
-		$(meson_use archive libarchive)
+		-Dsupported_build="enabled"
+		$(meson_feature archive libarchive)
 		$(meson_use bash-completion bash_completion)
-		$(meson_use bluetooth bluez)
-		$(meson_use elogind)
-		$(meson_use gnutls)
-		$(meson_use gusb)
-		$(meson_use lzma)
+		$(meson_feature bluetooth bluez)
+		$(meson_feature cbor)
+		$(meson_feature elogind)
+		$(meson_feature gnutls)
+		$(meson_feature gusb)
+		$(meson_feature lzma)
 		$(meson_use man)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
+		$(meson_feature introspection)
+		$(meson_feature policykit polkit)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
 		$(meson_use test tests)
 
 		${plugins[@]}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 0016b0a19524..5ad610d49abe 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
 		<flag name="amt">Build and install Intel AMT plugin</flag>
+		<flag name="cbor">Enable CBOR support for coSWID and uSWID via <pkg>dev-libs/libcbor</pkg></flag>
 		<flag name="dell">Enable Dell-specific support</flag>
 		<flag name="fastboot">Build and install fastboot plugin</flag>
 		<flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 0531eeb5b289..45c037c9a6af 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,7 +1,4 @@
-DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
 DIST gawk-5.1.1.tar.xz 3250860 BLAKE2B 35eec6f4c9bf52496ac16e4b0e1b98947ae0dd46d0ab1df9ec13ede24374a4917214e492182a16e25fc515fa62a765340914feac16a006d980ba1328634a5291 SHA512 794538fff03fdb9a8527a6898b26383d01988e8f8456f8d48131676387669a8bb3e706fa1a17f6b6316ddba0ebe653c24ad5dd769f357de509d6ec25f3ff1a43
 DIST gawk-5.1.1.tar.xz.sig 488 BLAKE2B 1c7813753f3e982e1ef31efc7a1d78da4b977064b395e7b138ce09e68c1b9cb9a7b7de0d0b36afd6d39a2e62d5563cf7ceac6fcc73e9124ab07eceb56c0aa040 SHA512 71ecfa1b3a9e3005f033e83a75abce5c576c7941c62ed571cb6124032426db0e220bcdd577395d1af00a53c13dd1c8e6de71702cbe9c71960d3a3ff76dc026bd
-EBUILD gawk-5.1.0.ebuild 2272 BLAKE2B eefcb6bd789cc7681873db57a83d1a9e1b00f4f2bc2b2d7df67252537f87f99436e0922abfb61ceba1ea21e80090d605df726f23ba17a002501f802c9ba2f06b SHA512 9ed71f1ef8e5178df8332d328fb037c39b8f7017a8bd3020867c1210ba26ca6d7272de26b26b5892b6965c21019403754c34864dc0aa7c0ff124e212abc876cf
-EBUILD gawk-5.1.1-r2.ebuild 2719 BLAKE2B abbcc24655e9210e06df90c77ea575d1b43551a4bc4c971161834510545c5e094dfb95d46320dc9e72df5472d1bb228a7688fa0e9c60648b76e8d57078b2d271 SHA512 bc3dea4c2e5ccb055257daa5574f341a062fffdb3c9210a638a511c5780692ab35ab46cd78b98aabc56166484091b9228d5eafd63a6fa5a253723de1cab264e9
-EBUILD gawk-5.1.1.ebuild 2477 BLAKE2B cf11db4d78fd7567f427f195600435b3a2b335371823504a4d6f5d44ae6c282b1ad5a1ef4775f1805c1fba88a257a4c64733c7e5042e4cdc5236a7e4ca6cab54 SHA512 bf9e799650b61b93e349d861a99a58e2ed170b823e5ca224ac8e800224c235e39abf4e1a5aad9ac5d6c023e60fc467a038047ee21c5fd1dc437c5bb8c9fa7161
+EBUILD gawk-5.1.1-r2.ebuild 2726 BLAKE2B ed5ccf5cea50c5255e7ed2485a0d7659a96148d369acf55825394e8c0fde6ca814720de9753ce2cab15bce210dd4f1b2d86fe679754eda57147fe772973f4459 SHA512 c27d728e5e07e461ddcd1644f8dfd94d08fce898d58e98668f1b484075f5775315d01e61101e39fa46e30acb15224833ef219c36271528462f2d2fc6e65014e9
 MISC metadata.xml 348 BLAKE2B dd212d42a4218147703b0dd20699b3040aa7fa6e214d26b7919e7e547a71d4ba22f827aa952952ad97314f90444fb27dbd79da73988f33084c457e1a358b5d1c SHA512 8a6da25157316d3caf69f2a2f68c93d98ba76e89304237b2df04032db39849349c1911e69037da4d8789d8c284792de1071e7eda66e62f2be5523806c6f13223
diff --git a/sys-apps/gawk/gawk-5.1.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild
deleted file mode 100644
index 5599ce73b0a2..000000000000
--- a/sys-apps/gawk/gawk-5.1.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="mpfr nls readline"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	mpfr? ( dev-libs/mpfr:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-apps/texinfo-6.7
-	>=sys-devel/bison-3.5.4
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-
-	# Use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in || die
-
-	# bug #413327
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die
-
-	# Fix standards conflict on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
-			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
-			extension/inplace.c || die
-	fi
-}
-
-src_configure() {
-	# Avoid automagic dependency on libsigsegv
-	export ac_cv_libsigsegv=no
-
-	local myeconfargs=(
-		--libexec='$(libdir)/misc'
-		$(use_with mpfr)
-		$(use_enable nls)
-		$(use_with readline)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	# Automatic dodocs barfs
-	rm -rf README_d || die
-
-	default
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h
-	rm "${ED}"/usr/include/awk/config.h || die
-}
-
-pkg_postinst() {
-	# Symlink creation here as the links do not belong to gawk, but to any awk
-	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	else
-		local l
-		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do
-			if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then
-				ln -s "${l##*/}" "${l/gawk/awk}" || die
-			fi
-		done
-
-		if ! [[ -e ${EROOT}/bin/awk ]] ; then
-			ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/gawk/gawk-5.1.1-r2.ebuild b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
index fa1f1f7a15af..6e6db23f870b 100644
--- a/sys-apps/gawk/gawk-5.1.1-r2.ebuild
+++ b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.1.1.ebuild b/sys-apps/gawk/gawk-5.1.1.ebuild
deleted file mode 100644
index 2a78b349bdc1..000000000000
--- a/sys-apps/gawk/gawk-5.1.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gawk.asc
-inherit verify-sig
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="mpfr nls readline"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	mpfr? ( dev-libs/mpfr:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-apps/texinfo-6.7
-	>=sys-devel/bison-3.5.4
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gawk )
-"
-
-src_prepare() {
-	default
-
-	# Use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in || die
-
-	# bug #413327
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die
-
-	# Fix standards conflict on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
-			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
-			extension/inplace.c || die
-	fi
-}
-
-src_configure() {
-	# Avoid automagic dependency on libsigsegv
-	export ac_cv_libsigsegv=no
-
-	local myeconfargs=(
-		--libexec='$(libdir)/misc'
-		$(use_with mpfr)
-		$(use_enable nls)
-		$(use_with readline)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	# Automatic dodocs barfs
-	rm -rf README_d || die
-
-	default
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h
-	rm "${ED}"/usr/include/awk/config.h || die
-}
-
-pkg_postinst() {
-	# Symlink creation here as the links do not belong to gawk, but to any awk
-	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	else
-		local l
-		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do
-			if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then
-				ln -s "${l##*/}" "${l/gawk/awk}" || die
-			fi
-		done
-
-		if ! [[ -e ${EROOT}/bin/awk ]] ; then
-			ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index e522565901f3..c1098651db55 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-functions-0.14.tar.gz 11330 BLAKE2B 72543941f2954e35d3671c1c482eda44ae00cf0c636a1d706c5b90c56dfbb985d20c156b6de650e5d33ff9fac0abaf9fc50b1172832c2bd5276f6adfe5baf3b8 SHA512 e1e0fee9f3e8b79478aaf2b9a54c8623c858e62f72f2885ea88f7006631cf513bdfaac7122f2a5fc97379bde57851793bf7d6c63a1c63a6923a7f13a73d803fc
 DIST gentoo-functions-0.15.tar.gz 11236 BLAKE2B da3df4ee809c33a7aa275757380584abcc70dc5f54d32b2e9d3336a9453cfc935e932df065a65a7458b885a449774713fead5aea99ea5e7ee522e5493d35482b SHA512 b2a42e5b43c487d62e036eade88b5cc8e0f4eb249c783837a0293cdbba4ed8a1eea8742d531885bcc56eefa337853c41d257b6a9880fc0e7420b490bb6f98fd4
 EBUILD gentoo-functions-0.14.ebuild 856 BLAKE2B a6b02beaf3908fcce0a652d49d2168992be2a5ea96c106606b8415a80c965f347a3786b06f62b0bee0727ef894990f9673fb0184768939856abb9e4f7c50c4ca SHA512 053d4d88f29f95f54320a1663f361a8a012591d2b9e5c1872a1772c8f0fc64f86e7b54311aca3e96e77f78714507f9bde9e779cab23fb6657b85f622a5a3df4b
-EBUILD gentoo-functions-0.15.ebuild 856 BLAKE2B ae7d3e2633622b24fccd32cd78f4d845c4fc152c032ccc6385c00263f7da2a1b6928319be505898ed6e041ee30f94562d3373d80054d0f2631bf287225e25f24 SHA512 84e93ea6310cfd0cfc77232377c5021421c5ca62fc6a4c4508f3cd978e4dd8c3d70555602e82668158dbe98dbb7108497dbab35fb6a3215b697b278d688cd9ae
+EBUILD gentoo-functions-0.15.ebuild 863 BLAKE2B b75dddcee50a7948ef9056ec08148139fdabd5ef479fd825c3a0017a0587a249680422480c641e5cb6d8249131c27644f9e2b8234c91710f985c02e45ca00898 SHA512 b7909559a804f0bceffe181ad7b1ea9d5440cf9840641da8c9b677feaf71f0d1671b9d8fc6d981d90259ce15a7f33f27bedb0a85bf6d534bda9557dae92eac22
 EBUILD gentoo-functions-9999.ebuild 864 BLAKE2B 7516cfa9a50f69cbcd702945da6b83fa6975727f2f03af81243f18c8da302ea31fede39cb5831507e2e77ce50c9b8f336bcaeb20ae69a854bb4c2c86cfe112e8 SHA512 1c0b8e1d97910207d2d128998631799dd39ac3af3393cd3da8c11e6bfed58046afef8473953af2bec9b2b32f1107484d3dc26c773e69e5645205b1cd028ab506
 MISC metadata.xml 493 BLAKE2B c38d800838c6a17834b7783dd5e59ccd58ebaeefa7071f86a798105876bf2c4166157416c31f009d2edc2694b16f922e23f49a51c5d7e29739c536024f54a42f SHA512 4434fc898c5c895a1081535e5f6640001d81d4e2e1772df14541ab31ad3daed9cc34796348d8fc425af06a8d5a0779fa9f5fb6a4b02600dd73d314597ff7b59b
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild
index 8f51bdc66cd6..b565670c20bb 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 521e12c91d0a..35c155d0cc56 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,8 +1,4 @@
-DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52
-DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809a32f61486ab068b1f636502ac36d58e4c204b5f0d46f51a6624f134a457f246b520614213cf45cc5397de769b315e01e32720bcf SHA512 373892ca9ae8845673f9ddad74e0be0b71af944e109adf0d2ce8e54a9c24ffff5e90cfa92e74b7abc1e7d7b1598404258b90b549697bde28a1025a2d974e991f
 DIST gentoo-systemd-integration-9.tar.gz 65696 BLAKE2B 7d2105e37ff53d48e312b78a971f16124df1d3a1f99ae37eb757e4be31663eee15ba1a9fb31ef31250c79f902f7a00e1de84030f3fb67e41ab2243d58deabcb6 SHA512 e4810e74c713793f1e5aca7f025780c32e8f0fe404bf74b65263bfaeff1ae1398551fdff7de37a4050f0e48d5e0b90525217f5b3caa18111ab1981f57f41fc18
-EBUILD gentoo-systemd-integration-7.ebuild 794 BLAKE2B 7f33bc671174599f5a855a93522f7888f2a818a2a45f47742ed61f05f05708b976ee566625df20cfd422dd6f9f9ba4ebd21fcefd51e9bbb2059d48b542e795cc SHA512 fdef060281bf6c98ac0236a6e111bf8f36746fe80c335b4b2fec453502f903effd7ff261593a60a836beb1e333812102061165c9e1f86a340c9bf3db3729bf1c
-EBUILD gentoo-systemd-integration-8.ebuild 959 BLAKE2B 7dd60424f23e74b82e59177529ed287033261331717b9ae266636cda173c2335d29ed7c49320427fdad5d0a3a0da3b0bdab32ceea4be40e47af44e0c479fcb24 SHA512 8d266198855d341d64db22ca0c721f48afe66d1a82d1de7bfc3164cfc00beb80a163dcf5c0593a7176fd4614097e96590620297200ce11dbbada4edc64eddf8e
-EBUILD gentoo-systemd-integration-9.ebuild 941 BLAKE2B f34fa7310f47f06ac697dc6189a5cc659bd25cc303cb8e93fcc45767f5ec9d785b0d45fe94962c49538c6d84746c3256567cb7dcabd1a87974121b1180c88738 SHA512 e0cfa25866b549f98d522a4cb31a4a7a2d732ee55b0a92f0fd134a69f28b43abf8074eb4e418ac18ab89c37dc74c20763ddc57551e3e8d39f6edfbcbc1df6334
-EBUILD gentoo-systemd-integration-9999.ebuild 949 BLAKE2B 5b069394c6337d9cdad48839c2c27b1d455bae43f9f64f090a0a3514d240bd2a7e06fc1990e440a5a13fa5c9ed02271e6fa8bd3da866e6c52f2811f5936f8c53 SHA512 f1506897008d24f8c6229480ccfd25947b4db655eab9c5d25aef9ebea380ab1e195163f921aadec366f94a1b36254749642664228591ac1f5179708a85e4c478
+EBUILD gentoo-systemd-integration-9.ebuild 990 BLAKE2B 3167c9350b6d90606516ad2eec7afa2fc2c1c7ec1bbc78d125b4cefdf21750da062980733a5dcdc9db6d48f6ffc1ebfff30c985a707b79202508c977822020e0 SHA512 84063f24f86dfe9a94ebc96d9424cd0199643a4a09c5d9970ee516e74eaa7507879aded7138112a179f42ace7deb7a7b9fa27bb5e757f949fe2ecb6d694c20c1
+EBUILD gentoo-systemd-integration-9999.ebuild 991 BLAKE2B 946da0cf6ff72cdfd50555e56c4b42e8d6ccd577cd6901ebfe07dbbfe39507dfdd8ad83d4e4fed3aa14f34d73c7084257c4b1a36b79a4dc1dc4ea3725a318c66 SHA512 bbea76053dddbb7bbcea129d41cae4d4b48998fe0be995d4d30cd152837bd8c065bee81e70519f4420c485bfee39e4b0f4b03fd11049ccea6c85d582968ed026
 MISC metadata.xml 380 BLAKE2B c85bcefccc2876a63a0b0348c42099812d371f2893971cd3ed76726bb1c305c6d17a30814743b9db8f91f96448ea241be723bd9deb11d627ee0c3b38643f8a42 SHA512 d72a532ad36554a12da2dad9645e939f79fe67ad969850f702bfb2691e80fda2c3c7a99e5f7be992a2b0b78aac4a09aa56d04ee914d1c98f131ef29e10a91dcc
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
deleted file mode 100644
index cf3c9066f0cd..000000000000
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-inherit systemd
-
-DESCRIPTION="systemd integration files for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/systemd-207
-	!sys-fs/eudev
-	!sys-fs/udev"
-DEPEND=">=sys-apps/systemd-207
-	virtual/pkgconfig"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/systemd-m4"
-fi
-
-src_prepare() {
-	default
-	[[ ${PV} != 9999 ]] || eautoreconf
-}
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
deleted file mode 100644
index c5acec8fc6de..000000000000
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-inherit systemd
-
-DESCRIPTION="systemd integration files for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/systemd-207
-	!sys-fs/eudev
-	!sys-fs/udev"
-DEPEND=">=sys-apps/systemd-207"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} != 9999 ]] || eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
-		--with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
-	)
-	econf "${myconf[@]}"
-}
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
index c2fc5b4077e5..83f9b27ef1a7 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit systemd
+inherit systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="systemd integration files for Gentoo"
@@ -35,6 +35,7 @@ src_configure() {
 	local myconf=(
 		--with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
 		--with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
+		udevdir="${EPREFIX}$(get_udevdir)"
 	)
 	econf "${myconf[@]}"
 }
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
index 0d5b07883d97..bb66dd8ea452 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit systemd
+inherit systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
@@ -35,6 +35,7 @@ src_configure() {
 	local myconf=(
 		--with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
 		--with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
+		udevdir="${EPREFIX}$(get_udevdir)"
 	)
 	econf "${myconf[@]}"
 }
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 4b5b168b5999..dba836ef1ef9 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -3,6 +3,6 @@ DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07
 DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331
 DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
 EBUILD gptfdisk-1.0.7-r2.ebuild 1290 BLAKE2B 789fed2d6991ebbb1bc8707dd17ed86449e6c2d22db73d8ec7451fa0f9c8d13dac65752295109010ce3332c63f0aab16bbd55cd757c959a8ef57f89543645569 SHA512 0d9b32e690c1e6d477b4009cbf55dc2361f00c6c99b289b8e927b516787770351f751f6226bd6cbd68dda4edd6450d0c55e5db6b9834356830d6e4bb464c4fa3
-EBUILD gptfdisk-1.0.8-r1.ebuild 1226 BLAKE2B a2cf4124d04580e997b3b07bcf0a05386fc5ffdd28a1cf23bcadaf298c2baa85a623fc86f3b7fd1e20b385f136025ec3db4b95ca204d2a103d40ec0856b291e2 SHA512 2d5925cbd3b1c951752526bfae8ab5c2b32f67ca50684255e490b46687ee1e5d301f38bd135c6798a5b50193b512c0a61951e3d59a0bc363cdd7c3402b46f399
+EBUILD gptfdisk-1.0.8-r1.ebuild 1225 BLAKE2B 2f0960a54787e83b4f4cdef9b33ea0bafac5423f80c4db6e0a6fb2bbcc898b0cb5bdb1054769a92601b7ff2ae7a1974554ce89793242096f29d8596e55d12a0d SHA512 5d24033c201ac8f3fa66c0137e2de032fa2cafdddfa3ea740c04f651b268e59541de831bdd84f191397ca2ed395338bc33ed6fcb2c91430c8f27c9b00d3831b5
 EBUILD gptfdisk-1.0.9.ebuild 1232 BLAKE2B f5e5b583fb8449d46e87be7918e4112fa7d419160140bf4203219b84ef9c92d6fc52d48fe54a3b83dbd3763ae0fb7332a4267b60f13e19c3bba7e6031f462988 SHA512 b6d08bd889289a2a16f2bbe1d01430647c0a9ad246bce6217db91b5fe63d86b171114bc53587ab49017d134481d0633b0999b2489e935c5d1bc0a4d6cd7b7b5d
 MISC metadata.xml 340 BLAKE2B 1934da4cf8289a324846642f69ba53d6e0988eb37c4a56019bae8094935efc1ff485f7f6746d58a72efcf81b1a017baca1f48e3a47d321fd8c87fb756b2e5419 SHA512 6074f7a7c0ada7deacf252c2bd7be3b5aacc3402e88b13bfbbf085b7760956a1ec35e52c22d49663d358dd837319815e4b1d5071ea0119f9890d31eca9ef84ed
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
index 245535567ce5..bf0421bb8ff3 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 01749c17dd08..d46ffa3cd2ce 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,9 @@
+AUX loong-fix-build.patch 859 BLAKE2B 1c37ecbf8f7c0148e1634691b36c5e526e1111c851bb34059cbc03b902e45f066b976899e8c155db0d8358f9f45ef39d8bd6a87616c885d9ceafaaa24905d39c SHA512 f97ea8dcd28957c58d4b08f91b3274ebcba9bef9fb93ea91576925d8cbb516781524c172f35dcfb2be4be17cb446ec6b8366d04d485eb5ec012b126be02b9c82
 AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e
+DIST grep-3.7.62-9a668.tar.xz 1687820 BLAKE2B 95f5deccb3b3b223cb429f5c515674bed5209e6ca1d295b5ddfcf09614c6c10f6c6f56df9931a3dc0926b48abced15ab1099d8e84840c74846cb89270e248473 SHA512 b24a11138e683d75e75b4f04a42f4d202526a691aa70c303af4d257e2a395a4266b4bc05afff4fff7ab0efc5564af3efe0f9108cbeddf406d4dc3f171a642f25
+DIST grep-3.7.62-9a668.tar.xz.sig 833 BLAKE2B 9be6a33b1d2e29eeaea6bfbcbeade37eb4d7c8b2fdf37ec82376b1cc158f02c6916c87c21378cd099f863787ae46e2bc7dd40df77b263fe971f50b7bbe67cced SHA512 5245b7af4202bd49ef8937eda3ad91949e6bd9e16e217c0a326e8d6abc17d8f47e068197cb5df16829298912eed0d811164da4d1d7bd3ce3ff679a87a281f33b
 DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82
 DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4
-EBUILD grep-3.7.ebuild 1983 BLAKE2B a72a43b9908600ea32d2645ceb8ef0d51e42ca43393fc7b6c9f223332729cd35795c69455979f6ae45219bd59eef9d141ad3de315ccb21fd92352e1cc88edd0b SHA512 5300eadef8a792b4e0b255590f8336c6989c51843d56f4e7a064a68d313371eeef8ecc6ff8fe6c5316ab4c50cb8e2020b0eb8e3984ff8d1b632a25bfc9e0f1c3
+EBUILD grep-3.7.ebuild 2274 BLAKE2B b847a17bfe835e573a6406c728e99c1af5687bc2e83bdb4c1b6103790f587210c5bd3f4121c7fb83d8c96805a6a7fc636f06050df1f8f591d95e931f2cfecbc9 SHA512 dace79b242b68187cf8d756b4c91a7873eb8c1b1a3f631b67bb07192a95c4c4af521db19e6a943ae03f1d885317c0d6f497e129c7644e36d5dc97963415396ee
+EBUILD grep-3.7_p20220425.ebuild 2169 BLAKE2B 61fd2620aceeb5517493347bb2817dfa0c3ef4230b732c713f7d8e4693e0cedc92c7a78583512104022185de43f011771130900f10170790de845b0e3aa6bfb8 SHA512 822880de93aa6f7cb4eadbf24429fc79b32db36a68a87cc45dd985d63684aa0c39f3fce0927c21c6ec69535938238b9a11bd0b4a72c3124708c165d94a73235a
 MISC metadata.xml 335 BLAKE2B 9348d579c8858b0764c9e6edc144183686945cac2a68eead6e5ad83d364d293292ec6ef97bf87ea5c146048757d080e157bf9edf101177a8854d77305d8a9dae SHA512 3ea8b4569cfadab59ecabcf13c25941f9ad0db6c15b0625760339224aa4c82dc99b102c59c858de20d3ab9399db38f47e23d1b360ff86cfba6ede73b548ea7ff
diff --git a/sys-apps/grep/files/loong-fix-build.patch b/sys-apps/grep/files/loong-fix-build.patch
new file mode 100644
index 000000000000..e3b346dd92d3
--- /dev/null
+++ b/sys-apps/grep/files/loong-fix-build.patch
@@ -0,0 +1,30 @@
+[xen0n: this is https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch with change to generated file added as well.]
+From: Sun Haiyong <youbest@sina.com>
+Date: Tue, 31 Aug 2021 11:11:52 +0800
+Subject: [PATCH] stack-direction: Add support for loongarch CPU
+
+* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch,
+set "sv_cv_stack_direction" to "-1" .
+--- a/m4/stack-direction.m4
++++ b/m4/stack-direction.m4
+@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
+       i?86 | x86_64 | \
+       i860 | \
+       ia64 | \
++      loongarch* | \
+       m32r | \
+       m68* | \
+       m88k | \
+--- a/configure
++++ b/configure
+@@ -35668,6 +35668,7 @@ else $as_nop
+       i?86 | x86_64 | \
+       i860 | \
+       ia64 | \
++      loongarch* | \
+       m32r | \
+       m68* | \
+       m88k | \
+-- 
+2.17.2
+
diff --git a/sys-apps/grep/grep-3.7.ebuild b/sys-apps/grep/grep-3.7.ebuild
index 4f07cae885f9..799ae9355ad6 100644
--- a/sys-apps/grep/grep-3.7.ebuild
+++ b/sys-apps/grep/grep-3.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 # We lack dev-libs/libsigsegv[static-libs] for now
@@ -31,7 +31,10 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	verify-sig? ( sec-keys/openpgp-keys-grep )"
 
-PATCHES=( "${FILESDIR}/ppc-musl.patch" )
+PATCHES=(
+	"${FILESDIR}/ppc-musl.patch"
+	"${FILESDIR}/loong-fix-build.patch"
+)
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
@@ -42,6 +45,12 @@ src_prepare() {
 		src/egrep.sh || die #523898
 
 	default
+
+	# touch generated files after patching m4, to avoid activating maintainer
+	# mode
+	# remove when loong-fix-build.patch is no longer necessary
+	touch ./aclocal.m4 ./config.hin ./configure || die
+	find . -name Makefile.in -exec touch {} + || die
 }
 
 src_configure() {
diff --git a/sys-apps/grep/grep-3.7_p20220425.ebuild b/sys-apps/grep/grep-3.7_p20220425.ebuild
new file mode 100644
index 000000000000..342f35aa3dbb
--- /dev/null
+++ b/sys-apps/grep/grep-3.7_p20220425.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://www.gnu.org/software/grep/"
+
+if [[ ${PV} == *_p* ]] ; then
+	# Subscribe to the 'platform-testers' ML to find these.
+	# Useful to test on our especially more niche arches and report issues upstream.
+	MY_COMMIT="62-9a668"
+	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+	SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
+	S="${WORKDIR}"/${MY_P}
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+	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
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="nls pcre static"
+
+# We lack dev-libs/libsigsegv[static-libs] for now
+REQUIRED_USE="static? ( !sparc )"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
+	sparc? ( dev-libs/libsigsegv )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-grep )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	default
+
+	# bug #523898
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		-e "s:@grep@:${EPREFIX}/bin/grep:" \
+		src/egrep.sh || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# We used to turn this off unconditionally (bug #673524) but we now
+	# allow it for cases where libsigsegv is better for userspace handling
+	# of stack overflows.
+	# In particular, it's necessary for sparc: bug #768135
+	export ac_cv_libsigsegv=$(usex sparc)
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable nls)
+		$(use_enable pcre perl-regexp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 578f38237aaa..217e71a17e73 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,4 +1,4 @@
 AUX groff-1.19.2-man-unicode-dashes.patch 582 BLAKE2B 73e0868465b5372376e5bb5b382f2a4918fb9227208ad001f35ae041af93fda494a9be355e732697d264ec974d6e9528f9f91e0d26b2ecd82a41508222f1e439 SHA512 7d9f88c8bcc1b220c82c214f2f638601e8b44bd3933df03c74a2ef51b555773734c92044a3162bf5815932ddaae08158994a7c5106098de3e9f3bf202975de97
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
-EBUILD groff-1.22.4.ebuild 2788 BLAKE2B 3bdca2da3010c0305cd203a163478ff996716e5261aed0094d331cfe68953421955118874a42768c33f9c48c29f9293587adb6490d52bb67d7bbb0d8b43662ff SHA512 ff4a57f4924fbacb7ef66ef1971dd420c6ba0c3922444806b48853ffbce5592cdfbfba388b1935b2e6a09ef4376ed7e7bd25046be828629da3b18b247d939fdb
+EBUILD groff-1.22.4.ebuild 2795 BLAKE2B d386818667ff0389a6920b172ee42b1a00af2648a38b2616aba72da0102c3979d8c9e38b10ef8d87fb09e77bd3a91fe681f43f618029c65c72ef36d7127e304b SHA512 69188450b4d3a88154a03e7668220f09e330312dfceb87d6905c76a36f143ea2b4cb2fe07021beba4ea450ea8df6ec5119d4e35cfe2e2b04930d14d33d364292
 MISC metadata.xml 366 BLAKE2B 0f3b739bcbb532cb5b28776179b0bfc8ae66252a73b5eee91b602087c0c2ae789b9ef254a7f54f483b761401cc806b038bab5c06dae0f64f625d28f4822e1cfc SHA512 a2e17e7c48754f0a7fd7d9bd1d4251111983b4f6b556bfc84b846b3ff72f55da88c508fa0f3f20bd78456e5c18eca95e0facb495ddc86a18dbbd8706b6fe52a6
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index a8d2517a24c0..958daba55415 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="examples uchardet X"
 
 RDEPEND="
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 2ef7e08043f2..48294c145f0a 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -4,6 +4,8 @@ AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
 DIST haveged-1.9.15.tar.gz 493789 BLAKE2B 08d956651e3e717bdaf42f957bca93d0f74049b38219b2d283c3b0e2dc49be0061c8a58b742c63cb1f8b03f8060ed9816735879d023c5dc606a0362e81b56f75 SHA512 405fe15e3711de503d4d28f5f67fc9f393da03eb80d2a5f6167c3539fda4f11f7e7b8e795a6770d6dfa3273ee887133898c1ca4b41d80c62e1997d8796f4325e
 DIST haveged-1.9.17.tar.gz 495429 BLAKE2B e1f89bc47a9920517ffe9040b4bfcf2fb25e8b7f7404b16fe526fc225550050d602446ccba7442cb68b797c1b12d6e93e1826cc847c27e1a6d3a04814c31b4cb SHA512 0db4fc287dc80b6d7fbe6e1b4a6fb73bcab9db6604b437ac127f4fb4aeef64867d7bb90b24b4286e5e46e85db8e85f4b5fc15f189a8fe1f071ec79c9b5f24095
+DIST haveged-1.9.18.tar.gz 495798 BLAKE2B 73e93fff2edfb39e4b5966fb9e1e631e073d9da3aca3e85ef579a1824f3243484dc4b6891b385358969b1d4224bdbfb2d58a6c3fa62e7bed5fe5a8788c625f49 SHA512 ef2e0ae3be68a8fba16371c3347d52ecf9748269ae30eef2e5c26aad6cfb516f87295e1e56be902df1064e7d4ace04863dd094d62b69e584608f779d63b42d8e
 EBUILD haveged-1.9.15.ebuild 1012 BLAKE2B 4984b1d33da747d0ac7cf62dd9bc11c420daaa2f9296069e44ad018c0c6e1ab9d7f5a7ee3fee3213a39316eeda3a2eec02f46f9cee743c38020e9323d752436f SHA512 8b47e4fbe680c208027eacb76365b216a74364dee285d1da024763138f80cdbdc0f1062f258b6254dcf0d3e0a9bb0a0f81d088b5ccccbd09a6112ae5d3f4015c
 EBUILD haveged-1.9.17.ebuild 1014 BLAKE2B 4c7dd2d5081373da83c554ce29c832c972d757b12e1d159cc233be2bee6cb04be96faa34d9f2d5181955b8b445b6bf3ce677ad050043bfe823edaf77ef6243af SHA512 0d9476169848e602575f529be08f6e1c9f61f8193c232d62ab803e7f2876a3f4ac94f8966aa1d7b595474fc849ea4f489747d3863bf40697a02013479cc33796
+EBUILD haveged-1.9.18.ebuild 1018 BLAKE2B aa32a6115afc8ab03ca6d39ebceb3cf19a260f0ca8df76a4bedd19fc9b3afdb4dfe5192bdb220cfa8b72f5503bd41790b518c72084f9426e9965a549273440e3 SHA512 e2d5e54f5be8f4c1c336fddaff3f2ab62398dc7d54fdd1a0563a390a20628a34948b5672fec3facfd31b467962d4816f3c5ff034cb2a8cacde1e8268572904e8
 MISC metadata.xml 453 BLAKE2B 8e0b710e55e214dd0dfeed4222fbfd8eeb4fd363a2d0e8f3c1d3ac401d7bb68a7d608f5629f06fe46b2d368e221772a63a03641c6aa8c6e62b21aa0ed2ca2960 SHA512 46efe891a245b81f9d872fe8be2cf62beb8a7e39659ab6929f52a4936deb8e9b66c52d7575b741a1ddf3d158ce5ca1b1df8b3c6ffee97b15effc5b4ba8c4c23f
diff --git a/sys-apps/haveged/haveged-1.9.18.ebuild b/sys-apps/haveged/haveged-1.9.18.ebuild
new file mode 100644
index 000000000000..d244e8e4456f
--- /dev/null
+++ b/sys-apps/haveged/haveged-1.9.18.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
+HOMEPAGE="https://www.issihosts.com/haveged/"
+SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="selinux static-libs threads"
+
+RDEPEND="
+	!<sys-apps/openrc-0.11.8
+	selinux? ( sec-policy/selinux-entropyd )
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		--bindir=/usr/sbin
+		--enable-nistest
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install gentoo ones instead
+	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
+	newconfd "${FILESDIR}"/haveged-conf.d haveged
+
+	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
+	insinto /etc
+	doins "${FILESDIR}"/haveged.conf
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index ed25134731f3..5cbf7e7cd043 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,5 +2,5 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.48.3.tar.xz 211504 BLAKE2B 407cc87b1238242c202d37c0c4cd394e0efba95759b86a88026aef7c05d6a097d1946614547ebfab45f7fe0c1ddd057724234629246d32e94862c3d633b78c31 SHA512 e000e7380604c0986b14cb64b852d55eff48595884bddd389e876056dde6ce72b37aa16d92230e6f8f6e128003b819954bae4aa90933a58b51d3665d3c0ba356
 DIST help2man-1.48.5.tar.xz 204672 BLAKE2B 6d96f5f65f8c637d524e5c373f2b89f114adf544c1d3508a9cb51115279b9bf6399c8ebb0a8d831de12ef8cdaca40b6e75412a221efc5d2dd1794e9c9643196f SHA512 800eb0daa9daef8e423d52ede55eee2960122ea0269865295afada4cf4fcc1c6791da8429c3a57c0fc1bf0a14c8a77953952325413a8faa5dd07b1bc5bc0edd1
 EBUILD help2man-1.48.3.ebuild 1035 BLAKE2B 2bdcaea0a0b2256abf60dabc5f212b586ff59113f8d3ae541ce21d2f5c7c9a294b18280d741f116ea9dd75d9bdb24480ae6bfd5ac332456174d4ce942ffb997d SHA512 d1bfe5663fe13784f5d08e077f216f3155e44bcddba456413fc495dea90e799703a866f0210c690e4764f8826fb7f2732f8912df095b6e9c1f209432911aae0f
-EBUILD help2man-1.48.5.ebuild 1035 BLAKE2B 2bdcaea0a0b2256abf60dabc5f212b586ff59113f8d3ae541ce21d2f5c7c9a294b18280d741f116ea9dd75d9bdb24480ae6bfd5ac332456174d4ce942ffb997d SHA512 d1bfe5663fe13784f5d08e077f216f3155e44bcddba456413fc495dea90e799703a866f0210c690e4764f8826fb7f2732f8912df095b6e9c1f209432911aae0f
+EBUILD help2man-1.48.5.ebuild 1042 BLAKE2B 32553914ae2c27d4d4f05d5be5ac93ed582c1443bd04642aedcf0d838f87dfebf6666d9159f41483bb91d56cb4d29c3b4220a75703ab567d8541117f93d0c44a SHA512 17c63491252c0730ec8e1403062a0413ea5be4368a5e43db561fc80bf07afe835533ebdccaec55b4e8078e8f827b2518ec726e97d3f5c4736dcd6a8572853ef2
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/help2man/help2man-1.48.5.ebuild b/sys-apps/help2man/help2man-1.48.5.ebuild
index 31a7f04f2fc2..b55c7a1c9a5e 100644
--- a/sys-apps/help2man/help2man-1.48.5.ebuild
+++ b/sys-apps/help2man/help2man-1.48.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index 33e5ca12c99b..9bb176d7c2d0 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,8 +1,6 @@
 AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326
 DIST hw-probe-1.6.2.tar.gz 163183 BLAKE2B f9b8d405e59f7799dd665b62362fe8f2b9fe45491d43249ab61ef0fa5ea4d83671ac0dbeef622c68f7c581eef8cd3aa33e6c8bbd46d5488a9c1f4781c820453d SHA512 8a7bf5254f24cc3a1ca19039a00de312f1400f34eaa0459fbff665221940abf60396e5d9e95b4a021e7f5fb9c54254b8c50d0d0b125fc60a0a7f5c7a57edf68c
-DIST hw-probe-1.6.3.tar.gz 161938 BLAKE2B b4c43846411452a580ec4ea1743d3779fdfcf74636c62be5d66bbebe087a6355141f73b3da500cc36eba4dfba322ce19931cfd7023b395134b2fad940785cbff SHA512 b9898603b3bc15bc9d26be8511e64a776b51c8bfdfa6b62d5ca550d2663df8a7a2e3f423023ad8b221b0bc81ac413266ecd9e5fed618dc9967994523dcc7dd0a
 DIST hw-probe-1.6.4.tar.gz 162317 BLAKE2B 5fc5ddf032c6b2504430349089d95be5310a7ac7752a2b6c3c504240dae6572ee773f8360d6449e9122b20de904a7348a2bdc0af660de44f14cf37b16664ef2a SHA512 c812ebdb23f6b8a4df2f2849a29ecc1307c09f758aeb912face6e899510af69f9dee606fb0ff1807a6de1e89a5f7a8b3259b894cc823b9d25efbf26accf60ac4
 EBUILD hw-probe-1.6.2.ebuild 2308 BLAKE2B e1619f4d5de09a5d7d2d2b55623d2db2ea5cd3833ac62c49b65fc8e1bc4af837c5f13bb50570d4a402949203b88035874d87c725eb563552816ac3c2afc065e5 SHA512 03e09dc195acb9f079e8980e6a3cd74cfe4da63a846fd177e27888b047ea974345a6a6d5c50eec59e8ac20899857f143cd268065727c0fe631737f81e0839f07
-EBUILD hw-probe-1.6.3.ebuild 2310 BLAKE2B e0be3c494d1c55e417aa6cda7fb5dce20fbdfde3c7a6a8912dea50d689429d76f1070cc04fbe2d38818db82284d4b14a73ad11bfa3d91f0d07f5d8b999bdc63c SHA512 ff0384687c15d332a47e890f49efae9da2a153eebcd971510b7f47704c10a72b87a1e829cf1faa7a47584259b68aeb1b2742ca38ea46782cbeb7db33cb12061d
 EBUILD hw-probe-1.6.4.ebuild 2310 BLAKE2B e0be3c494d1c55e417aa6cda7fb5dce20fbdfde3c7a6a8912dea50d689429d76f1070cc04fbe2d38818db82284d4b14a73ad11bfa3d91f0d07f5d8b999bdc63c SHA512 ff0384687c15d332a47e890f49efae9da2a153eebcd971510b7f47704c10a72b87a1e829cf1faa7a47584259b68aeb1b2742ca38ea46782cbeb7db33cb12061d
 MISC metadata.xml 647 BLAKE2B 522741fd8d5f7b64d686ce02dd5ccd7d9ba42df1e50a3e51921fa17c110c6db114ee22d5a903c8bb61a2a5f3884fad5e8b1a929a062af111fd52faf047638ab1 SHA512 ef6e4af1150d72b3cc26ba56267dae006ae8a19a8df2606a9f02df0dc6b091f0bd3dd9caee2171e896dd7b5e582b853f228e899dbd9281dd07b435a1da1f6b7b
diff --git a/sys-apps/hw-probe/hw-probe-1.6.3.ebuild b/sys-apps/hw-probe/hw-probe-1.6.3.ebuild
deleted file mode 100644
index 89965032f4b0..000000000000
--- a/sys-apps/hw-probe/hw-probe-1.6.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature readme.gentoo-r1
-
-DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
-HOMEPAGE="https://github.com/linuxhw/hw-probe/"
-SRC_URI="https://github.com/linuxhw/hw-probe/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Digest-SHA1
-	net-misc/curl
-	sys-apps/dmidecode
-	sys-apps/edid-decode
-	sys-apps/hwinfo
-	sys-apps/pciutils
-	sys-apps/smartmontools
-	sys-apps/usbutils
-	virtual/perl-Data-Dumper
-"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "showing Machine Check Exceptions." app-admin/mcelog
-	optfeature "showing additional I/O statistics." app-admin/sysstat
-	optfeature "showing display data channel (ddc) information." app-misc/ddcutil
-	optfeature "showing smart card (reader) information." dev-libs/opensc
-	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
-	optfeature "showing information of attached scanners." media-gfx/sane-backends
-	optfeature "showing GPU information provided by MESA." media-libs/mesa
-	optfeature "showing zeroconf statistics." net-dns/avahi
-	optfeature "showing HP printer statistics." net-print/hplip
-	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
-	optfeature "showing additional CPU capabilities." sys-apps/cpuid
-	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
-	optfeature "showing available I2C sensors." sys-apps/i2c-tools
-	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
-	optfeature "showing information about tested memory for faults." sys-apps/memtester
-	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
-	optfeature "showing systemd boot process information." sys-apps/systemd
-	optfeature "showing ACPI statistics and tables." sys-power/iasl
-	optfeature "showing information about NUMA." sys-process/numactl
-	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
-	optfeature "showing available Xinput devices." x11-apps/xinput
-}
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index b40fb33b1712..526ddf8a30f6 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -3,5 +3,5 @@ DIST hwdata-0.357.tar.gz 2234392 BLAKE2B 54f26384664cc78d99db52cffa99bf74f57bf35
 DIST hwdata-0.358.tar.gz 2240851 BLAKE2B b164c267a6779fec2a4018fb8bad98e564794e46cdec77b6f1234444f0fb20f49f44303a400d3301b40b07cebe0cc590553ae5e01702032b53180826273eb416 SHA512 52c765786aa41551e47bad2358bbe50f8f6a60cd820696c6c341f08cbde695f86746660a3fdadd8fad5614b99a98616111011a17d115c25bbcaf03c891cc3e69
 EBUILD hwdata-0.354.ebuild 698 BLAKE2B 136ac0f6d57825812547ca50d3abe718286ad2446205f0a155b5579761d1de1505075082bd2bceb8a7ab537ea36d1e8ea5f00fd4e02d9c4bd26d20353cba6b7b SHA512 31fe8fb5e5ac591a9df1c6817677b9a7acf604e20a1ab20dccd7bb884093456f024d6765bef3fececc8bc160ec9bd5828063ac0435c923da759fd9443a99996d
 EBUILD hwdata-0.357.ebuild 701 BLAKE2B 2dfc5adafff54a5860818f63314931b5f2344ace66f45fb8b0d57d4272128b121964ed5ccc37d6a90d95720fb492c2309db19518c8fc6d9edeac17ebb2610112 SHA512 30344157fb62cf2ccba7a17e1713b51cd840548339e2c9400b20eecd3926c322c2d8e62516daa35a6961c202e6a7cf5ad316e414a9112d73b674f80d841179d6
-EBUILD hwdata-0.358.ebuild 701 BLAKE2B 2dfc5adafff54a5860818f63314931b5f2344ace66f45fb8b0d57d4272128b121964ed5ccc37d6a90d95720fb492c2309db19518c8fc6d9edeac17ebb2610112 SHA512 30344157fb62cf2ccba7a17e1713b51cd840548339e2c9400b20eecd3926c322c2d8e62516daa35a6961c202e6a7cf5ad316e414a9112d73b674f80d841179d6
+EBUILD hwdata-0.358.ebuild 708 BLAKE2B 1412ce67e1332c9df371a9a4bb0c68a94f24cd430b54102c4b2d9adbb6f0254fdc5359da02ffab4e463a9d341b3f81a4ed5bab4dc50be30894ff042c624316fa SHA512 68c36e8ae23c54c25be73b797cf9233d1db5d61591a7ef2150b0e63143c6bd825d784e5232e3abbc0a1adf7811d8e34477c803b428d269949b7557589a670b2e
 MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sys-apps/hwdata/hwdata-0.358.ebuild b/sys-apps/hwdata/hwdata-0.358.ebuild
index 6ad75332f251..81b4b0771008 100644
--- a/sys-apps/hwdata/hwdata-0.358.ebuild
+++ b/sys-apps/hwdata/hwdata-0.358.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 RESTRICT="test"
 
 src_configure() {
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 2aa2567594b1..cb6d1c286c14 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -2,6 +2,6 @@ DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8
 DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096
 DIST i2c-tools-4.3.tar.xz 81276 BLAKE2B c7300224c8d32785cd067b632bf0e9591f05264b1572f44aebda5f30a95164732d606710c13739ccb7899476219ceb3033beaf95b718ed7e18122f9181dc13fc SHA512 8a6cc12d927d6291b9baf407bc15807280539a7048ec5c2edf77414432eab43b28353c42bc0e45b7b481502aa4c5588def08f130d97fc275f635d1f77488f501
 EBUILD i2c-tools-4.1-r1.ebuild 1950 BLAKE2B 5c926d1ab2f68669edb32c18afa7f850019fcfd442831b2bfb59c09119a81c6c03102a76eabd5f4a80c6f0998c861960a2a042c4a43d736051d6d8af1963154c SHA512 7dfef8c4f41023505161146cb6a9ec7dfc945d75a76615aab35d4de2f371240be173276d15b4c18f3819e2e0f5998712bb0df2586d819e22baa9852149978f0d
-EBUILD i2c-tools-4.2.ebuild 1693 BLAKE2B 49151dc46b648547ec59308075ef93e62a1195fab218ae7b8308f222604c7448995f8fc12951136fe500eb40571bdb49b7b635aaeee319ee114f6de32eef67fc SHA512 2c8821550347c2c2a13999f16a6888cc006d76e60aeac585d63d7c25dd2d9ee99dc0c1f44b65f693db4f4a0865709f0a95832b0de7f2ac289fba57a043bec3b3
-EBUILD i2c-tools-4.3.ebuild 1348 BLAKE2B ca765bb7687dfe7f5f7c6544ad964fe442e32ab4790902eca511875774069f66e77f1bbde15195194580b8472bca9daca1743ee5003e42e802a99694f462dfaf SHA512 a8fed2339f6da3e08f3bebf247a544933437d0539bf29d154b71fc5e906991e75503ce7a5e39a983d38927d576b88395cdcaa0652155a6f5db643ed9c26d6042
+EBUILD i2c-tools-4.2.ebuild 1689 BLAKE2B ed6c1a0f4386a42c760420abc4f565b55b4f5e905f47eb528587cafb5b5aa865bbaadb5d2abc79137842f48ce798f2260baf3c889f7ebf2ec4a0caf08ac1b6ac SHA512 75d51125f60ee980017c7e13c2789485f019b760ffbddbffb4413c588fd60ac4629e335ffee2543c54d1850f91f22a7985d93c3d4fbe31fdfc7a4c6c62881adf
+EBUILD i2c-tools-4.3.ebuild 1341 BLAKE2B dbaec21840e677ecb837ce0706c79ee871c854b9670c0f3d7f0509de018739c87aa43a942c2695dc86c285d895eaebce36ddc6c4347f4dfdb2add7c6ea33bbd7 SHA512 c004b01ec546b38da1fbc3eea13205899bca8fc35d15eba12bd630365c78b6600f57871f3278c9e79327edd18ddedfa81061227f299b68d6b1bc51a9dbda705d
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
index 7372aa58066c..c40274690e01 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_OPTIONAL="1"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/i2c-tools/i2c-tools-4.3.ebuild b/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
index 1b4f3d12d061..8c54b56cce62 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python{3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL="1"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index 503f824f42ec..30dc00d7d06f 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -1,4 +1,4 @@
 DIST install-xattr-0.8.tar.bz2 16359 BLAKE2B 25c483211ea6d01f46d9739fd3f1327e543e8b986a252d97e8b012ff6169a9b6430dc0ab7c184bf04c6665182c242eb37f7059d2d23cecececea723bde74cb56 SHA512 3af95a724d95286854767fe28679b024de8d257ce2d21addecbd40906e10bf48cfd4263609c6c2f436c6a807e91d24118110fda041091fadbefd848c892af778
-EBUILD install-xattr-0.8.ebuild 999 BLAKE2B ce5c7a8deb8e24069b14f9c34de53df122617610a61038e1cd0cce28dfb8e5b6b16963b710a31ec2477e4a92da724202b7ebe11cdabf635b8e400c1f27cef4eb SHA512 61719944927bebd43367d254e24480eebdc4f9a25529e4683730d23851a830319dcc11d7c53368109f1e4fe5fabb488280738e362b176b034d099be95901b1c6
+EBUILD install-xattr-0.8.ebuild 1006 BLAKE2B 90eecf926ae3b82c957c6d961f37819e6a425320433ec8056e2270dc5394485940b549740e06bc935760417994a504052e0e1ebba016081abff8087a1b5401a9 SHA512 28aad2eb15ac7d13ef468e3feb0e456fec5caeedac2b758d5670e854cd2269ae6da88c1d8ddfed9826b37fa979e88b71a2cd539d6870520778e1c1b22c9007ea
 EBUILD install-xattr-9999.ebuild 1007 BLAKE2B ad60a837a7388bb01f7c0e7af39ff536973143c9f75281952e45629345e11690d63cd1649032ce1f55448e6dbe56ba506ddb489175f1265cbf41fca55eeba589 SHA512 ce4545fee470b395c9d7b6df65f9bfdccff526e1de3a64976f45717713b6053c5bcf93fd9661642ac6ca294dcc49ba5d2a82e41b731f9faf93949964e2c57025
 MISC metadata.xml 331 BLAKE2B e3b7ee18d397a8cf60b49d5c4eca33441306f8fcc993db82f5448ff157e0a2fbaf2c68aad458ee7fedec0bc88d0227ef179303b413e016f99b37da250e065226 SHA512 cf38b01cf7b8c471b1983a1906a95bbf1f492f4a94e4d8beb7802b72f9ad3ee365efd4971f16301acc0bb5ca8786ed5346cb218300ed12ddf4d1b98cbb77cadf
diff --git a/sys-apps/install-xattr/install-xattr-0.8.ebuild b/sys-apps/install-xattr/install-xattr-0.8.ebuild
index b797b164d5bf..734046b5f3d7 100644
--- a/sys-apps/install-xattr/install-xattr-0.8.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index ad9c311a7c67..7b1a3f36d3de 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -3,12 +3,15 @@ AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b494
 AUX ipmiutil-3.1.5-fix-configure.patch 5817 BLAKE2B 3a953a03d495a453d99dae70ea29ed95e03ee5d4da6a1a2aab42bda289f43725fff9a5721d7a08538f9a5f35b36ae956e5da493a50301fdaf487a8aef05ca0ba SHA512 c1f2c13f1aafc4244b1a3cdf2da23d4ff9e982613063b2e8995c0003db6cb31e1facce9d590725f5e02789fcd62c3b334ce20e1b8815b99c002bc2f90d9fa065
 AUX ipmiutil-3.1.7-fix-configure.patch 5872 BLAKE2B 6058c5f3cd3d389dec152649098925d8fd4aa4dab22f11924cc006dba44eeb5254b7b5a10eaf202d496e7da4e71b69c984553fda730708ffdc0b7bacf0a46dfa SHA512 0d47df5c1599f16228819325c666b2ed9f0c85617af8ce6a0be5496403ae0ce8d5548302ad8b9315105ec8a1a54cd4b46636e5ee21539b813b35ed4fd78f86a2
 AUX ipmiutil-3.1.7-flags.patch 708 BLAKE2B 70b96d8de3221d11757ff54957be2153540da78edef549a627983e745064d503d38cd3b95c5640445c1c6ca8cf208d43781e486e1df481a409636dc8d6c4c9f4 SHA512 f0f34b10c65e3ddab56ef757085dcfbaceb1a8b745d8be72e0630fdf7b6da3fadd37f08a9eee814c140419b1e9dda9937690dac67b3f506f36f622076c8119bf
+AUX ipmiutil-3.1.8-fix-configure.patch 5520 BLAKE2B 62a2f71824c37015e9b5999acaa06780a9e398b4ba74461cb963375c497c0c18e5cbb4b5188aaa5d34521ac0a2153835fda38ffe80a1414d85ecc96da49d114e SHA512 13e58b8516ade13d907462b0eca9ce639ea486740992e1d2f348f17a9ed8deadd1ca7ab0fb2c725e5721f7840119fc5e9b134a8eb842d661d81041f39dd1f6cc
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
 DIST ipmiutil-3.1.6.tar.gz 1693461 BLAKE2B efc2b283d7655b8afb9d3d8da2e5458deea1c1b939f3ccdf2be0cdf3792ea60229099cce1b8e32f087972385feb01d604f1c63bddbfd031210d5acf8a6b1b9d7 SHA512 9bccfa2e0bba7f30e422d67f93ee6cff50c08cc8bceab5ba5bfd1b0a91e1af8a4a98a2eaa81364e8a1f38e0bd1ce6b99717d86957c6f689aa7329e7013f5b0ef
 DIST ipmiutil-3.1.7.tar.gz 1726396 BLAKE2B 7fa31f8aca61462fc08dd4fe420e27eecce2ee9fa5fb2676eb944e2ae6c09598aec5f06d59e4ed02faab077003b14085f944b6cf0b63f90b10f2660f363e997b SHA512 7522808e4a94c8627de0a95dde0e3eb463ba05948159b5181129b573ce8f9feba3543ef603c14e7cdcafcbd58ca5319536cc5534ea8191cce0ef9d33cc548274
+DIST ipmiutil-3.1.8.tar.gz 1841037 BLAKE2B 69139fc2b82a701657c5fec6aa928a0ee2d7874a8ebc26631eca438f298e8bddd3afb578462979eb24cd51bd816263f13e9f38fec8b5d6fa4fcefb2519a652c9 SHA512 77a01be420d8362ddce2b2b2bd44ee53a70812b29b3dd7bc5add6429f0e43a48905ca0401e1855f2cca5e69086605eb7b84e2f4bf9cf33251934acc0fe51346f
 EBUILD ipmiutil-3.0.6.ebuild 1304 BLAKE2B a1ce20853a9c2e29fe289bba096bbfb74beac4009630e9e7a36af13c69b98a0a48a0c86db4516fb179e5b8887576e832d1a81a921fde56c559906dbdfbfccea7 SHA512 a13dc0bd8546e321c84e942c9137d6e8f64e5df99c7a3aa41b090c116ad352aa631d51c7078e2c063004e20e10e86b3b26473ab209a81b9fca99776226812cbb
 EBUILD ipmiutil-3.0.9.ebuild 1401 BLAKE2B dd45a5580ccc8aad7f329985bf3fe6e3d68a95a54bf345cadfec84cf77fc6b65c073b8a31ececa88d7caa0dba94cf0bbeb882aee6cb13e56c496818a291d5074 SHA512 a8dec8237051be08002fa96517a8a322e213e08bd04f18249d2ee174d892cb4bd49d290d3f4f9b8e3ff5b73a1f3b05d4b1129699de8443b3834278e301a855f9
 EBUILD ipmiutil-3.1.6.ebuild 1575 BLAKE2B 16cb959c4a276eaaeefa96584c1915c3c182a9f03ea8c2269e1b6221f7bab84cb9433db59a3c293350ae9f473f48544008b52f569b9cc67170eebbdefee1d898 SHA512 6cca689fd814b1fb3f4939f1b8a34902c9ff4c41834053ded5cf7f051b134e0ce5c946b51da6b855ff8bcd828c9e7d55d1c79fd9eb32e50544db22037344c63c
 EBUILD ipmiutil-3.1.7.ebuild 1657 BLAKE2B d40ba9d2aa612b8ef9c9e52c8d4c702bda5800f8f6042afd6b7f08e862ffc51247a41cff79c43b3595adb887b5ffc809cdb78536b5eda0d030acab1e4efc6099 SHA512 d5fe935fd756afbfda7af92cb84349693bc9f75855b2030d4218ed6336375459e9a3e70cf6320915f05fa694b55d3c3fa1495b965089d03b68e9815ce632f15b
+EBUILD ipmiutil-3.1.8.ebuild 1961 BLAKE2B 377059c8a5c7aa0cc2957f667eabf1b5e49f0f2a5fba8518d796b6df93d1b278e45f48e5ab0bdb92b55478a2c3ce75029e0fb5e1e258775ab6e250eb8d97e2ba SHA512 e9cdc6c21fe607e241f13a3b66952e38647267ed66fb4c3bc118e63893473222f7d0038498bef4e021a36688f36c281c7a3b0ba76d42793dc0f0cb945529236b
 MISC metadata.xml 395 BLAKE2B bbc505300e1bb4a974b8c5f19c43fe9cbfe4300c31a5174adad799cac0d2507e231845ab8f586ca427538b67ad45012aec660692f1a4a134af4e7615467b0ee0 SHA512 170e9a7718037935d373ad84c37f7c87764e30fdb1c2860fa3021021f91dd94adb2d3acb4adfc5cea8d64a7e612340a2286c5a4748f91ed32d603b9c306f3513
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.8-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.8-fix-configure.patch
new file mode 100644
index 000000000000..f59701079828
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.8-fix-configure.patch
@@ -0,0 +1,170 @@
+Fix automagic configure options.
+
+--- ipmiutil-3.1.8.orig/configure.ac	2022-05-05 20:48:27.180318912 -0700
++++ ipmiutil-3.1.8/configure.ac	2022-05-05 20:53:10.070503250 -0700
+@@ -80,22 +80,30 @@
+ #  fi]
+ 
+ drv_landesk=0
++LANDESK_CFLAGS=""
++LANDESK_LDADD=""
+ dnl configure for LANDESK libipmiapi or not
+ AC_ARG_ENABLE([landesk],
+-    [  --enable-landesk       adds landesk library support [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-landesk], [enable landesk support (default=no)]),
++	[],
++	[enable_landesk=no]
++)
++AS_IF([test "x$enable_landesk" = "xyes"], [
+ 	    drv_landesk=1
+             LANDESK_CFLAGS="-DLINK_LANDESK"
+             LANDESK_LDADD="-lipmiapi -L../lib"
+             AC_SUBST(LANDESK_CFLAGS)
+             AC_SUBST(LANDESK_LDADD)
+-    fi]
+-    )
++    echo "landesk enabled"
++])
+ 
+ dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
+ AC_ARG_ENABLE([lanplus],
+-    [  --disable-lanplus      disable lanplus support [[default=enabled]]],)
+-if test "x$enable_lanplus" = "xno"; then
++	AS_HELP_STRING([--disable-lanplus], [enable lanplus support (default=yes)]),
++	[],
++	[enable_lanplus=yes]
++)
++
+ 	drv_lanplus=""
+ 	LANPLUS_CFLAGS=""
+ 	LANPLUS_LDADD=""
+@@ -103,8 +111,7 @@
+ 	LANPLUS_CRYPTO=""
+ 	LANPLUS_SAM="no"
+ 	LD_SAMX=""
+-      echo "lanplus disabled"
+-else
++AS_IF([test "x$enable_lanplus" = "xyes"], [
+ 	drv_lanplus="lanplus"
+ 	LANPLUS_CFLAGS="-DHAVE_LANPLUS"
+ 	# LANPLUS_CFLAGS="-DHAVE_LANPLUS -I${projdir}/lib/lanplus/inc"
+@@ -115,7 +122,7 @@
+ 	LANPLUS_SAM="yes"
+ 	LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
+       echo "lanplus enabled"
+-fi 
++])
+ 
+ dnl Configure libipmiutil.a for lanplus or not
+ dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus
+@@ -130,21 +137,28 @@
+ #fi
+ 
+ # strings /lib/libssl.so* |grep EVP_sha256 
+-dnl configure for SHA256, build lanplus with SHA256 support, uses later openssl.
++dnl configure for SHA256, build lanplus with SHA256 support
++dnl requires openssl-1.0.1 which was released in 2012/03
+ AC_ARG_ENABLE([sha256],
+-    [  --enable-sha256        build with SHA256 support, requires later openssl.],
+-    [if test "x$enableval" = "xyes"; then
+-	LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
+-    fi]
++    AS_HELP_STRING([--disable-sha256], [build with SHA256 support (default=yes)]),
++	dnl action if passed
++	[],
++	dnl action if not passed
++	[enable_sha256=yes]
+     )
++AS_IF([test "x$enable_sha256" = "xyes"], [
++  LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
++])
+ 
+ dnl configure for EKANALYZER, build with ekanalyzer function enabled
+ AC_ARG_ENABLE([ekanalyzer],
+-    [  --enable-ekanalyzer        build with ekanalyzer function enabled.],
+-    [if test "x$enableval" = "xyes"; then
+-	OS_CFLAGS="$OS_CFLAGS -DHAVE_EKANAL"
+-    fi]
++	AS_HELP_STRING([--enable-ekanalyzer], [build with ekanalyzer function enabled.]),
++	[],
++	[enable_ekanalyzer=no]
+     )
++AS_IF([test "x$enable_ekanalyzer" = "xyes"], [
++	OS_CFLAGS="$OS_CFLAGS -DHAVE_EKANAL"
++    ])
+ 
+ GPL_CFLAGS=""
+ CROSS_LFLAGS=""
+@@ -154,17 +168,20 @@
+ SYSTEMD_DIR=/usr/share/ipmiutil
+ 
+ AC_ARG_ENABLE([useflags],
+-    [  --enable-useflags    include environment CFLAGS and LDFLAGS.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-useflags], [include environment CFLAGS and LDFLAGS.]),
++	[],
++	[enable_useflags=no])
++AS_IF([test "x$enable_useflags" = "xyes"], [
+ 	   CROSS_CFLAGS="$CFLAGS"
+ 	   CROSS_LFLAGS="$LDFLAGS"
+-    fi]
+-    )
++])
+ 
+ dnl configure for standalone, with no lanplus or GPL libs 
+ AC_ARG_ENABLE([standalone],
+-    [  --enable-standalone    build standalone, with no GPL or LanPlus libs.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-standalone], [build standalone, with no GPL or LanPlus libs.]),
++	[],
++	[enable_standalone=no])
++AS_IF([test "x$enable_standalone" = "xyes"], [
+         GPL_CFLAGS=""
+ 	LANPLUS_CFLAGS=""
+ 	LANPLUS_LDADD=""
+@@ -178,10 +195,11 @@
+ 	   # cross-compiling, so link with -static (e.g. Android ARM)
+ 	   CROSS_LFLAGS="-static"
+ 	   CROSS_CFLAGS="-DCROSS_COMPILE"
++	   # TODO: how can this be effective? Configure only converts Makefile.in -> Makefile
++	   # Configure does not convert Makefile.am->Makefile.in
+ 	   sed -i -e 's/^# ipmiutil:	$(METASOURCE:.c=.o)/ipmiutil:\t$(METASOURCE:.c=.o)\n\t$(CC) $(CFLAGS) $(LDFLAGS) -o ipmiutil $(METASOURCE:.c=.o) $(LDADD)/'  util/Makefile.am
+ 	fi
+-    fi]
+-    )
++    ])
+ 
+ AC_ARG_ENABLE([doc],
+     [  --enable-doc           build with documentation [[default=yes]]],
+@@ -194,20 +212,22 @@
+ 
+ dnl build libipmiutil with sensor modules
+ AC_ARG_ENABLE([libsensors],
+-    [  --enable-libsensors	 build libipmiutil with sensor modules [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
++    AS_HELP_STRING([--enable-libsensors], [build libipmiutil with sensor modules (default=no)]),
++    [],
++    [enable_libsensors=no])
++AS_IF([test "x$enable_libsensors" = "xyes"], [
+         LIBSENSORS="isensor2.o ievents2.o"
+         SAM2OBJ=""
+-    fi]
+-    )
++    ])
+ 
+ dnl configure for GPL build or not (GPL files: md2.h, ipmi_ioctl.h)
+ AC_ARG_ENABLE([gpl],
+-    [  --enable-gpl           build with some GPL code [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
++    AS_HELP_STRING([--enable-gpl], [build with some GPL code (default=no)]),
++    [],
++    [enable_gpl=no])
++AS_IF([test "x$enable_gpl" = "xyes"], [
+         GPL_CFLAGS="-DALLOW_GPL"
+-    fi]
+-    )
++    ])
+ 
+ dnl Does this Linux have systemd enabled?  Otherwise use sysv init.
+ AC_ARG_ENABLE([systemd],
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild
new file mode 100644
index 000000000000..45f547fdfb09
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools systemd
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/openssl-1:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.7-flags.patch
+	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+	"${FILESDIR}"/${PN}-3.1.8-fix-configure.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix hardcoded CFLAGS
+	sed -i \
+		-e 's|-O2 -g|$(CFLAGS)|g' \
+		-e 's|-g -O2|$(CFLAGS)|g' \
+		util/Makefile.am* || die
+	# The configure script makes some guarded and some blind calls to rpm &
+	# rpmbuild, that trigger sandbox warnings if rpm is installed in Gentoo.
+	sed -r -i -e 's/which rpm/false &/' configure.ac || die
+	sed -r -i -e 's/`(rpm|rpmbuild)/`false \1/' configure.ac || die
+
+	# Don't compress man pages
+	sed '/gzip -nf/d' -i doc/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-systemd
+		--enable-sha256
+		--enable-lanplus
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Ugly workaround. Upstream is misusing the make system here
+	# and it doesn't even work.
+	# Please check on each bump if this workaround is still required.
+	# Yup, still needed in 3.18
+	pushd lib/lanplus &>/dev/null || die
+	emake
+	cp libipmi_lanplus.a .. || die
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
+	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+
+	# Init scripts are only for Fedora
+	# TODO: ship OpenRC systems for non-systemd?
+	rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
+
+	# --disable-static has no effect
+	if ! use static-libs ; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	keepdir /var/lib/ipmiutil
+}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 1f3a6750409d..cc531cba7543 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -5,6 +5,6 @@ AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 DIST iproute2-5.17.0.tar.xz 870908 BLAKE2B 4310829ebbde7fd21ecc28856deddabfa93f26bf7937b3ef3c0e05e4e0bf925a9b167334efaefe3e275d196e7370a290679739ae8d8397dc6511f4da25dfd459 SHA512 fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d
 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e
-EBUILD iproute2-5.17.0.ebuild 4926 BLAKE2B b10bd40a6acb0ca3345a5ca66349e70fb170e53471249021655ca073efb72bf335ad12a9b4ba44c339657e69212083fed886b92f0bc998ffa0f34ffffa68b5e9 SHA512 1a7faee630ec6735e49ddf30bf902f7e781114fbf0ea0f14c61aa7d074a4ef871f9b3f51648f766f27a49d087c2efc314eb054147eb5bc4346c5266851b5853b
+EBUILD iproute2-5.17.0.ebuild 4933 BLAKE2B 7ef77ee3b1725b8c7b428e6ed97e9fc218f6956824e2b723c06aee7bf66e7e02901f05b2dca4099ddbfd4901a51c16198ba34410fdeac4280220dda94e3086c8 SHA512 56dd4e89a9ac6733ad4c8b2fc09368f2ad7c02f399d6fba7794b3a7b715fad743b1270f7d02a95b96979634e31d91596f3f64a84498e51bfb44247f71ba7a39e
 EBUILD iproute2-9999.ebuild 4926 BLAKE2B b10bd40a6acb0ca3345a5ca66349e70fb170e53471249021655ca073efb72bf335ad12a9b4ba44c339657e69212083fed886b92f0bc998ffa0f34ffffa68b5e9 SHA512 1a7faee630ec6735e49ddf30bf902f7e781114fbf0ea0f14c61aa7d074a4ef871f9b3f51648f766f27a49d087c2efc314eb054147eb5bc4346c5266851b5853b
 MISC metadata.xml 814 BLAKE2B a74c3bee84fc81acfeee405c22b84ca9a10f2daf4be9d496202cbc5a2595f7222b864f4105f5dd46ec45e7de57b6ffff991f907da6378293267209b9eafe91d5 SHA512 74936295cae7e84f39ea6dd8e6bee613bed9e9716c6a96aa8f497be96b14367a2d8829db3ed108b760afdd196c5dbc9f32b14f29f5a0939e47b15d7a68aeca4a
diff --git a/sys-apps/iproute2/iproute2-5.17.0.ebuild b/sys-apps/iproute2/iproute2-5.17.0.ebuild
index 11dfd239d1a7..f9085bf91567 100644
--- a/sys-apps/iproute2/iproute2-5.17.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.17.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index ca60647085eb..b49085f8f55a 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,5 +1,5 @@
 AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
 AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c
 DIST irqbalance-1.8.0.tar.gz 55238 BLAKE2B 0181ee57c4ddbdb55e1529cfd7da4b875320eff65cb606f925f0b4f4243b51e1349d4aba38690a78d7deab6d3f55ae8d6c45af44a904f03d7127678202f288db SHA512 3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740
-EBUILD irqbalance-1.8.0-r1.ebuild 1327 BLAKE2B e2e7a6f91917be742ac5015dd0a465a6858b738ac8638306d800aec8e9c3963121d170548572d03c56bdcab3c47714ab80e015ce9b066889aa9823a1d8937c10 SHA512 79a99042e0a300eac653a6ace0efe75ebd3aa50f3e8e00f8a24e3e2d677b0bcaae505f7d233a3047da5678b7b60e6230cac01bc94a933a43c3032bd3728ba2ef
+EBUILD irqbalance-1.8.0-r1.ebuild 1334 BLAKE2B 74900103bf0167ae4d3dc4fe0d73de353ccc818f29b9edddffe9c163f47f46d3baee119b403ceb24058598739c9c691a69bd4a896f47a591687435c22ab32124 SHA512 03363872eae5a613833a7e1b6506f5440cc40b1bdce4aafbb891e5091f1c1815848c3df8f0b578a3742b25b5f3a0dd3f22100fb1c2068882a3affb4fbfa625ad
 MISC metadata.xml 547 BLAKE2B 0a83f459995622fe247317aa9f045c0696f888712e9e5b56ac4eedb12862772044aaf407e25181ac84d64b9fced0e950b74c9dfcfa7a44e2451356dbab03461a SHA512 90b145e0e3fd1519eb1e6a412fc06700eed8bd27bea262e3d0bed02b0140586c0a9a01b9e301d3c0ec464c2cfbc6f80118c48eead3c830ba13dfd3b1588f6c9f
diff --git a/sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild
index 35518b30ad63..a815655e61b5 100644
--- a/sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 x86"
 IUSE="caps +numa selinux tui"
 
 DEPEND="
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 5a0bbb7a734e..ff950d9cf61f 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,4 +1,4 @@
 DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb
-EBUILD kbd-2.4.0.ebuild 1852 BLAKE2B a37a3904190468f61276f537f083d215401e4f2660a4919578fb90a9d7bae8a07f8134900f04b14a58c7500ab5befa91489b82b59c09bf445ad532f12d332f4c SHA512 f880f231c19d189223f348349926b7bf227cf1bdfa8a419009e0fedc387c1bf0e77913db047b1c87f0072663d7c468b7d1a4beeb99783c4bbc06393f7eb8a72d
+EBUILD kbd-2.4.0.ebuild 1859 BLAKE2B 30abb362d5bca1d525ca6d96cf844ab79a8c12bcf8c83e65d78ee3227b805aceef699040e9315e11b2c80cb9615fd217e343ef0dac856fd99aaad8da6859dc5d SHA512 314268d654df7524bf8ba61cd7c234127f9171044bc20136f99e9b3c013529226e872bb9fea05a32b22953588a0b3d198a58fa16eed343e0072d1a25e5d2c71c
 EBUILD kbd-9999.ebuild 1860 BLAKE2B beaf59ae73c17d9d01a5bd7d4a807f8f80259cc9194d0f9b221f3ac329e72eb290fc7b70bdb4b66b666f51bfc3bc5cf2c2b3541469881c1fc318a522cf7b31bc SHA512 939675dfc61faac63a75c968fe5d2cc73672316f16aa1ea4f0f1382e0e515a82e9ac1800e136ddfa8dc6eb0fc5018133ea81cd09f55414e56f86746bdd1cf884
 MISC metadata.xml 322 BLAKE2B c059619ec7424e63ad96d2be7d4d5a0872b494d24dcb923eb159898563ac7a79f6c51cf1b4027c1a3e40f1177107e24dd7485e73010625c64eb7bce2a35429fc SHA512 813a710b7238c4b0366da55c1180a9f1df97d3e58207680dc902739e4306d28183b5a5b04bb98714b488a12b09a9b388a30eb1407f41fdab49e86cab3b5f51f9
diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild
index 8d60197a756d..70122423cadd 100644
--- a/sys-apps/kbd/kbd-2.4.0.ebuild
+++ b/sys-apps/kbd/kbd-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	if [[ $(ver_cut 3) -lt 90 ]] ; then
 		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	else
 		inherit autotools
 		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index cee017ebd9f2..b0124121d711 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -8,7 +8,7 @@ AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649a
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
 DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
 DIST kexec-tools-2.0.23.tar.xz 304024 BLAKE2B 0150985093dc0012d3870c127ac5eab81d4cc839c0a79ff20224d1a409462a194d7e304f54ed8f0952e4d325dbff11bcbe1565b2c57c45c212302810dc06ed62 SHA512 b6e3b967cacc31c434b185d25da4d53c822ae4bbcec26ef9d6cb171f294fdcc80913d381e686a0a41e025187835f4dc088052ff88efe75a021d7624c8b1a1ed8
-EBUILD kexec-tools-2.0.22.ebuild 3263 BLAKE2B 81df746fbd75d29a45e23cc1b1509dbe7c99e2a34cae30a04625dd13b41c770451752eb7cbfc2c53bff33948aa666119fdac81ade871c086973b27e70f1f0331 SHA512 dbb7744f92104f1a174a90c30eda7a384c43d3659f36f1103987e4a6354c77d21b3c45f9c4053fae699f13b1e87550b7ae7f3b1abe6c4fe31ff9a7d97a4868d3
-EBUILD kexec-tools-2.0.23.ebuild 3265 BLAKE2B f1b79999adf8df2e0a85cdcc2cd25027e78e8305fd8ba10d530cd2db3d31f8f5a148b978131c77871f4b0a97c0b496fa342834e8b8c4fbea74417c82a36f430e SHA512 bfe4ebad0b2c3e5281309e8f7b76f9f2f5a4a6b19f46b8077b1f066d0a9e41b0dd529d19071c660021d7dad41e9d86b1e5f3af3ca4149a2ea660af89b2eafd5f
-EBUILD kexec-tools-9999.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
+EBUILD kexec-tools-2.0.22.ebuild 3265 BLAKE2B f73c0709212598dc834fe12567891266c3e07fb6efbbd3fb91a1b579faba10475d387a73a53ac7ce5b694db0c2d67ae6bb1fa602faae6902e42e0b0920d0e725 SHA512 05f74d84eadb72d9399a1769d69520191d98e057d137253c49d0faef523a0f6f2f7a85c582fc5cf60606cb3d91a15d7c813835ab668419d32fa3091ea63a5e1e
+EBUILD kexec-tools-2.0.23.ebuild 3267 BLAKE2B 69aca60481b1300d82a3d0198501423b6505570ff16da0dd54f7c516786fac11c15eb7fa2ba01b8d75d83c0eeea9934fb7c63816856d56699857483c1949e97a SHA512 9bc20ee9eb06df7d6f29f28e7b56ea8266b1fa01a61ee669c979c2cb00c9e86fb6a69f151265fcd1e33afae8dd77f6bfb3bcc44375caf71da176e400caba86d0
+EBUILD kexec-tools-9999.ebuild 3267 BLAKE2B 69aca60481b1300d82a3d0198501423b6505570ff16da0dd54f7c516786fac11c15eb7fa2ba01b8d75d83c0eeea9934fb7c63816856d56699857483c1949e97a SHA512 9bc20ee9eb06df7d6f29f28e7b56ea8266b1fa01a61ee669c979c2cb00c9e86fb6a69f151265fcd1e33afae8dd77f6bfb3bcc44375caf71da176e400caba86d0
 MISC metadata.xml 491 BLAKE2B a47fdf282e096eb77748e23470df2a95cf2982e1e722ea74b9aee795f764e287a9364836139bba6462afd0a0f2a9d2f67c25ba1dd22a0a842a3f547a92cdd476 SHA512 a9f187f3cd1d63cfcfdcd93cdb50015b2d29eeb24558530febe440e6573464712d8e83a8743efc727c4c92ad61e1c36dc7d93cd33a222d751a4ec2b75d42f17d
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
index 897b98a24b69..c92e41d36170 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -114,7 +114,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no"  ]]; then
+	if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no"  ]]; then
 		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
 		ewarn "This was probably caused by a previous version of ${PN}."
 		ewarn "Please reboot system once *without* kexec to avoid boot problems"
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
index 0879b84e6744..b69a3c09e13d 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -114,7 +114,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no"  ]]; then
+	if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no"  ]]; then
 		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
 		ewarn "This was probably caused by a previous version of ${PN}."
 		ewarn "Please reboot system once *without* kexec to avoid boot problems"
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index 86b8d9fc9789..b69a3c09e13d 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -114,7 +114,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no"  ]]; then
+	if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no"  ]]; then
 		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
 		ewarn "This was probably caused by a previous version of ${PN}."
 		ewarn "Please reboot system once *without* kexec to avoid boot problems"
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index daa7b2c4096f..9fb5bae29645 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -3,8 +3,9 @@ AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45
 AUX keyutils-1.6-endian-check-1.patch 1152 BLAKE2B 7614e1b72ae012f1d3126a2edfd26b17bdc80621c4197c3f7a2e47c3cdb9fd703fe92adfb5da419775d4b4bb334ffe7fb57e26645a8fc201568f070b11cdd923 SHA512 f7d5423173c0e65080931653604d9179a9c6dbc4e22c7e62b67685d444e81b33a2a61d26906e47987521a61e28c199fe4ab4fc7f9ba8cacd2faf00bc443259c1
 AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b
 AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
+AUX keyutils-1.6.3-fix-rpmspec-check.patch 1400 BLAKE2B 135c2f9caf216ea57997ea48b6fe0a2546a6f087f39261bb28521c570455d0dd6ce54cd74f007b3cb1611e5ab7e6330513823adba5006151d8fb99d7ac14774c SHA512 8bf8ff09af6f1e763ecfcaff842a9edfbcecaba3e4187805db2ce11d46c789e58133464fb73297934f078a49c2420a010541a6e9c860f3918dc46e1d909bd7d7
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9
-EBUILD keyutils-1.6.1.ebuild 3870 BLAKE2B 9c3bfe57a55d744623756154f5f599b5e66bb731ad1903e42acb3646883095006bacf338a7d8fb161be6c9a2e6e14f924105b527c191552f6e1c31d5d7742d3f SHA512 1f08385e89141147decfd3e4f125928c743eebdffeb2bdb074778186357e674c747c9681dbab14a7474cee459d8683b7bf390528a7d3cc5c574cbd7122a69c0a
-EBUILD keyutils-1.6.3.ebuild 3773 BLAKE2B 5dee83357a3cb3422a417882cff0b13acbd80181f9c9eb07a590b6eab88d21af2b46478d54f134c7fa10e1119c2294546ac627261eff63812f8918dd82349633 SHA512 8c140672226b95199f3118c04b5d365c4a9c7f85654e44fa7b49306b4e921cb9a996b4911e1a2ba407cad04d6bddca7d1fbed012211e945adbb02f5602de7661
+EBUILD keyutils-1.6.1.ebuild 3872 BLAKE2B 3cb6a0bf2a3551691298ec596a1f9e73056d62ee6e1baa676bab98bb0d4dc387dcbbe8aeb58feef2d5fe353c1c97dc35cdfec9c72571063c7fafa03e7256696f SHA512 9dbcd613db121598f87c151207e400c6f58d338c7f13f8ea1f75ae629e9569612cf73781832fca613083b831d4970b048603a9b46d1d989c71d3734bd8c09324
+EBUILD keyutils-1.6.3.ebuild 3830 BLAKE2B 295233f76152cae579d57ff14fc1ceb498824cd1676dbcecba63bedfeb40e38b62fac76951613e41be966e88a1d85560cc685474f965160b9e5b9bde9ad040c0 SHA512 b6a558547023ba7c920e019a26aa367819849cf1eb4d6349de5aa92aa2251ba034419fddd66c601edd08446d2a253155967d2dc1a74f73f6d86f78e5a5b4f2f5
 MISC metadata.xml 425 BLAKE2B 2e1c7ba57d9ff2133d453198363f3d6ebb299f86b6e20a40de99922a04bb3661473bbe93b2cad53fce887a62eaa3760e2a209ac278a0456d57903e3fd613f274 SHA512 fca0158e8e96854a03da5a5d877ce23b635a4f052cd7580108dd4ee47fdafab79a436f01ff32e0111421e0904a16e71eafb8629bcafe4e3199e025f0554b2932
diff --git a/sys-apps/keyutils/files/keyutils-1.6.3-fix-rpmspec-check.patch b/sys-apps/keyutils/files/keyutils-1.6.3-fix-rpmspec-check.patch
new file mode 100644
index 000000000000..3fb659712aed
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.6.3-fix-rpmspec-check.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/760633
+
+From 41077f8901b642d36b63f94b0fc62377a07fc0b2 Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu <adrian.ratiu@collabora.com>
+Date: Tue, 4 Jan 2022 03:51:10 +0200
+Subject: [PATCH] Makefile: only run rpmspec if it exists
+
+keyutils is built on many distros which do not use rpm like
+Gentoo, ChromeOS or Arch. Older versions of bash silently
+ignored the fact that rpmspec was missing, but newer bash
+like v5.1 issue a new error:
+
+/bin/sh: line 1: rpmspec: command not found
+
+This happens every time the Makefile is parsed, including
+for a simple "make" invocation or "make install" even if
+a rpm package is not desired.
+
+Arch Linux simply ignores this new error but Gentoo and
+ChromeOS fail because portage actively monitors the build
+log for errors like this. See bug report [1].
+
+Fix this by calling rpmspec only if it exists.
+
+[1] https://bugs.gentoo.org/760633
+
+Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
+--- a/Makefile
++++ b/Makefile
+@@ -285,7 +285,7 @@ SRCBALL	:= rpmbuild/SOURCES/$(TARBALL)
+ ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
+ 
+ BUILDID	:= .local
+-rpmver0	:= $(shell rpmspec -q ./keyutils.spec --define "buildid $(BUILDID)")
++rpmver0	:= $(shell if which rpmspec >/dev/null 2>&1; then rpmspec -q ./keyutils.spec --define "buildid $(BUILDID)"; fi)
+ rpmver1	:= $(word 1,$(rpmver0))
+ rpmver2	:= $(subst ., ,$(rpmver1))
+ rpmver3	:= $(lastword $(rpmver2))
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 96aead1e2727..b99c47b63c99 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index e70d7c5d4311..fe79df96fe7d 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~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="static static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
 	"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
 	"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
+	"${FILESDIR}"/${PN}-1.6.3-fix-rpmspec-check.patch
 )
 
 pkg_setup() {
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 4a2f3c5852c4..23eb6257b144 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,5 +1,5 @@
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
-EBUILD kmod-29.ebuild 5229 BLAKE2B 5a8532596f75b0a25e2c54d57fb96c43d2fc8e6f33a43971159f17138b28088e4ef2cb9e287c83c4a3b1c7e40a1c6cea7f18e10c0ba4faebdff4b98bf6db408c SHA512 9d43245699f2dd8c51dc21b7bf929829fc29073c8679964f723b2f398867b9a039b86335b4bc021a1fc9b03545a3847c5330dd0363bf0b20ed764c2833ce23a4
+EBUILD kmod-29.ebuild 5236 BLAKE2B 8674297d2f9ba5382792f4ca756e3fc47e6558020dd11d07c590232098d14f358130163733d5338cecf13b55b0f90086011bab2e4a753de8fc17f17cd22c7e07 SHA512 f576e67fd863468a49fa0b17a70cc654cce65675a10080911a210a07392a9b542d5706d63eba6daf5662be4670e2e254afc70780c9d50a7fa6ba7c967df94a41
 EBUILD kmod-9999.ebuild 5237 BLAKE2B 6b8233ab744534061927afdd75bcd8d8a26c7f4243db2fa460729e5bbb78914d9279f0667e9d6f25ca5213eb4846d33fb18c3fa189dd8a68559507a68f513d49 SHA512 0739003537b94cff33ab4bb4a795df48dc01b2fb2cf15501e8f6b756a5734e0568d91b50787aff8e10e08db8e6a0c9a609db8bb473d50b10c1ea0add817ebe9c
 MISC metadata.xml 611 BLAKE2B d356a4efdd4696d1a57b9e57a4c2c6cda612830c11dcedadb307db85f202ceb8d8f6e6aaacc0e1b69f9bf909cf226f4174fb270f5f4eded14a1b42d236e345e5 SHA512 bba19da08e022d4de0970d80646dfdcaaede388e2b0a020bb9d83ebcb0fe1e62864e944c29a9bb6692df12981e24c091803ccda6161c2d6186b0dd46c3074108
diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild
index d2700e7716d6..215876687c49 100644
--- a/sys-apps/kmod/kmod-29.ebuild
+++ b/sys-apps/kmod/kmod-29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	#inherit libtool
 fi
 
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 2e1b24ad1297..ae552242676b 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,9 +1,5 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
-DIST less-581.2.tar.gz 349230 BLAKE2B 3f9d3c94f3d9eae5ecd033c5f16a575bd3a179ca335b0318e097a916c6713379cafbe6c57459e86866e890a432fb02be9102726b35c46d9bdd07ca1b35f83058 SHA512 b1189396c798d7cb8655175f31b1af6163dcf8e8d7a72531161cc8396e72e0cf5858ce7b39173be603f9f16eda498f2805cf42c2b92ec6970fd9d2b603fb7b92
-DIST less-589.tar.gz 352390 BLAKE2B d91eaf0e4a3c14bb8a1c1b820965922c9e795cc8c6489c04dad79d14bc634db1e8e20aae9578ca5375d4d1f1fb861a510527ee9433437457d653453eabf5dce9 SHA512 c2a610c894e98853e73d83cf2c7e94ff75a868280b2ab7fa01676c35d35fdbba808f3630fa4954eca40f0823e654df4c287885499bb24f4d0b7b4558fb91977e
 DIST less-590.tar.gz 352574 BLAKE2B 0f640f1b6b4d4925c4904ee77460e8becd2dae168fe5c1483bf6a9cfabe9eb0abdc4d4811507ba88a2b4cff6c238158bd8b4463b63d3d7863b44ce8538d32adb SHA512 426fa5840fd43c17bd5a452ad35ad24f2d6684623c6914403fd0059af62266bf2138e6828c7d73a1cef26a736c0d2b8ed4ab180eea8297281dae79a4228eb903
-EBUILD less-581.2.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53
-EBUILD less-589.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
-EBUILD less-590.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53
+EBUILD less-590.ebuild 1372 BLAKE2B 9e6ca781c599b023ac69f2f50efe2d67fd2240dd1377c0b01d03e5fa2dde68be1f64d28d118fcf96e25ac96e5ddaf4c85c3e531214f251cabe26ff75a2fb1b50 SHA512 4f1365280ed6c95546ccba75535592edc299a1e2facb1b34ea21c04e03754c05387bcf1a4543533dc1047ef78b762deb16c1cc13d0b5e111c3b6368647ce89df
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/less-581.2.ebuild b/sys-apps/less/less-581.2.ebuild
deleted file mode 100644
index 10671e00e64e..000000000000
--- a/sys-apps/less/less-581.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pcre unicode"
-
-DEPEND=">=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre2 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
-	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
-	local myeconfargs=(
-		--with-regex=$(usex pcre pcre2 posix)
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}
diff --git a/sys-apps/less/less-589.ebuild b/sys-apps/less/less-589.ebuild
deleted file mode 100644
index c91345dc9f3b..000000000000
--- a/sys-apps/less/less-589.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pcre unicode"
-
-DEPEND=">=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre2 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
-	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
-	local myeconfargs=(
-		--with-regex=$(usex pcre pcre2 posix)
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}
diff --git a/sys-apps/less/less-590.ebuild b/sys-apps/less/less-590.ebuild
index 10671e00e64e..a10cea4792b3 100644
--- a/sys-apps/less/less-590.ebuild
+++ b/sys-apps/less/less-590.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 01a302fa67c7..35fe65fc3bdf 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -8,5 +8,5 @@ AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378e
 AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
-EBUILD lm-sensors-3.6.0.ebuild 6622 BLAKE2B 9e80658c28faa3254b57667c215d524854db92d2352106d7233053dbdf3b32732319de1d8cab12bae51bb114214474b543c4fea5cf7d2c720e155d76f6ca2a82 SHA512 1b8f7628e7a11ea350d79533950087428acd4c94925e2b335f9f15ba70064b5ac87097bc4219171b823d7a6e623a4078e137014d6bd7bde1461bc4633ac79491
+EBUILD lm-sensors-3.6.0.ebuild 6629 BLAKE2B f82f43029c27520bcad2b4ef1f1b9816bfbc86e6b4da2ace33867ce3d3c66ee93459470c09cb8a2663cef552f21818b84a40e07f47a96a2f09e83efa8021ef27 SHA512 12950ccb4c069b48a0ff856d472370d164b8b3085694a9991d36e943b07f935ba19e152cc1e279bd72a0cf8504f75ac1893febb6cc58dd8e1edaf84bb662ed5b
 MISC metadata.xml 944 BLAKE2B 51d63cd4ecf93033ee09f766a240778fd71f666f26cab5b6e8cb19a10dcb174e88feb69d4dbea5e3d4b35a12d7d52dad7a96f8f53d6e3e366dd1383b9e5aaf22 SHA512 2bbd482a716a6cccd84d4ed299934205b6fcdb77c4e12805791273ca5b7d64d27ecd75f2a877bdcfdcd7a9c4e0df2b18a1e1045e4f5194f6169716893b459289
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
index 9fba4b6c08e2..74b209916ec0 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/5.0.0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 87330be07b63..7c4d26c405df 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -3,6 +3,6 @@ AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2
 DIST logwatch-7.5.6.tar.gz 484873 BLAKE2B 18a10f7baade4650c836ad402fcb92096923e0a8b6890352916e3b514bf85fe5b5070c0a47059c68fd84624407006107332f75a5ce3164a25cfa05f28f2ec882 SHA512 fb490f5bc1bf469309ee9caa1e040d71b4332d7fb64f94865a9b5fe707a92cb10c207022ce5e279709bf3412605f67f7da11303d91aa078f680c598398aab2ab
 DIST logwatch-7.6.tar.gz 488750 BLAKE2B fd7f2a7c65151dbfbd924102b01ead00f92d74a59a417361b65be972368f7ed93810feefedf1ad9bba2de5ebbc74589c3fc0a8a484f19b5a9782c9799ffdf656 SHA512 8672dcf2b781d89ec281c4370b204467f9db219edb7c23adf02b71decf0ecab7b442d6e95e91416af3aecc27948e9442bb3b369e532e40f7ef32635628e110af
 EBUILD logwatch-7.5.6.ebuild 2412 BLAKE2B cbcd0212a9615556f4fd1d88dad7020bd8dd9d389efbd0cb11c8aa59c5d23e0d05ecfab4fb5fcfc750e78914c0ce6f15f68225d0921163e1edb56b5cf55c07a5 SHA512 a1a7f7e4bc55099b8aaeeef0250496850a5a3c82ae6855795668a91e2e0f2a35c0c94b9fbc431c74ff3c57d67a89645ebb04d29421214c0aeec4a6f8b8dd39a3
-EBUILD logwatch-7.6.ebuild 2420 BLAKE2B aa85e87a1ff4534b34460d9e3050e6cbee4ee3989a3cfcbaaec1251f821c34336b42279cf46262489ed5042750e837894ab63fbb49dd2d21c816d4d4dc0d9932 SHA512 507ac4415ff7770107bb11a7abc46f5ad56068436fb40eb2a1baa2e44cc51972eac7f4b960ddc3ad3588902dd7a850e1665f3cd456b8551e324fa2f43fd8d096
+EBUILD logwatch-7.6.ebuild 2412 BLAKE2B cbcd0212a9615556f4fd1d88dad7020bd8dd9d389efbd0cb11c8aa59c5d23e0d05ecfab4fb5fcfc750e78914c0ce6f15f68225d0921163e1edb56b5cf55c07a5 SHA512 a1a7f7e4bc55099b8aaeeef0250496850a5a3c82ae6855795668a91e2e0f2a35c0c94b9fbc431c74ff3c57d67a89645ebb04d29421214c0aeec4a6f8b8dd39a3
 EBUILD logwatch-9999.ebuild 2420 BLAKE2B 5876966303c0c8c809b49a14278f2196747b21c32bdfd7aee74418ec8309b3a2eb6f7fe28c89cd1cffaafb7b371d4837b5ee32fdd44226d98b3a9bd3b1e0ff1a SHA512 7bb4bc9a0e4e463185f7080fd8144d0f42f036fc354f55aaf25025ef722e6ad5921c942bface3571465b308bf7ed892c8623224bc991651c4144833d63cbdc4e
 MISC metadata.xml 329 BLAKE2B ae6bfb6282dd2f5ddc01959eb57e894cc12a69de5fea771439d9b2a95110754fd7c35db97ee238865cfb81333800dcdcfb42654d12572e16cde12c7212a505c5 SHA512 a523f269535d7e0272f2d66b903319197f52477dbf40b32729eff93b5788f9c8b8756a4750128f894b4ab0d05b9effbac5d350e5ae2ab68474ef4fa39022710a
diff --git a/sys-apps/logwatch/logwatch-7.6.ebuild b/sys-apps/logwatch/logwatch-7.6.ebuild
index 0cc6a59b0cfa..24fb4fa00cfe 100644
--- a/sys-apps/logwatch/logwatch-7.6.ebuild
+++ b/sys-apps/logwatch/logwatch-7.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Analyzes and Reports on system logs"
diff --git a/sys-apps/makedev/Manifest b/sys-apps/makedev/Manifest
index 945a3d017795..e796bbd9cdd8 100644
--- a/sys-apps/makedev/Manifest
+++ b/sys-apps/makedev/Manifest
@@ -1,4 +1,4 @@
 AUX makedev-3.23.1-headers.patch 433 BLAKE2B bd8e6e4b32c69be3b5ccec72b425cdafbfa9723b0fdd1b634da6f130590a72fd251c6f21ff29224a705211274efad53f8fecff3ac3710eccff4833e1769c75dc SHA512 ffc80692b9bc317c0c14c5e7211155c4a7849967a9a3588a811f21feb6034da264c7aecdb7ce4e67786aa2a28f8d33af381ff410afd118ab44f47edddc421d0d
 DIST MAKEDEV-3.23-1.tar.gz 122613 BLAKE2B 2b0a4a02db36d7a3a71018378396c7d5ac8bbd4e9f8b24a1d3659084f381e8cc686f3d9198dc54e1efd93095ea09c21aab3b9866b942bff8e8a393355403f28a SHA512 5ca82cdcc4544042ede552370acf6266929fa34d177bd8e831573ccc1c57e06ec87766b9e60a686ec1449b204ae0ac3c048eab32b57ce8d610366219d3a77dbc
-EBUILD makedev-3.23.1-r1.ebuild 1346 BLAKE2B 041c624f426a6e3e1627b0fcd688550f5f28d1f4cdd3cae2d1ddba09361fd0af30686644f88ce12dcf50377242dee76f5b61769702e53e9c11f1e9ba038aa2b5 SHA512 5baecf59aa6da0a7f10ba2bdf995a96a955344a220ac0b6f81d34e69cb57cfc2d759c702e18b4cb1972b443af98caae93dc5b1a34a22a705bfe24da6e49be15b
+EBUILD makedev-3.23.1-r1.ebuild 1353 BLAKE2B c31056749a6345c450f4e55c217107c119c2ffe7150db64df252bc795fb5ecc4d2babb9b902326072c216b01b075f5c5bf52d9bd86033289e5c10d64b2f05a32 SHA512 565b762c925191dad2e6b87af0df6a731202dbeeadc92a4f469a789627a84984917baa280c46c7a523090b24b93b308b448f78a6361f0e5aa1da2db094d69bd4
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/makedev/makedev-3.23.1-r1.ebuild b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
index bd14e7054c69..34b779032631 100644
--- a/sys-apps/makedev/makedev-3.23.1-r1.ebuild
+++ b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="build selinux"
 
 RDEPEND="!<sys-apps/baselayout-2.0.0_rc"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 5b74b432a8ca..f98168900ad0 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,11 +1,6 @@
-AUX man-db-2.9.3-darwin-libdb-intl.patch 788 BLAKE2B 509c656f45a4b1ee5af1f28704b5c7c4507fb8405708c7554842a390f31ca2453baa26cbea76461fe40886e6f886c5d9321e6b39da0603364a4a59ae6c065218 SHA512 1de97d18ebf56aca43c183fdb90e09782b79c3f55e1738e03fd478b6f14d02c1ae398cfa87ace3cc96049bf234cd4417c93fa64eccc4e957964c31c6c607c6ae
 AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70ee664192db05fbe74013724fcdbe112ead2d4288f90be032777a58ee41515c23d5561ab9cde495a92aa9f74ee353479ef884e3 SHA512 d8840d45c3b115f51bb9b3fc11ece2fecadfe284cd7db29cd012ed32faed990b12a9920cf11282358e5dd27df4bcf3c1a0316116ecae58917ef3c65efb1eb22b
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
-DIST man-db-2.10.1.tar.xz 1890536 BLAKE2B b052a7006e1d47dfe7b82f82b6e6e47500ca1c8fa20716af7d3d4193ebde0b109f13f4ed3148c5e4bbc76f34d457ec71bf93ed88f9ab0f5da5b5e1c9066e6d70 SHA512 25a3c4e3d7b171faf0771885a7a7d502c4af801881777231c79d7ee9768c2e48e44afbf5603af13f5ac63e6981cfdb8e36ba8a33d5f926d8122635cf45fcff7a
 DIST man-db-2.10.2.tar.xz 1902840 BLAKE2B 8d1748503cdf66a613d7544a27b42df9436bdf4e07ccb130d2fa62343488d2c4ab791238c348236a253abddb564db9d1bb851249da9911737ff822d822819599 SHA512 5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf
-DIST man-db-2.9.4.tar.xz 1909020 BLAKE2B 43427e851f0e661ca1cee55211dd7636f4ffde067c75de7715f525029b22c205728f8e86ac49abff60e47a4a4c9e1fbd78e2c87e70bd37778b88594a3897275f SHA512 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c
-EBUILD man-db-2.10.1.ebuild 5180 BLAKE2B dcc6468224e72ca1d54d95d397483463887df70459f4beffa1a26c932f4ba15f51e25087b9f65425ffc3401ac13a021620c90d6e3af42dde2f760fb6985a4c53 SHA512 cc9fe78d2752b2b74b3e04dc5f34bb5c37aa16db9757fff938f16576e5fa3edf6734b7402b7b31ba8078920e69859443b5ceb02fe2a83920e1d7c478e3fe69e4
-EBUILD man-db-2.10.2-r1.ebuild 5099 BLAKE2B a2e368e7a251606c73b503f7ebca4731e48d95f57a2d932cce268e7019d332f7b21ee427270efb29abeba1ea0da744fda906676756738b6edfbb7536ef302576 SHA512 dcfdc38ac4afd98fb828038cda07cc5763a550d3bb819cc55f8ef668e40145ecfad31f3e8cad90b4940cf12e3209f20dcb8164fef37a340d296acbec1a1a8a1f
-EBUILD man-db-2.9.4-r1.ebuild 5182 BLAKE2B 1c875d760100c08c6188a0933faf7de31036df192b7b9aefed54d2d95aca3d6f736fa99ecced6e72a6b9b7a672a5c6901803fe65265edc0899d82bf0771aecaf SHA512 f9507572028a410b5e01b4fab73552c3ba3e4e944740a16cb964b8fe3d8b4a6b375134cdf77df0e44daa29cbc90584789df74a3a350cd78c3b875873501a7ad0
+EBUILD man-db-2.10.2-r1.ebuild 5098 BLAKE2B 3a09876a1109ec7bbf287d045961873cc59fce1c0cdbf4236a470f381e0f38b2b18fcfa73d56e8e495a945503f22678c195f94be947b8a7fbccae78eff87e701 SHA512 36ff78df7e2054ed9710fd09367b4cf0cf02ecb636ad3f8d48b1c42e37267c59ffb2ab39ded688d89ff400b368a71e50444600e2a04999d93a363235e85c1796
 EBUILD man-db-9999.ebuild 5099 BLAKE2B a2e368e7a251606c73b503f7ebca4731e48d95f57a2d932cce268e7019d332f7b21ee427270efb29abeba1ea0da744fda906676756738b6edfbb7536ef302576 SHA512 dcfdc38ac4afd98fb828038cda07cc5763a550d3bb819cc55f8ef668e40145ecfad31f3e8cad90b4940cf12e3209f20dcb8164fef37a340d296acbec1a1a8a1f
 MISC metadata.xml 343 BLAKE2B bed6b94c3e46bb74275e578a901e0a2706ee2ad1c25e2401f0cb5900bb3c3e8a07a7562e9b074340ed6f4511cd906aa25172122bda3c8e931077d47a14f29db1 SHA512 7244ccbaa5e4e64f67694069f1831ec5b142974b5ca57dcc10f1da62a0c533e4084ae3bb2b51f91fe1f98b52818f3e988ecdf83a52473d87a404b92733498882
diff --git a/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch
deleted file mode 100644
index 71cbb1c20df6..000000000000
--- a/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://gitlab.com/cjwatson/man-db/-/merge_requests/3
-
-libdb: link against libintl
-
-necessary since gettext is used for translations
-
-Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-
---- a/libdb/Makefile.am
-+++ b/libdb/Makefile.am
-@@ -43,7 +43,7 @@
- 	db_xdbm.h \
- 	mydbm.h
- 
--libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS)
-+libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL)
- 
- libmandb_la_LDFLAGS = \
- 	-avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined
---- a/libdb/Makefile.in
-+++ b/libdb/Makefile.in
-@@ -1541,7 +1541,7 @@
- 	db_xdbm.h \
- 	mydbm.h
- 
--libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS)
-+libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL)
- libmandb_la_LDFLAGS = \
- 	-avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined
- 
diff --git a/sys-apps/man-db/man-db-2.10.1.ebuild b/sys-apps/man-db/man-db-2.10.1.ebuild
deleted file mode 100644
index 10986291516d..000000000000
--- a/sys-apps/man-db/man-db-2.10.1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd prefix tmpfiles
-
-DESCRIPTION="A man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="https://gitlab.com/cjwatson/man-db https://www.nongnu.org/man-db/"
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.com/cjwatson/man-db.git"
-else
-	# TODO: Change tarballs to gitlab too...?
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="!sys-apps/man
-	>=dev-libs/libpipeline-1.5.0
-	sys-apps/groff
-	!berkdb? ( sys-libs/gdbm:= )
-	berkdb? ( sys-libs/db:= )
-	seccomp? ( sys-libs/libseccomp )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${CDEPEND}"
-BDEPEND="app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-		virtual/libiconv
-		virtual/libintl
-	)"
-RDEPEND="${CDEPEND}
-	acct-group/man
-	acct-user/man
-	selinux? ( sec-policy/selinux-mandb )"
-PDEPEND="manpager? ( app-text/manpager )"
-
-PATCHES=(
-	"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_src_unpack
-
-		# We need to mess with gnulib
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
-		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ "${PV}" == *9999 ]] ; then
-		local bootstrap_opts=(
-			--gnulib-srcdir=../gnulib
-			--no-bootstrap-sync
-			--copy
-			--no-git
-		)
-		AUTORECONF="/bin/true" \
-		LIBTOOLIZE="/bin/true" \
-		sh ./bootstrap "${bootstrap_opts[@]}" || die
-
-		eautoreconf
-	fi
-
-	hprefixify src/man_db.conf.in
-	if use prefix ; then
-		{
-			echo "#"
-			echo "# Added settings for Gentoo Prefix"
-			[[ ${CHOST} == *-darwin* ]] && \
-				echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
-			echo "MANDATORY_MANPATH /usr/share/man"
-		} >> src/man_db.conf.in
-	fi
-}
-
-src_configure() {
-	# Set sections we want to search by default
-	local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
-	sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
-	case ${CHOST} in
-		*-solaris*)
-			# Solaris tends to use sections named after the pkgs that
-			# owns them, in particular for libc functions we want those
-			# sections
-			local s
-			for s in $(cd /usr/share/man/ && echo man*) ; do
-				s=${s#man}
-				[[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
-			done
-			;;
-	esac
-
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	local myeconfargs=(
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--disable-setuid # bug #662438
-		--enable-cache-owner=man
-		--with-sections="${sections}"
-
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with seccomp libseccomp)
-
-		--with-db=$(usex berkdb db gdbm)
-	)
-
-	case ${CHOST} in
-		*-solaris*|*-darwin*)
-			myeconfargs+=(
-				$(use_with nls libiconv-prefix "${EPREFIX}"/usr)
-				$(use_with nls libintl-prefix "${EPREFIX}"/usr)
-			)
-			;;
-	esac
-
-	econf "${myeconfargs[@]}"
-
-	# Disable color output from groff so that the manpager can add it. bug #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-
-	cat > 15man-db <<-EOF || die
-	SANDBOX_PREDICT="/var/cache/man"
-	EOF
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING.md,TODO}
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron-r1 man-db # bug #289884
-
-	insinto /etc/sandbox.d
-	doins 15man-db
-}
-
-pkg_preinst() {
-	local cachedir="${EROOT}/var/cache/man"
-	# If the system was already exploited, and the attacker is hiding in the
-	# cachedir of the old man-db, let's wipe them out.
-	# see bug  #602588 comment 18
-	local _replacing_version=
-	local _setgid_vuln=0
-	for _replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test '2.7.6.1-r2' -le "${_replacing_version}" ; then
-			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
-		else
-			_setgid_vuln=1
-			debug-print "Applying cleanup for security bug #602588"
-		fi
-	done
-	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
-	# Fall back to recreating the cachedir
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir -p "${cachedir}" || die
-		chown man:man "${cachedir}" || die
-	fi
-
-	# Update the whatis cache
-	if [[ -f ${cachedir}/whatis ]] ; then
-		einfo "Cleaning ${cachedir} from sys-apps/man"
-		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process man-db.conf
-
-	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
-		local _replacing_version=
-
-		for _replacing_version in ${REPLACING_VERSIONS} ; do
-			if [[ $(ver_cut 2 ${_replacing_version}) -lt 7 ]] ; then
-				einfo "Rebuilding man-db from scratch with new database format!"
-				su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
-
-				# No need to run it again if we hit one
-				break
-			fi
-		done
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.10.2-r1.ebuild b/sys-apps/man-db/man-db-2.10.2-r1.ebuild
index ef05ecd8416f..215bd2c7051d 100644
--- a/sys-apps/man-db/man-db-2.10.2-r1.ebuild
+++ b/sys-apps/man-db/man-db-2.10.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	# TODO: Change tarballs to gitlab too...?
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-db/man-db-2.9.4-r1.ebuild b/sys-apps/man-db/man-db-2.9.4-r1.ebuild
deleted file mode 100644
index 4dd59206d9d6..000000000000
--- a/sys-apps/man-db/man-db-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd prefix tmpfiles
-
-DESCRIPTION="A man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="
-	!sys-apps/man
-	>=dev-libs/libpipeline-1.5.0
-	sys-apps/groff
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( berkdb? ( sys-libs/db:= ) )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
-	seccomp? ( sys-libs/libseccomp )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-		virtual/libiconv
-		virtual/libintl
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/man
-	acct-user/man
-	selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-PATCHES=(
-	"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
-	"${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch
-)
-
-pkg_setup() {
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_unpack() {
-	if [[ "${PV}" == *9999 ]] ; then
-		git-r3_src_unpack
-
-		# We need to mess with gnulib :-/
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
-		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ "${PV}" == *9999 ]] ; then
-		local bootstrap_opts=(
-			--gnulib-srcdir=../gnulib
-			--no-bootstrap-sync
-			--copy
-			--no-git
-		)
-		AUTORECONF="/bin/true" \
-		LIBTOOLIZE="/bin/true" \
-		sh ./bootstrap "${bootstrap_opts[@]}" || die
-
-		eautoreconf
-	fi
-
-	hprefixify src/man_db.conf.in
-	if use prefix ; then
-		{
-			echo "#"
-			echo "# Added settings for Gentoo Prefix"
-			[[ ${CHOST} == *-darwin* ]] && \
-				echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
-			echo "MANDATORY_MANPATH /usr/share/man"
-		} >> src/man_db.conf.in
-	fi
-}
-
-src_configure() {
-	# set sections we want to search by default
-	local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
-	sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
-	case ${CHOST} in
-		*-solaris*)
-			# Solaris tends to use sections named after the pkgs that
-			# owns them, in particular for libc functions we want those
-			# sections
-			local s
-			for s in $(cd /usr/share/man/ && echo man*) ; do
-				s=${s#man}
-				[[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
-			done
-			;;
-	esac
-
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	local myeconfargs=(
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--disable-setuid #662438
-		--enable-cache-owner=man
-		--with-sections="${sections}"
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with seccomp libseccomp)
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-	)
-	case ${CHOST} in
-		*-solaris*|*-darwin*)
-			myeconfargs+=(
-				$(use_with nls libiconv-prefix ${EPREFIX}/usr)
-				$(use_with nls libintl-prefix ${EPREFIX}/usr)
-			)
-			;;
-	esac
-	econf "${myeconfargs[@]}"
-
-	# Disable color output from groff so that the manpager can add it. #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-
-	cat > 15man-db <<-EOF || die
-	SANDBOX_PREDICT="/var/cache/man"
-	EOF
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
-
-	insinto /etc/sandbox.d
-	doins 15man-db
-}
-
-pkg_preinst() {
-	local cachedir="${EROOT}/var/cache/man"
-	# If the system was already exploited, and the attacker is hiding in the
-	# cachedir of the old man-db, let's wipe them out.
-	# see bug  #602588 comment 18
-	local _replacing_version=
-	local _setgid_vuln=0
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
-			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
-		else
-			_setgid_vuln=1
-			debug-print "Applying cleanup for security bug #602588"
-		fi
-	done
-	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
-	# Fall back to recreating the cachedir
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir -p "${cachedir}" || die
-		chown man:man "${cachedir}" || die
-	fi
-
-	# Update the whatis cache
-	if [[ -f ${cachedir}/whatis ]] ; then
-		einfo "Cleaning ${cachedir} from sys-apps/man"
-		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process man-db.conf
-
-	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
-	fi
-}
diff --git a/sys-apps/man-pages-posix/Manifest b/sys-apps/man-pages-posix/Manifest
index 880536168de5..1800dd90e2aa 100644
--- a/sys-apps/man-pages-posix/Manifest
+++ b/sys-apps/man-pages-posix/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-posix-2017-a.tar.xz 935196 BLAKE2B 45d732c712f8d6b18f151c7383130a367d5774ec9d814cf9e61accb01e9d91ad3e9b49bc4f1b993f28688e9c39cf1fbea91b86b00c05968b0bc0a5665211defb SHA512 dac6bd5bb3e1d5f8918bad3eb15e08eeb3e06ae160c04ccd5619bfb0c536139ac06faa62b6856656a1bb9a7496f3148e52a5227b83e4099be6e6b93230de211d
-EBUILD man-pages-posix-2017a.ebuild 732 BLAKE2B 13fdb827ab5bc5acb33da5a421db9b398ecd660877e300e9427b2dddbc789218d3d2335bd371b73a2ce3ff997dfbdbb5b6a7a3c9f94cf2a8dcf851603032f622 SHA512 f53eb1bb86b7b474475d6f6260d0fc868578951228c69c364f8c4edb7d6c2d5bd39198459cdf048da83de5bb841790a85bbbfa03aec480092e0e6d08628bf272
+EBUILD man-pages-posix-2017a.ebuild 739 BLAKE2B 68572749a1250212bad8de2b4dcf69139903efc2bef2fdea56864364cacc5c7d18b7b902fb9c2e4c9c1803b0a845248103a0538044a1167534cc8d2a7fb5451e SHA512 1ada856ce8941c30d5a4ef4c391a28506da26a699ef42334596ae4a7afa83e2e9d035fb5acacd116a2f5e1e80718306c68c02df1c4b0ec2290787e791a6b8843
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
index f29b60c9e04b..81d0d14450e1 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz"
 
 LICENSE="man-pages-posix-2013"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 RESTRICT="binchecks"
 
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 383d8bbd9681..41ab23bcf0b9 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -2,5 +2,5 @@ DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7
 DIST man-pages-5.13.tar.xz 1788980 BLAKE2B 7cca88b7f201d177b087893f60e6a87fd3ed8c78a183bd6ebcd0c28961f5f5d24aa2ba9d3a1d9cec4e0fc9cc0b26489c91e991a2d4420c28e1f61b850b882752 SHA512 a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-5.12-r2.ebuild 1912 BLAKE2B a613be39418f7d57549a53cfa41c982b49068000d1039f2f0980a97dc7e08d300ff168c8bdaa36d301144317fb748640449d61884b929456969733e03bf4a3a4 SHA512 2c8fe64e0b047fcdc8cd1445d6a6a343fc299f12b104b93084d3ac0b5ae9fbcf7954e158c29f7f3a640d39938e507f8a9c6216eae4a128573ee3bd08d4bedc51
-EBUILD man-pages-5.13.ebuild 1921 BLAKE2B 4bfc6fdf690209c553301f76c5ada93a73ac3ecad229ea71383375d92a47967e42952d01910ab6683c404ef4886c163f97cb3037ef64adacf4877e167ce5ae63 SHA512 ce7863cd6e9948d0a4435df70be60caa037f862e5ff35c5640ce961ed68e9de5d03a0f01feda155ee8838fa33010655c1ffe7122b088a95f2190adc0d25caa67
+EBUILD man-pages-5.13.ebuild 1928 BLAKE2B 9961fab2fe28337a545cc9922272e7069f022fe140dfa8ceda1d673fcfd6b76ee252d8539617488d55d8f0c652ab03b76a2e20f36581e0ba8db2a81326286758 SHA512 ac6d5c9463cb7718889aa48e715443cc07aab0a9ce15d3acfe37795a5fd9bb5bb826b7e080153017a91390f2163cd01105faf82b1fcc8fee32cb7eced4cbb8f5
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-5.13.ebuild b/sys-apps/man-pages/man-pages-5.13.ebuild
index 24b58ba3b70f..811b1b19ea3b 100644
--- a/sys-apps/man-pages/man-pages-5.13.ebuild
+++ b/sys-apps/man-pages/man-pages-5.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index 50566dd634a7..0cf0cea0078c 100644
--- a/sys-apps/man2html/Manifest
+++ b/sys-apps/man2html/Manifest
@@ -2,5 +2,5 @@ AUX man-1.6-cross-compile.patch 1747 BLAKE2B 4fca1280617283151ddf037d12b97d65ac3
 AUX man-1.6f-man2html-compression-2.patch 1741 BLAKE2B 51baebadffcc5f58eb7b980c0eddac550ecc98a682ced9ca0ffae6318a806536e42ae5f13d1d061ddd2d41f6ef792f2eb6eac1c1a00e2a8f730de54a3b6589f5 SHA512 85dfdffaaddefff9bfb7b92ab274dcc2e88d880d11c67b0690ff4a92a2a6d3a3b65ad4d425f09bfd042b041b316ec9cb6d1ba6e0a4c13fdf71c9524c50ffe7d0
 AUX man-1.6g-compress.patch 347 BLAKE2B bae29d07f89e71fb2fbc04305f67b5c6bdb0c660a428236c7cf2019403c74c8b6603e61b09d4e9da1677cce46b6ab252651c4e71b48a44ed37116374aeca21e8 SHA512 2901e2d77509245880686ad1c2baab9648952bb0eef7bdd6b77ec20d054373464e237a100acec5ace95935708b1b226d18990c48d9a864f384cc6afe7ed6cf96
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man2html-1.6g.ebuild 1170 BLAKE2B b137e34dc121e7a7c311193fe6d9d85968d0b68ee0570858d5a12d07559fb8da7cc8f40bb3d8c871104acb59a5cd7ae0b2277922d667fee6192f798846aa8c3a SHA512 edebf865cefa08894f4f999db735833396e3052ea94e471cb9b8494693f832986682b3488188471519e1b55e3c23afe1d61158ec13ca100f6e6f8b1bbf769d41
+EBUILD man2html-1.6g.ebuild 1103 BLAKE2B 5db03510f781f75825ccb1ee61342ef3f4bc9f58dc3d6485c6f9d884cae669377d41342020fd18a429a05feca4e79c5936445e7c667e9f8d0c9bea0e6f3b0388 SHA512 13728b5069e2221f7c2482a2ed7f3139eca26a5dfa006a665ab02587e3d94f945570d67f2410cd33dd27bf32005f54f55d658c21517a84aff7001cfd4128c6da
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index b35afa12de16..20fc85be6073 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit edo toolchain-funcs
 
 MY_P="man-${PV}"
 
@@ -25,21 +25,14 @@ PATCHES=(
 )
 
 src_configure() {
-	echoit() {
-		echo "$@"
-		"$@"
-	}
-
 	tc-export CC BUILD_CC
 
 	# Just a stub to disable configure check.  man2html doesn't use it.
 	export COMPRESS=true
-	echoit \
-	./configure \
+	edo ./configure \
 		-confdir=/etc \
 		+sgid +fhs \
-		+lang none \
-		|| die "configure failed"
+		+lang none
 }
 
 src_compile() {
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index c2058ff454bf..02b1a8c6c8d6 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,3 +1,3 @@
 DIST memtester-4.5.1.tar.gz 23655 BLAKE2B bb7214a41f7cfa39dff6ab4f1efcd1788f5e6bd4cc1defba8c77ae030321703c1da7b6c1c6f1a67ea59e2cb9fc960772b710050b7c6d14b0799db4d9d99e9c31 SHA512 cf5744f11a931338a94158aee3047ad2dab18b0cb27b8998184a98f33aaebc678beec74841a2bcbbd7154cc2e46a20f746d9cae01a9274714bcedb93f29f8c80
-EBUILD memtester-4.5.1.ebuild 735 BLAKE2B 8d8de497e7edf64b40c92329f17cdc1524b48b61ffce6c702f508e3f96382576224022157745d970239c279d01e2f64e6e2aa6d12ea7db688cf0c01e9a35ec09 SHA512 7cf1adbfffc2eab84106b48ec9d15f93286179f4c71a289551a4a523a4693caad367ddbf990b6ffca92fd60a94a35b3f1b9de56856e55b58952110bf3e8511c7
+EBUILD memtester-4.5.1.ebuild 742 BLAKE2B c885dfaf724bc280051a6a383c5d65cf27eb74ec9cd46cc10fc0d32474d2f8117f467f05daf21ab04775941f70340f2564728a4edd0d6b98c1cb8ec368d68d32 SHA512 4e55c3f765e142e52970c1d7f5ab79972de52258780323f74d883e98b5721f7c6949b175afad6ead75dd3703054be52e84bb3d135595175bc82b37d8212686ab
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/memtester/memtester-4.5.1.ebuild b/sys-apps/memtester/memtester-4.5.1.ebuild
index b2bfe34d2f17..45c81eb5f2d7 100644
--- a/sys-apps/memtester/memtester-4.5.1.ebuild
+++ b/sys-apps/memtester/memtester-4.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 src_configure() {
 	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 88db660b8274..f4375a092ba7 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,7 +1,3 @@
-DIST miller-5.10.0.tar.gz 6793426 BLAKE2B 25ec96e29ee8d913feffd6e9a54cd2d494c9050e180556ed462a6d94a6adaaea88dbdbc09b4753f8888673bdc33a1f0aa43f9dac37bdc3c25191b2a565fe8847 SHA512 a7cbaee9ad4075d27e74ab3a60297164c535ea2bc1e38128174f4f226ad061850d37108e7d7547821b7e6667cb9a024639795d7678b1897fedf6ee15d6064538
-DIST miller-5.10.1.tar.gz 6158587 BLAKE2B f22db3ccd29e0ff99e3f287e7e4382d679bba2c4d8e0fef3f3c086fa11ffbb287c22fc69c23f3baf647c2e5ac020d73f55ee613b0bb71273d7f94a5fe9561ea5 SHA512 32ec8216ea9c73c20b5c22fa047535c37f52a0d3c3c1100b090c57011cd555cae57a56425dfb0eaf0d09d41d82dbea3ad78a182ec8b538e194599b754f562961
 DIST miller-5.10.2.tar.gz 6192382 BLAKE2B 73daf0ca8a5417890e060b04103c4542f1122c13a9a13271dc53e94c4fdf0610dcad5ab04729326fd4ab72b47673db9fdf5aacc5a4ca5330c3220046e4d8a38b SHA512 be40611b055d94f3b0ef75b35dfd242dd4942dce3292bb01b48a6a12f9e4c09fc43bb9d0650902c7aa13328d9a2bbcea4da2964af58d07f39ae63b34712a45f5
-EBUILD miller-5.10.0.ebuild 1044 BLAKE2B 74501a4d7622e89ae1bf1653466b7ad41950e3e15b5e25b0d344a28378edd4b9e2ee3950c48669bf8258bc794e9ddee6a2949bad5518b7ca695da0bfff6a714d SHA512 ce2b40ca3f6a0e360bb5a13e87c4e51a4b629458501f6dc9c07d5aa6e06c3077864316caab187e5cbee1dbe8914cdd16d8d7857a1c61a8aaccd83fc2bdbd14b1
-EBUILD miller-5.10.1.ebuild 1045 BLAKE2B f5e71780d7469b52f88b75e8cebbbe15c730b6dc62a62ff3dbb4b27c949e12555fcad34545ee508e86d04dd2b22a98c18d835bce2a90a0744ce578e6f9fbbafb SHA512 843cf472b73a9464ffff14fde046c8ba2c72846fab9abceb190e5271ec894718359cb998eb812f817fab555962b1380a570f4a0f01812bf4e3e8c0a66e80b8ad
 EBUILD miller-5.10.2.ebuild 1050 BLAKE2B dfb4ca87e6b29681fb9dce541522285db48320022c7c225069050492f6907886e022c19f80adb6b9368cd90898be6f2de8a22130f9128c69a1775d328ced29fc SHA512 a8e5da195457cdf42b1477cd4790add3e5118490d9281328a480b08c4eb4b4e75053a807eef3a3ad10934171ab8b992dc354d16023969a02a066e2f040e26c72
 MISC metadata.xml 246 BLAKE2B e72fc3f75116d3b253685b995328f1823cb6ed7263d49bde4dc8d5d4b4b309efc85bb7beeb3e1d09e0143726bbc8d5028f3acb7a91eae3ca61cc649f8b7cabf9 SHA512 e772f1ac75cefddf23d6cec0cb2a25fa456586307e55207a29d2424d1610618226965412f4d5a1bdfd02b43830ed04b8ea2f0f938ffeb0a5878e1a0ff2f90132
diff --git a/sys-apps/miller/miller-5.10.0.ebuild b/sys-apps/miller/miller-5.10.0.ebuild
deleted file mode 100644
index e7b6e45d36af..000000000000
--- a/sys-apps/miller/miller-5.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)"
-HOMEPAGE="https://johnkerl.org/miller/doc/index.html"
-SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-devel/flex"
-
-src_prepare() {
-	default
-
-	# respect flags
-	find -type f -name "Makefile.am" -exec sed -i -r -e '/.*FLAGS[^=]*=/ s:(-g|-pg|-O[0-9]) ::g' -- {} \; || die
-
-	# disable docs rebuilding as they're shipped prebuilt
-	sed -e '/SUBDIRS[^=]*=/ s:doc::g' -i -- Makefile.am || die
-
-	# disable building tests automagically
-	if ! use test; then
-		sed -e '/SUBDIRS[^=]*=/ s:[^ ]*_test::g' -i -- c/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_test() {
-	emake -C c/reg_test
-	emake -C c/unit_test
-}
-
-src_install() {
-	local HTML_DOCS=( $(usev doc) )
-
-	default
-
-	doman 'docs/mlr.1'
-}
diff --git a/sys-apps/miller/miller-5.10.1.ebuild b/sys-apps/miller/miller-5.10.1.ebuild
deleted file mode 100644
index 4f24e895c456..000000000000
--- a/sys-apps/miller/miller-5.10.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)"
-HOMEPAGE="https://johnkerl.org/miller/doc/index.html"
-SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-devel/flex"
-
-src_prepare() {
-	default
-
-	# Respect flags
-	find -type f -name "Makefile.am" -exec sed -i -r -e '/.*FLAGS[^=]*=/ s:(-g|-pg|-O[0-9]) ::g' -- {} \; || die
-
-	# Disable docs rebuilding as they're shipped prebuilt
-	sed -e '/SUBDIRS[^=]*=/ s:doc::g' -i -- Makefile.am || die
-
-	# Disable building tests automagically
-	if ! use test; then
-		sed -e '/SUBDIRS[^=]*=/ s:[^ ]*_test::g' -i -- c/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_test() {
-	emake -C c/reg_test
-	emake -C c/unit_test
-}
-
-src_install() {
-	local HTML_DOCS=( $(usev doc) )
-
-	default
-
-	doman docs/mlr.1
-}
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index 1d6534f85e2f..51bd81adc638 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,4 +1,5 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
 EBUILD miscfiles-1.5-r3.ebuild 1700 BLAKE2B 366872b7f95d837bfe179e40b2c0562bfd756e12619fd695c1427c965f1f59c5aab4e418578122b8e733b7fed373e993070d174489c5fe24215fb7a62a389941 SHA512 78ab9a62e854e0f2801119c309d25443d057577c6e406f03c06000461ed2131d7e1388b6065cd9524ac1c783f5ae51aca0d18e35f481459b0e2deec93df5397e
+EBUILD miscfiles-1.5-r4.ebuild 1696 BLAKE2B 2117860031f78221ac13387d7f8811e453f49031494843db32f050c67076baccd6291d1ee3e6cfef05f2bf968e64c368d1f603c24e571402dab637b940defa53 SHA512 790435250bc83480e71a35a9fc4bbb5cfbe044c46b30d030017e1f31e45a65bd4240c26e31cc3fea9deeb25f699b8827856707fc1a144b1c587ebbf37a74310c
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild
new file mode 100644
index 000000000000..7ecdbacf6c43
--- /dev/null
+++ b/sys-apps/miscfiles/miscfiles-1.5-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+UNI_PV="10.0.0"
+DESCRIPTION="Miscellaneous files"
+HOMEPAGE="https://savannah.gnu.org/projects/miscfiles/"
+# https://www.unicode.org/Public/${UNI_PV}/ucd/UnicodeData.txt
+SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
+	https://dev.gentoo.org/~whissi/dist/${PN}/UnicodeData-${UNI_PV}.txt.xz"
+
+LICENSE="GPL-2 unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="minimal"
+
+src_prepare() {
+	default
+
+	mv "${WORKDIR}"/UnicodeData-${UNI_PV}.txt unicode || die
+}
+
+src_configure() {
+	econf --datadir="${EPREFIX}"/usr/share/misc
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc NEWS ORIGIN README dict-README
+
+	# not sure if this is still needed ...
+	dodir /usr/share/dict
+	cd "${ED}"/usr/share/misc || die
+	mv $(awk '$1=="dictfiles"{$1="";$2="";print}' "${S}"/Makefile) ../dict/ || die
+	cd ../dict || die
+	ln -s web2 words || die
+	ln -s web2a extra.words || die
+
+	if use minimal ; then
+		pushd "${ED}"/usr/share/dict || die
+		rm -f words extra.words || die
+		gzip -9 * || die
+		ln -s web2.gz words || die
+		ln -s web2a.gz extra.words || die
+		ln -s connectives{.gz,} || die
+		ln -s propernames{.gz,} || die
+		popd || die
+		rm -r "${ED}"/usr/share/misc || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] && type -P create-cracklib-dict >/dev/null ; then
+		ebegin "Regenerating cracklib dictionary"
+		create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null
+		eend $?
+	fi
+
+	# pkg_postinst isn't supposed to fail
+	return 0
+}
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 5cc7e763dc5d..b9b2084a56ed 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,4 +1,4 @@
 DIST net-tools-2.10.tar.xz 229616 BLAKE2B 0d11a5c12f6447282c65ee74428c1b9f6da9fd6d26ca558813d002fac8a4f03fd25a26231a5f4e45f88d821e9a8281e3be1fea4a832bd09afbc2239634a1c25d SHA512 aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf
-EBUILD net-tools-2.10.ebuild 1915 BLAKE2B e9a9491e765e18f079f02fd0120abbbc2cc503c662ddd738778bf2865f82ce2706e2fac519cb841067c914934b3aa78cc6a77639202b3e901cd14e385fdb2d17 SHA512 8cd9b2bf5a9c3e60a1ae2b6a24a9b64068df2ea161d5fe7b068e5103d84875d21b9b29f951d716562df386b10c6d0e6e9d341ff96e0e52380bf4e3fdabb5ec53
+EBUILD net-tools-2.10.ebuild 1922 BLAKE2B 1accae1bcd60f548222dbbb063d245300d81768474fff15e1306fa8e6b24fcfbb1f270e7fdc57570bfdcb07bd8e0da5e0a3eac6e84c9524e8cc2578040c46469 SHA512 20dacee1fa8b998b81f6286827effa552a845bd827037ef53a4a5f6be0b3cd3331811b617c3bef4002048f266d683ad1efd6b315e917f7c37a85c24293167802
 EBUILD net-tools-9999.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e
 MISC metadata.xml 688 BLAKE2B aacf54e98a252d221e71709b9084ebee51520bcf9c4f99340528a84f46de7c4586d809212ee6c70240bf6fd2315a041c764d18d8112302a036b2d825cf7f1103 SHA512 6fee2bf4d0796d2610d82c70fdf08349bcfbe5da34f6aadf12fdd7772ec38d0c79859a46c9fe0cb898dd29f162280bab43bdddddbc737590ead9279597206ab9
diff --git a/sys-apps/net-tools/net-tools-2.10.ebuild b/sys-apps/net-tools/net-tools-2.10.ebuild
index 988859d733fc..71379f1a2ef6 100644
--- a/sys-apps/net-tools/net-tools-2.10.ebuild
+++ b/sys-apps/net-tools/net-tools-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index deae9c15192a..c95809939534 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 1489 BLAKE2B f9146daa95f58dd05e8338f74428aab3f8e71f92a8d9499fa691c8140c920313d5a93dfbbe89662573fef27fc2ced7910db644ec19a0c1e6f9ac8fa56b14e522 SHA512 76e2f43d74f6d64b5d2c6e28be936f3ab0f262fcc91e829ad8070ff61c256759ccd3aac37b6ecac78c0753cab42b0902aefd97b80888061a50bd8bb0850dc886
+EBUILD netplug-1.2.9.2-r3.ebuild 1496 BLAKE2B 6c23c00a9bb252de1d3dfef271d92abf2ea5abdba0c794a4ba6900b903ef6088d709ac4019c7e879ce7b3cb3ceee722c539b1621312e89c0e3bc898e0b17e610 SHA512 7c4a4af168034ba05e83e318b6dbf6111efe5f964627dceb75eb1cd69100d69c6e5fd32577912d1d740b644ec1e9245b9369b84991b9b59c5b1f2ec850152ea5
 MISC metadata.xml 252 BLAKE2B 5dd8d0c83d6c9c396753f4e6674725483e0c7a005b4c529d3bd1fba5de36cee7f2b33e53aec48aa75f35ec663173677c2c964fb73f7f954b20631cc9c59533ca SHA512 afee4a606f4b70f265eb14178037c0459e32ddd98378c6c2978b829e906f83dc3607385173bd8f84ad988d307f8e44e1320310c92c070c802a4ccba93a96ae18
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 41043cb0afdc..6f9af1c75154 100644
--- a/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
+++ b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug doc"
 
 DEPEND="doc? ( app-text/ghostscript-gpl
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index dbf71d866164..08c15fbd444f 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,10 +1,6 @@
 AUX nvme-cli-1.16-musl-limits.patch 1148 BLAKE2B ee1206a23ee11d6badaed70a98cd2ea405d3ad144def7d00e44a49b2f2579fc61efbaa3325856e426be097e52b02e4b18c4122ab74c1f20d58ced1c1748419c0 SHA512 e7c8c387446360eb2ed816006fe7d9a7f6a1b9c81dd6d3171f909ae760236243278a4b42be727b39381f95c9b50dce09f816400a280da929da8453b6c9851004
-DIST nvme-cli-1.14.tar.gz 579561 BLAKE2B e27dade228ee47d88ef5cbab4d9d6163e75af44fb3345ed2ae566e875b973355255a5aba1b1846e53006f9676922cf7901a5e6e4867fcf04c591bf372a119bca SHA512 b5e18708233fd37069d84ee34232d737ed6d6909b0ec523d82cc2c4940172f7ce769b9bbec0d8615ebee544a5174cb4d752ad6d96ea05cfaa1177efc760f0e9e
-DIST nvme-cli-1.15.tar.gz 610927 BLAKE2B 66278904d49987d92083c1bb28a98d362adee8e85ee92e44e9dee381f3efcc76ac53ddf82957495ac7b2ef82e717c570d55e1b2052224740c1bc7e5af8af137e SHA512 0614105153edf7217d4c428927423628b63f6bee034c59926370a13d433c9c3af217338fb6fe2f8bbf781fc17ebae0102e8c072371b7ea4324c18dfdffd40305
 DIST nvme-cli-1.16.tar.gz 598246 BLAKE2B 8aef6ae82ec9a2c67de6c69addd72c87ade6554e6d374c717f8e3c0585565974a2b2870eb172b3ebdc1ae307bd3a55a14a17d3feea8d437265db136b434b519f SHA512 c713eb15b979ad17791cf95717b42d5f638cb4803d646bca1f4825e6bb50f086226b44b108b61571709b2cb615ae6ba86dbad309f675b240ebd3968d1cf536ff
 DIST nvme-cli-2.0.tar.gz 646320 BLAKE2B 81a8161091071be4e98d4feb78b3f3edaed07262212a8950c1882e3b46f38cd82d8cd8bfec62b3971feda6e82d297338e5541c8eda33c8b6f714d3b3ce000c25 SHA512 24a00ee8e0fc963c1757797413ff5725cec18f821a714d6bbbf37906010d72934d6fdd7b466c085f13716a5279d1a7bd3254ee474e37a0ecd00a85ef23e12417
-EBUILD nvme-cli-1.14.ebuild 844 BLAKE2B b88134580f9f4fb22ffd24bd2e8aca6f7778bc7c68af526e1002963cabe9766f39c69513eac46a7e3426e755e4ba2e1dee651b45ca1ffdd6ae2362d5d5e3a91e SHA512 aa1fecc32da2ac0e456cd73f516e7760a45ccd91fa9b9d4f4fb080e93024c69b5476621a1cbe8d9fcb26292eca6ab79f0c5cd0c35122e2dd70a1f5304c520d26
-EBUILD nvme-cli-1.15-r1.ebuild 1283 BLAKE2B f90189f1d7d34d340dc3e9f4ca7a1fa611d32ed0913d43e4d74707b159889b3bda123352454bb051541e1168d9eeb9746607bafaf0894566df4c9c4d8036edeb SHA512 506471a6dfc87c346c9a1bd46c19415f795e0a4b11dd8cc8ff59254929d7a59477d254fbeebea5badf53eb8c72cfda2ac85bdbc4dac4d0ede15f5d619d78b4c2
 EBUILD nvme-cli-1.16.ebuild 1330 BLAKE2B dca5bcee7da2e65799bed14ba6eec3484b19d025061f1068d343891f2e76aa2c000c017b03bc977be76f51d9b0d38180ba7e44e6d7ce27eeed338a2b1741ba07 SHA512 44c68fa403731bd0d8f54f361e6d7b84cbb7f9222f7070ef174354c29e0314fa1007f0c1caba48e30afb607e5a6c56f355eb2d02b80079f62a8c2defc073b55f
 EBUILD nvme-cli-2.0.ebuild 830 BLAKE2B 28e4292e92d7863ea0a56936497cf55428c3fc83efa8a9bf7fa6223c09ab46ae917b56c0cf073ee3e655d766a481dd0e63d8244a65787bf53b4935e6d56df2d6 SHA512 87536e85ae720b018679ec0798d1cdd5edd6bad105d8e5a3098efd230dd4a038aee6e4e09edf751c389af6ac0cff0e5c099abe730888f16cea2627a0265ec9a0
 MISC metadata.xml 594 BLAKE2B 52ac0579fd52797d0c9b2ec0528b134f67ef927987f9b99cf72d1010f13088af42d5eddb761b53939b196bc96ef4b8589b1bfc02242c95a56bf6a6a40afbad91 SHA512 d971b4fd68f8574b4e93377e9c4eef1f5901e81099ae97003ccfafbbd1657db92ce8a975cae38e6516cc4652b54259013c0c5e3ba53e80d717e42dab71440464
diff --git a/sys-apps/nvme-cli/nvme-cli-1.14.ebuild b/sys-apps/nvme-cli/nvme-cli-1.14.ebuild
deleted file mode 100644
index 0b5c3803dc39..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-1.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs udev
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
-IUSE="+uuid"
-
-RDEPEND="uuid? ( sys-apps/util-linux:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
-		-e '/DESTDIROLD/d' \
-		-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-	export PREFIX="${EPREFIX}/usr"
-	local unitdir="$(systemd_get_systemunitdir)"
-	export SYSTEMDDIR="${unitdir%/system}"
-	export UDEVDIR="${EPREFIX}$(get_udevdir)"
-	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-1.15-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.15-r1.ebuild
deleted file mode 100644
index 0debd0e006e6..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-1.15-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs udev
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="hugepages +json systemd +uuid"
-
-RDEPEND="json? ( dev-libs/json-c:= )
-	hugepages? ( sys-libs/libhugetlbfs )
-	systemd? ( sys-apps/systemd:= )
-	uuid? ( sys-apps/util-linux:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
-		-e 's|^LIBJSONC =|LIBJSONC ?=|' \
-		-e 's|^LIBHUGETLBFS =|LIBHUGETLBFS ?=|' \
-		-e 's|^HAVE_SYSTEMD =|HAVE_SYSTEMD ?=|' \
-		-e '/DESTDIROLD/d' \
-		-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-
-	export PREFIX="${EPREFIX}/usr"
-
-	local unitdir="$(systemd_get_systemunitdir)"
-	export SYSTEMDDIR="${unitdir%/system}"
-	export UDEVDIR="${EPREFIX}$(get_udevdir)"
-
-	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
-	MAKEOPTS+=" LIBJSONC=$(usex json 0 1)"
-	MAKEOPTS+=" LIBHUGETLBFS=$(usex hugepages 0 1)"
-	MAKEOPTS+=" HAVE_SYSTEMD=$(usex systemd 0 1)"
-	MAKEOPTS+="  V=1"
-}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 1acfa5a97d9a..bb6616d96131 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,6 +1,6 @@
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.44.10.tar.gz 254298 BLAKE2B 3cfecc27b560b8bb60d2104ab3dcf176b98677b65b829fa403ad2eb0e2e8bb0d586d374c336328a07c2f35e3abcb3f897cf5df142540a60fc09883aabd0ac79d SHA512 0e41f5268c6b8c325a6773511ca58c38ba52a1987aa47165794df8a99359bd1bfcb99d30e0d129b9242a2661663234f6f85c92c55c891dbb6c5b8a11d93edea4
-EBUILD openrc-0.44.10.ebuild 4387 BLAKE2B bc963720189c83f651237c52a55d907b2039c7447f9835b50e5f8decf4f3003aedfb5ac0bac5040bbafbe2ab739e41e267503b3d674031d7a32d8f5cd2dbba32 SHA512 1240620cbc33f7d6313278abe7aa6fda7ae99f8a74c882fccf1f7c4ca07311442952867c9f2e30e89830413daa54f606f4508fe0c494ccaf617ef4e17e20d81e
+EBUILD openrc-0.44.10.ebuild 4394 BLAKE2B 41dc3568e4050567dd31ac036df3c74a860746cc144ed7a7b5c5ec0c482c5a9805c269c40888f9c77d7cade7c909b67f487b14d9acc2f49994f428873ef722ef SHA512 dd9166adae7920717861502d44bf0ae560d2ed1678f20d7d0b58e6272de890e3966ce8cadea9f583ad0df623001e3ef15d3a48e084b76f0f9704a4ff4be67f17
 EBUILD openrc-9999.ebuild 4396 BLAKE2B 78a8697930e9ec5b4792cb8ad738a0b69426fd0979d15da3378fd0a1008a21b0df67d0ed43603fa4ad4a6fed03e8fd6aa04a629f41025582cb14f89b85e011f5 SHA512 2773b661bca4a7279cbffed1606c622c8d73561dbae40c1fe6ad67bebc71c75f0fc90e0ecdcc4136c313d12269319d825118a81f6dee2393e83dbd2d2c3c14a1
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/openrc-0.44.10.ebuild b/sys-apps/openrc/openrc-0.44.10.ebuild
index 8ced74993f6f..e7337a132e40 100644
--- a/sys-apps/openrc/openrc-0.44.10.ebuild
+++ b/sys-apps/openrc/openrc-0.44.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} =~ ^9{4,}$ ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index a4fa0ef042fd..9252a81d71fb 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -2,5 +2,7 @@ AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a932
 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
 AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
+DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
 EBUILD pciutils-3.7.0-r2.ebuild 2625 BLAKE2B 79828b3bb68b1aea998c716677815a2a459df5813c26056d69ce336ff3b2c63b51a9299f4f75c7e9eb7d99d75644c8a68ef21016ce15c929294566d894ee0b5f SHA512 6b35ea095aac16030aa2033e8429dcb80bbd6300e8de1750342e3b70af354417dfde559936f962b8c883d0b173ae0ccd164da4eded1065fc47924ce879ccc028
+EBUILD pciutils-3.8.0.ebuild 2568 BLAKE2B 0373c7cb27124af1f6ceaf2a333f2f732976a727d9d5caa075cfc65dfeb401cfcb737fc1ec46a3598feaf33c305aa45427f44a3c6e56d06371bcd9dd0b805e5a SHA512 ebf9b0c4a49e1da1ff2b579dcb0364ae2e2dd403f5fa74fec7e0f3d0cf39e36bf674777105b8027dd627e5e51da1d549deed353fdfb942d064e6087823bdc8d3
 MISC metadata.xml 525 BLAKE2B 5a7a502d28b6e74db1f1f008adfc5d9c398fb7832c8c82e066c9d4834726a0cd1e97b9738ca21906468f3c2444f20bfcf715339a1314e34b2b43d4f5c631a659 SHA512 5e53a4261ea0aa0d58f7a16b5c8ddbc2e6bda130e49642a9dc220f39cd6a77b8fdf22c22fd7def106d4728b880b75371feea3d552981d03294b86b8cb7fd08c0
diff --git a/sys-apps/pciutils/pciutils-3.8.0.ebuild b/sys-apps/pciutils/pciutils-3.8.0.ebuild
new file mode 100644
index 000000000000..311aa06502b2
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.8.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dns +kmod static-libs +udev zlib"
+REQUIRED_USE="static-libs? ( !udev )"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libpci.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
+DEPEND="kmod? ( sys-apps/kmod )
+	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
+	static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )"
+RDEPEND="${DEPEND}
+	sys-apps/hwdata"
+BDEPEND="kmod? ( virtual/pkgconfig )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
+switch_config() {
+	[[ $# -ne 2 ]] && return 1
+	local opt=$1 val=$2
+
+	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
+	return 0
+}
+
+src_prepare() {
+	default
+
+	if use static-libs ; then
+		cp -pPR "${S}" "${S}.static" || die
+		mv "${S}.static" "${S}/static" || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# bug #471102
+	append-lfs-flags
+}
+
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		DNS=$(usex dns) \
+		IDSDIR='$(SHAREDIR)/hwdata' \
+		MANDIR='$(SHAREDIR)/man' \
+		PREFIX="${EPREFIX}/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(usex zlib) \
+		PCI_COMPRESSED_IDS=0 \
+		PCI_IDS=pci.ids \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		LIBKMOD=$(multilib_native_usex kmod) \
+		HWDB=$(usex udev) \
+		"$@"
+}
+
+multilib_src_compile() {
+	pemake OPT="${CFLAGS}" all
+
+	if use static-libs ; then
+		pemake \
+			-C "${BUILD_DIR}"/static \
+			OPT="${CFLAGS}" \
+			SHARED="no" \
+			lib/libpci.a
+	fi
+}
+
+multilib_src_install() {
+	pemake DESTDIR="${D}" install install-lib
+
+	use static-libs && dolib.a "${BUILD_DIR}"/static/lib/libpci.a
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README TODO
+
+	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
+	rm -r "${ED}"/usr/share/hwdata || die
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 289537d1e1e4..34554c0c8acd 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -11,5 +11,5 @@ DIST pcsc-lite-1.9.5.tar.bz2 775736 BLAKE2B 2e42fa3864ec68725f90338ae981c758328c
 EBUILD pcsc-lite-1.9.0.ebuild 3167 BLAKE2B 9172b138a531936e2de9bd0d9d961d252f88d57950ae414b6ea3816f0d25f60406ede13d3d1e17159bf33681d7294526e9778f42a10292aaf846a70c6978c208 SHA512 baacae6682f43ce2ab5d89c5e278d11cc9cc5420d14821bbaa7b03e000884953d9aa1cda9df634d090444ba16af9fb7e2ed7e12d5b6d568ab4808960f5ee16da
 EBUILD pcsc-lite-1.9.1.ebuild 3181 BLAKE2B 5d67ccc4a2705aa85746347ff32f6d15e6613ea40ea244d7c810061a3dd5c023606f070b6d73544e4ef9f86ddfe4444e37c335177d65eb2a02ba06d4abb8ce0a SHA512 c8fee2822eada5dd7cbbe334be1ca72318a009fde315c8dc46fb9380f8f76a0965445bfc858bbadff1baae6bf80353223b59eb4990c9097970d8d891d07f9a02
 EBUILD pcsc-lite-1.9.4.ebuild 3182 BLAKE2B d1f81f1ff0e2b317847aaf59e32afcb17a813fff04a7326b6d5c1cc4f91b6775de01674e15f3a773d565d986caa7c585df7e807ff3e450e6c17d62a62172e376 SHA512 0b1d4de95dfabcbbc958e38f5e07551cf0fd59674a23027c0dbeb8d237356d4dd928bcc444aea8dc7fd090d6beea6fb321b9eea9883b28d4ac658c7d3a3151b6
-EBUILD pcsc-lite-1.9.5.ebuild 3223 BLAKE2B b34beae2ce30217c22aebbc645e523cc8a8ea7e19b4a102f040cedc4cbe00c75b5e958f147db98b089a1ece9021aa3c4b56fb59f3489926ed9a34ad79b1ae6c7 SHA512 956396329fafcda0b5397dcfdebf48a68447b0bbe71acbb1c1637ba8ffb540bd4dda2161231b18b19595562f8bc00aafb0fbca776819195d1bac127e83877595
+EBUILD pcsc-lite-1.9.5.ebuild 3230 BLAKE2B 78aed73e849af2ae4fc4a0d0167e7ea3b456100414191b7bebe798fe7b1f9a968ec2e178ddfc8ed6930583f5e0a73f5cc2f814215af21bf7cdd31d7e8b0eff72 SHA512 3972d7bae4d6d5622296a29c83477eebf50511af235516610f09326b944859a3ac23bc2acf73c08247b3bf3deab098c04e320a6372899f33be55b31bb73ee68a
 MISC metadata.xml 1083 BLAKE2B 8dc3fe1bbd660b4ea9db99fb8f82b905843d96005928f42aa4007e13aa6e0a75af83f1552b434136c8584b98ddae6a0c68776fbb1096da29433864536405fdf3 SHA512 da7d9e3842429795970dd73ffab39e031188e6fd585d144e6348007c55eeb67dcb8e5e04aea1115796f73ff1d455887e0c00301da2b9e689551fef8144c2f388
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
index 147fd36f5bc0..3b34179b63c5 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 502226209104..6277d0c10e05 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,4 @@
 DIST pkgcore-0.12.10.tar.gz 625285 BLAKE2B e6d8aeec37e9f5379cc12ca9ff502bbfd8ab355087be63160b9a03feddb5c792cc0ef01d338926e3217ee01859fca5a84aa710db8e224dde8e2befc59e3fafad SHA512 8b5159a06e8291be1663de077ac089b0cfc0da1334111ee66cb6c3b627bb29ecbc7fa6b4727fef1d4c9ac93889a7de787114d07071157a1fc1ed0b5143ebe12f
-DIST pkgcore-0.12.9.tar.gz 624918 BLAKE2B 190ccae01862b7e498dabcab5e8716ab0f3ed732eeb0469a0ca39f5e201c75ea19575f49be29a6d36b3acad8d5252528dc5e76444cd21fec25681a9350b93875 SHA512 2e391f9ae2baacaaec025c4b6cd7fd7c7757d7815d8bc62aec0f09e4fdbf7fc99ce832bc2c3ce15013fda860465ca19f27377935dc535a286446e548e08be6cd
-EBUILD pkgcore-0.12.10.ebuild 1120 BLAKE2B b1d653ef353ba355345c6033ab1b2a70ec651d4e6867060259318c7b684302731456ece67ba42367426090fd2e4e8a5c96674c9e198571cea9f83d6eed7e30af SHA512 71c929d71a042a5c574f176c93b892fcdbcfc23a547e3ffca6a7507ce5b859c34e0eb3d51615c1e1373efc890db116a1c48df784f243856af3c97581a2156663
-EBUILD pkgcore-0.12.9.ebuild 1119 BLAKE2B a5b776d54396ecd6491bf3db798c1131caa37402331c3968096673d0efabc172469734a04312fc0f8ead1b2a37018d8b03bc69ec05fd9ec792c73dba0db5c9ee SHA512 97aa6863c986cfdbf0a04af429ca774c6e4230c1010aebbc487156d92db4e23e082f5939e05dec83de2eefe83fab4192a7c5293779bcad260e878ba4f038a36d
-EBUILD pkgcore-9999.ebuild 1128 BLAKE2B 8a1e4b3be381366d63c74e02d3f4daa2a4c9613b07b7837579da10763aff9029e41e390c4b8e2f9754b0d6e621feb559328128e681da9ea00f6a49e5638cb698 SHA512 44ceade535f78821029b3a4d26e0b3b1c1510530499daf2989c66b9e5f99d72eeb873c09351bc3e8648d7a6521638a80bb48c1f6e7ee742a8a88ba56591bc819
+EBUILD pkgcore-0.12.10.ebuild 1301 BLAKE2B 57d05e60b30be4a51fba84d10fa8fc4914d7e879f098b5a265c6f973d8180ccbcae86ba834fc0243aab4451b63f34d2d9dec264d45251a34abc376d27bffa894 SHA512 3c8a8001b429b97d057ee9212ba748b2e43c8323b7e0430fbed17bbd7200f9d4fe0af5bd36aa20de3112443c2bad824c0113a98afdd41441a1a72ca736ef27cb
+EBUILD pkgcore-9999.ebuild 1309 BLAKE2B b92c0f41da48bbbd8e2ee2abf63da449e098ed5ee95a305b9ff101320bdd06d9fd54034384601c0be378baa5ce505e381a3834449bd6846cc83fd7aa46e02c2a SHA512 15ec096ac7978faff4191192030dda97ffa9dee7ad75ee6b57e2a44ce671753a6cbf6d6b855ab82c2295cdab6d5633ddcce6d0115a079fb3635bae9e86fc4b8f
 MISC metadata.xml 338 BLAKE2B 8e1efa689e0129b002ca035af4d3da753e9ef4d80029e01d2baceaca5a45a4c1c325ed25d58f38094a73564a033611e92a3b60d836967e9c664021d643bd0813 SHA512 019b2e934eb8f3a04148d4426466fc397983487122e10e9a2dc2f42e747bc7675947edf549e5ab5efb284d753de0af994a0a7a4f014ee22183a156afa4a462da
diff --git a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
index 9f81bcac50ec..e0fb6d80f2d5 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -39,6 +39,11 @@ BDEPEND="
 distutils_enable_tests setup.py
 
 src_test() {
+	# With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
+	# https://bugs.gentoo.org/840266
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+
 	local -x PYTHONDONTWRITEBYTECODE=
 	distutils-r1_src_test
 }
diff --git a/sys-apps/pkgcore/pkgcore-0.12.9.ebuild b/sys-apps/pkgcore/pkgcore-0.12.9.ebuild
deleted file mode 100644
index c9746dc7c745..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
-	>=app-shells/bash-5.0
-	dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index f6d5f97f6274..8ee26f5ac2e5 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -39,6 +39,11 @@ BDEPEND="
 distutils_enable_tests setup.py
 
 src_test() {
+	# With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
+	# https://bugs.gentoo.org/840266
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+
 	local -x PYTHONDONTWRITEBYTECODE=
 	distutils-r1_src_test
 }
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index a9e56e705a58..3b97dd2f8461 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -1,10 +1,7 @@
-AUX plocate-1.1.10-meson-use-feature-option-for-libiouring.patch 1833 BLAKE2B 4aba8c5ff0e5aade451ef02e60db223ff00f53c8d8e0761a83ae8a306348df0c42bb25549396684e75b4f1ae6d62b7b18972f2890291ba1643481c2401548c76 SHA512 8b8a08f0cbbe9455f5c2c88c609cab602bcb15f2f162c9ca597c779b550067ff430556df0d16f90221b615582e1d637e08b0cf29e013ef103fec0ccebb5b4c7e
 AUX plocate-1.1.15-meson-use-feature-option-for-libiouring.patch 1943 BLAKE2B cbcd583d93c3423c4cb8f13b3891ec34690ec1447c92f60291ec395437f11626aef82e669f470482c63232b9a7ebe73ed67cb7e0595a9f08b309f742c0d79d72 SHA512 110292358260f5fdf6f687b80c0375a91f224a190f6a25ec166c406cf4d39732493e0ebfea0fc02ccca18d95fdfcbff5d17d00cd10ac28c9a4ae46db8faf0ac9
 AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc16a4662b606f5a0c6c62e4b1475a02ec3f244dde1ff73fe0ad16e0850aec53e6e8836fd0ba1273ad07 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
-DIST plocate-1.1.14.tar.gz 73037 BLAKE2B 032963fa268d31664a8abd38ca501aacda4cfe29c8fd1e41228a4cfd5976174736e8d8f8aa1265de8953ec63211700da73e4cdd3eef42c059a638cdd9cd59379 SHA512 c97c9e4aed785af6bd8c2a30d5d5c7190cb4c513f1d6b66bb2885c9550b4cd39f097fac4bd736c211a921955422d0c27b5f35713f03ebe136450cb724fcfe600
 DIST plocate-1.1.15.tar.gz 73274 BLAKE2B 72dba287ba3357d2fa541542bf5e9d283eac672b7f3b2eebab687ecec930d6e91400eeb0f24c97d6133d69cae0308bc4473b7c8cbc5e263dd18ae8a7728a42a4 SHA512 772f82af38fd7b61fa51ac31f71d4a855542cfa617867da54b5ad8202f49f9e1861064a01e9b8f0937c3da902d84f19a50c1d0e4f037a491a9a6819b2413cfa1
-EBUILD plocate-1.1.14.ebuild 2081 BLAKE2B 0a76aaedf386c23cf05742cd7f1f59f884a2bb4decc3962a9e3d4241e95ddd02f7bfde57ebeaec86f79c22c55293400a8e2b7bf8e25ac5161dd7078cffecac42 SHA512 48f6d71e2cb738b3b0b734a4a93e0d81d094daadd61e2f66eb8be7eb114305343c3f2819d0a8d25729e0a968a433100dad64427bd6286d1f41ab0e35165152f1
-EBUILD plocate-1.1.15.ebuild 2081 BLAKE2B b1239b595cf96315985570b333e21cfbd7accc2fc2f17476f68fabe3a339d7ac873560b1706161f75fefefe7933d4c8c641f7fd32908f6a037d389c85d7f9960 SHA512 a55b2468ddab3d0cbf68ef177ca2f34e9d1728dbe896715712788d3f32b72542a1677ac0d8b74fe5d167f0afc8066e32b37def98320f1f64b5eb9aade8f654ab
+EBUILD plocate-1.1.15.ebuild 2086 BLAKE2B 9409e3c332deb24190a4c21cc131c7f327629f14d7b26d8de6438e4ccf0d29aa9e1efd01eb46cdcd9b3e7c16d90e9340f9d7d1cf61835587c75cc93228c1b8cb SHA512 bfc5795021a7863ba464d58d416755e29ecbe2c927f50fe1c96cc9215ec4249dee3e9a8fac11524eadc631b42a38f6a248955f9b9fc58ce4ccdc353703fff62f
 MISC metadata.xml 1437 BLAKE2B d3aece3d36e8cc4ceaf9947f0b535c7e2187a25cbb88910f704b1d72a2784831bfb746cca323c98183964688e6b5f2f2fa6bf54c97f8fc99eeea4ee946983e0d SHA512 b24d79da1b27531a7f3353128f7fbc583ef064f4aff58894e9d37dfa9144203c1f1898113aa31f82604aea93de66423e3313924bad25e31e075832c77a99c39e
diff --git a/sys-apps/plocate/files/plocate-1.1.10-meson-use-feature-option-for-libiouring.patch b/sys-apps/plocate/files/plocate-1.1.10-meson-use-feature-option-for-libiouring.patch
deleted file mode 100644
index 183c9f8e7fff..000000000000
--- a/sys-apps/plocate/files/plocate-1.1.10-meson-use-feature-option-for-libiouring.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 562128212376305bac8edd10d80c24f1223f1870 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Thu, 19 Aug 2021 12:03:39 +0200
-Subject: [PATCH plocate] meson: use feature option for libiouring
-
-source-based distributions would prefer to allow this option to be
-disabled without a hack, regardless of is libiouring installed or not,
-and meson already supports feature options for this purpose.
----
- meson.build       | 2 +-
- meson_options.txt | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 6fb0f74..fb79e3f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -10,7 +10,7 @@ add_project_arguments('-DPACKAGE_VERSION="' + meson.project_version() + '"', lan
- add_project_arguments('-DPACKAGE_BUGREPORT="steinar+plocate@gunderson.no"', language: 'cpp')
- 
- cxx = meson.get_compiler('cpp')
--uringdep = dependency('liburing', required: false)
-+uringdep = dependency('liburing', required: get_option('use_libiouring'))
- zstddep = dependency('libzstd')
- threaddep = dependency('threads')
- atomicdep = cxx.find_library('atomic', required: false)
-diff --git a/meson_options.txt b/meson_options.txt
-index 8ac13c5..9c90bf0 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -3,3 +3,4 @@ option('install_systemd', type: 'boolean', value: true, description: 'Install sy
- option('systemunitdir', type: 'string', description: 'Where to install systemd units to (default: autodetect)')
- option('locategroup', type: 'string', value: 'plocate', description: 'Group that the install script will use for the .db file')
- option('updatedb_progname', type: 'string', value: 'updatedb', description: 'Binary name of updatedb')
-+option('use_libiouring', type: 'feature', value: 'auto', description: 'Enable libiouring dependency (default: autodetect)')
--- 
-2.31.1
-
diff --git a/sys-apps/plocate/plocate-1.1.14.ebuild b/sys-apps/plocate/plocate-1.1.14.ebuild
deleted file mode 100644
index 1c92c6cde6cf..000000000000
--- a/sys-apps/plocate/plocate-1.1.14.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info meson systemd
-
-DESCRIPTION="Posting locate is a much faster locate"
-HOMEPAGE="https://plocate.sesse.net/"
-SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
-
-# GPL-2 for updatedb
-# GPL-2+ for plocate itself
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="+io-uring"
-
-RDEPEND="
-	acct-group/locate
-	app-arch/zstd:=
-	io-uring? ( sys-libs/liburing:= )
-	!sys-apps/mlocate
-"
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~IO_URING"
-ERROR_IO_URING="required for USE=io-uring"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.10-meson-use-feature-option-for-libiouring.patch
-)
-
-src_prepare() {
-	# We'll install the manpage ourself to locate.1
-	sed -i "/install_man('plocate.1')/d" meson.build || die
-
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlocategroup=locate
-		-Dinstall_systemd=true
-		-Dinstall_cron=false
-		-Dsystemunitdir="$(systemd_get_systemunitdir)"
-		"$(meson_feature io-uring use_libiouring)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dodoc README NEWS
-	newman "${S}"/${PN}.1 locate.1
-	dosym plocate /usr/bin/locate
-
-	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf
-	doins "${FILESDIR}"/plocate-cron.conf
-	fperms 0644 /etc/{updatedb,plocate-cron}.conf
-
-	insinto /etc/cron.daily
-	# Ensure that the cron file has the same name as the
-	# systemd-timer, to avoid plocate being run twice daily on systems
-	# with a systemd compatiblity layer. See also bug #780351.
-	newins "${FILESDIR}"/plocate.cron plocate-updatedb
-	fperms 0755 /etc/cron.daily/plocate-updatedb
-
-	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "The database for the locate command is generated daily by a cron job,"
-		elog "if you install for the first time you can run the updatedb command manually now."
-		elog
-		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
-		elog "please customize it to your system requirements."
-	fi
-}
diff --git a/sys-apps/plocate/plocate-1.1.15.ebuild b/sys-apps/plocate/plocate-1.1.15.ebuild
index 632c45be5000..3fb8c7c34d07 100644
--- a/sys-apps/plocate/plocate-1.1.15.ebuild
+++ b/sys-apps/plocate/plocate-1.1.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
 # GPL-2+ for plocate itself
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="+io-uring"
 
 RDEPEND="
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 848d7c388075..96cf54b35726 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,4 @@
+AUX 3.0.30-loong-abis.patch 4292 BLAKE2B 64fa54755f321168b88ab484f028fd4947330501d32dd08f15e76906dc074d9a8cec81d218a045cd0628c6febb166b9a7b6d9d1ba679553801c9ab98c69438a5 SHA512 7ad08a8b12b945e764eea49424a65297789f21bdec318fc09b959e11384f2205aafdfc1856c1dc7376b32e4ac81223cf133eb6e47798126c5a62023f3ffabb49
 AUX 3.0.30-qa-checks.patch 4865 BLAKE2B c708406feb7c67ebdf2b2c08add80eeaefccf27f106c3fd2336c1c42b2547cf32a609b0b81d501a515e24540c49ca83531ff6b64fc0a5e289de0c9003ac209d7 SHA512 06eda997946d285e4b84a955efb4e88a4cc5e4516cde46d222ece97e92d87f2f52dc186a29115793cbc3f40c6e15a8d0e2fe672928f96ad95cf8bb109cd61b65
 AUX 3.0.30-revert-default-enable-soname-dependencies.patch 2342 BLAKE2B 3852da2110ef498700e113495daf568bbd06d700a43d8719f4179179a9a96e7a809da15281cd2485b6608fa22e2bb8d43cb36140d91242ed281d7034a790c1bf SHA512 fc0cf492b9ca9f8937dc5ac432954245ffb6e1225c51d350efe6546535e42efd5a551028cfdc0c1cf0a1561aa5bb02d6b238ab485a8c8ba1500cbf7064c683ea
 AUX 3.0.30-revert-run-warn.patch 2228 BLAKE2B 9845ed36d9d0e8ca966a711e08bf24d9f308646abd1e1bb5efa8bd2c4545ae1b452349f7b83e57749f41566ef9ef440f2b9111667a44b7898f1a15324f3558d0 SHA512 29834935a3f8e103738e898316a073befb4539aa5bb8d1a913c90e85286b5928ba9d82db1a2293a7f1f776b9ca7aa4ba873909a346f4f705a1285cdd2c420a43
@@ -18,7 +19,8 @@ EBUILD portage-3.0.18.ebuild 8718 BLAKE2B 31ae0f52479b5c4704eaea954e09fd2e105bbb
 EBUILD portage-3.0.20-r6.ebuild 9837 BLAKE2B a4176c20b1e43ef301bbf595a335406130be6d157180a3cb867a71813280dccdbb5f03ec0068c0f4803b123d56da951898e49f30a60e6e5a3ed8bee56092d3d1 SHA512 e3cbfc10e9891e51c382ef1d854f3eafe3c147a8e1248316a6f78b6dd25715bab84bfa32241bc54624e5db610359d27c9162bc3753531b753fc0b9a7aba97c68
 EBUILD portage-3.0.28-r1.ebuild 8727 BLAKE2B e174e7fb7f51f1ec04d4076f6b04e9d7facc33319c3c743c0e87b503d8f00ca459fec5546f322c6b84291e5e0178b0d76b20806908bfd542983f547e900e0a0a SHA512 86c2b9b9dcdcaa6be5247db802ec230327981d4f3c4e31980e19064621a9287dc9ac9c8e81a94dbc1611857fe847c8989a7f3b7a09db3227092a9297d7f440a7
 EBUILD portage-3.0.29.ebuild 8548 BLAKE2B 32eba52517af7bde9fbafddb15203a7c9c6b72cd549b6a81f79b35b0ba96cedc7a121f3dd9496a3d4c66377ef591fe63a6eb0b57da3a1b72d0e2656aa4b11da9 SHA512 11f9394cfd8ed261d0b83a724366d9e43b2fb76fd71d1f6e1424ebf07d55a4dde78ea25157266f5eb6bd85d414f07d4499888907697d41248ceabf74ced03282
-EBUILD portage-3.0.30-r1.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43
-EBUILD portage-3.0.30-r2.ebuild 8926 BLAKE2B 96f1c4b40f1489d5a8c0274b9795460c4b3cd9508e8bb44506b98961ebceba1daf4a48008805631075a8d4cc2ca97f17ebf8d0571f71b1a8ba95a8ba9612a0fc SHA512 47328268b12cedcee99ee431f5eda36ab02d790a77bb0bb9658e9248b9b1bb2d3d1a5aa2567be5ae74a8a3ae0666b4d7aa9fed7a74f6113c8333858b9a040b5a
+EBUILD portage-3.0.30-r3.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43
+EBUILD portage-3.0.30-r4.ebuild 8926 BLAKE2B 96f1c4b40f1489d5a8c0274b9795460c4b3cd9508e8bb44506b98961ebceba1daf4a48008805631075a8d4cc2ca97f17ebf8d0571f71b1a8ba95a8ba9612a0fc SHA512 47328268b12cedcee99ee431f5eda36ab02d790a77bb0bb9658e9248b9b1bb2d3d1a5aa2567be5ae74a8a3ae0666b4d7aa9fed7a74f6113c8333858b9a040b5a
+EBUILD portage-3.0.30-r5.ebuild 8973 BLAKE2B 7d128def685ab7656f51ebdcccad1ee21719eaff8d8e61581c3f01fa6712a01a769c9c35c004796deae0e7fa7226c0e2ff935475210bb8dbbc8f05ea8efc3b99 SHA512 55151ccc3c2f0c5631de0230137b1325d7d268100bbfde66221b35a460fb67c12841101144b8996ab4ca2369b88a2806e0c1b4afdfd784827ee86316e0bda6d0
 EBUILD portage-9999.ebuild 8018 BLAKE2B 9df65587b54a652aa2c404bbb6cc97a96740c5467753858d3a498ddf5990db62ca8ae590a67e21d793297bc02ff61c0eef86ccef0f7a7e135866914acad8e780 SHA512 51307bb4ec176494f4fd4c9d24bf876bc0dc69077ae0fd814e69844a6ef640974ca8b4897358a3f3082baaa8d66287e1910890d381d0b8da5fe888c1ceb4627e
 MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402
diff --git a/sys-apps/portage/files/3.0.30-loong-abis.patch b/sys-apps/portage/files/3.0.30-loong-abis.patch
new file mode 100644
index 000000000000..7558107570cd
--- /dev/null
+++ b/sys-apps/portage/files/3.0.30-loong-abis.patch
@@ -0,0 +1,133 @@
+From f6cdba7689ea423245a232cc13103dd988363845 Mon Sep 17 00:00:00 2001
+From: WANG Xuerui <git@xen0n.name>
+Date: Mon, 9 Aug 2021 15:31:25 +0800
+Subject: [PATCH] multilib_category.py: recognize LoongArch ABIs
+
+Add its ELF machine number constant as well. The Gentoo ARCH is "loong";
+all six ABIs defined in the LoongArch ELF psABI spec [1] are supported.
+The upstream binutils port currently implements an earlier version of the
+spec [2]; the ILP32 ABIs are never fully implemented so far, and the
+value for LP64D is coincidentally the same, so the code here stays
+compatible.
+
+This is preparatory work towards a port to the LoongArch architecture,
+which is the new RISC architecture from Loongson Corporation after
+switching away from MIPS.
+
+[1]: https://github.com/loongson/LoongArch-Documentation/blob/23d53fe146a4/docs/LoongArch-ELF-ABI-EN.adoc
+[2]: https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=include/elf/loongarch.h;h=b4d801ae9bd5a6c4562ca6b1cbae6e6d45d6c704;hb=HEAD
+
+Signed-off-by: WANG Xuerui <git@xen0n.name>
+Closes: https://github.com/gentoo/portage/pull/740
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ lib/portage/dep/soname/multilib_category.py | 26 +++++++++++++++++++++
+ lib/portage/util/elf/constants.py           |  9 +++++++
+ 2 files changed, 35 insertions(+)
+
+diff --git a/lib/portage/dep/soname/multilib_category.py b/lib/portage/dep/soname/multilib_category.py
+index ab855d339..567b1d32e 100644
+--- a/lib/portage/dep/soname/multilib_category.py
++++ b/lib/portage/dep/soname/multilib_category.py
+@@ -11,6 +11,7 @@
+ # 	arm_{32,64}
+ # 	hppa_{32,64}
+ # 	ia_{32,64}
++# 	loong_{ilp32s,ilp32f,ilp32d,lp64s,lp64f,lp64d}
+ # 	m68k_{32,64}
+ # 	mips_{eabi32,eabi64,n32,n64,o32,o64}
+ # 	ppc_{32,64}
+@@ -37,6 +38,13 @@ from portage.util.elf.constants import (
+     EF_MIPS_ABI2,
+     EF_RISCV_FLOAT_ABI_DOUBLE,
+     EF_RISCV_RVC,
++    EF_LOONGARCH_ABI_LP64_SOFT_FLOAT,
++    EF_LOONGARCH_ABI_LP64_SINGLE_FLOAT,
++    EF_LOONGARCH_ABI_LP64_DOUBLE_FLOAT,
++    EF_LOONGARCH_ABI_ILP32_SOFT_FLOAT,
++    EF_LOONGARCH_ABI_ILP32_SINGLE_FLOAT,
++    EF_LOONGARCH_ABI_ILP32_DOUBLE_FLOAT,
++    EF_LOONGARCH_ABI_MASK,
+     ELFCLASS32,
+     ELFCLASS64,
+     EM_386,
+@@ -46,6 +54,7 @@ from portage.util.elf.constants import (
+     EM_ARM,
+     EM_ALTERA_NIOS2,
+     EM_IA_64,
++    EM_LOONGARCH,
+     EM_MIPS,
+     EM_PARISC,
+     EM_PPC,
+@@ -71,6 +80,7 @@ _machine_prefix_map = {
+     EM_ALTERA_NIOS2: "nios2",
+     EM_ARM: "arm",
+     EM_IA_64: "ia64",
++    EM_LOONGARCH: "loong",
+     EM_MIPS: "mips",
+     EM_PARISC: "hppa",
+     EM_PPC: "ppc",
+@@ -84,6 +94,15 @@ _machine_prefix_map = {
+     EM_X86_64: "x86",
+ }
+ 
++_loong_abi_map = {
++    EF_LOONGARCH_ABI_LP64_SOFT_FLOAT: "lp64s",
++    EF_LOONGARCH_ABI_LP64_SINGLE_FLOAT: "lp64f",
++    EF_LOONGARCH_ABI_LP64_DOUBLE_FLOAT: "lp64d",
++    EF_LOONGARCH_ABI_ILP32_SOFT_FLOAT: "ilp32s",
++    EF_LOONGARCH_ABI_ILP32_SINGLE_FLOAT: "ilp32f",
++    EF_LOONGARCH_ABI_ILP32_DOUBLE_FLOAT: "ilp32d",
++}
++
+ _mips_abi_map = {
+     E_MIPS_ABI_EABI32: "eabi32",
+     E_MIPS_ABI_EABI64: "eabi64",
+@@ -92,6 +111,12 @@ _mips_abi_map = {
+ }
+ 
+ 
++def _compute_suffix_loong(elf_header):
++
++    loong_abi = elf_header.e_flags & EF_LOONGARCH_ABI_MASK
++    return _loong_abi_map.get(loong_abi)
++
++
+ def _compute_suffix_mips(elf_header):
+ 
+     name = None
+@@ -136,6 +161,7 @@ def _compute_suffix_riscv(elf_header):
+ 
+ 
+ _specialized_funcs = {
++    "loong": _compute_suffix_loong,
+     "mips": _compute_suffix_mips,
+     "riscv": _compute_suffix_riscv,
+ }
+diff --git a/lib/portage/util/elf/constants.py b/lib/portage/util/elf/constants.py
+index d86b39483..19b72cfa1 100644
+--- a/lib/portage/util/elf/constants.py
++++ b/lib/portage/util/elf/constants.py
+@@ -36,6 +36,7 @@ EM_X86_64 = 62
+ EM_ALTERA_NIOS2 = 113
+ EM_AARCH64 = 183
+ EM_RISCV = 243
++EM_LOONGARCH = 258
+ EM_ALPHA = 0x9026
+ 
+ E_ENTRY = 24
+@@ -52,3 +53,11 @@ EF_RISCV_FLOAT_ABI_SOFT = 0x0000
+ EF_RISCV_FLOAT_ABI_SINGLE = 0x0002
+ EF_RISCV_FLOAT_ABI_DOUBLE = 0x0004
+ EF_RISCV_FLOAT_ABI_QUAD = 0x0006
++
++EF_LOONGARCH_ABI_LP64_SOFT_FLOAT = 0b001
++EF_LOONGARCH_ABI_LP64_SINGLE_FLOAT = 0b010
++EF_LOONGARCH_ABI_LP64_DOUBLE_FLOAT = 0b011
++EF_LOONGARCH_ABI_ILP32_SOFT_FLOAT = 0b101
++EF_LOONGARCH_ABI_ILP32_SINGLE_FLOAT = 0b110
++EF_LOONGARCH_ABI_ILP32_DOUBLE_FLOAT = 0b111
++EF_LOONGARCH_ABI_MASK = 0x07
+-- 
+2.35.1
+
diff --git a/sys-apps/portage/portage-3.0.30-r1.ebuild b/sys-apps/portage/portage-3.0.30-r3.ebuild
index 142f3b42ff89..142f3b42ff89 100644
--- a/sys-apps/portage/portage-3.0.30-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.30-r3.ebuild
diff --git a/sys-apps/portage/portage-3.0.30-r2.ebuild b/sys-apps/portage/portage-3.0.30-r4.ebuild
index 41d008c12f34..41d008c12f34 100644
--- a/sys-apps/portage/portage-3.0.30-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.30-r4.ebuild
diff --git a/sys-apps/portage/portage-3.0.30-r5.ebuild b/sys-apps/portage/portage-3.0.30-r5.ebuild
new file mode 100644
index 000000000000..e3b118e52957
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.30-r5.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		>=app-shells/bash-5.0:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=sec-keys/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/3.0.30-revert-default-enable-soname-dependencies.patch"
+		"${FILESDIR}/3.0.30-revert-run-warn.patch"
+		"${FILESDIR}/3.0.30-qa-checks.patch"
+		"${FILESDIR}/3.0.30-loong-abis.patch"
+	)
+
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions && ! tc-is-cross-compiler; then
+		printf "[build_ext]\nportage_ext_modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	if ! use build; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 40885ec7c363..3e04ac1f7d59 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -3,5 +3,5 @@ AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9
 DIST rng-tools-6.14.tar.gz 60277 BLAKE2B 177065f9ea68b68459d034d38278f866a0c9d5c499578fabcc29ceb387b49667393f23dcae9f13ff401599846e872dbada73f5e319a99dfa4605cdb77ee3e896 SHA512 6a267257292697023cd349a5bda4998e39e874969f2b437eb2498f2d7d70a7ed293ca76b4c83aebf80955e33f6c8f8bbb65c6636cc0979e0e0d80d148380b8c7
 DIST rng-tools-6.15.tar.gz 60731 BLAKE2B 693056ca600448d07413661498ca33893e99648c6344e02f2f0babb014878b9452e024904f5b58efc6cfe72201e582a6b458664d11160bb1b0dbdc28ba6325c5 SHA512 44146d891c4f46675a031f2e5ff7755cfaf1abe3252f241c16e042d3bb5e988b77ff840382caca49d8cb9854af1e49369398a506de5e819167739ad33b58d180
 EBUILD rng-tools-6.14-r2.ebuild 1614 BLAKE2B 71d653d03e6efdd46783d53dbe0306b417dfb56d06f3a658ff1e158d761bd5234d7b6d00f7318374e299e678b9b8ee368263c498702a91c2c5df7e98e69e6f15 SHA512 5d0c3bda93eae06d80c87dadafbcc00604bc962590d8ddc6b2c4d3fa8ebee757f081890b41345a60307dd144259526679a7cec655d4928293b863eeecfd37c76
-EBUILD rng-tools-6.15.ebuild 1620 BLAKE2B 7ecc142ac92e10c546656bb1cd8c5ba7651da6f97ac3c6564d6f3da690b22bfe3d568746f13a0eb0fa2fe3255daa3cd88869c62195d182eb57ab3f5e16212caa SHA512 a56af0a592c76a35b9969e6dd54511c582f8d03f4f1085adf7ec197627e388603e447cd454cd2a90af96826633b53f19bd29e5be709d09041c8c4312b9fc4824
+EBUILD rng-tools-6.15.ebuild 1619 BLAKE2B 3cbfc2bc50d3fff64ff1473cb0eae22f72c58a8e14fcce017bfcf83d3abb9f5bb71ebe9581c8d2e0d192e77effe8593c5e3c68edcf569c1f318639eca64a2d5e SHA512 5e25d099db7d28456b4fc86e04c6777c3aaca44fa183e54f57b5feccb0f8c8b211b45edc33376d0ef167d9ecad27a2db3de206eee75c6999f8cd802773a2db24
 MISC metadata.xml 826 BLAKE2B 6a0fb04e17c209dcbf342357d8b044258533e877bc191d3afea272d379f02e75af2fbf912a840db32313e2fbf418c25556d423aec7793a0fca0fbaca5a4feb18 SHA512 24e9616ab14295a4cc0101752734332e98bb0299c42e831a0db9262527f83433174b704d3b1114841c4a00c82adfbe07b7473b2d57ec85d9358f41bff3797f3c
diff --git a/sys-apps/rng-tools/rng-tools-6.15.ebuild b/sys-apps/rng-tools/rng-tools-6.15.ebuild
index fde3616954b5..6f8f8bee081e 100644
--- a/sys-apps/rng-tools/rng-tools-6.15.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~riscv ~x86"
 IUSE="jitterentropy nistbeacon pkcs11 rtlsdr selinux"
 
 DEPEND="
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index baa9a42a2069..5e7bd55977b2 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,5 +1,5 @@
 DIST s390-tools-2.12.0.tar.gz 1186816 BLAKE2B bdf7975d236ec939539221ba548d67582836ae1ef8fab29ff19ac32596ba60686d41db47412bfe7a86d74a1728e3ee41356403ba21557cec4400a2aae98165df SHA512 4903ded5368966513e1090faca04482316870cf5fc53206d17ab98b821541e2836a016bd18cd1ca49ed6b5df0dff92dd1ed257ff712920a7aa3fd74e4a6bc6a0
 DIST s390-tools-2.9.0.tar.gz 1162090 BLAKE2B a86b8b1859d125f476a96546163881723cf87536a654871269c23ec6e72266776083f5d49bff3c65c2a01af7de985d2079cc9504a605e3d42de297a464b8ee69 SHA512 23315e8914a5c797b0678298ff51fd95a3c9f065b0fa9f6cf954573fd5ad394890d7f8dbd9cf2501d845c76c3fe31952b25cb7c2b2d59744305b2f37cf3a65bb
-EBUILD s390-tools-2.12.0.ebuild 1560 BLAKE2B a386b182efb8fac0045a5ad5deb3b70f39d5d6fccc91a92edab87210ea096c7067e6ea24a5cecbf6526739f262667a6cd8cd1072129d94dc53c3aab7df8a6415 SHA512 f63cb8d370b47e927a813a6c02541dfa6601f279f06063115df4b2e9c626ee471600bde05fc170d848ca280135fea4b2a27008ec11e28818b3f1b33ff7039b91
+EBUILD s390-tools-2.12.0.ebuild 1552 BLAKE2B d2d3cde25a32bb41dd3f5d398c539c0cc0f9f8fc1673fc69d097a3b8285e2eaa4203c5e668c564c04e9cedf605c93afa773173bc0edcf7a9748dedc058816c15 SHA512 ad7df34a876f0f0ff0b7adfbd573567cb6259476bc90b0cc1ab1dd3083195e4248d450c29ae22b8cabfd48738879ac2ee7158644e3b503fce6de39106a893311
 EBUILD s390-tools-2.9.0.ebuild 1558 BLAKE2B 3cb867c60c43f8c1c9aa13d2e04bfbe1f0d992e76f69ec98cb4e67e1995e1cdad71bca54f5d400f1a9aebeebf8f362b8941323766e212295a1db928c75b23f6b SHA512 570f5c924efc1a69927ef8c3aa105fd6213bbb5827c15796b79fdfbed124d6f2b3efd7e2026dc73c5c1a8716c0800a5b05871d2b4ae83cf5e0b0da135b2885c8
 MISC metadata.xml 732 BLAKE2B bc8ce837c2104840df2812e5efdcd33edcd26a31f23fe2a8b978011dd6fe5113d79d59243dfeee88ca3a618d57ffbbff821fae98b535b8444ab48438595bd9af SHA512 31182ba6f9b6e7f4c8682194337bbd2e65eb39b7b5195ccca155c4c7e829d5dbb58c0fcab95bc8bd0179ee2d56b5053d3357c727f6ed3934775e49047a868f5f
diff --git a/sys-apps/s390-tools/s390-tools-2.12.0.ebuild b/sys-apps/s390-tools/s390-tools-2.12.0.ebuild
index 4c890c3a9d1a..cac302c78a9f 100644
--- a/sys-apps/s390-tools/s390-tools-2.12.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -26,9 +26,8 @@ RDEPEND="fuse? ( sys-fs/fuse:0= )
 	pfm? ( app-misc/pfm )
 	snmp? ( net-analyzer/net-snmp )
 	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	dev-util/indent
-	app-admin/genromfs"
+DEPEND="${RDEPEND}"
+BDEPEND="app-admin/genromfs"
 
 src_prepare() {
 	default
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 64b9275941fc..96e4b5d7b74e 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -2,6 +2,6 @@ DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c
 DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64
 DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3
 EBUILD s6-linux-init-1.0.4.2.ebuild 1792 BLAKE2B 13834f7a4794db95f5cca7b98b8e2a119d5ba341a81a256ea953987c04994224d7108c43a0e375cf003821089f5973640e2399f3ce656d636abef7f3ed58fbed SHA512 83a8813ae4d6d6fe87d23c74e8093a999e52d29d4b4433172ff13dc55ecbb750da5729aa8f899b874ab0fbdea82eb21b5f82a4d975fc75de45c37422b64d0d83
-EBUILD s6-linux-init-1.0.7.1.ebuild 1735 BLAKE2B e51d817eca7b4bb5a384309551029d5a79c584579fafc8fba909e38e566d0980829585e9ba0fb1042d337e6fd39e59c33226611c1068cd6526c62538f3eb06c2 SHA512 68766c6a3edf3368810cd029d24cbe1e20fea33006f2e2022c6418c2cf802a8c30b7eb4506eba6c2ffb8b9feb40b8ab138ee7e27006cee59cb93f1346825e20d
+EBUILD s6-linux-init-1.0.7.1.ebuild 1734 BLAKE2B 68c3cd8aa92cd63dc66997ef24291d83b78b735cbfe68bcecfe18eafbb4626ad4d28eea1f825ab9dc4b14e3ff290a7d84bfed9260882e846cf9bed321ec089d1 SHA512 bec91dde8777bd4694528cea56410a98d640f94b7fce97ec81763f0cefa5e59dc92fe1be8b6ec3aad027ce3eb6bb2c583c45ccab5f194744caafd9d4c9484b9b
 EBUILD s6-linux-init-1.0.7.3.ebuild 1736 BLAKE2B c4726a5a52c2f662471f13bdcd644b5c3260b299a9a49dad3bf2948e9ce0aaa7d12ba9a52a6b8ec09a16e3fef96dad03c990636c181e77c4495cd7d77f8bb38a SHA512 ba7b39e4e7a14c03de166fd3bd9fdcecd97e71e06466108bfb692a0d02cd2e1e3fa81e8f9d84de3d9ce54985867f5a93b5dfe6da7aeb8d3373dbc55cd08b294a
 MISC metadata.xml 762 BLAKE2B c6fcd5da4965ab30aa041c568356cbe8fefb5df76f5396d5d47264d1463730be034b8a8fa96bfa8961bd27ea253495b340ce07da6f16f59ed1d657da560d36bc SHA512 ef5a96b38cc3b927841a7d7e9bdc27d6609c95f585b93c8e6496c57743cdb3d0335434c63d0634207c4554d8a0aaaebd2c0ec06e953d3065dd119db6972e1666
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
index 13438c848234..305a8b7a163c 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index e241987ae47d..9164557f4d6a 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,5 +1,5 @@
 DIST s6-linux-utils-2.5.1.3.tar.gz 35549 BLAKE2B e39dcf141839e6fc4554ba10fc89daaa7b9600ffa4360c80d3278d49224c88f124588ec988a2386a3243923002a16d9829d4828c829fda18745356fa6774175d SHA512 73c887e67251c162677b2151d37a1cdbb9cee6f50bd52c5eefd4750f9bf77452a023e0484891e384312fb169dfbe02af3d4cfecb17d34f1668cc0acb8d7a9181
 DIST s6-linux-utils-2.5.1.7.tar.gz 36574 BLAKE2B 53b5c46e84873df2263eb05ef6dae2321957e2065966854402f819cff6712de991a3a3c480325556e53491c9016deb52c0a437a8b9bcc721dac97e31c98ba501 SHA512 dabe510d0a4d045578309beeec17aa1b4f88acb09513be65c31a7b338bd50fcb7cc809015fa7328c4a310b838f1335e754f49a12dcf369483c83294b5957156c
 EBUILD s6-linux-utils-2.5.1.3.ebuild 1115 BLAKE2B a2709fa8f63247cbb652ae9a4af0b639d199b7676946163d50f20254ebce130941acaae68900e4e1ac8a5a8c1e38da231de557815439aa51b9f1c948b9dc0287 SHA512 39ac3a5b2d126ea8e3601230727e5cb650417aa69ab5fbfab5eb69ad5dbea144a2a2294b1c2bd9bab19d488886b650986dc7192655eadb5c0dbb98c2268762e6
-EBUILD s6-linux-utils-2.5.1.7.ebuild 1072 BLAKE2B 08e14813aa520e25d628fc794925f54cec28eeee0d7ee87820cd107d94e60b73b6b498f3bda4dbadb371bf3109900be0b0e75bbeda2b2c9edfc2f82e2b8562a6 SHA512 e62bf24ed80ae76cdecb2de946081d5c6975c61301e54e97d8320ce783edc1c7e12404d97e909c5f5b34c26ef12d31da6435f5798b06478fd3b8a38df304988c
+EBUILD s6-linux-utils-2.5.1.7.ebuild 1071 BLAKE2B 5eb4a0a9d77d72e6ff3fc82f0d0a6b959ed7bef4288667b059c9f39c01e33fa16b7ca8e17fd39d4ddbe02aedb00c7bb5560dbf5e021ae7b6d91cfd7a46299b40 SHA512 8ed1649c5e5e1da603cca0a09897a9ff399685da241c3c521f43c9f066f8a866d852c1921ae2f0bdbe02fed68f6b5903fee420107c278e1ae5ec6811fe455deb
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
index 2c23500a4dc7..3a7aed22a1ac 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="static"
 
 RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )"
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 9779163ca1f5..f9b5d782e0c3 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -2,6 +2,6 @@ DIST s6-portable-utils-2.2.3.0.tar.gz 49239 BLAKE2B 3be6d6f7b92eea4fb67e3e52ced4
 DIST s6-portable-utils-2.2.3.4.tar.gz 50120 BLAKE2B 17eecbf432b91720ed672e0388665e3dd7302fa2638225d0cdb9ad3c580fa29734ebf5f6e838e1bc4fdcec841ac4414d5b13d78ccb9167f5fad18dc763d8f611 SHA512 1bb9f7bd1c00d12d8434dbabb7061fe589ee9de9f0745399aacf560712bb0c9b4df2dbc221b0c8144c351e9976982c7a7e69dd127517281799d810596d8db5a2
 DIST s6-portable-utils-2.2.4.0.tar.gz 50343 BLAKE2B edfbe4ab48914ae485072f220931e6af4d53fc8d1c1dc5e1186bc1688a429e6d14a370b02dbe0a9b641a8204f65e6f6bfb6cb0c0c9318acf89d9f6ad7f7f914f SHA512 35b62aff76b9fbf978e81dad2f343a2542cb4a853530948cc3b446b20e8d5f976d1624194c2aad6e0277b73d23d5cecf2142e3f2916bd152ad62342fc30fe07a
 EBUILD s6-portable-utils-2.2.3.0.ebuild 1128 BLAKE2B 028d23ac9833e15903d5a4bb8bde19423993280bc38c210ff31de80bf885f0aa216a55b2dc047df4ba565d4af5e4b53c08fe8488f6765697b77c8d667b5932eb SHA512 33674630d7611880b44a67cf390037007b8f321c138fe49be1588a3e27d75639d63b804cf60d9c5639b62cff5d5c355f34c75526c5bc614a6c5998985e90a898
-EBUILD s6-portable-utils-2.2.3.4.ebuild 1076 BLAKE2B fd827dcdde5e83a1200301a51f6deba9c7499c7cacf5c400415c3927c2a98221cbe3ebeb67bfa3b3a4e298d3f868b15018f1ff99d1b1b0b3b6c04fd78da2b361 SHA512 9411318d743838415bdf9f0c25982ce96e860f4dac7c45ebe7d79b2c41e418353d678736d3095693278c1c699121df3ee96d6541d0022a26d104a18d98648344
+EBUILD s6-portable-utils-2.2.3.4.ebuild 1075 BLAKE2B f5b3b90648b618522c9a12658fc397010f8afa09329e6f13384e3d2e9f66a374a474ce456c646bf9914d56b8448f062278869356549ceaa4a2dae09a52b46304 SHA512 4e6a7ecd36e4525e07a4df1ebf2750aa2eb73b19b4c7bbb6f67c49f8908ccab0f11a2ed085491aff8b9c2c5bda8023b9e9b937f2c543537e0c673521f8f1ed3d
 EBUILD s6-portable-utils-2.2.4.0.ebuild 1077 BLAKE2B 1a6204b90ece44b6f12cfb259e9ecba89552848f5759b0793b1ed9d7e93cbd925672c7e2a467b0e83824f6af5ddf1d7bff9cb90d0c2b4775fb967e0e5d2cf906 SHA512 250d3c598588b128dcbba24a5ef657798b158262ef9fb868e6000aceb48c92d082a85124c9a33f0dbdc32e7dfee9d1373a361642fbeff1e5e614364fd8b857db
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild
index 7b110be210be..e94c0ff91382 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static"
 
 RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )"
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index dc6440d89d57..ab393c29ef56 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,5 +1,5 @@
 DIST s6-rc-0.5.2.0.tar.gz 98758 BLAKE2B 9de7a96a67be33dd152a801af1f85d2feeed6581e96cb5f9ea4f9497326061096fff4873e068d5eb9a7361aad6dc11e8c43566d4f108cccf0a56378448bc4df8 SHA512 663cddac2b60143703cf9cc33777ead2a283eb9cba53add726849e1c95418fa2729e0d3bc5dafe8879a5ce036f705e344aaf3f7e2f287fbd6c2a68e9dcbb01f5
 DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1 SHA512 0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
 EBUILD s6-rc-0.5.2.0.ebuild 1613 BLAKE2B 8eaf3b4e3598ad22f0e4e26c54cab9bfb7e0592c5f3b2147ebc82841f5d7b45d3611ba60ef14e09358179dce3aa14bb7f96d568c40313cf15cb41659818ec708 SHA512 6035993720a534dc85be24466c65b3edda4d4b47da166fe1e360ebeae5f4e480fcff4fd5dd4c6e7cd47b5f94942302ce75e10d1256ec4a1765327fd5337fed5c
-EBUILD s6-rc-0.5.3.0.ebuild 1556 BLAKE2B 85863cde249edc5f12849edf0051fae44cdb62525ad8ab6ad5e29c42bbd76cabd107a6425eefbf09cf5b1fddb8ec2266aa95ce62e19e1d665d25d1b6a4e68a45 SHA512 79c0d9e298d09fe49f7184f1dc08476e6958dda47bc28af7f18133006ec414e360a7df341ae42136e220a38a244fdeb5e0ce15190e0d4e12719d199183d5d43b
+EBUILD s6-rc-0.5.3.0.ebuild 1555 BLAKE2B 4999b9c4e4c54a6054a4f51b5a7c1bcb10ea6da1c78c664f2cb0e039451bc3ee4b8e1c3e5e324632278da9f8836da40594cc108315bb17024de12d56ead0d039 SHA512 596b1f9c1261ad6dcac1bba72080285a51d2ccb00714970824ac39ab5cfa49b92a28a231571ffd57947d2f930ba7b3ec85f4b3c1b9913fb5a1f0b2079192d3cc
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
index 4f20f1c0aa33..6feff233b4ae 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index b8ac75d1ac8f..f101f06160a8 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,7 +1,7 @@
 DIST s6-2.11.0.1.tar.gz 227802 BLAKE2B 76721fdbc4fdbcb11d20eff31b817e66c49a488290ac8564a0418c5cd2ba3a204625dac2ce0dedcc8fccb18f54c5178253627f6874160b748db323cb4a34f32e SHA512 e833ae42d7094a46eea4d914c8e9b07b030cab2c6010c1d7698a070d14adbb62a614822a9575a3064a6b8a5a856146fc9fa27661f0d84569dac14ad6cdbf84d9
 DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
 DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee
-EBUILD s6-2.11.0.1.ebuild 1304 BLAKE2B 95d3453f3ca0cc1857ea57b3cbdd8a8c556c93f2752d10bd395e49bed858d1a4bdea5a4fe70066a842bf1f5b898b0614879c84adcc15fc9ddf259d8713e30bc1 SHA512 787ccf48ef743562907ffb5d144f723d1e94615536a8e44b4eedcbd6e85185bc21a97ed0873c7e5f12693829fb63767076c90c2ccb1e9c64ba7a137e7529aceb
+EBUILD s6-2.11.0.1.ebuild 1303 BLAKE2B 48e80812dfdecce6aca5998024b95aaa25533f0dd6c73e03a7c41ea7b898b1388b3941b32ccf111912e7da89821f658fa1e0c4a1447bcff16c84825b58b88748 SHA512 0b2ba15254cd187e8594d1124e0431e7d6a64ce21578f36dd6e6309da93e64452ddc80b5c56d6fcd10770358df47b4f45e78c140f35ff6adb9cc2abbf7a8e552
 EBUILD s6-2.11.1.0.ebuild 1305 BLAKE2B 61b02f5abb1138a61a431f8ae267e0a5746ac6e8b759a5eca11b1845fc3ca5d18b9bedd6396508de68148aa718cdfade3684bdf5bfb446968f6920a867b71375 SHA512 ed187f4373043e66ab0aadba46ce10e350c7d5c1e596e67e5701e8de750c70ec6348d636d8dfd9b69413b233c0dbbbde6a44be140c4d3cc24e5e8c1e6db11dd5
 EBUILD s6-2.9.2.0.ebuild 1360 BLAKE2B b031627f947e70b106b19335538a7873430dfba114d8c8fa5384570eb99d43c276777c4a6943bfac5808d57d8f0767e071db9a1405d44e758f71f90c6812ba89 SHA512 37b8ec76eeb1a008a5694ce07181a7b76bbeaf4e5ad445028e0fd0fecfd230541b8b68d529cfc59012e352b2116e2baf2b2508038edc0fbc2391b28aaa884781
 MISC metadata.xml 883 BLAKE2B 501518e15b1abd7badfd84007057b30f5ce972d7da8997ebbc218db6aa4001e06500f3b42f88ff259324bd3ba732231275cd33f27baa1588e28b9b80098befa9 SHA512 98b763747501225ebb0a5a1b8fb8a49757bb64c792c572f01c84dbdfe62ae83f03f72cb4ccfb905f58f9d24f06ded96a158602528ee26c1979c017477a4be183
diff --git a/sys-apps/s6/s6-2.11.0.1.ebuild b/sys-apps/s6/s6-2.11.0.1.ebuild
index e4566808cd8a..2f9f63992ca5 100644
--- a/sys-apps/s6/s6-2.11.0.1.ebuild
+++ b/sys-apps/s6/s6-2.11.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+execline static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 2772d8566da5..d0e71e6dc55b 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -10,5 +10,5 @@ EBUILD sandbox-2.25.ebuild 1615 BLAKE2B b42f819adc73df7f3c7b0f2654eeaa41f2384076
 EBUILD sandbox-2.26.ebuild 1455 BLAKE2B d1d05a952f34ec697b26176ba6183006d636d546af197277d30a1811b7200a45d1327db669ac411174e74989024f4c87d69ffbd68834e7a76fdf5a8ce8bd0446 SHA512 8fb95b39aad62153208436bb73c84fd6d891333cb251958ac2ee71913cdc59b98002f53dbb471fbbb2e76ae954b34c3cedc8c94b4f5d6e4fb65ffd40e4c8b3d7
 EBUILD sandbox-2.27.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
 EBUILD sandbox-2.28.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
-EBUILD sandbox-2.29.ebuild 1553 BLAKE2B 15711468cb189af759ad500d66626484dc435764002252b65ab49138afc66206a506f1fa462280833527358e21fbf82650a67b03404612c6cc042889f77577a3 SHA512 8bbf9fb39ea1312ee514a5ca745150f18ec796d6e7470d722d6748810c58d9fddc855aab7ade14960b97cf411f1e165054e90317512e3e832d08d5848a6f2130
+EBUILD sandbox-2.29.ebuild 1559 BLAKE2B 932256bc928e7bd353bb63314d99dd2910f0d27d162804f318bab5e6d912450b1078ba91c79441b16990726b96fa1fe6302ea1a30c8b27ec416c1226ef440932 SHA512 798034189cde52b59c4a8d613590462a0353253e9b18dd33dda80dd27c1027c3b5dd83901789390665a3a56e287ee365e1af8c50edd7948b8c0ec95809b84465
 MISC metadata.xml 377 BLAKE2B fcbc91501a4a61bfa3c3cc01b0746f5f638093933cf8a9ba1e6206071cb0482c9ba18c5c10541d934327cf805ee0e40c010b3f25a221ab63fefa2fd9f39da0d7 SHA512 92aa26a3200dd1508fb86da0e0bc70be66ccbcf66593ee6833102c9961ac17c8a99c5b070a2cd2e79dba8e5daa0316cdb6744baa3fbd9342953fcc00b1277d35
diff --git a/sys-apps/sandbox/sandbox-2.29.ebuild b/sys-apps/sandbox/sandbox-2.29.ebuild
index ce5ca66d6320..e36a8c1e59f8 100644
--- a/sys-apps/sandbox/sandbox-2.29.ebuild
+++ b/sys-apps/sandbox/sandbox-2.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+nnp"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 9174f4865c17..b2fdbe2db08f 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,4 +1,4 @@
 DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
 DIST sed-4.8.tar.xz.sig 833 BLAKE2B 8e5b3c69a28ffbfa49ef6f769fbb72c6f1ec14e6e1e0cec3851d15d85e05560a8a74e28e037eefb916b10831b4afbe0e4735d713dc3b90d7d73de7d0b1176d0b SHA512 9b886bdbd18ee2d60608cee3fd2b4193a1b6c3309d887ee05828c14b89b7b515dbf042a9e0ebdd13e6ccfa42e3cd217a408c796d68c4ebedaaa64f795000f095
-EBUILD sed-4.8.ebuild 1095 BLAKE2B 883e52e7bbbdd2cb275bd585c3592718d38eb3c73d4c891762dc8c208feb2a31bda2002b43fd66726ae99aca3965d96413119c8cc9e52c10325d03e1cdf78a9c SHA512 5fbc05e9ff3ebb467298dbff56a63b2da2e3464bb69679e5bebe7daa7e93216b7177749f558590c124784c845af2712fe8af9b3430034fcd058983c207516e64
+EBUILD sed-4.8.ebuild 1102 BLAKE2B df5b3b78d4cd505fb56c5e2321ea10fbd4b190b05af303f8dc3d760fbab118e4c56a67de95f6329375c0e1f2b42c73591e54be1ba7f478dc3a68250c32daac3f SHA512 48a545b4cf5c2d3df81a55593f0d3f31e46f154c16b3974bc6bd86952f24e717df1a4bdb3d4a57336ed0f650799bc0ebbd003785837102d4f1bb74221f8f5f40
 MISC metadata.xml 374 BLAKE2B a7f25f18d1ffcd990f11d66f403f5e283af61b7a81127b8a4450506b5432610972d4d28df0c60b5e45d502d2f2e260f0390836b43d9e5efd48e4594796f751c4 SHA512 7efb14e44bc0d9d25b0e90f776f25ee5fbcb8b44b226255dcdd5e54cb1fb414f9c7dcd33ec2aa6f6bfa82159be8bba19069fc9e13576bfe2b99a87c898f2d002
diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
index 3ecfbc9df7fd..d71ab4f61ead 100644
--- a/sys-apps/sed/sed-4.8.ebuild
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl nls selinux static"
 
 RDEPEND="
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 15398caa8572..bf5e39020ada 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -4,20 +4,6 @@ AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d3
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
-AUX shadow-4.10-libsubid-soname.patch 1329 BLAKE2B 67b1219bea1dc50e47ca8006c1c4d855ffd9db7410c4c21947d23711768603062433f41a659064a0ec9d02c3cba0082ec85d3706376ca0e1f6c643356d652ba0 SHA512 0b06ad15aaee73cd5dd8dc394476fc28ba46f70a1a0b52360b002c6b17e4d0471c41fba31d9e959b1c9dd80217f4cd83d4cabf88e2ca1c30983dd8fe7c115613
-AUX shadow-4.9-SHA-rounds.patch 1714 BLAKE2B 71dbc5189486cded95e34aa5d1b1a2af836004d42c0ccaf4b0fed7bdf525e87aaa73fd40ceb29b19eabc0043e20843aab846eaebce3e9d84d67a3106af8c3252 SHA512 f7b332818a2eb5b4c72021ca6f4befb5d067277599d9e57a5f68fa92dadfc40b6c3286627e42d237468ab3c41868b607ae35c08e2e60439ad5d08627318bfe4f
-AUX shadow-4.9-configure-typo.patch 806 BLAKE2B 3edc2b9fe1b6559617aa6a9d971d2dbc26c45ca1d8d2f5aef85b20f19e9c2f10b7c0b80fdf5767799dc25167bdcd5c81aa97e3bf37553a2e003336f06aed14a9 SHA512 e126fd489828819e8dbd64b367f7b9e38a43992938c8a1f3c36947071060f5f42b921c40a1b8ada5fb555450c7ce0924641ba47f12c519c07b1e5f13f55654cf
-AUX shadow-4.9-gpasswd-double-free.patch 931 BLAKE2B 034a929c86f9ce85aea4898836d94f5303684b0babf4b70b71fa80316421842b1fa100006199fdd16ef40da75073430ecbf3d8f812db6be6b39d820bc7e0351c SHA512 bfe68f6a54f5d477739aaa37ace842d0c1a0499aeccc505ca62d58bd01ad4dd9e43913cfcb757855f49eee932a7bceb018be4fbc96f852c3568b831cb3188ede
-AUX shadow-4.9-libcrack.patch 738 BLAKE2B 7ba0fd5e2c9c81bbefa75b2f1e29ed94ae32f302cf81c9ff978319bdb81a905248a638a535131df92c401383c184b22aff174d1a366e37a9dbb8756c9f7975ba SHA512 c967227926a5bd2c511ecc9d4e39b39aef50615404c79ad30d1e7bb967e09d52669ac9e2047d7d5039cdfad9b2dcf53f2de17a6d917cecbf9c8a72a77f1c0a10
-AUX shadow-4.9-libsubid_oot_build.patch 2933 BLAKE2B 9bc638bd1d0733c6e51b54ab1f1db132bd4499a24b33efc76c58c306267015ebd9e2e927e774c3631cfa94490bb249b4d2267a163ae85f9f6ba18b964fcc81d4 SHA512 7f42cd84cb606fde19750f26883c4650642499dc6cb0078bc733d5d61a51b39c9f1c3898000e2df8ceb84eaecadbab6ae502178bf51d205fe644bb8c58a62bfa
-AUX shadow-4.9-libsubid_pam_linking.patch 706 BLAKE2B 8d9b3f6ab2aea004275e6347568013b0092beb57d08a51e6bbca0480773525518febd0ec975dd37a9c071c5ec17d56541586b9afa12010081a392dc60cee4c13 SHA512 49a40045520358d1fb29daae30f9fef1f8aab4516596f16781d3702642ef70592959536d69f4755d57689fc6e30d029c5dfc545d95362e811a284900cb628b6b
-DIST shadow-4.10.tar.xz 1662364 BLAKE2B 80b5f0f6b8fbb3e2ca134e14e93a3f67e5baa34d793ace5b90690676634f4cc72dfb4b3d50dbd7626c1a144898c1c943f8acbc8121903f17519c981986c284ae SHA512 39ffc1863d1f84aa39a2983c08e5adb93642b09e3e5e65c1c4e8a342207a79201b199e518e3701726014c7cb736977ef275d2dc1c659b5776183ae73978357da
 DIST shadow-4.11.1.tar.xz 1656584 BLAKE2B d459a1e0ffb342b6b455caf65e6af60b32eee72d4a9b1ab126485fb4632503a42061d3f0b960554c8155af6dc0564c585335b27aecca6538b394a0d58d927588 SHA512 12fbe4d6ac929ad3c21525ed0f1026b5b678ccec9762f2ec7e611d9c180934def506325f2835fb750dd30af035b592f827ff151cd6e4c805aaaf8e01425c279f
-DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
-DIST shadow-4.9.tar.xz 1627008 BLAKE2B 7a9a6a489115c7a20520cfec61f008fc0f70f7f50aaf539e94dfdcb20035d2de88ab3198e76812a4e3eb944b92c76c0ca2e85e35f4342537711c2c033248a72b SHA512 254cda49bb14505a7604821e7fa898bf4bf317d648e9ddc881ab80a6860d52053dfffacad6feab87c7d16608c35ed6b6cee99e7757eac930da3a7b31cdcd4b95
-EBUILD shadow-4.10-r4.ebuild 6298 BLAKE2B 239be497a87a4ae3442c0aaf10b6f97f417d734eb41f7ef4ea1a4afb3951a9bc44922b6b624667066ed0172b7727cccc8da1ad98cafc7530e024b7eaf3714d14 SHA512 9c118d0fc3e81bf4300787b40bc03e4107be12cbebf32e311e866e9ccafa337e109448b8e7e6e0b5021d9ae7c3da45bfe3db4b3543a190505da251f4df4b5bb3
-EBUILD shadow-4.11.1.ebuild 6240 BLAKE2B 5f43aa097c5bdabb28dc6619293b9d4b58721f8c5ee565799b9a80a4ee05f549e51cf518e39d11f9c48f9216a757359841c448b18a9f75448a84d45a0b98fe99 SHA512 3f6c366e67520f311a1e469877335b08e760598381387650b38245f6bcfea7111d0b0a86f369f22676cb583f7879dc46024f17927e3bf422bc432d1e37f888c7
-EBUILD shadow-4.8.1-r4.ebuild 6057 BLAKE2B 88aef5e1dcbb7e3206040b43758336a18f60b60dc29e9cd3b67da71da5aa3d213d37a7fd3475979934a3c08061701d12d8761cd17b55f0609d9d331a3ffa0b33 SHA512 b838166f8cf0a7bd128b02b2368010251a0d65d65a3ab0bc3817a73d7393d297a055482fc5b431f239383ed07fb60bc351576f2bf725f17c023d39ef541e93a1
-EBUILD shadow-4.9-r3.ebuild 6035 BLAKE2B 7ed01b79a23ab4a88db83a16bf421edd1c4842cccdcc4228ffc3e33abd21c948bfb7c6e6ef50a33b0c591d7313653fbc5c9f367fa60c30b4c5e6baa02837e89c SHA512 10949dfabf88d084adaf12339d837632c4231e7038c57dd1432df686f1e70cd82aeacbc4d500ea628181944bfe0e82790be2916ee52d3c3a62e10d423760bfc6
-EBUILD shadow-4.9-r4.ebuild 6122 BLAKE2B 62ecf5fc7a4d294435087bb697454110d7ad9bd6788afe7a82f0e2604466d60b5926762307504276aa91cb290848548e35b8321409e241284224adc2f262b6d5 SHA512 5105979473441075eec2b2148e65a20e381de32a0d9a60dd9dc885726b52cdda7a7ccae878f42afb11924c1baf1a72263155c1153efd2aacc3ad35448793ddfa
+EBUILD shadow-4.11.1.ebuild 6247 BLAKE2B 1aa58e8496f45bfa85c1d9a9893eeb31629ea6709b81451e68a42369f7bfb293c538bc1b2d458afbd30a7c9511d88c8f977c7ec4283b38553de454f5b1712ef1 SHA512 021974ec33b5cc1d512a6c1626b7e71787b30ecf331aa9aba214b1f37a2ea8ef02f53dcc186ee2ccdd304845af3f5ae8526da5073611f90e26cb45840ed2aed6
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch b/sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch
deleted file mode 100644
index e2f8ddf466d9..000000000000
--- a/sys-apps/shadow/files/shadow-4.10-libsubid-soname.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/shadow-maint/shadow/pull/463
-
-From: Sam James <sam@gentoo.org>
-Date: Mon, 20 Dec 2021 01:37:23 +0000
-Subject: [PATCH] libsubid: fix defining SONAME version
-
-We were overriding this when --enable-shared was passed. We can actually
-just dump the conditional logic as libtool will do the right thing for
-us here anyway.
-
-Without this patch, libsubid is installed as .0.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -321,8 +321,6 @@ if test "$with_sha_crypt" = "yes"; then
- 	AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms])
- fi
- 
--AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes")
--
- AM_CONDITIONAL(USE_BCRYPT, test "x$with_bcrypt" = "xyes")
- if test "$with_bcrypt" = "yes"; then
- 	AC_DEFINE(USE_BCRYPT, 1, [Define to allow the bcrypt password encryption algorithm])
---- a/libsubid/Makefile.am
-+++ b/libsubid/Makefile.am
-@@ -1,10 +1,6 @@
- lib_LTLIBRARIES = libsubid.la
--if ENABLE_SHARED
--libsubid_la_LDFLAGS = -Wl,-soname,libsubid.so.@LIBSUBID_ABI@ \
--	-shared -version-info @LIBSUBID_ABI_MAJOR@
--endif
- libsubid_la_SOURCES = api.c
--libsubid_la_LDFLAGS = -export-symbols-regex '^subid_'
-+libsubid_la_LDFLAGS = -version-info @LIBSUBID_ABI_MAJOR@ -export-symbols-regex '^subid_'
- 
- pkginclude_HEADERS = subid.h
- 
diff --git a/sys-apps/shadow/files/shadow-4.9-SHA-rounds.patch b/sys-apps/shadow/files/shadow-4.9-SHA-rounds.patch
deleted file mode 100644
index 05be7adc1b19..000000000000
--- a/sys-apps/shadow/files/shadow-4.9-SHA-rounds.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 234e8fa7b134d1ebabfdad980a3ae5b63c046c62 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 14 Aug 2021 13:24:34 -0400
-Subject: [PATCH] libmisc: fix default value in SHA_get_salt_rounds()
-
-If SHA_CRYPT_MIN_ROUNDS and SHA_CRYPT_MAX_ROUNDS are both unspecified,
-use SHA_ROUNDS_DEFAULT.
-
-Previously, the code fell through, calling shadow_random(-1, -1). This
-ultimately set rounds = (unsigned long) -1, which ends up being a very
-large number! This then got capped to SHA_ROUNDS_MAX later in the
-function.
-
-The new behavior matches BCRYPT_get_salt_rounds().
-
-Bug: https://bugs.gentoo.org/808195
-Fixes: https://github.com/shadow-maint/shadow/issues/393
----
- libmisc/salt.c | 21 +++++++++++----------
- 1 file changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/libmisc/salt.c b/libmisc/salt.c
-index 91d528fd..30eefb9c 100644
---- a/libmisc/salt.c
-+++ b/libmisc/salt.c
-@@ -223,20 +223,21 @@ static /*@observer@*/const unsigned long SHA_get_salt_rounds (/*@null@*/int *pre
- 		if ((-1 == min_rounds) && (-1 == max_rounds)) {
- 			rounds = SHA_ROUNDS_DEFAULT;
- 		}
-+		else {
-+			if (-1 == min_rounds) {
-+				min_rounds = max_rounds;
-+			}
- 
--		if (-1 == min_rounds) {
--			min_rounds = max_rounds;
--		}
-+			if (-1 == max_rounds) {
-+				max_rounds = min_rounds;
-+			}
- 
--		if (-1 == max_rounds) {
--			max_rounds = min_rounds;
--		}
-+			if (min_rounds > max_rounds) {
-+				max_rounds = min_rounds;
-+			}
- 
--		if (min_rounds > max_rounds) {
--			max_rounds = min_rounds;
-+			rounds = (unsigned long) shadow_random (min_rounds, max_rounds);
- 		}
--
--		rounds = (unsigned long) shadow_random (min_rounds, max_rounds);
- 	} else if (0 == *prefered_rounds) {
- 		rounds = SHA_ROUNDS_DEFAULT;
- 	} else {
diff --git a/sys-apps/shadow/files/shadow-4.9-configure-typo.patch b/sys-apps/shadow/files/shadow-4.9-configure-typo.patch
deleted file mode 100644
index 1a6db304a013..000000000000
--- a/sys-apps/shadow/files/shadow-4.9-configure-typo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/shadow-maint/shadow/commit/049f9a7f6b320c728a6274299041e360381d7cd5
-
-From 049f9a7f6b320c728a6274299041e360381d7cd5 Mon Sep 17 00:00:00 2001
-From: Andy Zaugg <andy.zaugg@gmail.com>
-Date: Tue, 21 Sep 2021 21:51:10 -0700
-Subject: [PATCH] Fix parentheses in configure.ac
-
-Resolving issue https://github.com/shadow-maint/shadow/issues/419
---- a/configure.ac
-+++ b/configure.ac
-@@ -345,7 +345,7 @@ if test "$with_sssd" = "yes"; then
- 	              [AC_MSG_ERROR([posix_spawn is needed for sssd support])])
- fi
- 
--AS_IF([test "$with_su" != "no"], AC_DEFINE(WITH_SU, 1, [Build with su])])
-+AS_IF([test "$with_su" != "no"], AC_DEFINE(WITH_SU, 1, [Build with su]))
- AM_CONDITIONAL([WITH_SU], [test "x$with_su" != "xno"])
- 
- dnl Check for some functions in libc first, only if not found check for
diff --git a/sys-apps/shadow/files/shadow-4.9-gpasswd-double-free.patch b/sys-apps/shadow/files/shadow-4.9-gpasswd-double-free.patch
deleted file mode 100644
index d7102ce03c32..000000000000
--- a/sys-apps/shadow/files/shadow-4.9-gpasswd-double-free.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/shadow-maint/shadow/commit/117bc66c6f95fa85ca75ecfdb8fbd3615deca0b6
-
-From 117bc66c6f95fa85ca75ecfdb8fbd3615deca0b6 Mon Sep 17 00:00:00 2001
-From: Michael Vetter <jubalh@iodoru.org>
-Date: Mon, 20 Sep 2021 11:04:50 +0200
-Subject: [PATCH] Only free sgent if it was initialized
-
-`sgent` is only initialized in `get_group()` if `is_shadowgrp` is true.
-So we should also only attempt to free it if this is actually the case.
-
-Can otherwise lead to:
-```
-free() double free detected in tcache 2 (gpasswd)
-```
---- a/src/gpasswd.c
-+++ b/src/gpasswd.c
-@@ -1207,11 +1207,13 @@ int main (int argc, char **argv)
- 	sssd_flush_cache (SSSD_DB_GROUP);
- 
- #ifdef SHADOWGRP
--	if (sgent.sg_adm) {
--		xfree(sgent.sg_adm);
--	}
--	if (sgent.sg_mem) {
--		xfree(sgent.sg_mem);
-+	if (is_shadowgrp) {
-+		if (sgent.sg_adm) {
-+			xfree(sgent.sg_adm);
-+		}
-+		if (sgent.sg_mem) {
-+			xfree(sgent.sg_mem);
-+		}
- 	}
- #endif
- 	if (grent.gr_mem) {
diff --git a/sys-apps/shadow/files/shadow-4.9-libcrack.patch b/sys-apps/shadow/files/shadow-4.9-libcrack.patch
deleted file mode 100644
index 5c954feac1ae..000000000000
--- a/sys-apps/shadow/files/shadow-4.9-libcrack.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6becc82e262205f8a23bf9fe1127af57286826ee Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 2 Aug 2021 11:51:44 -0400
-Subject: [PATCH] libsubid: fix build with libcrack
-
-Fixes a link failure:
-
-  ../libsubid/.libs/libsubid.so: undefined reference to `FascistCheck'
-
-Bug: https://bugs.gentoo.org/806124
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- libsubid/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
-index 8bba02ab..bfc982ef 100644
---- a/libsubid/Makefile.am
-+++ b/libsubid/Makefile.am
-@@ -11,6 +11,7 @@ MISCLIBS = \
- 	$(LIBAUDIT) \
- 	$(LIBSELINUX) \
- 	$(LIBSEMANAGE) \
-+	$(LIBCRACK) \
- 	$(LIBCRYPT_NOPAM) \
- 	$(LIBSKEY) \
- 	$(LIBMD) \
diff --git a/sys-apps/shadow/files/shadow-4.9-libsubid_oot_build.patch b/sys-apps/shadow/files/shadow-4.9-libsubid_oot_build.patch
deleted file mode 100644
index 6609ccd6d3a5..000000000000
--- a/sys-apps/shadow/files/shadow-4.9-libsubid_oot_build.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 537b8cd90be7b47b45c45cfd27765ef85eb0ebf1 Mon Sep 17 00:00:00 2001
-From: Serge Hallyn <serge@hallyn.com>
-Date: Fri, 23 Jul 2021 17:51:13 -0500
-Subject: [PATCH] Fix out of tree builds with respect to libsubid includes
-
-There's a better way to do this, and I hope to clean that up,
-but this fixes out of tree builds for me right now.
-
-Closes #386
-
-Signed-off-by: Serge Hallyn <serge@hallyn.com>
----
- lib/Makefile.am      | 2 ++
- libmisc/Makefile.am  | 2 +-
- libsubid/Makefile.am | 4 ++--
- src/Makefile.am      | 6 ++++++
- 4 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index ecf3ee25..5ac2e111 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -10,6 +10,8 @@ if HAVE_VENDORDIR
- libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
- endif
- 
-+libshadow_la_CPPFLAGS += -I$(top_srcdir)
-+
- libshadow_la_SOURCES = \
- 	commonio.c \
- 	commonio.h \
-diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
-index 9766a7ec..9f237e0d 100644
---- a/libmisc/Makefile.am
-+++ b/libmisc/Makefile.am
-@@ -1,7 +1,7 @@
- 
- EXTRA_DIST = .indent.pro xgetXXbyYY.c
- 
--AM_CPPFLAGS = -I$(top_srcdir)/lib $(ECONF_CPPFLAGS)
-+AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS)
- 
- noinst_LTLIBRARIES = libmisc.la
- 
-diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
-index 83051560..99308c1f 100644
---- a/libsubid/Makefile.am
-+++ b/libsubid/Makefile.am
-@@ -20,8 +20,8 @@ MISCLIBS = \
- 	$(LIBPAM)
- 
- libsubid_la_LIBADD = \
--	$(top_srcdir)/lib/libshadow.la \
--	$(top_srcdir)/libmisc/libmisc.la \
-+	$(top_builddir)/lib/libshadow.la \
-+	$(top_builddir)/libmisc/libmisc.la \
- 	$(MISCLIBS) -ldl
- 
- AM_CPPFLAGS = \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 35027013..7c1a3491 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -10,6 +10,7 @@ sgidperms = 2755
- AM_CPPFLAGS = \
- 	-I${top_srcdir}/lib \
- 	-I$(top_srcdir)/libmisc \
-+	-I$(top_srcdir) \
- 	-DLOCALEDIR=\"$(datadir)/locale\"
- 
- # XXX why are login and su in /bin anyway (other than for
-@@ -183,6 +184,7 @@ list_subid_ranges_LDADD = \
- list_subid_ranges_CPPFLAGS = \
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/libmisc \
-+	-I$(top_srcdir) \
- 	-I$(top_srcdir)/libsubid
- 
- get_subid_owners_LDADD = \
-@@ -194,11 +196,13 @@ get_subid_owners_LDADD = \
- get_subid_owners_CPPFLAGS = \
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/libmisc \
-+	-I$(top_srcdir) \
- 	-I$(top_srcdir)/libsubid
- 
- new_subid_range_CPPFLAGS = \
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/libmisc \
-+	-I$(top_srcdir) \
- 	-I$(top_srcdir)/libsubid
- 
- new_subid_range_LDADD = \
-@@ -210,6 +214,7 @@ new_subid_range_LDADD = \
- free_subid_range_CPPFLAGS = \
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/libmisc \
-+	-I$(top_srcdir) \
- 	-I$(top_srcdir)/libsubid
- 
- free_subid_range_LDADD = \
-@@ -220,6 +225,7 @@ free_subid_range_LDADD = \
- 
- check_subid_range_CPPFLAGS = \
- 	-I$(top_srcdir)/lib \
-+	-I$(top_srcdir) \
- 	-I$(top_srcdir)/libmisc
- 
- check_subid_range_LDADD = \
diff --git a/sys-apps/shadow/files/shadow-4.9-libsubid_pam_linking.patch b/sys-apps/shadow/files/shadow-4.9-libsubid_pam_linking.patch
deleted file mode 100644
index 7fb03f6ff429..000000000000
--- a/sys-apps/shadow/files/shadow-4.9-libsubid_pam_linking.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f4a84efb468b8be21be124700ce35159c444e9d6 Mon Sep 17 00:00:00 2001
-From: Xi Ruoyao <xry111@mengyan1223.wang>
-Date: Fri, 23 Jul 2021 14:38:08 +0800
-Subject: [PATCH] libsubid: link to PAM libraries
-
-libsubid.so links to libmisc.a, which contains several routines referring to
-PAM functions.
----
- libsubid/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
-index 189165b0..83051560 100644
---- a/libsubid/Makefile.am
-+++ b/libsubid/Makefile.am
-@@ -16,7 +16,8 @@ MISCLIBS = \
- 	$(LIBCRYPT) \
- 	$(LIBACL) \
- 	$(LIBATTR) \
--	$(LIBTCB)
-+	$(LIBTCB) \
-+	$(LIBPAM)
- 
- libsubid_la_LIBADD = \
- 	$(top_srcdir)/lib/libshadow.la \
--- 
-2.32.0
-
diff --git a/sys-apps/shadow/shadow-4.10-r4.ebuild b/sys-apps/shadow/shadow-4.10-r4.ebuild
deleted file mode 100644
index af2ce039df60..000000000000
--- a/sys-apps/shadow/shadow-4.10-r4.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-# Subslot is for libsubid's SONAME.
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-REQUIRED_USE="?? ( cracklib pam )"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	virtual/libcrypt:=
-	acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	xattr? ( sys-apps/attr:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.14
-"
-RDEPEND="${COMMON_DEPEND}
-	!<sys-apps/man-pages-5.11-r1
-	!=sys-apps/man-pages-5.12-r0
-	!=sys-apps/man-pages-5.12-r1
-	nls? (
-		!<app-i18n/man-pages-it-5.06-r1
-		!<app-i18n/man-pages-ja-20180315-r1
-		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
-	)
-	pam? ( >=sys-auth/pambase-20150213 )
-	su? ( !sys-apps/util-linux[su(-)] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
-	"${FILESDIR}/${PN}-4.10-libsubid-soname.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-	#elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-account-tools-setuid
-		--disable-static
-		--with-btrfs
-		--without-group-name-max-length
-		--without-tcb
-		$(use_enable nls)
-		$(use_with acl)
-		$(use_with audit)
-		$(use_with bcrypt)
-		$(use_with cracklib libcrack)
-		$(use_with elibc_glibc nscd)
-		$(use_with pam libpam)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with su)
-		$(use_with xattr attr)
-	)
-	econf "${myeconfargs[@]}"
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=${1} val=${2}
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
-	emake DESTDIR="${D}" -C man install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	if use split-usr ; then
-		# move passwd to / to help recover broke systems #64441
-		# We cannot simply remove this or else net-misc/scponly
-		# and other tools will break because of hardcoded passwd
-		# location
-		dodir /bin
-		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-		dosym ../../bin/passwd /usr/bin/passwd
-	fi
-
-	cd "${S}" || die
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chsh shfn ; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chpasswd newusers ; do
-			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
-		done
-
-		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man -type f \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd} || die
-		if use su ; then
-			rm "${ED}"/etc/pam.d/su || die
-		fi
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man -type f \
-		'(' -name id.1 -o -name getspnam.3 ')' \
-		-delete || die
-
-	if ! use su ; then
-		find "${ED}"/usr/share/man -type f -name su.1 -delete || die
-	fi
-
-	cd "${S}" || die
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc || die
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Missing entries from /etc/passwd can cause odd system blips.
-	# See bug #829872.
-	if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then
-		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
-	fi
-
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
-			grpconv -R "${EROOT:-/}"
-		else
-			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	[[ ! -f "${EROOT}"/etc/subgid ]] &&
-		touch "${EROOT}"/etc/subgid
-	[[ ! -f "${EROOT}"/etc/subuid ]] &&
-		touch "${EROOT}"/etc/subuid
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/shadow/shadow-4.11.1.ebuild b/sys-apps/shadow/shadow-4.11.1.ebuild
index ded6bdddef79..7a8c042c0b85 100644
--- a/sys-apps/shadow/shadow-4.11.1.ebuild
+++ b/sys-apps/shadow/shadow-4.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.ta
 LICENSE="BSD GPL-2"
 # Subslot is for libsubid's SONAME.
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/shadow/shadow-4.8.1-r4.ebuild b/sys-apps/shadow/shadow-4.8.1-r4.ebuild
deleted file mode 100644
index 8471d2236d9d..000000000000
--- a/sys-apps/shadow/shadow-4.8.1-r4.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-REQUIRED_USE="?? ( cracklib pam )"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	virtual/libcrypt:=
-	acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	xattr? ( sys-apps/attr:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.14
-"
-RDEPEND="${COMMON_DEPEND}
-	!<sys-apps/man-pages-5.11-r1
-	!=sys-apps/man-pages-5.12-r0
-	!=sys-apps/man-pages-5.12-r1
-	nls? (
-		!<app-i18n/man-pages-it-5.06-r1
-		!<app-i18n/man-pages-ja-20180315-r1
-		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
-	)
-	pam? ( >=sys-auth/pambase-20150213 )
-	su? ( !sys-apps/util-linux[su(-)] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	#elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-account-tools-setuid
-		--enable-shared=no
-		--enable-static=yes
-		--with-btrfs
-		--without-group-name-max-length
-		--without-tcb
-		$(use_enable nls)
-		$(use_with acl)
-		$(use_with audit)
-		$(use_with bcrypt)
-		$(use_with cracklib libcrack)
-		$(use_with elibc_glibc nscd)
-		$(use_with pam libpam)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with su)
-		$(use_with xattr attr)
-	)
-	econf "${myeconfargs[@]}"
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=${1} val=${2}
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# Remove libshadow and libmisc; see bug 37725 and the following
-	# comment from shadow's README.linux:
-	#   Currently, libshadow.a is for internal use only, so if you see
-	#   -lshadow in a Makefile of some other package, it is safe to
-	#   remove it.
-	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	if use split-usr ; then
-		# move passwd to / to help recover broke systems #64441
-		# We cannot simply remove this or else net-misc/scponly
-		# and other tools will break because of hardcoded passwd
-		# location
-		dodir /bin
-		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-		dosym ../../bin/passwd /usr/bin/passwd
-	fi
-
-	cd "${S}" || die
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chsh shfn ; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chpasswd newusers ; do
-			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
-		done
-
-		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man -type f \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd} || die
-		if use su ; then
-			rm "${ED}"/etc/pam.d/su || die
-		fi
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man -type f \
-		'(' -name id.1 -o -name getspnam.3 ')' \
-		-delete
-
-	cd "${S}" || die
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc || die
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT}" 2>/dev/null ; then
-			grpconv -R "${EROOT}"
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	[[ ! -f "${EROOT}"/etc/subgid ]] &&
-		touch "${EROOT}"/etc/subgid
-	[[ ! -f "${EROOT}"/etc/subuid ]] &&
-		touch "${EROOT}"/etc/subuid
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/shadow/shadow-4.9-r3.ebuild b/sys-apps/shadow/shadow-4.9-r3.ebuild
deleted file mode 100644
index 6d6e13ab4822..000000000000
--- a/sys-apps/shadow/shadow-4.9-r3.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-REQUIRED_USE="?? ( cracklib pam )"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	virtual/libcrypt:=
-	acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	xattr? ( sys-apps/attr:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.14
-"
-RDEPEND="${COMMON_DEPEND}
-	!<sys-apps/man-pages-5.11-r1
-	!=sys-apps/man-pages-5.12-r0
-	!=sys-apps/man-pages-5.12-r1
-	nls? (
-		!<app-i18n/man-pages-it-5.06-r1
-		!<app-i18n/man-pages-ja-20180315-r1
-		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
-	)
-	pam? ( >=sys-auth/pambase-20150213 )
-	su? ( !sys-apps/util-linux[su(-)] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
-	"${FILESDIR}/${P}-libsubid_pam_linking.patch"
-	"${FILESDIR}/${P}-libsubid_oot_build.patch"
-	"${FILESDIR}/shadow-4.9-libcrack.patch"
-	"${FILESDIR}/shadow-4.9-SHA-rounds.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	#elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-account-tools-setuid
-		--with-btrfs
-		--without-group-name-max-length
-		--without-tcb
-		$(use_enable nls)
-		$(use_with acl)
-		$(use_with audit)
-		$(use_with bcrypt)
-		$(use_with cracklib libcrack)
-		$(use_with elibc_glibc nscd)
-		$(use_with pam libpam)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with su)
-		$(use_with xattr attr)
-	)
-	econf "${myeconfargs[@]}"
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=${1} val=${2}
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
-	emake DESTDIR="${D}" -C man install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	if use split-usr ; then
-		# move passwd to / to help recover broke systems #64441
-		# We cannot simply remove this or else net-misc/scponly
-		# and other tools will break because of hardcoded passwd
-		# location
-		dodir /bin
-		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-		dosym ../../bin/passwd /usr/bin/passwd
-	fi
-
-	cd "${S}" || die
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chsh shfn ; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chpasswd newusers ; do
-			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
-		done
-
-		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man -type f \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd} || die
-		if use su ; then
-			rm "${ED}"/etc/pam.d/su || die
-		fi
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man -type f \
-		'(' -name id.1 -o -name getspnam.3 ')' \
-		-delete
-
-	cd "${S}" || die
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc || die
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT}" 2>/dev/null ; then
-			grpconv -R "${EROOT}"
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	[[ ! -f "${EROOT}"/etc/subgid ]] &&
-		touch "${EROOT}"/etc/subgid
-	[[ ! -f "${EROOT}"/etc/subuid ]] &&
-		touch "${EROOT}"/etc/subuid
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/shadow/shadow-4.9-r4.ebuild b/sys-apps/shadow/shadow-4.9-r4.ebuild
deleted file mode 100644
index b155bff5396e..000000000000
--- a/sys-apps/shadow/shadow-4.9-r4.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-REQUIRED_USE="?? ( cracklib pam )"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	virtual/libcrypt:=
-	acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	xattr? ( sys-apps/attr:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.14
-"
-RDEPEND="${COMMON_DEPEND}
-	!<sys-apps/man-pages-5.11-r1
-	!=sys-apps/man-pages-5.12-r0
-	!=sys-apps/man-pages-5.12-r1
-	nls? (
-		!<app-i18n/man-pages-it-5.06-r1
-		!<app-i18n/man-pages-ja-20180315-r1
-		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
-	)
-	pam? ( >=sys-auth/pambase-20150213 )
-	su? ( !sys-apps/util-linux[su(-)] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
-	"${FILESDIR}/${P}-libsubid_pam_linking.patch"
-	"${FILESDIR}/${P}-libsubid_oot_build.patch"
-	"${FILESDIR}/shadow-4.9-libcrack.patch"
-	"${FILESDIR}/shadow-4.9-SHA-rounds.patch"
-	"${FILESDIR}/${P}-gpasswd-double-free.patch"
-	"${FILESDIR}/${P}-configure-typo.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	#elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-account-tools-setuid
-		--with-btrfs
-		--without-group-name-max-length
-		--without-tcb
-		$(use_enable nls)
-		$(use_with acl)
-		$(use_with audit)
-		$(use_with bcrypt)
-		$(use_with cracklib libcrack)
-		$(use_with elibc_glibc nscd)
-		$(use_with pam libpam)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with su)
-		$(use_with xattr attr)
-	)
-	econf "${myeconfargs[@]}"
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=${1} val=${2}
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
-	emake DESTDIR="${D}" -C man install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	if use split-usr ; then
-		# move passwd to / to help recover broke systems #64441
-		# We cannot simply remove this or else net-misc/scponly
-		# and other tools will break because of hardcoded passwd
-		# location
-		dodir /bin
-		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-		dosym ../../bin/passwd /usr/bin/passwd
-	fi
-
-	cd "${S}" || die
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chsh shfn ; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chpasswd newusers ; do
-			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
-		done
-
-		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man -type f \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd} || die
-		if use su ; then
-			rm "${ED}"/etc/pam.d/su || die
-		fi
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man -type f \
-		'(' -name id.1 -o -name getspnam.3 ')' \
-		-delete
-
-	cd "${S}" || die
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc || die
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT}" 2>/dev/null ; then
-			grpconv -R "${EROOT}"
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	[[ ! -f "${EROOT}"/etc/subgid ]] &&
-		touch "${EROOT}"/etc/subgid
-	[[ ! -f "${EROOT}"/etc/subuid ]] &&
-		touch "${EROOT}"/etc/subuid
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 05dd4f8d14d2..2734b8ed7d30 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -5,6 +5,6 @@ AUX smartmontools-update-drivedb 45 BLAKE2B 6b77927d453f6b39898dcb164b4e7cb32f65
 DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea
 DIST smartmontools-7.3.tar.gz 1043932 BLAKE2B 119fd4aded487796ffd38050ddf8c7dd69cc6f3950650cb0315846292fd4a6594d949d87c51ed46717d6aaadb332c68f655514d1fde89600d51f3fe36f8df1ca SHA512 08afe8b0a6a39e742160cd4e4c03fc7aff7b1ae8681b906360f0932277dc99e361b7606b2373bdf42425cf9453480a5f4344bc040ebc2fa26a03bd52f02a6ac0
 EBUILD smartmontools-7.2-r2.ebuild 4243 BLAKE2B a03483429b480b9116c6e7f9fd20dd39cd68899f5129bfac5e4a3ead00d5ba810047bbcdfba40dc6a7c9dae59dcef04234fe3964748e681e6ba1ec3922a402eb SHA512 dcaeb1f24fd743c8ebfb65ff44808d35d3258819e6ca75f26dd2077f7f9ecd18dcde295a68b335f74f82b50b4247db301ade39c5c2dab643a331a43e80a0110c
-EBUILD smartmontools-7.3.ebuild 4125 BLAKE2B 5018d8744506376192e89230f1c8d071b14c3bea956db4f0c42ff00feced9fea705b9ec09528a5c57a7fc53ca844cbf5270a7d7e92b90413ef36d68bceb8484e SHA512 cd04cd41ce6b8e0614765352a91a5e649db87dcf734c83a997237b5aee8c5e38e28d77e4c31953d5f498779f8474e3b76e936fa46ab3d1584e2f2d4e825927ca
-EBUILD smartmontools-9999.ebuild 4125 BLAKE2B 5018d8744506376192e89230f1c8d071b14c3bea956db4f0c42ff00feced9fea705b9ec09528a5c57a7fc53ca844cbf5270a7d7e92b90413ef36d68bceb8484e SHA512 cd04cd41ce6b8e0614765352a91a5e649db87dcf734c83a997237b5aee8c5e38e28d77e4c31953d5f498779f8474e3b76e936fa46ab3d1584e2f2d4e825927ca
+EBUILD smartmontools-7.3.ebuild 4159 BLAKE2B bcff963225c9d017346409c47b8c8acd82ad9173e1f4f597613687282fc01a19e97086bb4cd6a493ba545c9cb4792c54df94b4de400449c90053eb4776a9ef48 SHA512 a561ed49dc1d39995e9ffe5c6e0f07616c0e3200747d2ab2673bca7ef0ae5c56aa3914a2528de9866fe31d713f4ff74d77204a091ac454caedf5c9ec4f971b96
+EBUILD smartmontools-9999.ebuild 4167 BLAKE2B 4c44ef2ed5903bef1013c14ad9c8c9384e2285fe97e5ad7f22d3066e3705041c4d30ca51e74ef22a541b79adc856992a4afa8957179cc0d8da939296ca61c038 SHA512 0baa8408e8387ebcd7a983eecd5ea5dd0198be2f46d0b2f195320f9eb1459a95e3f2ee85e40a75ec79a082ceebfe02851558caadaf712f4d58ab1d25ce1d8949
 MISC metadata.xml 708 BLAKE2B fcd5acb620a89a1171a63a678e16a6eefd0f72616c7c8c8999adb617d5b7e6aa359c89793db574e18a7424e838cf986005df9b538eb4d3a0df59fe09aa701f0f SHA512 0c6315a656c69a2d343f072d91d0457d3ee6169824c6eb232fd651895f207cf8162b178adc5a1f9de2b76bc9cb0f10fb3ead49c45a104db744bc98915a3aa7dd
diff --git a/sys-apps/smartmontools/smartmontools-7.3.ebuild b/sys-apps/smartmontools/smartmontools-7.3.ebuild
index 1c0502087af3..5ad4bb1c967d 100644
--- a/sys-apps/smartmontools/smartmontools-7.3.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.3.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic systemd
-if [[ ${PV} == "9999" ]] ; then
+inherit flag-o-matic systemd
+if [[ ${PV} == 9999 ]] ; then
 	ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools"
 	ESVN_PROJECT="smartmontools"
-	inherit subversion
+	inherit autotools subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
@@ -52,7 +52,10 @@ REQUIRED_USE="(
 
 src_prepare() {
 	default
-	eautoreconf
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
 }
 
 src_configure() {
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 1c0502087af3..9772d6259993 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic systemd
-if [[ ${PV} == "9999" ]] ; then
+inherit flag-o-matic systemd
+if [[ ${PV} == 9999 ]] ; then
 	ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools"
 	ESVN_PROJECT="smartmontools"
-	inherit subversion
+	inherit autotools subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
@@ -52,7 +52,10 @@ REQUIRED_USE="(
 
 src_prepare() {
 	default
-	eautoreconf
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
 }
 
 src_configure() {
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index b936e80773cc..16c259860aa9 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -8,4 +8,5 @@ DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47db
 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
 EBUILD systemd-tmpfiles-249.7.ebuild 6091 BLAKE2B 63064cd496f780af754185f05a47551804f05d2b21c58d4b173d2a2ec82b7ba986c947ca1fc15cfc793f411caebf2b7586315ef7e741c534e00649c26c5d5bcf SHA512 e56de86404b80d686e233a17761adfd7f7f59afd1a8f90c2a50658d1fd04e8d1a8b62acbc4cc1d882d094fac10ed5964a03edc1f182c00b3821c856245e33eb3
 EBUILD systemd-tmpfiles-249.9.ebuild 5989 BLAKE2B 3aef19d9a002b4a697e778073d0ad59bb50150f5b5a4a2277f3d1fbb26098934ce1c84610943ad0219053a348c8c3c5e3ed0eeba4d0c47fbd267a890868213c4 SHA512 201c85c33567feb6dacde41f69c5e25f1f412fcf37af99fc211b161f55293b41cee199a3ae437f5b056d40e25218e5e985c145c9416c799c060b1102039b5afd
+EBUILD systemd-tmpfiles-250.ebuild 379 BLAKE2B f7b4cd861020c8b3a46f7b266b8ead19b22674c71bf1a84775729c1ea6a54a907cfb3295e81cbfc5015d64069edaae781465d480d398dafc04ca6589e0c218e2 SHA512 229ca3e4b7ed1ff2d1e04193b50151c583de4aa7e4f610d4b820aa7b9e8bdadc87ba5ded0d90e8cdf24519721caef035be8fd72f2fc1aaf21e079435f2c8e02e
 MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
new file mode 100644
index 000000000000..97da597ebea3
--- /dev/null
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual package to depend on sys-apps/systemd-utils"
+HOMEPAGE="https://systemd.io/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="sys-apps/systemd-utils[tmpfiles]"
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
new file mode 100644
index 000000000000..5485b02c1e5b
--- /dev/null
+++ b/sys-apps/systemd-utils/Manifest
@@ -0,0 +1,10 @@
+AUX 250.4-test-systemd-tmpfiles.standalone.patch 1369 BLAKE2B c0f2f51d0b7127a5a0161f9a56f4e94d9b4e983f9f496601ba4ce9197076556df4f699871480ce0cc0a4002b0c8a6fec6706a358b1b28ab75dcf216f2e408821 SHA512 18b9852cf9fe53e45ca0d3f051580e726aa39462c5477c7143523903c3836f131df44837ec19acfff10281bfe0e0b4c53ea4cb2ebed9e342f1289db07fc752ed
+AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
+AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
+AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
+DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
+DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
+DIST systemd-stable-250.5.tar.gz 11212059 BLAKE2B b7dbcb9e82c51e966db20a92ccd59ac19309702c481dd575c4e6367ca5ade10fe4b689925416ce1169682380cbf22d7d692b2378ef091f3007c16891992e3f92 SHA512 ad864b67bd5e2f5fd5705b636467827e4735142cefba150d24bb8e51ac0263650b2b0e53d4426eb509d1db59b83dc3b4c4bf157cc355fc2b7524db6bc4a9b5cd
+EBUILD systemd-utils-250.4-r3.ebuild 10521 BLAKE2B 2c0df60cc2cd254986f5258f529f2ab23ffd891aabfc135f0c58806a99848498c5f120df3c6116867f07a8be10c6919cd96f5f434d6c4bd5a548796b3c203f4e SHA512 47e6f1670d49a6bd9ef5e5228cbcf61db156524a5e54e24859fb0b2d7302ceb55851bc56cb11d371399e6d4cc77e9fc600b5e21fe2fb93994e59424416b57d90
+EBUILD systemd-utils-250.5.ebuild 10521 BLAKE2B 2c0df60cc2cd254986f5258f529f2ab23ffd891aabfc135f0c58806a99848498c5f120df3c6116867f07a8be10c6919cd96f5f434d6c4bd5a548796b3c203f4e SHA512 47e6f1670d49a6bd9ef5e5228cbcf61db156524a5e54e24859fb0b2d7302ceb55851bc56cb11d371399e6d4cc77e9fc600b5e21fe2fb93994e59424416b57d90
+MISC metadata.xml 571 BLAKE2B 6b3a69524c5fd3fa0bbe534ccbf3598cedcbe51542d738237ca13b465fd342555f35b2ebd1d784b7a81664c58125e01404434ca48a07502343a24dd395618c4c SHA512 8184f6d8107be83d7411f63e86a8469c4b86c96bf4738ebfda8d654e4ecedf334b4319c9d442832c8373a34e7c35ca14b879e75eb4e006d48fa3d667be0a66e4
diff --git a/sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch b/sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch
new file mode 100644
index 000000000000..a915cbb43115
--- /dev/null
+++ b/sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch
@@ -0,0 +1,40 @@
+From 55bf689308ed00692494d3623bd2064f33c9bbbe Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 17 Apr 2022 09:48:28 -0400
+Subject: [PATCH] Add test support for  systemd-tmpfiles.standalone
+
+---
+ meson.build | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 458370e83d..d60be1b050 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3451,7 +3451,7 @@ if conf.get('ENABLE_TMPFILES') == 1
+         endif
+ 
+         if have_standalone_binaries
+-                public_programs += executable(
++                exe = executable(
+                         'systemd-tmpfiles.standalone',
+                         systemd_tmpfiles_sources,
+                         include_directories : includes,
+@@ -3463,6 +3463,14 @@ if conf.get('ENABLE_TMPFILES') == 1
+                         dependencies : [libacl],
+                         install : true,
+                         install_dir : rootbindir)
++                public_programs += exe
++
++                if want_tests != 'false'
++                        test('test-systemd-tmpfiles.standalone',
++                             test_systemd_tmpfiles_py,
++                             # https://github.com/mesonbuild/meson/issues/2681
++                             args : exe.full_path())
++                endif
+         endif
+ endif
+ 
+-- 
+2.35.1
+
diff --git a/sys-apps/systemd-utils/files/40-gentoo.rules b/sys-apps/systemd-utils/files/40-gentoo.rules
new file mode 100644
index 000000000000..6b96bd07051e
--- /dev/null
+++ b/sys-apps/systemd-utils/files/40-gentoo.rules
@@ -0,0 +1,3 @@
+# Gentoo specific groups
+ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
diff --git a/sys-apps/systemd-utils/files/systemd-tmpfiles-setup b/sys-apps/systemd-utils/files/systemd-tmpfiles-setup
new file mode 100644
index 000000000000..a36c1020e0db
--- /dev/null
+++ b/sys-apps/systemd-utils/files/systemd-tmpfiles-setup
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 2022 Gentoo Authors
+# Released under the 2-clause BSD license.
+
+description="Create Volatile Files and Directories"
+
+depend()
+{
+	provide tmpfiles-setup tmpfiles.setup
+	need localmount
+}
+
+start()
+{
+	ebegin "${description}"
+	systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
+	eend $?
+}
diff --git a/sys-apps/systemd-utils/files/systemd-tmpfiles-setup-dev b/sys-apps/systemd-utils/files/systemd-tmpfiles-setup-dev
new file mode 100644
index 000000000000..496de522d08d
--- /dev/null
+++ b/sys-apps/systemd-utils/files/systemd-tmpfiles-setup-dev
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 2022 Gentoo Authors
+# Released under the 2-clause BSD license.
+
+description="Create Static Devices Nodes in /dev"
+
+depend()
+{
+	provide tmpfiles-dev tmpfiles.dev
+	use dev-mount
+	before dev
+	keyword -prefix -vserver
+}
+
+start()
+{
+	ebegin "${description}"
+	systemd-tmpfiles --prefix=/dev --create --boot
+	eend $?
+}
diff --git a/sys-apps/systemd-utils/metadata.xml b/sys-apps/systemd-utils/metadata.xml
new file mode 100644
index 000000000000..5f3934d37331
--- /dev/null
+++ b/sys-apps/systemd-utils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="boot">Enable systemd-boot (UEFI boot manager)</flag>
+		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
+		<flag name="sysusers">Enable systemd-sysusers</flag>
+		<flag name="tmpfiles">Enable systemd-tmpfiles</flag>
+		<flag name="udev">Enable systemd-udev (userspace device manager)</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
new file mode 100644
index 000000000000..1a7f5f5fb352
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
@@ -0,0 +1,475 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs usr-ldscript
+
+DESCRIPTION="Utilities taken from systemd"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-250.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	boot? (
+		>=sys-boot/gnu-efi-3.0.2
+	)
+	>=sys-kernel/linux-headers-3.11
+"
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
+	)
+	if use elibc_musl; then
+		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootlibexecdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Drootprefix="${EPREFIX:-/}"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot efi)
+		$(meson_native_use_bool boot gnu-efi)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dkernel-install=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				man/bootctl.1
+				man/kernel-install.8
+				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+			)
+			if use test; then
+				targets+=( test-tmpfiles )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					# Used by udev-test.pl
+					systemd-detect-virt
+					test/sys
+					test-udev
+
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-netlink
+					test-udev-node
+					test-udev-util
+				)
+			fi
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			udev:shared_library
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfiles
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev-builtin
+				test-udev-event
+				test-udev-netlink
+				test-udev-node
+				test-udev-util
+			)
+			if [[ -w /dev ]]; then
+				tests+=( udev-test )
+			else
+				ewarn "Skipping udev-test (needs write access to /dev)"
+			fi
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl
+			doman man/{bootctl.1,kernel-install.8}
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use sysusers; then
+			into /
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into /
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+		fi
+		if use udev; then
+			into /
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+			exeinto /lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+			insinto /lib/udev/rules.d
+			doins rules.d/*.rules
+			insinto /lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+
+		fi
+	fi
+	if use udev; then
+		into /usr
+		dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
+		gen_usr_ldscript -a udev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		dobin src/kernel-install/kernel-install
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+		insinto /lib/systemd/network
+		doins network/99-default.link
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+		insinto /lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+		dobashcomp shell-completion/bash/udevadm
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+	fi
+}
diff --git a/sys-apps/systemd-utils/systemd-utils-250.5.ebuild b/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
new file mode 100644
index 000000000000..1a7f5f5fb352
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-250.5.ebuild
@@ -0,0 +1,475 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs usr-ldscript
+
+DESCRIPTION="Utilities taken from systemd"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-250.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	boot? (
+		>=sys-boot/gnu-efi-3.0.2
+	)
+	>=sys-kernel/linux-headers-3.11
+"
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
+	)
+	if use elibc_musl; then
+		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootlibexecdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Drootprefix="${EPREFIX:-/}"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot efi)
+		$(meson_native_use_bool boot gnu-efi)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dkernel-install=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				man/bootctl.1
+				man/kernel-install.8
+				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+			)
+			if use test; then
+				targets+=( test-tmpfiles )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					# Used by udev-test.pl
+					systemd-detect-virt
+					test/sys
+					test-udev
+
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-netlink
+					test-udev-node
+					test-udev-util
+				)
+			fi
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			udev:shared_library
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfiles
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev-builtin
+				test-udev-event
+				test-udev-netlink
+				test-udev-node
+				test-udev-util
+			)
+			if [[ -w /dev ]]; then
+				tests+=( udev-test )
+			else
+				ewarn "Skipping udev-test (needs write access to /dev)"
+			fi
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl
+			doman man/{bootctl.1,kernel-install.8}
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use sysusers; then
+			into /
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into /
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+		fi
+		if use udev; then
+			into /
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+			exeinto /lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+			insinto /lib/udev/rules.d
+			doins rules.d/*.rules
+			insinto /lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+
+		fi
+	fi
+	if use udev; then
+		into /usr
+		dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
+		gen_usr_ldscript -a udev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		dobin src/kernel-install/kernel-install
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+		insinto /lib/systemd/network
+		doins network/99-default.link
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+		insinto /lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+		dobashcomp shell-completion/bash/udevadm
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 86e2efe3b92b..170a1a6660f0 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,17 +1,22 @@
 AUX 00-hostnamed-network-user.conf 227 BLAKE2B 0cc780a2ea9f31f08be01184704e4fa8b4b95e4c82b7e2dd4127f82c594a5cd7c8f865a83ae5f1284e58a7fd120ee9a9f4f586b7e479d21f1e8adf26e8e61238 SHA512 97e8decd802de8581fb546e3a714376fbd065108f3edfed54a1036d93df02f9947c358aec9aa4841a766c9120fa20c69eb7867bb4d2bd7339d8bd89c43235b2b
 AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194
 AUX 250.4-random-seed-hash.patch 3300 BLAKE2B 3a952e18ebc8075853943e57730b2f9cf0ac31e2161fce992d11df483a57fc777b74b212c243260ddb6255b2bfe6ac64ba4abfedd236d2cae5e18150e2e3d859 SHA512 4ade52e055d6ccd252221354125e3155c9398452a470b45dc15967fd354d94f4ef94437626c6063762c1c83243d65ec57b0b8d326b769514dbd76f2644925b39
+AUX 251-rc2-colorterm.patch 2964 BLAKE2B 42a6a39c864d2e7a6428ab7392e3d2b75f9d9d8d9acadc85f444ea768e67ab18e3d7bdc114d0c18c4f2d16da710bf7e9b8b318764df29ad6931a6a20da89551c SHA512 af06812f8674221632768923959aaf77bde05d74518c140a7ec8128146478e1f697f10c41ec08b783a636ee341eb5c8f58e5eb4435c0eef8280d587af7a2fd35
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX org.freedesktop.hostname1_no_polkit.conf 471 BLAKE2B 50d9f86b2c4813a90eac8a31f0f762eb1b9e0272024419bfffd1d8c4dbe9955541df5c1e5a14e1663db3c0194e95a8984e5ec0c8a65eb74d279f021c3ef3d348 SHA512 af38bfed2230a75e03de6831a5202e21af6c01e13670df1a5b1b454203bd9db47428a61aa9cf0a21841a11e7caa889e3f6147342ba5411649e00f334a8e03639
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
+DIST systemd-251-rc2.tar.gz 11407144 BLAKE2B 5049a959a461ee00b093a1a4127d0859f3d2b72479ced893446b6a27d8624f155e0979c18595475e36c50add146905feae53e341da12557ddb2076beaa89a21a SHA512 09f1d558afe368710adbed1c21d78e7538bdf3eb4fefa4633086fe12763eaa772a87af69cf0fe04689a34cde246541726ae5b18701f6bf39c046ed2971fb414d
 DIST systemd-stable-249.11.tar.gz 10622702 BLAKE2B aa3a327ba8de73dd2ac5ecbd9065f2ca4ed56702d6bbd19de43580e6d56211be58ec7678c1609d843f7e960b71b251e0b7080c49338942cd3071076fa02f7acb SHA512 fed7f81933648945a4bfac9fb12150ecd84d32181f79be0e14e0b3a789343a87569f868670e0b8dfc2801fab39f7490f95ee8c29ba831d7611f78c14ace5ddd8
 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
 DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
+DIST systemd-stable-250.5.tar.gz 11212059 BLAKE2B b7dbcb9e82c51e966db20a92ccd59ac19309702c481dd575c4e6367ca5ade10fe4b689925416ce1169682380cbf22d7d692b2378ef091f3007c16891992e3f92 SHA512 ad864b67bd5e2f5fd5705b636467827e4735142cefba150d24bb8e51ac0263650b2b0e53d4426eb509d1db59b83dc3b4c4bf157cc355fc2b7524db6bc4a9b5cd
 EBUILD systemd-249.11.ebuild 14749 BLAKE2B 3b6ccb1617acceb9ebd90805aa7e2124be674e235094641013a665b76bf2417f250cb290e96caca6cdfa6704ee179a07057dfb820ce3a57daaecd754427a88d2 SHA512 6aa8d8428824cc8961692075a4ec34d1d5b179fef6b499c381370645259250b8c340dbb4523f4ac1c61241e844ed17c7800fc34ceb51c43fcde62562ddc350d8
 EBUILD systemd-249.9.ebuild 14784 BLAKE2B ca86d60cc9890d368c269baa814c55345c05da6781dab850dc11d1ea81304e1d25319af0e3a81690df4fa178a796a54af5789dff4756c65b2bcb326f5f4bd511 SHA512 2c3166d0e8ce969b0117cd4454f7d8f71dcf6f079e7a8890cbe77c56e92e3d28d54e98ca07ed5dc0a391cd9acb0b58ce4869ee98b7d91f36fbdbfac54d01ee7f
-EBUILD systemd-250.4-r1.ebuild 15724 BLAKE2B 912db6d83bcb3414ee52ea1a91c80ec01b60ee2d37398b56ee3997d4b629d3f94bc28e45beeb5aeb9e675de7c6ceb32e81a24fa130ce16a08dc46cfa374fa3a9 SHA512 6dd59e22c1fdabed038fb37f3df6f9537eba36309cd858d136531a57c25e7f8699179b821f431571d2a866d0f378989803accd8aacdf7319602ca19531990a33
-EBUILD systemd-9999.ebuild 15683 BLAKE2B d1e7ab5d5835fd03d0fbb9b2826c59fa7fb5e717a81d788de8158f6af5f9a61be0e350232a87cfe70beaa654ea242c57eb8dc5d8e08e2e7e942c1f1515cc653c SHA512 65d25daa67d78c0b18468e5f40790235abb561e58582a861a78a60908923f6ec886e6cff4a9111b7ac8efffcda3139b165d3d9592eaa8ce8cdac00e4a0c88c25
-MISC metadata.xml 2627 BLAKE2B b785769f4d2d029a935d8aa4da18d2366d283565a70db63b36eccbab4213edd3c0063a61fe58b313a37cd72fa4a848f4ba12dd3761f82b862a84a3b09ce06258 SHA512 ecbc947ffc3ad23afb6c07c60907d5cbb91053c4153c6661fa26f358710e3d7ca44ae4c3b0d229b428fbe5abb63f83175448e6fae8ec11c1cbe01c1a692c873b
+EBUILD systemd-250.4-r2.ebuild 15727 BLAKE2B 693d157b9b961f5a241bcd541a43b5a89adcba3e4a747cbb6675fc6ec2c3d34fc6601f8c090b6600ce3c898996db3cc151d68dfa0ce1750df4000fb46104ae06 SHA512 e25b31b1b39ddf5e7b0090e4d06742b4b2302efeb6ff66b4842e910000a239de9ac264a5872eea850f8e94024062d3d52074df756d232c9979359fddc9e097b4
+EBUILD systemd-250.5-r1.ebuild 15690 BLAKE2B 95db48fc59472e29d3e72fd105af3a1bf1915b21baf67f812bbe32748b625e3805754794657eec8bb719180df7c2a5e25e8f0ebb304383fa5ab09b516f6f5725 SHA512 bbc8cc748f8f76d47e090e8220c4eb2f669dad72f3d883903e5c87b3d9d2c9d71f8db4b51bc39fd3ad760955df2c3371c8dbf079f76c529d2e2d38b9274e8449
+EBUILD systemd-251_rc2.ebuild 14814 BLAKE2B 81e01e42310dd718745ada1b906c5a2150940bc00955c37d4809e45a59f397909fe09892aff11838e30970873c58780acf3b0beb69c1fd704343a4406769ab8b SHA512 470b4f316864ae2d3e9dcc39ee2335e975c52c7bc2da4cd16fe77051532efd317387c639f238a01ed77c88266c2be954b6f1b4ebef4efe103594ac0fe21bf0db
+EBUILD systemd-9999.ebuild 14773 BLAKE2B 4ba71f245b22115dbfb4fac08b25151e32c7c5643939818b83b814eee9f50e08c6a939e881dbdb2be1523b9d774ed45e6e989285f97f53059edc0c830b17ec7d SHA512 8fe693b973e2aff7ff3b9b962863377480cf7a0438abcb2a260fe64ba4a44aacefd705cafb113b0f444473d8069abcdea15c24ab6b2663faedcbfc3fa136e967
+MISC metadata.xml 2668 BLAKE2B a50719e9a4e5ed12fcbfab8cd6dbe151d7013d8fe2965aa1e1b69d227e6f462555a7075890a99b6d3e1963e9b7c79400057ffef232ba60843907ca97259062dc SHA512 11a81a40054d7643a68ee0faf359a8f2c5719fb9d3765585ab27f3d5189198d8b70062e7cf6adbfffc2736b2590e949c9fac1db64bb4ced95d39df76269f2cce
diff --git a/sys-apps/systemd/files/251-rc2-colorterm.patch b/sys-apps/systemd/files/251-rc2-colorterm.patch
new file mode 100644
index 000000000000..167329b63cde
--- /dev/null
+++ b/sys-apps/systemd/files/251-rc2-colorterm.patch
@@ -0,0 +1,57 @@
+From 34c2d32cf97ddc41348960687e52db6637faf1df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Fri, 6 May 2022 18:19:21 +0200
+Subject: [PATCH] shared/terminal-util: don't use $COLORTERM to force colors
+
+Fixup for a5efbf468c96190c9562bc8121eda32310dfd112: if $COLORTERM was set, we'd
+unconditionally turn on colors, which is unexpected and wrong. It even breaks
+our own tests when executed in gnome-terminal.
+---
+ src/basic/terminal-util.c | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
+index 8ddcfe23230f..a142ba2dfb51 100644
+--- a/src/basic/terminal-util.c
++++ b/src/basic/terminal-util.c
+@@ -1278,12 +1278,7 @@ ColorMode get_color_mode(void) {
+                         /* We only check for the presence of the variable; value is ignored. */
+                         cached_color_mode = COLOR_OFF;
+ 
+-                else if (STRPTR_IN_SET(getenv("COLORTERM"),
+-                                       "truecolor",
+-                                       "24bit"))
+-                        cached_color_mode = COLOR_24BIT;
+-
+-                else if (getpid_cached() == 1)
++                else if (getpid_cached() == 1) {
+                         /* PID1 outputs to the console without holding it open all the time.
+                          *
+                          * Note that the Linux console can only display 16 colors. We still enable 256 color
+@@ -1292,9 +1287,23 @@ ColorMode get_color_mode(void) {
+                          * map them to the closest color in the 16 color palette (since kernel 3.16). Doing
+                          * 256 colors is nice for people who invoke systemd in a container or via a serial
+                          * link or such, and use a true 256 color terminal to do so. */
+-                        cached_color_mode = getenv_terminal_is_dumb() ? COLOR_OFF : COLOR_256;
+-                else
+-                        cached_color_mode = terminal_is_dumb() ? COLOR_OFF : COLOR_256;
++                        if (getenv_terminal_is_dumb())
++                                cached_color_mode = COLOR_OFF;
++                } else {
++                        if (terminal_is_dumb())
++                                cached_color_mode = COLOR_OFF;
++                }
++
++                if (cached_color_mode < 0) {
++                        /* We failed to figure out any reason to *disable* colors.
++                         * Let's see how many colors we shall use. */
++                        if (STRPTR_IN_SET(getenv("COLORTERM"),
++                                          "truecolor",
++                                          "24bit"))
++                                cached_color_mode = COLOR_24BIT;
++                        else
++                                cached_color_mode = COLOR_256;
++                }
+         }
+ 
+         return cached_color_mode;
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 1e7d92356be0..0c24d0ac54bb 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -18,7 +18,7 @@
 		<flag name="gnuefi">Enable EFI boot manager and stub loader (built using <pkg>sys-boot/gnu-efi</pkg>)</flag>
 		<flag name="elfutils">Enable coredump stacktraces in the journal</flag>
 		<flag name="fido2">Enable FIDO2 support</flag>
-		<flag name="gcrypt">Enable sealing of journal files using gcrypt</flag>
+		<flag name="gcrypt">Enable use of <pkg>dev-libs/libgcrypt</pkg> for various features</flag>
 		<flag name="homed">Enable portable home directories</flag>
 		<flag name="hostnamed-fallback">Enable setting hostname with networkd/hostnamed without polkit (requires running <pkg>sys-apps/dbus-broker</pkg>)</flag>
 		<flag name="http">Enable embedded HTTP server in journald</flag>
@@ -26,7 +26,7 @@
 		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
 		<flag name="lz4">Enable lz4 compression for the journal</flag>
 		<flag name="nat">Enable support for network address translation in networkd</flag>
-		<flag name="openssl">Enable use of <pkg>dev-libs/openssl</pkg></flag>
+		<flag name="openssl">Enable use of <pkg>dev-libs/openssl</pkg> for various features</flag>
 		<flag name="pkcs11">Enable PKCS#11 support for cryptsetup and homed</flag>
 		<flag name="pwquality">Enable password quality checking in homed</flag>
 		<flag name="repart">Enable support for growing/adding partitions</flag>
diff --git a/sys-apps/systemd/systemd-250.4-r1.ebuild b/sys-apps/systemd/systemd-250.4-r2.ebuild
index 18d7273e17e6..270bfe1cff71 100644
--- a/sys-apps/systemd/systemd-250.4-r1.ebuild
+++ b/sys-apps/systemd/systemd-250.4-r2.ebuild
@@ -20,7 +20,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
diff --git a/sys-apps/systemd/systemd-250.5-r1.ebuild b/sys-apps/systemd/systemd-250.5-r1.ebuild
new file mode 100644
index 000000000000..8272af827231
--- /dev/null
+++ b/sys-apps/systemd/systemd-250.5-r1.ebuild
@@ -0,0 +1,534 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
+	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	policykit? ( !hostnamed-fallback )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	hostnamed-fallback? (
+		acct-group/systemd-hostname
+		sys-apps/dbus-broker
+	)
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+			~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		$(meson_use split-usr)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool nat libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	# workaround for https://github.com/systemd/systemd/issues/13501
+	if use hostnamed-fallback; then
+		# this file requires dbus-broker
+		insinto /usr/share/dbus-1/system.d/
+		doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
+
+		insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
+		doins "${FILESDIR}/00-hostnamed-network-user.conf"
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if use hostnamed-fallback; then
+		if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then
+			ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run."
+			ewarn "To enable dbus-broker.service run the next command as root:"
+			ewarn "systemctl enable dbus-broker.service"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-251_rc2.ebuild b/sys-apps/systemd/systemd-251_rc2.ebuild
new file mode 100644
index 000000000000..433553652a86
--- /dev/null
+++ b/sys-apps/systemd/systemd-251_rc2.ebuild
@@ -0,0 +1,512 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod
+	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+		"${FILESDIR}/251-rc2-colorterm.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	# Fails with split-usr.
+	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		$(meson_use split-usr)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool nat libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index f5f763e60f72..93399a9c83e7 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -20,7 +20,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
@@ -32,7 +32,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 IUSE="
 	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
+	fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod
 	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
 	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
 "
@@ -40,12 +40,11 @@ REQUIRED_USE="
 	dns-over-tls? ( || ( gnutls openssl ) )
 	homed? ( cryptsetup pam openssl )
 	importd? ( curl lzma || ( gcrypt openssl ) )
-	policykit? ( !hostnamed-fallback )
 	pwquality? ( homed )
 "
 RESTRICT="!test? ( test )"
 
-MINKV="3.11"
+MINKV="4.15"
 
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
@@ -118,10 +117,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=acct-user/systemd-resolve-0-r1
 	>=acct-user/systemd-timesync-0-r1
 	>=sys-apps/baselayout-2.2
-	hostnamed-fallback? (
-		acct-group/systemd-hostname
-		sys-apps/dbus-broker
-	)
 	selinux? ( sec-policy/selinux-base-policy[systemd] )
 	sysv-utils? (
 		!sys-apps/openrc[sysv-utils(-)]
@@ -182,7 +177,7 @@ pkg_pretend() {
 		fi
 
 		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
-			~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
@@ -191,9 +186,6 @@ pkg_pretend() {
 
 		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
 		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
 
 		if kernel_is -ge 5 10 20; then
 			CONFIG_CHECK+=" ~KCMP"
@@ -253,6 +245,9 @@ src_prepare() {
 		)
 	fi
 
+	# Fails with split-usr.
+	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
+
 	default
 }
 
@@ -410,16 +405,6 @@ multilib_src_install_all() {
 		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
 	fi
 
-	# workaround for https://github.com/systemd/systemd/issues/13501
-	if use hostnamed-fallback; then
-		# this file requires dbus-broker
-		insinto /usr/share/dbus-1/system.d/
-		doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
-
-		insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
-		doins "${FILESDIR}/00-hostnamed-network-user.conf"
-	fi
-
 	gen_usr_ldscript -a systemd udev
 }
 
@@ -516,14 +501,6 @@ pkg_postinst() {
 		eerror "systemd again."
 		eerror
 	fi
-
-	if use hostnamed-fallback; then
-		if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then
-			ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run."
-			ewarn "To enable dbus-broker.service run the next command as root:"
-			ewarn "systemctl enable dbus-broker.service"
-		fi
-	fi
 }
 
 pkg_prerm() {
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index a8986dc6a1c1..79292da048ee 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -6,12 +6,13 @@ AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de63191
 AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0
 AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa45220a1bf79da86207ffa1393c311cb4c4a2ad9b8b7bf81cc4ae2ccb2acb19b66fd575935d8a0b0a2a9b3899c0088c9f SHA512 ef33da0d5673180275c8120c6904a4214cf1308827a626d8d6a2aab67d7d25b5407f9efcaf6a7a4a09a8c409899242943f6a95881cc8c8898b780224f991f2f7
 DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
-DIST sysvinit-3.00.tar.xz 127072 BLAKE2B d1c4e509d7c13cf0fb9da290f875e7c0ab0666d843d75d4dd6885112248a859dd077bdf9cc926c4af58473da99a5229bb879c7094afd648d5ebe72597a3ba6a7 SHA512 ba834ac6c48528304373018bfb05dcdd3573d8081dd7dc95a44808804404d77ee4832fedb3f34e67d87f22f201f9526c54910a51c6ed2a42ac55b756843cd825
 DIST sysvinit-3.01.tar.xz 126616 BLAKE2B b991c6d2a09b02003cc587379b148f8ca3817c27fcaf81f184f679cfd5325e0b551484bba47bb554a34c7eeba60538f4943de49b1d59bd4bef73d7d086fefdb2 SHA512 66da3830aa32b70f0beea994213145a550e5b5d58a5b54afb17109243d5efface6aba8c296b76dbfb22ce6f86c9c58f237ff71ee04ec7d5b316ad412bf7acbcf
 DIST sysvinit-3.03.tar.xz 219956 BLAKE2B e2f9d838a67341cabac4b82d90c66b29470727383c4a4d86f2767863a9b9f6d60768069fa79636552aa3bef654bd2f0944cb35eb15a4f053d1fa9aaa4e04473d SHA512 920205d70e1384d11926739ab45d4a04c5a7d7263c50bd06288c806ebc3316d641bd05a5c67497c48951fafe32fc364e88bfb1cb2cc1d6787e9eb6c5e692061b
 DIST sysvinit-3.03.tar.xz.sig 833 BLAKE2B 7d851f4cd12e5745055bb78f531b97b1e9fb9a16260a713fc7ac91000208f04ec8f1109068ebe017838449c73b9e40679f248816050979d9624742dd6023eeef SHA512 a643447ed906b5e3249808eafc85f8b336ebfa6028adf8a8e8df82469b7f08cfe98f44b8e7f6b50168f70925eabf610760a185f10d0529ec1a5ff7337de70dc4
+DIST sysvinit-3.04.tar.xz 220184 BLAKE2B 5caa94fd09e5660fb39982b8c8d68ca5546d83a7f78450f4d7fe8fcd9ac429cd8d9f1ef63e9276221ac878ca2964874c1065d61bfd9ed8b0d1505b44c775b388 SHA512 059092ee857782e88f88e47475846f859589aa1062a6e1294fe8983a11d04a13811e0dd6d277431f45abc2d9d96e5358f6b2d2df1d291402fada66cd009a5fa9
+DIST sysvinit-3.04.tar.xz.sig 833 BLAKE2B 8f04051ea7c03ab447fe309ee61cb4d35a9c02f9a88699423097f9fe4544a26e89536f2625572d0781f792103ce88276db19c2b9ed9489c6ca969d54bc45c117 SHA512 38becfc0d0796570bc75661d4212ad3b1470eea33905694a5264b8b68054d3e47d9250da58f67d52807efcd96334f170a600dff72491f76de94df58077eb4dd0
 EBUILD sysvinit-2.99-r1.ebuild 3849 BLAKE2B 144846be10f656a54d362593b1bfda4b5a50b4ae7d871243a703b3fc3cab51ec947c01726e4e72288f21da4159e2690d16da97635f187acede8f2e285a4b8b31 SHA512 4a39ebf78b0b738e88197af58b7c1cdad66361805e022c48c51705e5357ade36f0681821da6e64a43aaf186b00d8df218a2ea40bb6eb517e50a51c2bfc475788
-EBUILD sysvinit-3.00-r1.ebuild 3857 BLAKE2B 791e9a2c798e5194338bfa2b7339d8badfcbeaa1548fd9beffcd968cf36ba68b29d6a9087818d3fdfa90c725567d71757ff50029d460c8862e8487fbd4e0cb3c SHA512 ea6f4fd2491b49b9351b767feb14aeb696452277b80ab0244e6c2831f7ae7f29dd5164825a378e251d640ef6798f547865dd359eda032757531ce92359a352af
-EBUILD sysvinit-3.01.ebuild 3850 BLAKE2B 227c99b60698d49f94f75fa621e247c38429102289bb371bbf7b0a35c3a7cde552cee3209fbcc7999251b9321a8da206cbd802297699e691a442919cdf1501ab SHA512 d12700092f4adb65015fdd75153e553058ab6e4688cb6dd8a4616ed226740a1f8f60177390053e37f5ed8bbc015b79bc128808ffec6a7b0be1d3816a29456b71
-EBUILD sysvinit-3.03.ebuild 4910 BLAKE2B 6e309c3c4655da8a6715e63767e89c7cc0abdeabee6fb45628c2f826b72d9b0fbec10d4b154e16b4f1b3f28af01d5da5ecd50344775c9253d7b446d47eaf605e SHA512 82cd242ef9904377ccfadb0043ef3f609a872e59c6eb27324b354a895fa7830feff18d40b9de3c618356b722f33bccda152f4f0f2c7432d0001575ca65020c8b
+EBUILD sysvinit-3.01.ebuild 3849 BLAKE2B 144846be10f656a54d362593b1bfda4b5a50b4ae7d871243a703b3fc3cab51ec947c01726e4e72288f21da4159e2690d16da97635f187acede8f2e285a4b8b31 SHA512 4a39ebf78b0b738e88197af58b7c1cdad66361805e022c48c51705e5357ade36f0681821da6e64a43aaf186b00d8df218a2ea40bb6eb517e50a51c2bfc475788
+EBUILD sysvinit-3.03.ebuild 4917 BLAKE2B bc080021aff5e028a6378831154a7a71dc2bdae5cf00536393262a96e9c362120a0f6668293a03e70887162bdf917b0118df6e399e2c507a2b194284c7b2a530 SHA512 5235168913411aeafd9b533a78e27e3f19041eeebe0288f409002f0c9b77ebe51b06cdf8c6b56f85887ac0e123a1b62f877b830a3377f4bb732e33568d790ac0
+EBUILD sysvinit-3.04.ebuild 4910 BLAKE2B 6e309c3c4655da8a6715e63767e89c7cc0abdeabee6fb45628c2f826b72d9b0fbec10d4b154e16b4f1b3f28af01d5da5ecd50344775c9253d7b446d47eaf605e SHA512 82cd242ef9904377ccfadb0043ef3f609a872e59c6eb27324b354a895fa7830feff18d40b9de3c618356b722f33bccda152f4f0f2c7432d0001575ca65020c8b
 MISC metadata.xml 449 BLAKE2B e8c38e3a241f77fb4de63d170e24bcc8d1f8a9ada912fb5870d150874412c2a60a5c3a59ef662bc81f929fb4c36db393667c49c8c75346c3212b81b129edd5d5 SHA512 d5ae5c9606c89a9b73982983d68353bf0605a9c98e7272e762c5a62188b75a071675b61bac5894761a33babcb874949acb76292cda6a6b1fb4abdf725e2e847b
diff --git a/sys-apps/sysvinit/sysvinit-3.01.ebuild b/sys-apps/sysvinit/sysvinit-3.01.ebuild
index cd394fac2954..589bb6747c9b 100644
--- a/sys-apps/sysvinit/sysvinit-3.01.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="selinux ibm static"
 
 CDEPEND="
diff --git a/sys-apps/sysvinit/sysvinit-3.03.ebuild b/sys-apps/sysvinit/sysvinit-3.03.ebuild
index 2b673d969000..392f8ab24242 100644
--- a/sys-apps/sysvinit/sysvinit-3.03.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.03.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P/_*}"
 LICENSE="GPL-2"
 SLOT="0"
 if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 IUSE="selinux ibm nls static"
 
diff --git a/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild b/sys-apps/sysvinit/sysvinit-3.04.ebuild
index 2b6267d776db..2b673d969000 100644
--- a/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.04.ebuild
@@ -3,35 +3,44 @@
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic
+PLOCALES="de es fr pl"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
+inherit toolchain-funcs flag-o-matic plocale verify-sig
 
 DESCRIPTION="/sbin/init - parent of all processes"
 HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
 SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
+SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
+S="${WORKDIR}/${P/_*}"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="selinux ibm static"
+if [[ ${PV} != *beta* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+IUSE="selinux ibm nls static"
 
-CDEPEND="
+COMMON_DEPEND="
 	selinux? (
 		>=sys-libs/libselinux-1.28
 	)"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	virtual/os-headers"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-shutdown )
+# Old OpenRC blocker is for bug #587424
+# Keep for longer than usual given it's cheap and avoid user inconvenience
+RDEPEND="${COMMON_DEPEND}
+	!<app-i18n/man-pages-l10n-4.12.1-r2
 	!<sys-apps/openrc-0.13
-"
-
-S="${WORKDIR}/${P/_*}"
+	selinux? ( sec-policy/selinux-shutdown )"
+# po4a is for man page translations
+BDEPEND="nls? ( app-text/po4a )
+	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
-	"${FILESDIR}/${PN}-2.99-shutdown-h.patch" #449354
+	# bug #80220
+	"${FILESDIR}/${PN}-2.86-kexec.patch"
+	# bug #158615
+	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
 )
 
 src_prepare() {
@@ -81,18 +90,39 @@ src_prepare() {
 			-e '/ttyS[01]/s:9600:115200:' \
 			inittab
 	fi
+
 	if [[ ${#insert[@]} -gt 0 ]] ; then
 		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
 	fi
+
+	delete_unused_locale() {
+		local locale=${1}
+
+		einfo "Deleting non-requested man page translations for locale=${locale}"
+		rm "${S}"/man/po/${locale}.po || die
+
+		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
+	}
+
+	plocale_for_each_disabled_locale delete_unused_locale
 }
 
 src_compile() {
 	tc-export CC
+
 	append-lfs-flags
-	export DISTRO= #381311
+
+	# bug #381311
+	export DISTRO=
 	export VERSION="${PV}"
+
 	use static && append-ldflags -static
 	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
+
+	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+		cd man/po || die
+		po4a po4a.cfg || die
+	fi
 }
 
 src_install() {
@@ -104,12 +134,21 @@ src_install() {
 
 	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
 	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
+
 	into /
 	dosbin "${FILESDIR}"/halt.sh
 
 	keepdir /etc/inittab.d
 
-	# dead symlink
+	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+		install_locale_man_pages() {
+			doman -i18n=${1} man/po/${1}/*
+		}
+
+		plocale_for_each_locale install_locale_man_pages
+	fi
+
+	# Dead symlink
 	find "${ED}" -xtype l -delete || die
 
 	find "${ED}" -type d -empty -delete || die
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index fa25d54ef5c2..61141d1ea0c5 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,6 +1,4 @@
 AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9
-DIST texinfo-6.7.tar.xz 4337984 BLAKE2B 1ec9617b90dac1569f17eaac0cd8611e8e57cb3db6ece1e2f6ff20ee96fee37eb4ff3d83e4830127ccaa469e2d02b598a5af5ede4e586dd4b53d47a2f2278b60 SHA512 da55a0d0a760914386393c5e8e864540265d8550dc576f784781a6d72501918e8afce716ff343e5c2a0ce09cf921bfaf0a48ecb49f6182a7d10e920ae3ea17e7
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
-EBUILD texinfo-6.7.ebuild 1941 BLAKE2B 99867e6ddf768ce09331f9db52e2c7940f7f6e59949dbd4f0f66262d9c07f3240914c7510f87c6f94ad6571caf8ab451fa4019bfa78d5dc0d17c09d95c2835f0 SHA512 803c530e4abffedadb084c4e091b3981c0df97e0b2100d21b46c54afe5e022d415605a29854534205561d9209289c43bcb3c3b475e77beb4c15080e5f151d438
-EBUILD texinfo-6.8.ebuild 1671 BLAKE2B dc820949dc468fe56a687fb5301ca1ab8abfd9093a8ee707eba14a5fa64863f2124356990f397f74dbf75c55ae1404084fe078c9ccc254bbcc5395b7cf36cf88 SHA512 770f0999f99b51a497e63fba786dc3e906d789b74c3897ecd1857efb0c39d1c682e19cc3dd40dd77669f3de80b20b1a0f9d98443e785639321edc87a0516a84d
+EBUILD texinfo-6.8.ebuild 1678 BLAKE2B c55d227aaf21a2855bd0d32ba623312d21987a9ebbbe79494fe3a63a8a43361382d533a53d7fa1c29453699edb21cf078302f78017fe0e4e078513e136a8f404 SHA512 f44742872a26edbc6d1051d980808c1d7daaa0f5a4d7763e1e249571631e327774998485767ccd2258fc939589014562daa79a8ec35a92332beed4a6dbac5386
 MISC metadata.xml 540 BLAKE2B 64b068c14cc3ce828768e85d21c46e25d8930f66287329bd6ec41893bb26b352a0384155688768aa472cf7c58113e02b79e88d99c98233c3f80b393a0d518443 SHA512 32c337ea240d5ec20130fbb17a9622e3736d8c4b577b6bdebebbe3344675cf9faf3140471ff9fe4c5862b75858017b5e9fd8fc34a1c1f53fe8babc106aa83af3
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild
deleted file mode 100644
index 2a3060bb2484..000000000000
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: if your package uses the texi2dvi utility, it must depend on the
-# virtual/texi2dvi package to pull in all the right deps.  The tool is not
-# usable out-of-the-box because it requires the large tex packages.
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU info program and utilities"
-HOMEPAGE="https://www.gnu.org/software/texinfo/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls +standalone static"
-
-RDEPEND="
-	!=app-text/tetex-2*
-	>=sys-libs/ncurses-5.2-r2:0=
-	standalone? ( dev-lang/perl )
-	!standalone?  (
-		dev-lang/perl:=
-		dev-perl/libintl-perl
-		dev-perl/Unicode-EastAsianWidth
-		dev-perl/Text-Unidecode
-	)
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
-
-src_prepare() {
-	default
-
-	if use prefix ; then
-		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
-		touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1
-	fi
-}
-
-src_configure() {
-	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576
-	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
-
-	use static && append-ldflags -static
-	local myeconfargs
-	if use standalone ; then
-		myeconfargs=(
-			--without-external-libintl-perl
-			--without-external-Unicode-EastAsianWidth
-			--without-external-Text-Unidecode
-			$(use_enable nls)
-			--disable-perl-xs
-		)
-	else
-		myeconfargs=(
-			--with-external-libintl-perl
-			--with-external-Unicode-EastAsianWidth
-			--with-external-Text-Unidecode
-			$(use_enable nls)
-			--enable-perl-xs
-		)
-	fi
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/texinfo/texinfo-6.8.ebuild b/sys-apps/texinfo/texinfo-6.8.ebuild
index 31c46a3263b5..be21633802a7 100644
--- a/sys-apps/texinfo/texinfo-6.8.ebuild
+++ b/sys-apps/texinfo/texinfo-6.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls +standalone static"
 
 RDEPEND="
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index e42c42daf73f..b0eddfa4476e 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -1,5 +1,4 @@
 AUX ucspi-ssl-0.99e-fno-common.patch 1255 BLAKE2B 0a278c0340f2c8f7663afe25bc9478e5798e7fb51195a52fcf4a2ac887fd4d809ef4a617131f146a89095748208ecaea753746b6d4075cd528aad0ddac081a5a SHA512 87b0f8d955f4e9a0c3168d1ff7e29dd8844d34086b0aa77c2cc9b2bdbb1858a2e22e07178a18e04175e325e1e6fb4e4bacec89bdc3571dd973731344664012cc
 DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
-EBUILD ucspi-ssl-0.99e-r1.ebuild 1547 BLAKE2B b0d1f523aafe6c1f3a9c8ad659c51398143371d994f0ae9dcad61cf957b1b7b1d053b2295b2ef663eef90948a2d99159f27f1c02d0c07e6f0a26e9d34bdc9a74 SHA512 6e3ec443d1bf876c5b009971c1a16c8393e21da4d6ae7687ed2404df1a4c516c4bb2c01140597d689e866d293c5b59a276d1c0d8f4cfc4184c245f23cc2e5e69
 EBUILD ucspi-ssl-0.99e-r2.ebuild 1483 BLAKE2B 9d2b463bf3a1000c472d8926e78ddbd794f4e761766ec5a8d694a8b6621a80c3e8b340b2814ccb07517ef68837820dcf97f668545b28089bfc5fed147213822d SHA512 391a2ec8133539aad73cd846f05e23e41acfc45ab4b930c7881dfee4d5e0069c2042d0297fa21c520130cd51e6e51c214050ee65b783fbefe20d43d437b60d5c
 MISC metadata.xml 551 BLAKE2B 722aca8c638d9295469fff01028266cf48f77e8f81c88c103d9e8644f3336e86e4f9ab6a4faa8b6484d2e22478c5f1445dc4c6b233f0bf50117407a31d240ca4 SHA512 c63db8b7aeb9b543444cf0caa96152ed45896b7aa90b318b9f1225d6629a8b59365445ccfcec0a7afe0e520982cd668b0c1315b069b95baa81cf93cc766c6b68
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r1.ebuild
deleted file mode 100644
index a40eeae5407b..000000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="https://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
-IUSE="bindist perl"
-
-DEPEND="
-	dev-libs/openssl:0=[bindist(-)=]
-	perl? ( dev-lang/perl:= )"
-RDEPEND="${DEPEND}
-	sys-apps/ucspi-tcp"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_prepare() {
-	ht_fix_all
-
-	sed -i -e 's:auto:gcc:' conf-cc || die
-	sed -i -e 's:-m64::' conf-ld || die
-	qmail_set_cc
-
-	echo "/usr/bin" > conf-tcpbin || die
-	echo "/usr/share/ca-certificates/" > conf-cadir || die
-	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
-	echo "/usr/" > src/home || die
-	sed -i -e 's:HOME/command:/usr/bin:' \
-		src/sslcat.sh src/sslconnect.sh src/https\@.sh || die
-
-	# workaround: SSL_TXT_ECDH is always set in openssl/ssl.h, even with openssl[bindist]
-	sed -i -e 's:SSL_TXT_ECDH:ENABLE_SSL_TXT_ECDH:' src/ucspissl.h src/ssl_params.c conf-ecdh || die
-	if use bindist; then
-		echo > conf-ecdh || die
-	fi
-	default
-}
-
-src_compile() {
-	cd src || die
-	emake sysdeps
-	emake uint32.h
-	emake
-}
-
-src_install() {
-	dodoc -r doc/.
-	doman man/*
-
-	cd src || die
-	dobin $(<../package/commands-base)
-	use perl && dobin $(<../package/commands-sslperl)
-}
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 9da9fdbba8a3..492e95aa38dd 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -14,5 +14,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r18.ebuild 2106 BLAKE2B 02a7266ee3a794f01da1e1c93160913a963691e473e16710a860da78327030d8d4459a013ffd57df1e807235a546fa8f1d300a22ecc4e65e5b9c63e5db218401 SHA512 9867e2ac4e039c724ccc59679c942cf27184406e5b16b905aa630e1fa98db06d6bad69573a9a3f28dc12253e13b49746450d201d1d77266d63938550489adec4
+EBUILD ucspi-tcp-0.88-r18.ebuild 2113 BLAKE2B 888ce733f7f4e86c3706c5009c77e67ca398f50511dfdf3b14ecfb98bb02d33619d05f40135250d909b19688530ecd10e24cb2dce822756a3cd2b46cb6a3c519 SHA512 7c222bd080916fcdac32f551d29a79c89dc81eb442ec7119d93f6de97a54c594946718aab584234ba43f2e2c9d41970875437c96e5933da78bb5292e75116c40
 MISC metadata.xml 601 BLAKE2B f93f353c688147d0f0430e176de1f75e22321b6ddd621a8be45efba153a70ac697a2c383aec03a7ce860d79fffa7a3f3f5eed084d1ddf48c23c31fbf8d0ad3cf SHA512 41f81dd288b2ec4b48830876a7fc16f7361038803707e8f5f93fc4dfa6e8fb58c7836e762147917102621a2eb76cefd293d0cf260df6638d9b4427a261597214
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index 0181a320a247..8f328077498c 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index b13f180badb4..e7fa30c61c52 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -1,6 +1,5 @@
 AUX utempter-0.5.5.6-fix-build-system.patch 1168 BLAKE2B c513d18115a7a78e2c4d381f7ae650aa56de4d0833fa7c610948da072c4a1e85ae6832517012dd0c04ca91f4c3cb51d8b3b332c58b66b0716c63e3576917fe77 SHA512 a2febc07a01e0f9f95c8c846616d8f46e74e3db2ea66af720539f6825019dd05ab5472507210945c5caf84566584ab01824ebf0f16e51e7012f1334fc5a920b4
 AUX utempter-0.5.5.6-no_utmpx.patch 666 BLAKE2B 9ee0c3634b87ddd50d50f81811f749f615e4fad8dc27b9fc97cc1b61ffdd64eb5045910457547b2cbc245c593490ab354e3a7f5a5965a8aeebf330c6b32d4889 SHA512 4cdc7616f1b886b74fa39272f502fb9eb303047c93be57122ba32517f49a0274e4f7e02b25ead9dd9b60584610a576cb2d78c6350350b3d8364ccd903c3dafcf
 DIST utempter-0.5.5-6.src.rpm 21099 BLAKE2B a4a8c53ab31d53ec56d60a16e5c1d3a0a2ec6c73c3c3025c15dfc389da75f969545392b46976017cfcde1d9f9ca974b14786bbf39709aebdda890df13a7866ed SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655
-EBUILD utempter-0.5.5.6-r1.ebuild 956 BLAKE2B 4eb2d3be6732ee1eb07b62f0bbf711e141a1894f21db30d1279a8f3d7fad2470924a0c1944a4e45d9481e4c3b867ac258d0ac512428dc9a2e6324a8dd3f60186 SHA512 736a438f352cf84381a1de34355013dde0ca6052f16146fa8539c5fc4cc11266bc6f4c15a63b64a877818acd0095ef5be835c76e6faecafedc3ed7b824f95a1b
-EBUILD utempter-0.5.5.6.ebuild 1176 BLAKE2B f69291ee2133e60d389d9ee368920042f1dba52ec13c37eabd59925a7243a2eb0b6bc3ae2881406b9a9982287bc895400859002c65c83190370fc2f0053deb6c SHA512 9f03b9180d919d9f4f0782fa852f9398f38e307dff7edf0f865d37992ecbd2166c1c1262871e062d196cd127f01dfadb5b4ef186b632c3a66b714e0a0658bd12
+EBUILD utempter-0.5.5.6-r1.ebuild 950 BLAKE2B 1111f393b972caaeafad2527451d7a2c790067332bc0e87eb735c29f72218afdf4dbf613460712e736a2e30c8e9b9b47f529046970658e04ec05583ec21888c5 SHA512 fefa5360978fef80e566efcd25158d7ac0c4929f5c4c94da4914908ab34e708abcfc6e4e17fdefaad464815e9598cfdab263cb488587987e996ad6f55d15c71f
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/utempter/utempter-0.5.5.6-r1.ebuild b/sys-apps/utempter/utempter-0.5.5.6-r1.ebuild
index f52de8c53368..d90bfe7141c8 100644
--- a/sys-apps/utempter/utempter-0.5.5.6-r1.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.6-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}"
 
 LICENSE="|| ( MIT LGPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 BDEPEND="acct-group/utmp"
 RDEPEND="
diff --git a/sys-apps/utempter/utempter-0.5.5.6.ebuild b/sys-apps/utempter/utempter-0.5.5.6.ebuild
deleted file mode 100644
index 6d31a543cdcb..000000000000
--- a/sys-apps/utempter/utempter-0.5.5.6.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 flag-o-matic rpm toolchain-funcs user
-
-MY_P=${P%.*}-${PV##*.}
-
-DESCRIPTION="App that allows non-privileged apps to write utmp (login) info"
-HOMEPAGE="https://www.redhat.com/"
-SRC_URI="mirror://gentoo/${MY_P}.src.rpm"
-
-LICENSE="|| ( MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="
-	!sys-libs/libutempter
-	!dev-python/utmp"
-
-S=${WORKDIR}/${P%.*}
-PATCHES=(
-	"${FILESDIR}"/${P}-no_utmpx.patch
-	"${FILESDIR}"/${P}-fix-build-system.patch
-)
-
-pkg_setup() {
-	enewgroup utmp 406
-}
-
-src_configure() {
-	tc-export CC
-	append-cflags -Wall
-}
-
-src_install() {
-	emake \
-		RPM_BUILD_ROOT="${ED}" \
-		LIBDIR=/usr/$(get_libdir) \
-		install
-	dobin utmp
-
-	fowners root:utmp /usr/sbin/utempter
-	fperms 2755 /usr/sbin/utempter
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT%/}"/var/log/wtmp ]] ; then
-		chown root:utmp "${EROOT%/}"/var/log/wtmp
-		chmod 664 "${EROOT%/}"/var/log/wtmp
-	fi
-	if [[ -f "${EROOT%/}"/var/run/utmp ]] ; then
-		chown root:utmp "${EROOT%/}"/var/run/utmp
-		chmod 664 "${EROOT%/}"/var/run/utmp
-	fi
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 02a26c12a268..80e594801460 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,14 +3,10 @@ AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254
 AUX su-l.pamd 140 BLAKE2B 34f00c8814d454c8caa6bd5f0dd0bb89b24c12dbc0e39e852dc45965c4fae4dcfd0ab1def2364163908d416f9306c5193357c0be3a559d35574ef9a56fa645a4 SHA512 4490b7e516a9c306e991c0f719f742c5a13841d28a57385fc96482663f409025aa7ecc3a3855c20099547702ecd7a160b308761e28316f90d4d6622eea1ba21f
 AUX util-linux-2.37.1-agetty_ctrl-c_erase.patch 1900 BLAKE2B 570c03cc5059198efdec4bfe367c560bcc863de61e8b0e1055535d4731525613ee20eaee5efeac6f96b399df1a60865c29e554df6684e3525f71dac821c8205c SHA512 e970c7b3c6e50bffc2e57f90f3284ba55906d71d286e8d23f06fd9905f66273796712cbd8cf3fa1a12bbb2dc404c72b790caba11ec63c8ff84ed9e4e041f64ca
 AUX util-linux-2.37.2-ioctl_ns-test-hang.patch 1308 BLAKE2B 87f9d63b91342c7560987438dad5e6ed43046233ae3400f91ff09767825b20ae2ff3886d8a7a3d7790dda11cffbf351c4047ac5397d1dbb98a548303d1caa8af SHA512 f0f0616a8729e302ef30b72437e34d7ac308e32206c0fdea2d3117da6a01d18b809016e2f46affed3b8fcaf156c64cd895a7460895aadcf39352fe724a3bfd78
-DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d
-DIST util-linux-2.37.3.tar.xz 6126260 BLAKE2B 6a541dd1f243f0fc303cd813b50be3e0edd8dc7377734aed90fe0af03321bf03fd727285e406b95a1db176572742245220f2e6e7f4d35e508e948816ec4b6345 SHA512 2303b5c55b1fd932c73b0a079d37e56e10b6a20270b72d0b7e81ec7a6b715b42ebaa336714c3e1722d05e5aa4499f8be17ceaf61bb1341532bf9697c9a2174e9
 DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7
 DIST util-linux-2.38.tar.sign 833 BLAKE2B bddde8cf392155eabe1e5f3c77d4f61cc9cb235c6d668cb289bf78650775d309dbe633e8a272ca52ff208e18bc8eaa4f8664ac239e285feb1eea5e3def1b8c2f SHA512 8909576d64c74e43496d45fcf87a761d9960cd8867534923bb280f2e4abaf4df871723aed10ac4e514e14dcbce147bdc9590de3c84994b11227923264313ac2c
 DIST util-linux-2.38.tar.xz 7349140 BLAKE2B dd3b2abb3fedd91e35cc5665b49f1913aa93927cbb6eb5c9715a9f2ce06269d43c28fe96f6c67be88c210ca20e574177b06780ab4798cbbb0d7c76df07f3eeab SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c
-EBUILD util-linux-2.37.2-r1.ebuild 8770 BLAKE2B a5662ed7720f636f06896b98662d94267ca0b6719614ddabbeb27600bc29232577c96b1af13a2574a16216a0f401635554753c42f815174e933522c7cd4aa0bb SHA512 d4834e6e9c585e150a6ace0c29063cbc895e61346d554da8c1e5606c2338ef7c4ff343d338913fbccb38886b9c1b83c9a3917a764ff368a10d3dd4f74077a343
-EBUILD util-linux-2.37.3-r1.ebuild 9434 BLAKE2B e5bcbf418867e65ffcecd1348115e68cc611736994e1d2fd648c67d7a6d0ca9572d752871ec41bda9e07c94f99882e730e1c024d358c7bd263a58d2caaefef50 SHA512 ae8e6ed5c350afe109a578716676f4189e1bc02e4ebe1b9ba1beb24daf6e7774edef703fe2187c9d2c0332ff32175922aa170dc959c5ec393f0cb5b7cd7a354a
 EBUILD util-linux-2.37.4.ebuild 9434 BLAKE2B e5bcbf418867e65ffcecd1348115e68cc611736994e1d2fd648c67d7a6d0ca9572d752871ec41bda9e07c94f99882e730e1c024d358c7bd263a58d2caaefef50 SHA512 ae8e6ed5c350afe109a578716676f4189e1bc02e4ebe1b9ba1beb24daf6e7774edef703fe2187c9d2c0332ff32175922aa170dc959c5ec393f0cb5b7cd7a354a
-EBUILD util-linux-2.38.ebuild 10595 BLAKE2B 25dcd9797b789de23789e5f48a671f675e33ca7066e3d7fa807ca2c28cb18d3bb37eee16f0fe0f8057a50253bd17a0aa02722f7fd1d9815a65ed4e6b3fc17ce8 SHA512 6073ce8f64433a53e3cd65c5bb93ee0c60be9c799c17cd103182b743e8c85eff63bdf747348f77216e7b5234318cb969da1fec9b64deb5bda111600e455f8736
-EBUILD util-linux-9999.ebuild 10595 BLAKE2B 25dcd9797b789de23789e5f48a671f675e33ca7066e3d7fa807ca2c28cb18d3bb37eee16f0fe0f8057a50253bd17a0aa02722f7fd1d9815a65ed4e6b3fc17ce8 SHA512 6073ce8f64433a53e3cd65c5bb93ee0c60be9c799c17cd103182b743e8c85eff63bdf747348f77216e7b5234318cb969da1fec9b64deb5bda111600e455f8736
+EBUILD util-linux-2.38.ebuild 10819 BLAKE2B 7317078c9dcb3693626cf7b46c47c001ed5a8a267ccb0e6964f011c2cb2b165c19b5346b21363e786d77691b038dae5086e354a20ce53362725f5e198ecf9b49 SHA512 422801817576d20a373f63286b8ac226c6e9e091ec1bc4c3a5df8aa90aa11274e73a86a488e2e3eaf21e6e054599b8e4a195dafebb06b3baffc8e4423f373924
+EBUILD util-linux-9999.ebuild 10812 BLAKE2B 22837bd0bf1be41c25933e838280d1ecbc2a2fdc62a0305fc93c315f07f7900bfaafabc646540ba0bc8737fba9ac8087858f9cc11f977611d525ce2317cf3032 SHA512 618dcd140b34fcf20eb1e7d7a4e7a7a74067ca5acf7281cd8276c66b4ffab2ae52c6414a1c6e1b9b4f876f90bbfd1fa8f2916cc8607e15c73d763e752627b1ba
 MISC metadata.xml 1527 BLAKE2B 66d5b1f7f5fd85b467ec66f69c1ae71e61e41cd221ef8a52b39b09984dbabe63b26243183dbc86e8d1e5c6b0fa6866cccc18e454f741d40b6e146d9f8f1f8f80 SHA512 a6428edad3baa98b177d3363162fdffc6258305b956b9fef504341da43697935f5ff41bc9adc5d6327571f0f0bfd3148356f01f17e287b675c8c3a42e7dcea5a
diff --git a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
deleted file mode 100644
index 619414e131e1..000000000000
--- a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs su +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-	virtual/libcrypt:=
-	audit? ( >=sys-process/audit-2.6:= )
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
-	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)?]
-		magic? ( sys-apps/file:0= )
-	)
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	rtas? ( sys-libs/librtas )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-"
-RDEPEND+="
-	hardlink? ( !app-arch/hardlink )
-	logger? ( !>=app-admin/sysklogd-2.0[logger] )
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	su? (
-		!<sys-apps/shadow-4.7-r2
-		!>=sys-apps/shadow-4.7-r2[su]
-	)
-	!net-wireless/rfkill
-"
-
-# Required for man-page generation
-if [[ "${PV}" == 9999 ]] ; then
-	BDEPEND+="
-		dev-ruby/asciidoctor
-	"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.37.1-agetty_ctrl-c_erase.patch #804972
-	"${FILESDIR}"/${P}-ioctl_ns-test-hang.patch # upstream test hang patch
-)
-
-src_prepare() {
-	default
-
-	# Prevent uuidd test failure due to socket path limit. #593304
-	sed -i \
-		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-		--enable-libblkid
-		--enable-libmount
-		--enable-pylibmount
-	)
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
-	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-	# Avoid automagic dependency on ppc*
-	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
-
-	# configure args shared by python and non-python builds
-	local commonargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-	)
-
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(multilib_native_use_with audit)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-	)
-	if multilib_is_native_abi ; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-newgrp
-			--disable-nologin
-			--disable-pylibmount
-			--disable-raw
-			--disable-vipw
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable hardlink)
-			$(use_enable kill)
-			$(use_enable logger)
-			$(use_enable ncurses pg)
-			$(use_enable su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_with cryptsetup)
-		)
-		if [[ ${PV} == *9999 ]] ; then
-			myeconfargs+=( --enable-asciidoc )
-		else
-			# Upstream is shipping pre-generated man-pages for releases
-			myeconfargs+=( --disable-asciidoc )
-		fi
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-asciidoc
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-			--enable-libmount
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_configure
-	fi
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_install
-	fi
-
-	# This needs to be called AFTER python_install call (#689190)
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if use pam ; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-}
-
-pkg_postinst() {
-	if ! use tty-helpers ; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.37.3-r1.ebuild b/sys-apps/util-linux/util-linux-2.37.3-r1.ebuild
deleted file mode 100644
index 0f0d85a2f339..000000000000
--- a/sys-apps/util-linux/util-linux-2.37.3-r1.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-	virtual/libcrypt:=
-	audit? ( >=sys-process/audit-2.6:= )
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
-	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)?]
-		magic? ( sys-apps/file:0= )
-	)
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	rtas? ( sys-libs/librtas )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-"
-RDEPEND+="
-	hardlink? ( !app-arch/hardlink )
-	logger? ( !>=app-admin/sysklogd-2.0[logger] )
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	su? (
-		!<sys-apps/shadow-4.7-r2
-		!>=sys-apps/shadow-4.7-r2[su]
-	)
-	!net-wireless/rfkill
-"
-
-# Required for man-page generation
-if [[ "${PV}" == 9999 ]] ; then
-	BDEPEND+="
-		dev-ruby/asciidoctor
-	"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.37.1-agetty_ctrl-c_erase.patch #804972
-	"${FILESDIR}"/${PN}-2.37.2-ioctl_ns-test-hang.patch # upstream test hang patch
-)
-
-pkg_pretend() {
-	if use su && ! use suid ; then
-		elog "su will be installed as suid despite USE=-suid (bug #832092)"
-		elog "To use su without suid, see e.g. Portage's suidctl feature."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Prevent uuidd test failure due to socket path limit. #593304
-	sed -i \
-		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-		--enable-libblkid
-		--enable-libmount
-		--enable-pylibmount
-	)
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
-	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-	# Avoid automagic dependency on ppc*
-	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
-
-	# configure args shared by python and non-python builds
-	local commonargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-	)
-
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(multilib_native_use_with audit)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-	)
-	if multilib_is_native_abi ; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-newgrp
-			--disable-nologin
-			--disable-pylibmount
-			--disable-raw
-			--disable-vipw
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable hardlink)
-			$(use_enable kill)
-			$(use_enable logger)
-			$(use_enable ncurses pg)
-			$(use_enable su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_with cryptsetup)
-		)
-		if [[ ${PV} == *9999 ]] ; then
-			myeconfargs+=( --enable-asciidoc )
-		else
-			# Upstream is shipping pre-generated man-pages for releases
-			myeconfargs+=( --disable-asciidoc )
-		fi
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-asciidoc
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-			--enable-libmount
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_configure
-	fi
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_install
-	fi
-
-	# This needs to be called AFTER python_install call (#689190)
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if use pam ; then
-		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-
-		newpamd "${FILESDIR}/su-l.pamd" su-l
-	fi
-
-	if use su && ! use suid ; then
-		# Always force suid su, even when USE=-suid, as su is useless
-		# for the overwhelming-majority case without suid.
-		# Users who wish to truly have a no-suid su can strip it out
-		# via e.g. Portage's suidctl or some other hook.
-		# See bug #832092
-		fperms u+s /bin/su
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-}
-
-pkg_postinst() {
-	if ! use tty-helpers ; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.38.ebuild b/sys-apps/util-linux/util-linux-2.38.ebuild
index 68bb10664cf1..d125ee135b9c 100644
--- a/sys-apps/util-linux/util-linux-2.38.ebuild
+++ b/sys-apps/util-linux/util-linux-2.38.ebuild
@@ -19,7 +19,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 	fi
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
@@ -374,6 +374,12 @@ multilib_src_install_all() {
 	# This triggers a known QA warning which we ignore for now to magically
 	# keep bash completion for "su" command which shadow package does not
 	# provide.
+
+	local ver=$(tools/git-version-gen .tarballversion)
+	local major=$(ver_cut 1 ${ver})
+	local minor=$(ver_cut 2 ${ver})
+	local release=$(ver_cut 3 ${ver})
+	export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}"
 }
 
 pkg_postinst() {
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 68bb10664cf1..60535b687ba6 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -374,6 +374,12 @@ multilib_src_install_all() {
 	# This triggers a known QA warning which we ignore for now to magically
 	# keep bash completion for "su" command which shadow package does not
 	# provide.
+
+	local ver=$(tools/git-version-gen .tarballversion)
+	local major=$(ver_cut 1 ${ver})
+	local minor=$(ver_cut 2 ${ver})
+	local release=$(ver_cut 3 ${ver})
+	export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}"
 }
 
 pkg_postinst() {
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index 831fc79dbdf0..17e41566d1b4 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1,3 +1,3 @@
 DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61
-EBUILD which-2.21.ebuild 628 BLAKE2B 41009e94012370df27bc7b7ca2954fadae5d7f932f61f962e9be28d25ede1d5df403d27655e0a6efa46323d4e208cff48bfe6422ce2c0a62801f5bb1cf152445 SHA512 72df4b11a31454bbc91f60490d1096743ef1f81b92c08aef26c5e6c9315cc5106e02e83a0fc57f231d3174b22c4cd7147a13fc8e24620cb847334ebaf6716711
+EBUILD which-2.21.ebuild 635 BLAKE2B 4bf38a054d49d4ff979fda7f4b7f2ebe54e1f6aaabf9a08102c7926bdaa6bb3588ca9ece45e86d99fcf6fab560055f218a72f43d7c1cd8d3f703d5270238cd79 SHA512 9e9f353c69913b6254a9ce7df0f7a7a225f343ac99e74bd4f1f066a79b92ca04cf8b2c527aff33dc3acb88b515c191e68fd9e9fe242e80dd82d2e8989d3eaebb
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index a0a57a10d289..7c23ea65b162 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 
 src_configure() {
 	append-lfs-flags
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
index 72f5ade36302..abfb41b44ad4 100644
--- a/sys-apps/xdg-dbus-proxy/Manifest
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-dbus-proxy-0.1.3.tar.xz 119896 BLAKE2B c789ad697c1cda84a4cde2c84b90370869bdaeb76736c2891270a58834296e3acbf83b311ba153a0d1e9f3266de0cc1eda63866e2808dcbb4aeac451f90da7f6 SHA512 bb730366efca9d0d199983063dd5cd7b8a8aac8d9efd8e3d6b6090166e5e09a74ef241a07388cfbb2f108e66b3a29114671a6d955324626aebefa1d6c2423632
-EBUILD xdg-dbus-proxy-0.1.3.ebuild 564 BLAKE2B c26c86c6dfdc16be3fc706c5b2274e31c542df79e8c4b63180f313b6d6c72310b7f0a0eba64abaadddd5c585ac6113aaa74a6072026ca8edd14a22928609740a SHA512 9960a43f49682c4f9b1f6bf4b78f8b855f6e6a30433dab0dea35a0f633f295589c6bdbaf48253923401c4f6f7ce5a10d6b9ba7d6c27c4a4614d0d1c7a8dd04f5
+EBUILD xdg-dbus-proxy-0.1.3.ebuild 621 BLAKE2B f972dcbee8a8acfead30601ddc92388f26cc7d4b5a20ed3e3690d1f38cc66daf1eff676279d6dac6a7bff11de95af2f211bab3895d1d49f93a9f3f15b9c9da72 SHA512 95cecbb2dca547bc3b7822ce00fbf9e03e295d1a55c383bc4605db481dfe6332c126c8b548aca8c428f0b9f8744a1ef3600d43967064eb6818010a9e42cf36fe
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.3.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.3.ebuild
index e13679b6fec0..772eacd203d8 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.3.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.3.ebuild
@@ -10,12 +10,15 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.40:2
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/dbus )
+"
 BDEPEND="
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
diff --git a/sys-apps/xdg-desktop-portal-gnome/Manifest b/sys-apps/xdg-desktop-portal-gnome/Manifest
new file mode 100644
index 000000000000..5e37a7aa6299
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gnome/Manifest
@@ -0,0 +1,3 @@
+DIST xdg-desktop-portal-gnome-42.1.tar.xz 117932 BLAKE2B c0c6dc7e4efbfda8996d63c191228ebf867e3fe11a0ae031b5bfd4298a33ab3b9cb9d9cecc36c1b41eeb33c54bd3bca17149e641c1131f0be7dcb2dbdf42eda8 SHA512 6843fd10e7e70f3d09c2a9b1397288f553fb44bcae30e7992790fddbc92d6c5cc966c27b7f294e2de1a139d3893c009f1480855d66c873a13861f3fe4abecee7
+EBUILD xdg-desktop-portal-gnome-42.1.ebuild 792 BLAKE2B e7ac062dc0ef3d32285f761ce0a2665914cc714549f9b80abed1bebc59fd6caba636000a8f6e399376d29a91bd7e4ca2eb680deb2d59904f9561ab40222dc1c7 SHA512 38cd1adc6b676a265f9c1dc9d255a0cfe6dc3e4402453e54d40d0e7cf7c4a50d285bc7fe81b8cc1ac0c65e2b50dbbc538ac503457c7a04391531297c1acab9b1
+MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/sys-apps/xdg-desktop-portal-gnome/metadata.xml b/sys-apps/xdg-desktop-portal-gnome/metadata.xml
new file mode 100644
index 000000000000..f453528b934f
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gnome/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="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.1.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.1.ebuild
new file mode 100644
index 000000000000..06373774a4c6
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson systemd xdg
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal using GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="wayland X"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DEPEND="
+	dev-libs/glib:2
+	gnome-base/gnome-desktop:4=
+	gui-libs/libadwaita:1
+	media-libs/fontconfig
+	sys-apps/dbus
+	>=sys-apps/xdg-desktop-portal-1.7
+	>=sys-apps/xdg-desktop-portal-gtk-1.14.0
+	gui-libs/gtk:4[wayland?,X?]
+"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+
+	meson_src_configure
+}
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index 1933a1af39d2..cf118ede03c8 100644
--- a/sys-apps/xdg-desktop-portal-gtk/Manifest
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -1,3 +1,5 @@
+DIST xdg-desktop-portal-gtk-1.14.0.tar.xz 381316 BLAKE2B 73a1e1d9944c4776ef2ebff33b26559767aad10784e9518690d31575a6216014bd0c518bde9a3b4e92d6a7edbf1aaa3510d669a025b7574c4df978f7c24b83ac SHA512 b0ba54e1ddbdfbd22b8b31bf4ece261dc0beba303e642f10afc72659dd5477438a30688c9d018e3d1ed2adbc053ddf4e3a2d70de8cac03d9519355772862fafc
 DIST xdg-desktop-portal-gtk-1.8.0.tar.xz 370196 BLAKE2B d15a054e8fbc74718db7ad2d0f7b53c86b392e729fb4d5b8bdd87b16c0ebbf4feb11b29bc27da12990b351f520faa23bde694721819589513b6cfd1e4ea2f092 SHA512 832b3c4cb9ea738f2ab7641fbd7e14beaa5f6a1ae88f012cd44b12f4bc51588f61868b5982301e3dfd67965d6a69fd8669a9832b6ec7017168d611c87d76689b
+EBUILD xdg-desktop-portal-gtk-1.14.0.ebuild 1338 BLAKE2B d407d7c35c9a8b8c8f9f50a8a9327630adac6eb2626e32ad579f77a8f95d0b61300e6ec23776e60ee2c5841cdc8b8cccfb57533206045ce6ed6dae3e3a83e118 SHA512 93f29ce337740af77d3106e8b9746a8153289f96ea538b7080678e21325f80d82ad2a38212505a620b4656911e68c24fda7f2e97b2be335de3a01a8eb3032e8d
 EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 983 BLAKE2B a08a593be0d458d342b1a4b00abd38f6a20e09812b5219d75fe268c02908e9f2abd26727e220c8da1808341144e17ea000f9fb7136b45ba13418eb76effd24a4 SHA512 666f331b55f8c55475e559576c5321bdd998f413cc6e1ac9b4ba5e6fadbd993cc4f69878af5663ddd41331e98e87606e02899499ff22a1ee75500a3252ddcf33
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
new file mode 100644
index 000000000000..9e8da15268bc
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PV="${PV//_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal using GTK+"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="wayland X"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DEPEND="
+	dev-libs/glib:2
+	media-libs/fontconfig
+	sys-apps/dbus
+	>=sys-apps/xdg-desktop-portal-1.14.0
+	x11-libs/cairo[X?]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[wayland?,X?]
+"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	# As done in Fedora:
+	# All backends that are disabled are instead provided by
+	# xdg-desktop-portal-gnome to keep this package free of GNOME dependencies.
+	# The appchooser and settings backends are enabled for non-GNOME GTK
+	# applications.
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		--enable-appchooser
+		--enable-settings
+		--disable-background
+		--disable-lockdown
+		--disable-screencast
+		--disable-screenshot
+		--disable-wallpaper
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index c21b50e13bdf..7b27f6dc8f55 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-1.12.1.tar.xz 484352 BLAKE2B afa14ab78f35cb1c0e66514f313f5dc297ceef88af1ca7b3028305faa8398bdae1b9e897289b18a93b1cda1a8290c0e51bf73e66c9dce231f57a58652fb9e120 SHA512 62df427e2d8d54acd9a34a02a77c26ae3911fbb4c5844eff4a253dc839775c929c6945401b93549ba200ba637d315146767e41f18a831d7627b35de880de0da1
-DIST xdg-desktop-portal-1.14.2.tar.xz 504088 BLAKE2B e0a378c1f1d80afda7d73fd8e545f7304eeab349cf3298ebb616021c7e16e8a088360681e31eedca9ac90978eb04167a7e857ddaa5e023a2a8c24c9f959f9b2c SHA512 7164d6c0d89843d117e03bc46963d72f24dae2b9fc8e173f06a78bbc80655ccf192d86f951d3c404c88bf5da88d9d2053ea52cf3e541b833ee937b6931d803d7
+DIST xdg-desktop-portal-1.14.4.tar.xz 510492 BLAKE2B 32f71cbc74d6bb3010e31172972dd7bfc4c982691ef55f66c29d5cf4aa2abeed816f890800691e898f739c2c7aa13db1e04f322c89ce30e9ac8a69b87435a448 SHA512 23fa4f9fdf39f22d6eaa4f6020db5f81d272b85fe6051467c5e28a752c65b18a9b540fafe5b27725fafa29dffefcd113d873928cd78e3658895cd24d96b82f73
 EBUILD xdg-desktop-portal-1.12.1.ebuild 987 BLAKE2B 94bb8e58df78606aca537d7d824fa28624d1363ecbb851da6cf26c1c9c9df001c374700ce1927d9c8e21c4f9ba57f8f0401b67384b402955884b22e34f498323 SHA512 8364ffd4409b01f374b3e192bfb7e955f00e9c8fe056439b34ec5cc2b2ca750fb69ddef02469d5b542f6bee51f4de8885802acabccd6f112184920c9dcb814e4
-EBUILD xdg-desktop-portal-1.14.2.ebuild 1057 BLAKE2B 96717ed1de8af640d5a2e9ba776e04b9901c2980654d4bac60146201abe0ba5a9e13251ad49d25d89bd027fb3dd7619b5551d33075443babeb0c0c0a5ad5816f SHA512 e9e4de40e97bd48e80a88246c307a470c14a62cd76c1e1a0292958569a6f42e9ae0ac1f42b8ad0f23f3ca041339ee6fccde010b46cb032114cdea1622c26725e
+EBUILD xdg-desktop-portal-1.14.4.ebuild 1088 BLAKE2B cafd8ca7c6cb352dbb59b3c263b147f1d2cc15a669b5fb509740d08ea90a2f2b879122cfb6b126752862c8b1e7f49da6168cd3d318d2884143c69985a4f306b6 SHA512 2555737a1f5b4eefa8c59bdfa7ba8cfe4dcd32da8ce418a9171b4b722c5d45964d79a168581cf47af28e867716de9506c3a4b0ff4d803cff7b5968653c497cd8
 MISC metadata.xml 361 BLAKE2B 29f050b1cf9380b76d4a779066ae0db5704da11ba9d97e1b2ed7c8d15003d534ecb83c4cd186e7f47e0e89b10e51299ee7bdd9acff9a02f9dc721647bca283da SHA512 872fc2c477635667b5593856f3fef346b96add82b754f9978c36c3c4e56a00516196faab14bac0adff40636c481ba436889b13549b2fc29412f3a21d1166fa25
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
index 32e526740664..03615c15f70a 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.2.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	x11-libs/gdk-pixbuf
 	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
 	screencast? ( >=media-video/pipewire-0.3:= )
+	systemd? ( sys-apps/systemd )
 "
 RDEPEND="${DEPEND}
 	sys-apps/dbus
diff --git a/sys-apps/zram-generator/Manifest b/sys-apps/zram-generator/Manifest
index 6b79d728a6a7..5eec7b7325be 100644
--- a/sys-apps/zram-generator/Manifest
+++ b/sys-apps/zram-generator/Manifest
@@ -1,13 +1,10 @@
 DIST ahash-0.4.7.crate 51474 BLAKE2B 0974b90539398d61903ce7fcbecdfcd802fcb5c7ed631be919ec17be6951e68bc80787876cafebd33e40a80605f6e2352a86047077bc40575420bb6ee1a4915a SHA512 2f42cdbacb2b2f9bd7d94a4cc61294d7813428157ce242ba82f7c3fccb6e4b83c767f4dedd35ff26ae61a89506b388d7cf96af4e727c29a14b25b9f82b1f2126
 DIST anyhow-1.0.45.crate 35468 BLAKE2B 0a6e6bb7a04315e6aab21ad1da743b4087ed95e7bfb7f143b4c5b1cb9527c1e1f9c334bf94c8aaf7bb98f3fc6b0b0cb87244d13808cb86fb76d07555304db90f SHA512 a2ea3a764024dc5d5c176890e22aa9e91e18c4252e04548baeb6ed8cbc11ba8e3b0220758e7b1a670e934da0f40e747ce02520788c0e557cf9ed05b19806fd50
-DIST anyhow-1.0.51.crate 44100 BLAKE2B 20683fd139775cd399bd0fd63599f64a646f8b74c65415af965d3c24690fd81fe48205bedaaaab92075b487b71d5d315be5fdf38ff7c5ecf3e1a1d693a3505ee SHA512 e8e3feebc3c96b7301787502f000b9940a20343a466ac48186c9aa170fb52f0db17768630535a8b475077733ad6ff9f843a3bd5ae4415c86bf83cae0ed0bad7c
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
-DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
 DIST dlv-list-0.2.3.crate 12311 BLAKE2B c74bc2b7e8fa65443c8c8c8c44d5ccfa831ce63e3603797f193a12f78f249e5ed0fb57983469355bf3549ce335fdfac43eb4644e648296a1cd3f48f1e59b35e6 SHA512 ac464c8d1ccbb43b48618cf8912067f28e2d4f53d648cd8b6b8f1b2e2688d2e39ffb8d53faa0f665d23487fa7927258e60ff01e10df584a9e274583d8dc279ae
 DIST fasteval-0.2.4.crate 267521 BLAKE2B 2abd639d65e45fb31aada3d776a47eed7cc16f07fc191674fb8018696ef9cecf9fd65733e43702208023f86ef4f2ba7be4d001aada35d34aac64761938b33bc5 SHA512 5328fecd58aadb67cd0f8500c3faba001bcc0c71f3eb47e1e6cbd7bb18248d61bc79985f6a43166a0324121ca1c93425ed7a3447e3d0d4d0851339ed1802a5e5
@@ -15,13 +12,10 @@ DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST libc-0.2.107.crate 554639 BLAKE2B 583cc24943707bbd53823f15fddfececd7acadb5a4d7dc5d0eb07d7b4d851b93500f1e4081b70c6ce3cc76700bdd6c4173ba710fdd52af7776ec7f31aefa3714 SHA512 df1586889c97d45c95f47495f8285c273c143f1861e632b326345ee66da63c227c064d9e12a6a1b48cfb866c70010a4ad407fed120a1a808da7a345777a8f909
-DIST libc-0.2.109.crate 570506 BLAKE2B 629146033110c42a380a8e87f09af04773bfe9609b8430fa5ec8d85b3d8431e430b60b072e436c479aa8f0037410f1a642bfdb92e4a932ed2c875241bfd63eff SHA512 ecc5cff60ef7ef4febae95cb3ea4fc130b1844ee20d046332ea0738c85ce1c0afe9239d9ad5b1a50236918aa1166eed04b5a91ece76e49099e4a5415bde881a4
 DIST liboverdrop-0.0.2.crate 8714 BLAKE2B a60988a848d21390b46538f02a97cec247184eea7e72a4d77bb243a2476d8ac1d88f964c91ffc0ebefd1215c4c7538fb0a835c4cb41bc153ab89e0b2d98b3c6a SHA512 084c2c2e4c1ee787d5af53ce20f7118f9deb4f1f34b242ca1dd928a71515660b388eed94d1eedca108b3f23c4a8dc4e4b778b6b8a8704850989af63a8be20bdc
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
-DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST nix-0.22.2.crate 227371 BLAKE2B 614f863ba54c57e247d26df2c0673270fb2ee19dc729f8b2340139556fae943cf3b0499532d3f42a02dc26f98b62558921568c46a99f2ebc348b37dce0f14b30 SHA512 860c6cfe77117c28ea54fc5587a125e8ab14acec2dcf77f70d3e43ea574f5272ebb05999b266142616bd92aa613f8c2f60b026b95e758975601df9345a2dbf71
-DIST nix-0.23.0.crate 185348 BLAKE2B 3b5acd0972755d7e3f724d2429b801d5952f2410d91240f9410a8fcc724421beb8c85c9df35b7b877036bf7bb83977e579293ca473efbf9a34cfaa07ad174fe6 SHA512 0aa28f348b67eb79f6f36410e0be4a888294312350b67717ef462905fddb7cba4d81fc0748515629cfd617535c2244e651b05cb0600a054fdc40ec60346a8c8c
 DIST ordered-multimap-0.3.1.crate 20631 BLAKE2B 2d874bb9b37ea109cb7840209c4811c872bddb96f4fec4c936400c57e9a16c04fe801eb72a5b4877762dc9afb7d778c15f2c1efdc34a05b9405212cbf14e6c51 SHA512 37b827165659529e02e303a15ae51c1291e521510a11703ee4245f899d45a2a33237a85bc5e10aeb229f16647f544b37f45a35721c6ef6d6c3c75874a373fdc3
 DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3
 DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
@@ -34,7 +28,6 @@ DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c6
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust-ini-0.17.0.crate 15155 BLAKE2B 654c74c69dbef6ccea8a31070683b9008160340c0768b2e2d169554032cf5ff58533a824c42af83924eb10c2273bd0599bd397ae8322e7179c978015b31249c7 SHA512 2e89d4a60ba33115d3de5b7da551fd47f2350b3e77cc1148c5141134c7ac2bb87de152c67d4c782ae69d3dc04b4159c28eebab1810ce8b9b11bccc3f1a804410
 DIST syn-1.0.81.crate 234144 BLAKE2B 7258c4a0ad0eb0c807912c297233eeb195d22b44cb2078e13e43eb90f1c82ecda6f7672ab072832ce130ccb953c1bb23c8440a3df77b714f462fe39cc6e6e1a3 SHA512 288ddaf4dc5ad2fdb3bc36800d94b53e2bfe9ac74a61a5d158bfcad3728955bebac6a900a5881c7d4abde4f3759515a1dd877e1421c226b85aff99a5ee649390
-DIST syn-1.0.82.crate 234316 BLAKE2B 1d115a4fd61cfebf62657f8faf7fe8786b3715ecf0413a5d117289853b4ecad399611d92d7bed26e590236a4689bff5599787c04f83de1db7f6c771eaa032853 SHA512 9406f62404f1dec3ea37a5e583a8dd7daf646fd5a1b11359aea3004010b3b416a44e4457695ba5beb12b3cbb9fe437de6f73018faa364c4e48060f6aab8ada1d
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
@@ -43,8 +36,6 @@ DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST zram-generator-1.1.1.tar.gz 26091 BLAKE2B 439f550920c1d1a5ba834f3a7e399b8e4451d3fc70ba29788810e08e89f4009972fa9e2e068ce99484f282c82da19044c8498b4f59083a7df1baeceea8c75ab9 SHA512 3aedcd5fb5588b6b011948569785dbf970a3a574094f020e2e1f5a448db41deaa3c955962a8ade5b178df8749163a6282eb4f24e7256c3a185163aad3eee0d66
 DIST zram-generator-1.1.2.tar.gz 26483 BLAKE2B 20a3519c21f543626efb4bf507f0f59dc6dd2ec208eccbcbdbb07a96e7f03ca5539cda17e4a96187267f71f3d771921f7a83fbdab26051c312640c1118a3b186 SHA512 334864dade2c5e0ca5519c0d1d3448e115440538dd04d29857f71cdb6383c65afebd022903f7fa768824becd90072a6a15ed9e1709bbe2676fb71d9f6b9b5f42
-EBUILD zram-generator-1.1.1.ebuild 2080 BLAKE2B d6a78fbe61c718a85f906fc729e333d1b548a308a2031c0ea4de765ccef157def5f156ba7884ddef7bea017f1096ef0d913c35da71cfa36b8e3452bc81f9e6e7 SHA512 98edc49eade47b49b5010924bb647f0d6cf41e979e9e49892be6ec59fc36544bf41f9c0e5e4c09d5a321b829f8c86de5e17c760936bb48fd9737f68a3c1ec37d
 EBUILD zram-generator-1.1.2.ebuild 2080 BLAKE2B fd4654039d9d64a582a6e59e55a469bf047927a65065980ff28202f76be8e6432f4253cb7ecbeb9465dcda02b87f292438d30c3ffe5939c00c658114b705c6f0 SHA512 12f87ccb84935b6a0a5b24599c6a4a7b01632fcd063cc3015ef5843614fd941853325a9d5cbb8a4a57ef0fdc669310bec3ecc08394366fa38acf04dc25017bb9
 MISC metadata.xml 215 BLAKE2B d2ce9b6179c543801bfe26069c65df723eaac4c8bab2d6ea1bb78f41a6ea032fb4491adee16a11e38342158c312ea625113cb362f5da840efc2b432ba3117fe6 SHA512 375665b8997b26eaec5c9237b5ccdf8628af5fd54548e85ba80c12e34e6afe8304fbcf7dfb30f69c6081e9d45e372ae2603efc778421586a13ddfcbec695cf87
diff --git a/sys-apps/zram-generator/zram-generator-1.1.1.ebuild b/sys-apps/zram-generator/zram-generator-1.1.1.ebuild
deleted file mode 100644
index bdf734a90fef..000000000000
--- a/sys-apps/zram-generator/zram-generator-1.1.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	ahash-0.4.7
-	anyhow-1.0.51
-	autocfg-1.0.1
-	bitflags-1.3.2
-	cc-1.0.72
-	cfg-if-1.0.0
-	clap-2.34.0
-	ctor-0.1.21
-	dlv-list-0.2.3
-	fasteval-0.2.4
-	fs_extra-1.2.0
-	getrandom-0.2.3
-	hashbrown-0.9.1
-	libc-0.2.109
-	liboverdrop-0.0.2
-	log-0.4.14
-	memoffset-0.6.5
-	nix-0.23.0
-	ordered-multimap-0.3.1
-	ppv-lite86-0.2.15
-	proc-macro2-1.0.32
-	quote-1.0.10
-	rand-0.8.4
-	rand_chacha-0.3.1
-	rand_core-0.6.3
-	rand_hc-0.3.1
-	redox_syscall-0.2.10
-	remove_dir_all-0.5.3
-	rust-ini-0.17.0
-	syn-1.0.82
-	tempfile-3.2.0
-	textwrap-0.11.0
-	unicode-width-0.1.9
-	unicode-xid-0.2.2
-	wasi-0.10.2+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo systemd toolchain-funcs
-
-DESCRIPTION="Systemd unit generator for zram swap devices"
-HOMEPAGE="https://github.com/systemd/zram-generator"
-SRC_URI="https://github.com/systemd/zram-generator/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	  $(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+man"
-
-BDEPEND="virtual/rust
-	virtual/pkgconfig
-	man? ( app-text/ronn-ng )"
-
-QA_FLAGS_IGNORED="lib/systemd/system-generators/zram-generator"
-
-src_configure() {
-	cargo_src_configure
-
-	sed -e "s,@SYSTEMD_SYSTEM_GENERATOR_DIR@,$(systemd_get_systemgeneratordir)," \
-		< units/systemd-zram-setup@.service.in \
-		> units/systemd-zram-setup@.service || de
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-
-	export SYSTEMD_UTIL_DIR="$(systemd_get_utildir)"
-	cargo_src_compile
-
-	use man && emake man
-}
-
-src_install() {
-	# https://bugs.gentoo.org/715890
-	mv man man.bkp || die
-	cargo_src_install
-	mv man.bkp man || die
-
-	mkdir -p "${D}/$(systemd_get_systemgeneratordir)" || die
-	mv "${D}"/usr/bin/zram-generator "${D}/$(systemd_get_systemgeneratordir)" || die
-
-	systemd_dounit units/systemd-zram-setup@.service
-	if use man ; then
-		dodoc zram-generator.conf.example
-		doman man/zram-generator.8 man/zram-generator.conf.5
-	fi
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /sys-apps
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)