gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-apps
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
438 files changed, 4741 insertions, 4833 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0c28c92184d5..acafb483f623 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 51d0503e75aa..9d144407a179 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,7 +1,7 @@
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
 DIST acl-2.3.0.tar.gz 518155 BLAKE2B 8635e8616a94f6f62de7ece2ccbc789d48f081608493b759150f4bf9d1c98098f5660cc1ec95c8a54bbd0e7295245e1bf77f4afd17f8521172bed790ce217c88 SHA512 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc
 DIST acl-2.3.1.tar.gz 518292 BLAKE2B 82f88b1b2cafa81efa277ea9d1b4872864a9eb259839cf39a429fad8b702dc7158c24e62ca7dd0e72b028e63951798997caca7de9aa40e73f8adc462e7a31bdd SHA512 f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
-EBUILD acl-2.2.53-r1.ebuild 1388 BLAKE2B bb54a8d13adcdbc8c349501a314f08dcbbcc88ba35c511ed9d000f34495652474fa021e4eecbae1dd77a5b7ac6a04fbdc008aa07207dc79a216ab1518fb240e5 SHA512 ef48ffdf0891f550ae6b86d5b81cc00436ca791fb5583d976e6bad502e6a410498f468526fddf69ff1ec58db3c8c32e1803fe9d2ab2333dc983e6eec70cc0e53
+EBUILD acl-2.2.53-r1.ebuild 1389 BLAKE2B 3f315dce6b0f21880ed3d9bd5c050773ee4bdfa1041980946310e274c49d7300fb8d6b8fe95f9d497bf8097c6370ac2c7913a938e122b1c9936b0fbea4d46f7e SHA512 c1bc01a8c97730bdc6c69d0c3987c52ce0070a94d4e6efdf6be427d07bbe987ba402ea6e83bb96dc1474dbb1d5202a355026d5914d03ff33026b253b8ecaf30a
 EBUILD acl-2.3.0.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
 EBUILD acl-2.3.1.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild
index 36ef9c8cb34a..1c5fd4005593 100644
--- a/sys-apps/acl/acl-2.2.53-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.53-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 413dd0ad6c52..5e1085386e20 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,6 +1,6 @@
 AUX agedu-r9671-fix-automagic.patch 1684 BLAKE2B ab7d2d33a7577251fa65e222914a25e621c68f6bdedbe3c9e62b43f2d8b51e29bbdbc08560fbcd76beab98e115ddf43e76e4cd290f1ce751c0452318ad8ee9e1 SHA512 61f11c624ebd5fa632f24ecc46230146f999a68ffbd9c2ce73f6319a527cd9c37d634ecec9a6b2a7fd1dcc792ab3d23a6c8a599499bab54194f36acb262a201b
 DIST agedu-20200617.cec3021.tar.gz 181804 BLAKE2B 19acc1ac37d09f45227e08b92483c1a0be7d9faaf4b2bf65479ca99a0294305788e88d6494508ac742a4396c4a22352d927c125ed7437fe29cb71890dbb2217b SHA512 d7a913a867817a0457c8ec3644a6986ed3632721df1040de1db96c04e85f9e59c4aba632dc1f3f3666496435b6be3f68335a2ec3e50440c844ebd4ab81b2682a
 DIST agedu-20200705.2a7d4a2.tar.gz 181809 BLAKE2B 2802b223979b2f15efd14b6f1f445b9ca00312068ade3c26a057d54a65d5074fdcdee043c9673a59e4e6cc222deba7c817ee078a0a742f09ec1087ec921414bd SHA512 a65f90990706493fc2a080dc313706107ab603f461dcd63531f9afbc1efe785747947f2222559ab2b0b354453a7d9242025c7b96df7f4cac608b8422855c55d6
-EBUILD agedu-20200617.ebuild 817 BLAKE2B 8ae8b06a95d40ada2ac01194808b0c4f2c9b450824579e08b29bd5805573c45ac43f3a91e26e189eb0253032905882b33523ab56d2985736a93db77ec95c5ef5 SHA512 7b087160a3165e4ffa3b35fc165e41ba17b20cf052d1f8790635e77742694a8aa17f78a9c1fef6ef9a114be12c736610f75260d116cc99f60b1f38e57333c591
-EBUILD agedu-20200705.ebuild 817 BLAKE2B 8f574eb51c4a49355b2e325c0bd4c5122a624f07711aadc586025d41cb5efdfa871752e7edab351c5ea0c3936cdb56acc110ac47176ab3a50ae4539ddb020913 SHA512 2a44168dc23904b6c39e397b5cd9a9da04ea44e8bb173c1917f81b8f714211a2071e91c03899bfd3e365fe963c4af2a3aa86691db126975bdba4390d8860ee7b
+EBUILD agedu-20200617.ebuild 810 BLAKE2B 630a990f3002327d6581856e5b4146df7277ddbd631d798bbb8494cc2c501fa7906a69c4c555763231ad9896cf58418ae8b88b3bac2898daad1a09ad2627631f SHA512 07c26d320976498fde96dbd9b644abb1ad11f31220faf7c27434bfa3f324877177ea9800691294bfd944e0d9312611b5590f31c4d975836a8df0c02ad0c7df05
+EBUILD agedu-20200705.ebuild 810 BLAKE2B ae805dfc46890b17fced092675bedbcf9c8d06979b3f66b79832e72f544260cef2bd102a5aa49f13511ef62b05617ac90f9c0e48f5c7d46346d5b45099ca2ba5 SHA512 5ba38f2aad20d8fb0fe7f771864fffc70d71d44c7462cb17871ce85ddea2726b4ebfab3356914f1d2103c889132c0b9ce7604fdcfa0b9e8330379b45869c6715
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-apps/agedu/agedu-20200617.ebuild b/sys-apps/agedu/agedu-20200617.ebuild
index f33c3651492e..6e773cca11b6 100644
--- a/sys-apps/agedu/agedu-20200617.ebuild
+++ b/sys-apps/agedu/agedu-20200617.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
diff --git a/sys-apps/agedu/agedu-20200705.ebuild b/sys-apps/agedu/agedu-20200705.ebuild
index a49e4fc983bc..be1c1f08bf7d 100644
--- a/sys-apps/agedu/agedu-20200705.ebuild
+++ b/sys-apps/agedu/agedu-20200705.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index 9e13c82014a7..49f278cb9e5e 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -2,5 +2,5 @@ AUX apmd.confd 56 BLAKE2B 59236d42a8b27ba98ce06c61e19da23f0f131f82892e1a9907712f
 AUX apmd.rc6 568 BLAKE2B 10519550d5ed67ecdb2ae192517ecd9c4a8943309b31371be847aef4894b5171b50eca0b7a74655cbfd6fa4aa1a7a08c3fc2700b28b3945bb75962f93e5a60f0 SHA512 ac4578dd1b49207b8d1c50f3481a3652d8cfb83ea3c1984a553aa5acefd17fee5fa71a903fa9dca4d1991c47c6b14d6901352fc03df741cae0aed337ee55cf14
 DIST apmd_3.2.2-14.diff.gz 19195 BLAKE2B 554c84005fe443d3587169847b14cac186af0295e9b0dc4b9f564f014d2e717eb9c2d0ef0d6a4d701b81be26c2b0b8781f0bede008ac3bfcd2a20802a1e55ffa SHA512 a3578d0c43950f832fb437a744f8a4c3058c731649decb90f7b42c901b06f4df5f9a75599b4278e15af1c8a30d8043b0d76eb7d2cb67b05bf6bb210d5912a16d
 DIST apmd_3.2.2.orig.tar.gz 72757 BLAKE2B 1b93d831c1d24cbf8c061969dd915ce219bbf62374e4e82b8fd61b7154f3a1a8bd7da740c2b6a557a335f4aeed41feea13fb85bdedad80ab9197e1355d1b20e9 SHA512 fdc74703e75a700397bb2c907986f0cf0792ee4128d7a7ae08adf090bff0ea595044ba7a935d34929745bb702eb8bfe232e0ee9156efd23a995dc087f1b20bf4
-EBUILD apmd-3.2.2_p14-r1.ebuild 1816 BLAKE2B 31cf8d103146ac87656373f59a65b1b3abf4c40971945b55f8b95efda0e83eefb44e4481a70a332767d0cd69141a0c2daeeb2773da9d19c8fcaecf8c390502ab SHA512 48003312c87fc75bed146cfa833e4d6e9ac7c162309cb839c7798178506eea9357a0fecfc7ff378b683c1992504cee3558a27b1b22acafba509bcba32478c09f
+EBUILD apmd-3.2.2_p14-r1.ebuild 1813 BLAKE2B 9038ec4ec6adbea1c2ddd4bce959dda00fdd65dc9d24b4b1aee5b52fac46ffa601ca1ec2e92872745ba2abc8a83a0973497d418df77fe57db02be51943e376ea SHA512 2bc5f9f371acc7c168e31cbda3969986478681b5184a394910ff6eda12934e5fd5c73e9f8cb2785058c9ad24dc39a03f8b96842be77a74df751b63627a722405
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild b/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild
index 166a03b1cf8e..fefa3c983ce8 100644
--- a/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild
+++ b/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils multilib toolchain-funcs
+inherit epatch multilib toolchain-funcs
 
 MY_PV=${PV%_p*}
 MY_P=${PN}_${MY_PV}
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 6c58b0840e1e..e0a499dc1ad8 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -4,7 +4,7 @@ AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
 DIST attr-2.5.0.tar.gz 465575 BLAKE2B b50c6b741543140099e7f31fcc327d4547cda41f1b14159664096b571c5c14ed7279992e94fdd9bc23d5618715a7d4fe8d45ba8d5cc2941ac6a4d242bc80ee09 SHA512 900e66d13acd022f52986d4159925b23e60f9ef5d11983b16d9dfe4a98fd70eea5f78e18f3694d8adea1c422324772af4da6b5659d755ed37484b428e28bb5fc
 DIST attr-2.5.1.tar.gz 465714 BLAKE2B 05928f8274b0b4beee31b329c8459436c5b9019ebd2f937667b7beb8df7a455c48742a90d9c4faca5c0b38c9c3812043d3d66f9587108d3424c6184fef494b56 SHA512 8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b
-EBUILD attr-2.4.48-r4.ebuild 2352 BLAKE2B 7d90d8442281a18b198ef654a115accc7228c66386dc4b453dfffc1bf8b80b7d3978ab83b8f520be7935f114fdc5f9391124b6628b3dcc15ad6ea67bb65a761b SHA512 16be12e9f26b6140f66e4b67533945e17171495951e17c0384250e32a13159e8572f80d505b0d6b76bfcaf47297420044e815414d2862284f0bda5f669bfadaa
+EBUILD attr-2.4.48-r4.ebuild 2353 BLAKE2B 47e89fd3a2737de71b9a526c816b24ad0dad2c38c333333b4217fcdefd46caaa0148ddbe27ffe0baeb3be1517839a146c0e564fb1a00c67e1c01df2a441508ee SHA512 e384c8cfb28af3885e2ed1e5813d14f95af2081c457efb14757d4ed9a9f40c2ce9d007c2f28f3473d4743597bfe236c966c55f0784ccfc402ad4ae8270e1005a
 EBUILD attr-2.4.48-r5.ebuild 2584 BLAKE2B 44947dccaf200cedddc154153a957793b6de341b00ac395aba99b5c047f116eaa8f049ed2185d054261bb917d992ffa8c0bf79a53d6549ed2e26be0e3e0dc17b SHA512 7a9dfb9696cc8c7a452b21462be7f1c319042ea78aaad6cdf31cae1f48b229f7c390fcae4dc2ed20b24f9724e50f298ce4c706a238538976871a43e688c046e7
 EBUILD attr-2.5.0.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
 EBUILD attr-2.5.1.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild
index 4ed1fc5d9cc0..02c33f7c1f4f 100644
--- a/sys-apps/attr/attr-2.4.48-r4.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls static-libs"
 
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index a87aff1f4399..cb048e6faac7 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,5 @@
-DIST baobab-3.34.1.tar.xz 458500 BLAKE2B 1f27640bb369cf1712c7b1c79d1261fd4a99e427a99debbf7d2f31f191f5e0ddaec7b366cb6b34add6a552c9728b9b1f4b64bdc05f06b29e0071ccad73a77c6a SHA512 8234f26fde68d6ebe578360345dcb45314b6a818aa899f858b7e3b9ae1874165e4f1d644d169d6ba56270689a34e8cd78d993e99c08f66b3f2c7c9fd0b7ea516
 DIST baobab-3.38.0.tar.xz 579948 BLAKE2B b0ad702ff105e8308b7b9a5904b9331c0fe99db8b78a154a4b67ebc8b09992d967d896c713df42640319bab3c03de1130b88daf4f23be996ee3bc0bdb633a625 SHA512 764fc97ccab01d056fb657cda3c04e742d865e4c6ca16d4a5212a9d5470e961c8fe3523a27ab28945c38c25c1155903897e178b9ffaf0a6c07c6a044e29a750c
-EBUILD baobab-3.34.1.ebuild 741 BLAKE2B 10803eba1cddb0f50d6520faa8b966e7a97461f99b0187782aa2c02f2ee559348bf0c43bd2b87f41a62e0cab128a5e66ae69a28cba4504294b4ce831c7b1dce5 SHA512 6aa9a9e559875b149d3872f884c9d0bd60cd0ed6287da38804211fa14e2a2567cce76cc22be364cb70e157157ade86519f02a415fdf60c456ddaabe16eb00b40
-EBUILD baobab-3.38.0.ebuild 717 BLAKE2B a5383d37770463b26d900cc56f46cd9dca2146e05891c7baae6d39d4686f183d9b7bb2bc0802bc522bcfbf20db6b79e78a99079c97ac8918c1e865d1c8cd3603 SHA512 84418b7ed2944bf9957f660ce4cc619e5764c2a165cf0422e4a63c4c37bccc9b8bccd7a023f2c8b4a45910f40956d937783a1e9e917c27f9c568705d8ac3fd95
+DIST baobab-40.0.tar.xz 581744 BLAKE2B 12fc2023a19512117c235a54ac36045e1a733c4d64d8ff1ea77d6be624d442ed66bca83788ffc19be36855207cb693c8f1aa4793c8750e84d60c1b84e79b869b SHA512 31ab768f7e089c12717bc363111fe936f4a15986b69ee53b8f9aab19973ff5bf4970fdfa4d936af4d46673a9f08063518a6c314453e698e6068485152e400650
+EBUILD baobab-3.38.0.ebuild 716 BLAKE2B 4517ebecc5a6c6c9d96fe680cedaccfb69967f435afd05e92a2036be150dbe3687b723be81ce1ce5a63d4efc944144e476cd8b61ce1c815bc16a831f564ec736 SHA512 8ebe2322af4370235c695c1ba813184696cda7882898dde65ce5b65ebfd68d8580a50cfe273d33bef6733393b8b0cef7b28dd11559b40410be0af38afe8cb0bf
+EBUILD baobab-40.0.ebuild 814 BLAKE2B d873a555763d064b111c26fd5acf5976083a89909820b4a2d085cb1b445ca01ddc5081bdebe5f308c47d447af20bd7b8c4e96dbd4ef4578b636d1fe3c78a24bc SHA512 415dc3a9a5c1627e28b78b5c3969c31829a061426c1e8a1d9602f41fa981a17f0e3e837f8f0346595e42846f8a67511b460637de5b2b2a546379870e3531beb5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.38.0.ebuild b/sys-apps/baobab/baobab-3.38.0.ebuild
index 31b963eaf1c0..b3ff70089509 100644
--- a/sys-apps/baobab/baobab-3.38.0.ebuild
+++ b/sys-apps/baobab/baobab-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/sys-apps/baobab/baobab-3.34.1.ebuild b/sys-apps/baobab/baobab-40.0.ebuild
index 0202a6950ad9..ff893b860427 100644
--- a/sys-apps/baobab/baobab-3.34.1.ebuild
+++ b/sys-apps/baobab/baobab-40.0.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome.org gnome2-utils meson vala xdg
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Disk usage browser for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/gtk+-3.24.1:3
+	>=gui-libs/libhandy-1.0.0:1=
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
 	$(vala_depend)
-	dev-libs/appstream-glib
 	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
+	>=sys-devel/gettext-0.21
 	virtual/pkgconfig
 "
 
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 64574bab0e35..edc9de757e65 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,9 +1,6 @@
-DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
-DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
 DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
-EBUILD baselayout-2.4.1-r2.ebuild 8567 BLAKE2B 35400fafd5addba2128aab3ce0476893302572d16c9becd92963c99b4a260ccceb2b104e0a49e75ba3fd4ac25b623c22b31af78d689c71a68843b7071c51a0f9 SHA512 bfa7d130955aa6d8a55cdd1685f639ae009847ce88bed3088c26479dd47b8c47ff6775d6addf92716513b490544e2937a0ebff35b32eab4f3a98f0e308547a73
-EBUILD baselayout-2.6-r1.ebuild 9560 BLAKE2B 03f1513752235adeffe7274004ab9e6e3f11ce38c4715c3db4a5619571c11764385fc8e3bbf1b57120ac9b19efafaf6d2bb006c4be884eaf9d8db00ceceae2b7 SHA512 446b72d50abb3624e0e73590a903054b227b47d2ef6d65f1ca5e268fc0177d7f04139944afdc5b8cef1952d64c5d12067c00565c1ca84e904a29a4ac45515657
 EBUILD baselayout-2.7-r1.ebuild 10197 BLAKE2B 5e5f767f37bdf286cd77d21512a855e1e2f5f26fd794838e3cb21634f089b66cefc4e915c9e88148f0e1f2a0067a57bfb029833572614c0190d54f862ff15659 SHA512 847e2ddae301a856b7719fe9134635ea79f0059107188aad8c554fda4da428f970a2ad4daf56491050acacd822175fa8ae18f22402e19677df9d920c525ce737
-EBUILD baselayout-2.7.ebuild 10023 BLAKE2B 9e2d853215dbe206197fc40877f98df48a4d225cd47281dc557a6adc87efb35465a00434034176df3f4bdac2286373e56c2b310a8e4c3cc9211271073a32c76f SHA512 c9f534f789f3e9de15f2326066daa59eb28fd7ae3fa287e6f193bfc21b0e1ea4397d854ade1cf57bdb6b8be1af7fe626b8750081b0c726df1920d1c6d5d414db
-EBUILD baselayout-9999.ebuild 9940 BLAKE2B 6354e020354282c0ee7dadbf3044ed8a410b986149f25c565e015e8b3d616fc40b357490b322f7f2d749790c98bc7d1bfb34f80a7da7f99419540a88b5538e2d SHA512 e4f0ecf7b329f71835cd7667282def8acd114485390900279beb19d1d37c153d802f02c45a2993e28ae09f293eadd90fd7942b4bdcc7ee85d82708f8428089a0
+EBUILD baselayout-2.7-r2.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b
+EBUILD baselayout-2.7.ebuild 10024 BLAKE2B 490416f9367b1236ac8879b273acc2920f77f1fb23edba5bc825358270f434e0facb8f2794baebce5841b2be2ee3a4da5fffa026585555902e582ff36ab37bd3 SHA512 6a629e68f58d23f8d9653bccca3ad6d52610bd87ab73c5d6b12c9b6e9762f34f2deb452d689c99ea4d66f1c4dbe88e13991f1b2ea900720fd8c8d92067aaca71
+EBUILD baselayout-9999.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b
 MISC metadata.xml 382 BLAKE2B 7c360eab19fc55da87cf2a432c1f2407918be3cf32ec581b974fea953aea00a51998cd05facd0c4b6d609e38bd1f243380a5c3a9effcb5e7bebbf22ec6d9418c SHA512 1a444b5b8fc6573fae97c6e0bf5e3dc69f9e18a42d2a7c91ac2742bca17580468be8b17ca6349451817b0087f619bad90a1050b1fd8511fc5e57b792b5006d72
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
deleted file mode 100644
index 81f43cd133be..000000000000
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib versionator prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="build kernel_linux"
-
-pkg_setup() {
-	multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		exp=( {,usr/,usr/local/}${libdir} )
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	local prefix
-	for prefix in "${EROOT}"{,usr/,usr/local/} ; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-}
-
-pkg_preinst() {
-	# Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of
-	# the baselayout-1.x ebuild copies all the real configs from the user's
-	# /etc/conf.d into ${D}, it makes them all appear to be the default
-	# versions. In order to protect them from being unmerged after this
-	# upgrade, modify their timestamps.
-	touch "${EROOT}"/etc/conf.d/* 2>/dev/null
-
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
-		echo PATH=/usr/bin:/bin >> etc/env.d/99host
-		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
-	fi
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
-}
-
-src_install() {
-	emake \
-		OS=$(usex kernel_FreeBSD BSD Linux) \
-		DESTDIR="${ED}" \
-		install
-	dodoc ChangeLog
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}etc/${x}" ] && continue
-		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		[ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}"
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# baselayout leaves behind a lot of .keep files, so let's clean them up
-	find "${EROOT}"lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null
-	find "${EROOT}"lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"run
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.4 ${v}; then
-			ewarn "After updating ${EROOT}etc/profile, please run"
-			ewarn "env-update and . /etc/profile"
-			break
-		fi
-	done
-
-	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
-		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.6-r1.ebuild b/sys-apps/baselayout/baselayout-2.7-r2.ebuild
index 5471a444eb25..a37d17f3b8d1 100644
--- a/sys-apps/baselayout/baselayout-2.6-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib versionator prefix
+inherit multilib prefix
 
 DESCRIPTION="Filesystem baselayout and init scripts"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -29,11 +29,10 @@ multilib_layout() {
 	local prefix prefix_lst
 	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
 	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
 	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in ${prefix_lst[@]}; do
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+		for prefix in "${prefix_lst[@]}"; do
 			for libdir in ${libdirs}; do
 				dir="${prefix}${libdir}"
 				if [[ -e "${dir}" ]]; then
@@ -41,10 +40,12 @@ multilib_layout() {
 						die "${dir} exists but is not a directory"
 					continue
 				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
+				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
+					libdir="${libdir%%/*}"
+					dir="${prefix}${libdir}"
 					einfo "symlinking ${dir} to usr/${libdir}"
 					ln -s usr/${libdir} ${dir} ||
-						die " Unable to make ${dir} symlink"
+						die "Unable to make ${dir} symlink"
 				else
 					einfo "creating directory ${dir}"
 					mkdir -p "${dir}" ||
@@ -88,9 +89,9 @@ multilib_layout() {
 	# setup symlinks and dirs where we expect them to be; do not migrate
 	# data ... just fall over in that case.
 	if use split-usr ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
 	else
-		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
 	fi
 	for prefix in "${prefix_lst[@]}"; do
 		if [ "${SYMLINK_LIB}" = yes ] ; then
@@ -101,7 +102,7 @@ multilib_layout() {
 			elif [ -d "${prefix}lib" ] ; then
 				# "lib" is a dir, so need to convert to a symlink
 				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep
+				rm -f "${prefix}lib"/.keep || die
 				if rmdir "${prefix}lib" 2>/dev/null ; then
 					ln -s ${def_libdir} "${prefix}lib" || die
 				else
@@ -113,7 +114,7 @@ multilib_layout() {
 				mkdir -p "${prefix}" || die
 				rm -f "${prefix}lib" || die
 				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" #423571
+				mkdir -p "${prefix}${def_libdir}" || die #423571
 			fi
 		else
 			# we need to make sure "lib" is a dir
@@ -135,7 +136,7 @@ multilib_layout() {
 				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
 				i?86*|x86_64*|powerpc*|sparc*|s390*)
 					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep
+						rm -f "${prefix}lib32"/.keep || die
 						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
 							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
 							die "non-empty dir found where there should be none: ${prefix}lib32"
@@ -153,7 +154,8 @@ multilib_layout() {
 	if ! use split-usr ; then
 		for libdir in ${libdirs}; do
 			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+					die "Unable to make ${EROOT}${libdir} symlink"
 			fi
 		done
 	fi
@@ -163,7 +165,7 @@ pkg_preinst() {
 	# This is written in src_install (so it's in CONTENTS), but punt all
 	# pending updates to avoid user having to do etc-update (and make the
 	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
 
 	# We need to install directories and maybe some dev nodes when building
 	# stages, but they cannot be in CONTENTS.
@@ -176,7 +178,7 @@ pkg_preinst() {
 			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
 		fi
 	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile
+	rm -f "${ED}"/usr/share/${PN}/Makefile || die
 }
 
 src_prepare() {
@@ -188,6 +190,16 @@ src_prepare() {
 		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
 	fi
 
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr; then
+		sed \
+			-e 's|/usr/local/sbin:||g' \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
 	# handle multilib paths.  do it here because we want this behavior
 	# regardless of the C library that you're using.  we do explicitly
 	# list paths which the native ldconfig searches, but this isn't
@@ -196,7 +208,8 @@ src_prepare() {
 	# path and the symlinked path doesn't change the resulting cache.
 	local libdir ldpaths
 	for libdir in $(get_all_libdirs) ; do
-		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
+		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
 		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
 	done
 	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
@@ -211,10 +224,16 @@ src_install() {
 		DESTDIR="${ED}" \
 		install
 	dodoc ChangeLog
+	rm "${ED}"/etc/sysctl.d/README || die
 
 	# need the makefile in pkg_preinst
 	insinto /usr/share/${PN}
 	doins Makefile
+
+	# This is needed for https://bugs.gentoo.org/732142
+	dodir /usr/lib
+	mv "${ED}"/etc/os-release "${ED}"/usr/lib || die
+	dosym ../usr/lib/os-release /etc/os-release
 }
 
 pkg_postinst() {
@@ -226,23 +245,25 @@ pkg_postinst() {
 	# (3) accidentally packaging up personal files with quickpkg
 	# If they don't exist then we install them
 	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}etc/${x}" ] && continue
-		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc
+		[ -e "${EROOT}/etc/${x}" ] && continue
+		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
 	done
 
 	# Force shadow permissions to not be world-readable #260993
 	for x in shadow ; do
-		[ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}"
+		if [ -e "${EROOT}/etc/${x}" ] ; then
+			chmod o-rwx "${EROOT}/etc/${x}" || die
+		fi
 	done
 
 	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release
+	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
 	fi
 
 	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"etc/shadow ]] ; then
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
 		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
 		if [[ -n ${bad_users} ]] ; then
 			echo
@@ -252,8 +273,8 @@ pkg_postinst() {
 	fi
 
 	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
 		if [[ -n ${bad_shells} ]] ; then
 			echo
 			ewarn "The following users have non-existent shells!"
@@ -263,35 +284,35 @@ pkg_postinst() {
 
 	# https://bugs.gentoo.org/361349
 	if use kernel_linux; then
-		mkdir -p "${EROOT}"run
+		mkdir -p "${EROOT}"/run || die
 
 		local found fstype mountpoint
 		while read -r _ mountpoint fstype _; do
 		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"proc/mounts
+		done < "${ROOT}"/proc/mounts
 		[[ -z ${found} ]] &&
 			ewarn "You should reboot now to get /run mounted with tmpfs!"
 	fi
 
 	for x in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.4 ${x}; then
-			ewarn "After updating ${EROOT}etc/profile, please run"
+		if ver_test 2.4 -lt ${x}; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
 			ewarn "env-update && . /etc/profile"
 		fi
 
-		if ! version_is_at_least 2.6 ${x}; then
+		if ver_test 2.6 -lt ${x}; then
 			ewarn "Please run env-update then log out and back in to"
 			ewarn "update your path."
 		fi
 		# clean up after 2.5 typos
 		# https://bugs.gentoo.org/show_bug.cgi?id=656380
 		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}{,usr"
+			rm -fr "${EROOT}/{,usr" || die
 		fi
 	done
 
-	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
-		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
 		ewarn "Please migrate your changes."
 	fi
 }
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
index 1a631d10b938..cb06c4a3e20d 100644
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index ee4f298e8409..a37d17f3b8d1 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib versionator prefix
+inherit multilib prefix
 
 DESCRIPTION="Filesystem baselayout and init scripts"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -29,10 +29,9 @@ multilib_layout() {
 	local prefix prefix_lst
 	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
 	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
 	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
 		for prefix in "${prefix_lst[@]}"; do
 			for libdir in ${libdirs}; do
 				dir="${prefix}${libdir}"
@@ -41,10 +40,12 @@ multilib_layout() {
 						die "${dir} exists but is not a directory"
 					continue
 				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
+				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
+					libdir="${libdir%%/*}"
+					dir="${prefix}${libdir}"
 					einfo "symlinking ${dir} to usr/${libdir}"
 					ln -s usr/${libdir} ${dir} ||
-						die " Unable to make ${dir} symlink"
+						die "Unable to make ${dir} symlink"
 				else
 					einfo "creating directory ${dir}"
 					mkdir -p "${dir}" ||
@@ -88,9 +89,9 @@ multilib_layout() {
 	# setup symlinks and dirs where we expect them to be; do not migrate
 	# data ... just fall over in that case.
 	if use split-usr ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
 	else
-		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
 	fi
 	for prefix in "${prefix_lst[@]}"; do
 		if [ "${SYMLINK_LIB}" = yes ] ; then
@@ -101,7 +102,7 @@ multilib_layout() {
 			elif [ -d "${prefix}lib" ] ; then
 				# "lib" is a dir, so need to convert to a symlink
 				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep
+				rm -f "${prefix}lib"/.keep || die
 				if rmdir "${prefix}lib" 2>/dev/null ; then
 					ln -s ${def_libdir} "${prefix}lib" || die
 				else
@@ -113,7 +114,7 @@ multilib_layout() {
 				mkdir -p "${prefix}" || die
 				rm -f "${prefix}lib" || die
 				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" #423571
+				mkdir -p "${prefix}${def_libdir}" || die #423571
 			fi
 		else
 			# we need to make sure "lib" is a dir
@@ -135,7 +136,7 @@ multilib_layout() {
 				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
 				i?86*|x86_64*|powerpc*|sparc*|s390*)
 					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep
+						rm -f "${prefix}lib32"/.keep || die
 						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
 							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
 							die "non-empty dir found where there should be none: ${prefix}lib32"
@@ -154,7 +155,7 @@ multilib_layout() {
 		for libdir in ${libdirs}; do
 			if [[ ! -e "${EROOT}${libdir}" ]]; then
 				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
-					die " Unable to make ${EROOT}${libdir} symlink"
+					die "Unable to make ${EROOT}${libdir} symlink"
 			fi
 		done
 	fi
@@ -164,7 +165,7 @@ pkg_preinst() {
 	# This is written in src_install (so it's in CONTENTS), but punt all
 	# pending updates to avoid user having to do etc-update (and make the
 	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
 
 	# We need to install directories and maybe some dev nodes when building
 	# stages, but they cannot be in CONTENTS.
@@ -177,7 +178,7 @@ pkg_preinst() {
 			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
 		fi
 	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile
+	rm -f "${ED}"/usr/share/${PN}/Makefile || die
 }
 
 src_prepare() {
@@ -223,11 +224,16 @@ src_install() {
 		DESTDIR="${ED}" \
 		install
 	dodoc ChangeLog
-	rm "${ED}"/etc/sysctl.d/README
+	rm "${ED}"/etc/sysctl.d/README || die
 
 	# need the makefile in pkg_preinst
 	insinto /usr/share/${PN}
 	doins Makefile
+
+	# This is needed for https://bugs.gentoo.org/732142
+	dodir /usr/lib
+	mv "${ED}"/etc/os-release "${ED}"/usr/lib || die
+	dosym ../usr/lib/os-release /etc/os-release
 }
 
 pkg_postinst() {
@@ -239,23 +245,25 @@ pkg_postinst() {
 	# (3) accidentally packaging up personal files with quickpkg
 	# If they don't exist then we install them
 	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}etc/${x}" ] && continue
-		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc
+		[ -e "${EROOT}/etc/${x}" ] && continue
+		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
 	done
 
 	# Force shadow permissions to not be world-readable #260993
 	for x in shadow ; do
-		[ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}"
+		if [ -e "${EROOT}/etc/${x}" ] ; then
+			chmod o-rwx "${EROOT}/etc/${x}" || die
+		fi
 	done
 
 	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release
+	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
 	fi
 
 	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"etc/shadow ]] ; then
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
 		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
 		if [[ -n ${bad_users} ]] ; then
 			echo
@@ -265,8 +273,8 @@ pkg_postinst() {
 	fi
 
 	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
 		if [[ -n ${bad_shells} ]] ; then
 			echo
 			ewarn "The following users have non-existent shells!"
@@ -276,35 +284,35 @@ pkg_postinst() {
 
 	# https://bugs.gentoo.org/361349
 	if use kernel_linux; then
-		mkdir -p "${EROOT}"run
+		mkdir -p "${EROOT}"/run || die
 
 		local found fstype mountpoint
 		while read -r _ mountpoint fstype _; do
 		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"proc/mounts
+		done < "${ROOT}"/proc/mounts
 		[[ -z ${found} ]] &&
 			ewarn "You should reboot now to get /run mounted with tmpfs!"
 	fi
 
 	for x in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.4 ${x}; then
-			ewarn "After updating ${EROOT}etc/profile, please run"
+		if ver_test 2.4 -lt ${x}; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
 			ewarn "env-update && . /etc/profile"
 		fi
 
-		if ! version_is_at_least 2.6 ${x}; then
+		if ver_test 2.6 -lt ${x}; then
 			ewarn "Please run env-update then log out and back in to"
 			ewarn "update your path."
 		fi
 		# clean up after 2.5 typos
 		# https://bugs.gentoo.org/show_bug.cgi?id=656380
 		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}{,usr"
+			rm -fr "${EROOT}/{,usr" || die
 		fi
 	done
 
-	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
-		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
 		ewarn "Please migrate your changes."
 	fi
 }
diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest
index 37da7d898d79..c3376a06fa4b 100644
--- a/sys-apps/biosdisk/Manifest
+++ b/sys-apps/biosdisk/Manifest
@@ -1,3 +1,3 @@
 DIST biosdisk-1.01.tar.gz 214715 BLAKE2B 1a42523d0ec713a895276e3ca3b383206bb841c59bf789eb2b869ce3ade6bfde1e96d47afb8874eec5efec1ef4d404c093a707e36d2d9ab785211fa62abb5782 SHA512 f1920a0eee0a1f8530488c5ccd3f37b36170150b7658658af55beb41c2084c66b6d6bded6e144e36dd9d74f963881c504d7869bbe5c8b57749bff4d918581537
-EBUILD biosdisk-1.01.ebuild 588 BLAKE2B ca0d2e385dbf7138407ddb9ce60e4eb0ff8ff22e351a3ebf68d223c23490003721035bb54d2b128a419400f4b29312d2ee9d28e62ff032271000991dfd93dc19 SHA512 e81b6743cc3570f7ea0a903ea13d8f044eda3d538df6b5a3973ef4d943ab1c261832306c65bc4642e6df1e21724f5bc1f1add61b29531ea17f27744e26851f9c
+EBUILD biosdisk-1.01.ebuild 572 BLAKE2B 4330e72ee57c3d212627aaa82e3d48f398ef864c557c3909a26a4a05abc86a48a23805e8249f8b679b0b4cef034b836df2ba53a66eb9b6923c0d458ff527d46e SHA512 253d4694d255149fde8ef1a3c4ee43b05215178b0e53911c2c08e61f957c7998e5ba5e6397648ac1621844ebd04704c6a7440c0c3ac4cdd83e8820602fed82ca
 MISC metadata.xml 245 BLAKE2B cfb1c75ae97a85e469dede0ae542d146c40033c7220b383abaf7ffbb38325cb5132c98f4d920f7f33833b98ec5a1b51ca1b7574df675830a9e65468f01063e08 SHA512 d4a6599b57a5234bf178a387868bc06977b83bd56117edb8ff6dc4f0e3c8739cbb9acd9aa6ab7c053e6d84a2e14de474b0e9e76cf75938d492ccd7b87c314d9f
diff --git a/sys-apps/biosdisk/biosdisk-1.01.ebuild b/sys-apps/biosdisk/biosdisk-1.01.ebuild
index f4ae904c895e..ddd33591ce56 100644
--- a/sys-apps/biosdisk/biosdisk-1.01.ebuild
+++ b/sys-apps/biosdisk/biosdisk-1.01.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils
-
 DESCRIPTION="FreeDOS based BIOS updating utility for Dell machines"
 HOMEPAGE="https://github.com/dell/biosdisk"
 SRC_URI="https://github.com/dell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 681d4d91227b..3a2a6595195a 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -2,5 +2,5 @@ AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9
 AUX bolt.openrc-r1 374 BLAKE2B 91dcbfb842166837d4a89c12e7c8b39db9810ba1ffd18eb1ee61798f3634952440b1bb79118d1486819c34916b266a8c47b4398df42ba8f0c3411d482e2e4874 SHA512 3731459efce91c89e5a601b649acc7ed4faee4d08d2a52a5784dc53b914a15113003516e8fed64e532dc703e019ed53b37ec9a4414b770165c1e46813392f9d3
 DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
 EBUILD bolt-0.9-r2.ebuild 1344 BLAKE2B 7742674b1eff6b2ed07b90a9ae76b94b4050b585b172609bd74597ee64b1bac3a9822fd7d9ff5a80966e5e931780bdbb2ccc86a703882c3d0a281285926edbbe SHA512 c1b0353b4d69d022fc570a5e38a01c56e72f3f48adab3e876ca9fadcf9eee9e35bde22db118418f2a6141b070614346a0c74a10ec30862260219fb65b14c656f
-EBUILD bolt-0.9-r3.ebuild 1349 BLAKE2B 06096ee9038a236782116306126ec7838827788173da85f59debc72ff70cc1ff71ee3f48f0a5b293990609fca2d0770ec3a6e68eb6f3225b3fd06873f2c6d3e2 SHA512 1c207d5b6d983700e1d6bbf04c5e8339203a6ad1da70ec74644f67c6df0f8b0562b99af905ea744c14244917c74081c67bb0ada05a2c4d128ac68ef651ca037d
+EBUILD bolt-0.9-r3.ebuild 1347 BLAKE2B 28a3a9aadf5c1ce03b2ee4132e603de2f3e68051e2361bd984e3cb41aa62d1a4659bdc4c59002861c6ce51e5a8f8c68d39d37d35a7a8eb37e41eec9887533159 SHA512 e51fff67782fe10d9048d0feaefca084d481ccd3aee72a098d215750272e064bc3ea3059cf1adaaac917adcb3e664bd13bc95795948442258fe1d7d3b080722c
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-apps/bolt/bolt-0.9-r3.ebuild b/sys-apps/bolt/bolt-0.9-r3.ebuild
index 34cd766665ec..d0f8d019bc70 100644
--- a/sys-apps/bolt/bolt-0.9-r3.ebuild
+++ b/sys-apps/bolt/bolt-0.9-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc systemd"
 
 DEPEND="
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 2784f3ddab2f..0202d3735b29 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -13,11 +13,9 @@ AUX syslogd.confd 234 BLAKE2B a1601c31dab14e5c2712f49133758479914bcf37e0d9704fe7
 AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e7594d60bb9adfbbb631eede30f375cf38370606c93d10e8fba05f50e88ede6709ee30b6ae6aec7a7 SHA512 856dd97ed46b08fdd13e497737f1eb192594e33bfc5d395d7ca6eed2e6bc212cf0cf33518b36a6f9a18d6962d462430c7b50c07e9dc08e85606ef68b240b1211
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
-DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b
 DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd
 DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a
-EBUILD busybox-1.32.0-r1.ebuild 9485 BLAKE2B 0749d7f1a94bcbcae70ef9e305720a20c309397fb0013a411a8ea6caa4d24c93772a583a808d2467d81ce970be5762fcd2850b84295ac78a05f1e3b1ae788529 SHA512 c4dbabff8ee7ebfb3515ae94efa39b6c4e6de3bd478a243fb3156ef70f0f5b4b75c70beb77531d12abdbec3af4ea4a1c59437cbf462fd62c70a8d9bf82e74f7a
-EBUILD busybox-1.32.1.ebuild 9485 BLAKE2B 0749d7f1a94bcbcae70ef9e305720a20c309397fb0013a411a8ea6caa4d24c93772a583a808d2467d81ce970be5762fcd2850b84295ac78a05f1e3b1ae788529 SHA512 c4dbabff8ee7ebfb3515ae94efa39b6c4e6de3bd478a243fb3156ef70f0f5b4b75c70beb77531d12abdbec3af4ea4a1c59437cbf462fd62c70a8d9bf82e74f7a
-EBUILD busybox-1.33.0.ebuild 9493 BLAKE2B 54b44ae3a230bf7fd6f03b76b293e0e42b351049a3b2200928c2a6dfff459a62115e48bc279b280151a73cfbc660f8403a5f9673e88d4e1e30445029fe9c4cc0 SHA512 54af8a0e8f4c1d6c4bf28f85f2c205487c6d0449baab0f7872b9cb11121d7ddf7f142dd902a2abed3a770080d70e7b2d0b39f4f7d775d83dd3b22013c05d1aa9
-EBUILD busybox-9999.ebuild 9438 BLAKE2B ff3b404b01449191451c5126eab5368eb97c4a3ddada5f988b5ee106e483808ea008b7106bce99f357642fae4d600097ff0977df1f28c1338ac8e4270cdf1eb1 SHA512 45f808c10761fdbdc7571714590530fe5ed2de13ce70be1351e7b871bf8d34bcdc0e72837461459cd1a3ca2acc8f2af6177f9a85bcbad0e5d218a685c4fbd54d
+EBUILD busybox-1.32.1.ebuild 9579 BLAKE2B ca46d5c3161015e8623926604d79dd230eb7587ba442e5249fcaede9c9156ddcbd19e0a15eeacda3816dd51ec8ea0b11a9a4177a4ebb4dcdfd327612e2f4ad4e SHA512 ee80215d96d29bee8d675ba462046139dba49a00e4d089e29f471d296acc1d5b7ba04143a2821ca13cbc46d1814c9c8380abe2ef82a065ee926e34d67acfcf4a
+EBUILD busybox-1.33.0.ebuild 9586 BLAKE2B 8e8f1adbd071258c916ec7be204528854b9a8312f86ea67eaeab08b0b9b3a1b8a71bd802e338a105f6e32c7784aa1c7b038f9d786c776844865a2918c2dcfdc5 SHA512 43d16032edae71ed1c03a141c82525086f454dbc320c6f3746d0a6e17a124271a0eefa75cc2ac90e8faad11cee86e382fcb4002ee046e4772aada0498d517227
+EBUILD busybox-9999.ebuild 9550 BLAKE2B 2c2706c0ba15593df3b377c4b2fd10dc163c7f07ca1d99307ffd2a5ea3de8d5ebfa6c0876f3d5319d3d75fc15e2aca7d6873abb0424341b0d3b8a7677e473fde SHA512 ff39fd205050834de39a706df3c7b360d5a9b394d55d2f2633c7f7bcfe739e8f6d5ce566656593a01c351c69d54468cac2f0ebbd470d557b6106cf23544f5c92
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.32.0-r1.ebuild b/sys-apps/busybox/busybox-1.32.0-r1.ebuild
deleted file mode 100644
index a0431ffc93b7..000000000000
--- a/sys-apps/busybox/busybox-1.32.0-r1.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2021 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"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )
-	virtual/libcrypt:="
-DEPEND="${COMMON_DEPEND}
-	static? (
-		virtual/libcrypt[static-libs]
-		selinux? ( sys-libs/libselinux[static-libs(+)] )
-	)
-	>=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-	mdev? ( !<sys-apps/openrc-0.13 )"
-
-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
-
-	# If these are not set and we are using a uclibc/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
-
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
-	# 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
-}
-
-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
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	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
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	docinto html
-	dodoc *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-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
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _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-1.32.1.ebuild b/sys-apps/busybox/busybox-1.32.1.ebuild
index a0431ffc93b7..56929b85f919 100644
--- a/sys-apps/busybox/busybox-1.32.1.ebuild
+++ b/sys-apps/busybox/busybox-1.32.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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
@@ -25,6 +25,7 @@ IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslo
 REQUIRED_USE="pam? ( !static )"
 RESTRICT="test"
 
+# TODO: Could make pkgconfig conditional on selinux? bug #782829
 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
 	pam? ( sys-libs/pam )
 	virtual/libcrypt:="
@@ -34,6 +35,7 @@ DEPEND="${COMMON_DEPEND}
 		selinux? ( sys-libs/libselinux[static-libs(+)] )
 	)
 	>=sys-kernel/linux-headers-2.6.39"
+BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	mdev? ( !<sys-apps/openrc-0.13 )"
 
diff --git a/sys-apps/busybox/busybox-1.33.0.ebuild b/sys-apps/busybox/busybox-1.33.0.ebuild
index 7dd2ce8e7480..1b069a81190c 100644
--- a/sys-apps/busybox/busybox-1.33.0.ebuild
+++ b/sys-apps/busybox/busybox-1.33.0.ebuild
@@ -25,6 +25,7 @@ IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslo
 REQUIRED_USE="pam? ( !static )"
 RESTRICT="test"
 
+# TODO: Could make pkgconfig conditional on selinux? bug #782829
 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
 	pam? ( sys-libs/pam )
 	virtual/libcrypt:="
@@ -34,6 +35,7 @@ DEPEND="${COMMON_DEPEND}
 		selinux? ( sys-libs/libselinux[static-libs(+)] )
 	)
 	>=sys-kernel/linux-headers-2.6.39"
+BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	mdev? ( !<sys-apps/openrc-0.13 )"
 
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index a82a8aa33318..d52691079702 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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.
@@ -25,11 +25,14 @@ IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslo
 REQUIRED_USE="pam? ( !static )"
 RESTRICT="test"
 
+# TODO: Could make pkgconfig conditional on selinux? bug #782829
 COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
 	pam? ( sys-libs/pam )"
 DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
 	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
 	>=sys-kernel/linux-headers-2.6.39"
+BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	mdev? ( !<sys-apps/openrc-0.13 )"
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index f260a44499a5..6782d25b8616 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,4 +1,6 @@
 DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168
+DIST checkpolicy-3.2.tar.gz 69035 BLAKE2B 263c582c8ed3c38822513899f3591edfc5d0132977451503a8b45d2074b5a1c5ce03973353b3ceaad44da913b4e35546cfef1988b68bd517618efdb942f994ec SHA512 133639595c2acc66c02b5a637c5e0c60d80ce2bae04f4a709d9fafabd31f9497d1a6e3334904b985c2a1bd94a7a7e3df782c2af2ae41d1fd79b69156a835edeb
 EBUILD checkpolicy-3.1.ebuild 1149 BLAKE2B beac3751ebcfc7969e662a3cc1b25a266b144db2155a8f469170781d1e6aa515a759d40adecec768e066f6424291e6fd7ed5c3e87f56eb39a309e0e56de45676 SHA512 68682e8384cd6ff456343fdfa611be2bce2e15edb732dc377e8839cd3b1fcf510d914d02c8b2433d34ee6e53fe5cfba46ad0712cdb25f91bff3532b5cf80c035
-EBUILD checkpolicy-9999.ebuild 1151 BLAKE2B 68c17c638f651a64d4e40925f64ac0524c5dd042e679b1023510703f2e970f0c6d8eb5202e5a85beebf74aeccbb7802057768aaec08e47383e4ac365ddec8356 SHA512 0af0987ecca8693ff221aeaf358017a58f89a51c37f7e6ff0308a33e61e509835e905f8555b9e52b4957cd79b1697674493376312db679d86ff970a876b8e0f5
+EBUILD checkpolicy-3.2.ebuild 1014 BLAKE2B 08372b851c56f8392c54270335c7b4a7aac00f39523f4a1cabbe5a3c1855c3687fb580016589beba2d208f4199a428b72df93a093a1519c3a91a3e01199b0ffc SHA512 fe151a9a059ca7643dc0349dccad1c0eb80cb5c6455b02b85a2aaa747c8e13bdbb3f9cdc3d71313249f8f00ec1b8d5979a253eeea0d0a6b982f77183f798114b
+EBUILD checkpolicy-9999.ebuild 1014 BLAKE2B 08372b851c56f8392c54270335c7b4a7aac00f39523f4a1cabbe5a3c1855c3687fb580016589beba2d208f4199a428b72df93a093a1519c3a91a3e01199b0ffc SHA512 fe151a9a059ca7643dc0349dccad1c0eb80cb5c6455b02b85a2aaa747c8e13bdbb3f9cdc3d71313249f8f00ec1b8d5979a253eeea0d0a6b982f77183f798114b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild b/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
new file mode 100644
index 000000000000..f2cee8075367
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://userspace.selinuxproject.org"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+BDEPEND="sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND=">=sys-libs/libsepol-${PV}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		YACC="bison -y" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)"
+}
+
+src_install() {
+	default
+
+	if use debug; then
+		dobin "${S}/test/dismod"
+		dobin "${S}/test/dispol"
+	fi
+}
+
+pkg_postinst() {
+	if ! tc-is-cross-compiler; then
+		einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+	fi
+}
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 90907ec9a0d2..f2cee8075367 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -5,34 +5,27 @@ EAPI="7"
 
 inherit toolchain-funcs
 
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20200710"
-
-SEPOL_VER="${PV}"
-SEMNG_VER="${PV}"
-
 DESCRIPTION="SELinux policy compiler"
 HOMEPAGE="http://userspace.selinuxproject.org"
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
+	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug"
 
-DEPEND=">=sys-libs/libsepol-${SEPOL_VER}"
+DEPEND=">=sys-libs/libsepol-${PV}"
 BDEPEND="sys-devel/flex
 	sys-devel/bison"
 
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}"
+RDEPEND=">=sys-libs/libsepol-${PV}"
 
 src_compile() {
 	emake \
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 0f00154eddd2..173035a88ebc 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -4,6 +4,6 @@ AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
-EBUILD coreutils-8.31-r1.ebuild 5681 BLAKE2B eeb2a9914f8b04a0345bd47c02b4cfaf483f232367fcd2bd6db6985e4b05e6db80cba58785a8574bc114b70e0b5ba81b83ff614227a93e9bd9c8ecdb7b784846 SHA512 6ef45c8b3ff772a4a9562c7cf38efdddda162fc81592c669cab34c02a78dfa4f7b40a830e97391b6cd12f43ba65dcd680c59a7b55f62d473a164e16f2b9a959c
-EBUILD coreutils-8.32-r1.ebuild 5798 BLAKE2B 0ca64c77a6647c1fa89276f2fd309a2714d9d69b51f4e7557fd840dba966511dc8c8aeb33cf4f490d50d3b504275824e76921664d75638efec46a0fceb71e3b6 SHA512 8cd8a46194ea34acc096e0acb8d11eb24aa947d0dfdebd9403523c7c0ab3bede19b5f9c512ecb65b771677d85fdd9dcc234a892a0b055a8d828331ab5d5d8c73
+EBUILD coreutils-8.31-r1.ebuild 5682 BLAKE2B 206d6137b4724c31c7da1014ebad85aa6b8586feead92fda063332e48f7b4623d37591a58c3134e270fc079e1042aa0c0884c3f3f708947734e126e380855294 SHA512 0f9134804420d3b9e87f8f9e18bc755ddab5cc938308bfc3c3b528ad2bc8fd68e0510057b9d92f8ee399886f0c0a37a878396593b4107e35420119231615c581
+EBUILD coreutils-8.32-r1.ebuild 5799 BLAKE2B 0394e78d7a156530d60dbd0ca4bacf47195b671d0d88c928d1d0e2ae87e30f9f67d7111330620c01cc5cf290be7c8e13c06acdb2973dbb94d1de375dc34e77fc SHA512 e37b6c2caeaa7799c3b850047e02254af3c5b2e3cba87302f83753fc0df51ba1f496cd557fadb0de0919d67ae746d691f365eccacd86934e46b7e04f366f7440
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
index 25a6f051df0d..ff8eae00d6cf 100644
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,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 ~x86-linux"
+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 )"
 
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index 8328b9c5c3f2..9b25f987a67a 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,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 ~x86-linux"
+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 )"
 
diff --git a/sys-apps/cpint/Manifest b/sys-apps/cpint/Manifest
index 4242fb3f0a7b..492e88ddc1a6 100644
--- a/sys-apps/cpint/Manifest
+++ b/sys-apps/cpint/Manifest
@@ -2,5 +2,5 @@ AUX cpint-2.5.3-build.patch 1739 BLAKE2B b512b3cbda0ed371263c8ecb5b7494f19cb5182
 AUX cpint-2.5.3-kernel.patch 1454 BLAKE2B 3a52586bc642fb5ef3df08eb85ab81759557d2fb43dabcb587287762d35926e64d57faec13888f471b84e830fb1cec87201c50746fcacc3196ad800542b65a66 SHA512 b48850a91c80f36844e03a95db1616c9b11a5e076c0ca948e25ac17af4d533c0b7341607cebe7aa0f8b6482bab8508087c638fd7a0515853843a89c6c94e7030
 AUX cpint-2.5.3-prototypes.patch 1008 BLAKE2B 87928ee43fe5fd650dbbf65906172e9c97769eeb1cfff339346904b949fc1dfaefc8a30b28bca54ea0c614242fb739b60b582b6c28de2e28174e7f4d8df3bbca SHA512 ab78d5f9ea13962b2037a4fd67a88968d2fd71184389dcc7824d633eef3f2e129cd99901093656b23c126636ce7692f04c9dc315c698eee259d123ce4b77db3b
 DIST cpint253.tgz 31143 BLAKE2B e1891244857f22664bc80c7520c065fa18afd1d27a44de52fbbf1914104e36129858450998aea06eaeb06307b51867606256f33809cd7093cc6bc588c238f4b2 SHA512 ecaddee3d2b0c408828b9fd4f1c8bf0026ab8f3654f8792ef504ddfaa848a3ee6b4197f93d044768f3dad49b28dcec175246fe20454cbc7baa162c463bebf221
-EBUILD cpint-2.5.3.ebuild 631 BLAKE2B 958a5da4210ceed6888689e546734d7eb86fd5f876077812eb2a896f237f43bfa39f90bb4fe36341f9089224417e2e761c1019fab181dabb9c4dae7fa87d35e3 SHA512 4f6115e4f9d40138f0071dc5a6b14c079e4c9b988c459c16f603fbb01b0e7d8a955ea56955d76214084f93b6cadd66cc3b22f6fb5eb24b79b0ff01c3e0ae3691
+EBUILD cpint-2.5.3.ebuild 632 BLAKE2B 41e8978d0e90356d7f52a624c1c3cdf824696f91c46fa1022e9eb15d01c45797de09deb342948aca70c48b7367b4c0485d1b2694beac4547094dea2e00a0e8c0 SHA512 6025ab37a787160723cf83706af29bc6eaa9a17b59f3537e24aa5657db73abfa357fd6368a103cfba95dcdbd45999a30c40cf80376c9be721eca0fc6313dc68d
 MISC metadata.xml 257 BLAKE2B 9c70046221e1979f58651892812a625dfce638a62510e1006db976f8dce6632d7ed5aef61612e9737c1a857fac5bf4da1e97dc1e743df1c3eed0a0b06a307717 SHA512 1e83b08b20ce28c5dbd9f2822e336c3db0e54bfc7a330266a481688e4be62e18004244c5e3e795a48eb86975b225ec51274df20c3221ca4f0fed899fa5c61d8f
diff --git a/sys-apps/cpint/cpint-2.5.3.ebuild b/sys-apps/cpint/cpint-2.5.3.ebuild
index b37f49d86e9e..bd4d469d1d09 100644
--- a/sys-apps/cpint/cpint-2.5.3.ebuild
+++ b/sys-apps/cpint/cpint-2.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://linuxvm.org/Patches/s390/${PN}${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="s390"
+KEYWORDS="~s390"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-build.patch
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index a07fedd561b2..a494a0a059df 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,3 +1,3 @@
 DIST cracklib-words-2.9.6.gz 5536645 BLAKE2B b0ac23e8777cb094cec565e9728ca8dd37359cd19c2e2d4cd215635f462e464fb27fc5a9e560895804df4e519c465845b381a8cd47fb4d6f9b9c62109ff661e6 SHA512 fc5bbe7699c9c9e3f39f5c82f53ec8a4ea85e08d5513188a2f6423f92779008b87d85cfcf87a9a5d13a49b04c30f73890cd4d3fa7cd4a6bdac5c1ebc18e18bc3
-EBUILD cracklib-words-2.9.6.ebuild 700 BLAKE2B 5cc1603ea43b4227768779c456e464d285cd2668305af2338b89f343347f2b647e019ef70025b53b4b8d4c8e78d2797ae64fd921dcb15ee1808cea3314f4ee5e SHA512 645d548e2e976f44ceebb062b394d634bce6e81a20a69b3807e7c13a68bb08ea41dbfb1a3b12ec7415ecf51f0af83f695abf674a0908b79eb2eac310cbbb293d
+EBUILD cracklib-words-2.9.6.ebuild 701 BLAKE2B 83655609dfd26193f5bd663d9604ed01916481595ef2dbc089240da63a643063fa0094ae0110a054999c8b895b678af446f18123f3d5c5daa90cfa8b5060339e SHA512 c622dcc9f4e86d7e1c79dec11036910205f3eff87767e8e3c895f8a4e78096b6494b217bf865fdc428f2d813cc48fbcd5b5aa8f1aeb629d526241ab13642b527
 MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
index 1202ed1d2956..6f3b6cfc1d80 100644
--- a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/cracklib/cracklib/releases/download/${P/-words}/${P}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-apps/daisydog/Manifest b/sys-apps/daisydog/Manifest
index 0355e9e6243d..b2fd1a133886 100644
--- a/sys-apps/daisydog/Manifest
+++ b/sys-apps/daisydog/Manifest
@@ -1,5 +1,5 @@
 AUX daisydog.conf.d 115 BLAKE2B 55fa6089b54a2f5b4b56a5957020d6bab3dea492551bc84170d1cedbb17cba7e8063de08bee7d18cfa39388097073193b824a68c2b8e9f51c5d52b12c84074f8 SHA512 81d9f238f4240d452e6316e0a94c489fc88eb3c8fe189958292a02dd0ce669bf957e614cd2864b7ccada8a174c94c6ee1cda7216e4fe96582a5cc266657710ea
 AUX daisydog.init.d 356 BLAKE2B 0b7c59435e39e17f1afe3678f84b25ff65276ebf93664d689f38a746c5c5b2945fa86e9f0d104a5b7577f7939214e4f4f15b04470af0c843468f7a732fcb082c SHA512 1ad3cdf515777e5ba8eedc40a82177ca7cfeaecb0ac82fe5d5757c81c298e43a8fcfc5f46f6d8d31c83534793d7acf798d8b16ce8d7a6bd2868820cebf898feb
 DIST daisydog-3182aa85c087446e4358370549adc45db21ec124.tar.gz 10395 BLAKE2B e172c8cf9172e69b3c88586a6a96ec69573500101bfef981f2c2090aaf9def8f9cbafa991ef68c1e03c1c7d607f0534f92bad0b06d944f85859223b3f62ff926 SHA512 0a7312a3d9459487da8d20a80568187f51d4ae786939afbf38b8b89747831b2f7e0e32a3414b5d60863e33bcdebad9e457ff9a8f75143a7b60bf68fc9de17cd5
-EBUILD daisydog-2014.05.30.ebuild 878 BLAKE2B 4181a7e5374fdd43526740a9c95f2b2c9db6ab04a52f965168fa0579b8c7526895438374db4d7595a437b1fd90943e0785723ba18cd2d168e28d1453ee1b1e87 SHA512 fbf73a0a77329ca67ea2696d3c682e8800dc9a996ac51054e6af712c56ff7a2b0cc6519a84c567924812710247c8aeba164763854bf974601e08995f6a59c752
+EBUILD daisydog-2014.05.30.ebuild 879 BLAKE2B 246ff4a06fdd58199a04403314f59f09021eb23d3927c03fbef9f685107370f76e767a9eac0368adceef1705da8f99e6d2428d0d3b71e481bfb7179acc744964 SHA512 bf73be36347e9f57dbbb69d697f1a442b34170d44dc595ff54951c2eae8601e073819cc63c1f2e91755bada046af224ef9eb1fd7454c8a5be035c7d62df5e3b5
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/sys-apps/daisydog/daisydog-2014.05.30.ebuild b/sys-apps/daisydog/daisydog-2014.05.30.ebuild
index d5d854b5ecb8..83d0bc40f97a 100644
--- a/sys-apps/daisydog/daisydog-2014.05.30.ebuild
+++ b/sys-apps/daisydog/daisydog-2014.05.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static"
 
 S=${WORKDIR}
diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index 316d39308657..076e05500021 100644
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -20,10 +20,10 @@ DIST shell_cmds-162.tar.gz 179189 BLAKE2B 975728cbfe262072c9fcc3aee457d3814ceffb
 DIST shell_cmds-170.tar.gz 212954 BLAKE2B a9616f7604bb73c0d88f8a065441c2f4769747d407458b3844e3e9126c224b42501bf546b1bc82ab6cdfc318861b43318a8a8877e7a054209cbbc7bdaaec0e24 SHA512 b267a9b5e922c9952451ca05e5f9e328504dc46b5776e1a8405f8e41a604d7f184d70742cb6fa6646875bc1789082097c74eabcc151ac5568ba26ed858269ce7
 DIST shell_cmds-198.tar.gz 411088 BLAKE2B 074efebfdc0fb408df54ce763018c74370049d7c977c912c69bc399f3b3551280f1ea76fbd7205ad54ce676422c642431e297f269cafd2ee5fcb4cd916c91548 SHA512 6e3a43f0cd9b1e3799d1ba79f4fcc4c3bb9be178c35cba2bef9227ecc259ca52c39b4d0e39c71d9af689e07f48dbeee6806bd623286f116f7d3ee3889dc7c71f
 DIST shell_cmds-203.tar.gz 428799 BLAKE2B 54103daa8a8758dd34a66f9c34a5fa4cad2e6a2dd36ff838498d82179566eb95c25c49126341ac481889381c2d39ebea3bf57959bb943536a7ba8a90fcf96f67 SHA512 ba9b00d6681d286e6210d49d70e1f526e86b0a76ed794050e9cdbdb8c0cc30dbe82ee9cd908578ddabb19c53c8994f1b84650f08bfeb88ea9f77d4de942c1cb1
-EBUILD darwin-miscutils-10.ebuild 4788 BLAKE2B 794ad767bc69c790f1f1fff3eeb2a6f206af27177dbf7cd3ec5a5e584bf72fb94eee7a1e4c019f1c726924b81703fe05832f7db402787e009ff2e6caf882d75f SHA512 2adfc46e3e2931962bab5b622aaafb6f1bb05fe1c5b67187ece650771dc74069ffed9270cc226c9cb2feb11648cea8d0d543fce4b85e079f0dd1994faaee62ea
+EBUILD darwin-miscutils-10.ebuild 4788 BLAKE2B 9bc4a6bf9d97c5f382d7c301a791f154097c28b9842b41ddd825d1ceb46ae731ab35bc70d751e0e04caad2194fd804e5f413a7fdac24451ca435e7aef459a278 SHA512 61749b09b0cebe5a8cbb849c6091b853ec8d611358fa357ad3317be7717fb8b9419c199dc5667239d5cb55c5772d52e06902d9140778decc6dd6d343bf8ed480
 EBUILD darwin-miscutils-11.ebuild 4716 BLAKE2B 1c4200506064ad909c7a526c74835553c9b3122981341a42b3913f9dd58e0b48b425f6edfa3b6d4638932b45e55b1907a82add67241c834192be0e1d4e77c7ed SHA512 60abe7864087b108eaac01ed4ab718e20fff443c814883e8d74f071c1407ecf37f81295bebd9c4e30f2be66196a881e3b4676122f4dcfd5206a1137b7ba9b4c3
 EBUILD darwin-miscutils-12.ebuild 4315 BLAKE2B 9bd321199b249a2bec998a9e838999725bfe64aaabba3a8ea30627d26850db614e67f75dc684e5cded25477c7d21584e875298f791e202d40444447be9ecc380 SHA512 fadaa359cd639d78ea840eab8b790cc04d021fb9e4a897400ec5adc7410089965e5a219f3cf22c1430ebeea32c5e37bcc1dc013702dc597598f261bcf46f24de
-EBUILD darwin-miscutils-6-r1.ebuild 4241 BLAKE2B dff3e378215eb21d88517f78af16e1d5f60b61dc8862f5035cdb8fa67be66c249ea3173c34b0e12082b4b7fc52e23c8661c2192395725edaccf95054c63d22f6 SHA512 d6539baca353e25dff54e7b6dbde814603bd110743ed8263df86905b2774d09df48728f48adab39fb4fbeee0c80f7a19b455edcba92f40932e1130bdc6e24f64
-EBUILD darwin-miscutils-8.ebuild 4081 BLAKE2B e628dd25946c08d1e4686d6da954e084d2ea4939c7a01154604428684a9f1a028b8b4a2745ea45ed82e9a65a86e1da905a1f20c7d299b9153c9c2b4c0b200da9 SHA512 0f071c13ff152092125ced8b53c1c8d1331ca03d0d68337d3e2697a72292b858b62c8a44cfa8a6ce9816c165f4823f132d1f4029b743443860a22f093b07e505
-EBUILD darwin-miscutils-9.ebuild 3941 BLAKE2B a5524b52226608a94e8c82b1374e5354993f278542dd5d39b037b10cca9551e4d8a5ed77060e75c93db72d0f588b47632d26ab9f117489f0b31a28053ffcf1f3 SHA512 9160173a27c95c9a62998d3dc2fd0175be1a9ad1de94acebd876822dbeddd5321a071cfc6390e0cf3d6faa7e9deb3b9fd26f8fa94993660ebf7d439434a706cb
+EBUILD darwin-miscutils-6-r1.ebuild 4241 BLAKE2B ac895fb4ccdf1804ed6d6690e476f2d2b79fc6d9b571174b380f408a7bf255250e60edb6bbb823eaae40e9c8f5706acae28ca2a857db81fe31ba65dfaa633b08 SHA512 48b28a2bac4c8a9595e88945ded9baf4021fbe52f8bd32073fe6c83cce0c336d029785f92c8db90ac4c42b229f2d046606af5abf37ecd976b1691daf4210acf0
+EBUILD darwin-miscutils-8.ebuild 4081 BLAKE2B 2c034bccf4a29bfdc21996489524b0861aef25db63c211f00e4d7faae9d20f78772f7af2ccf8030f90ff3166d3bded38e5d470ab5bd41be2f2cd809a0490d605 SHA512 57b749c71d8e2ea977c76dd6a21df8cd0a90791e4fca2cf8e2c247df2180747effef9f7c74afe41d4a7f72399d1fd3822ea1410858894ecf4841ccc3cb570e66
+EBUILD darwin-miscutils-9.ebuild 3941 BLAKE2B 54aa892ca7e26dcbccc7855bbf0cbf95140a8604dfdc0132728f8afaa1eb1b6448709b6382fccaa2e70b0ddf251dbb1a9d2ecb902b7be2486b34855caaf1b5d5 SHA512 b3483e3a4d898d080f2b0765a2e8b113438228ba1ebc50daa991702513ceb8e54dc67e218662d008c7497b84d328f3c80ecf5e42492518b51fd44e000eadc100
 MISC metadata.xml 247 BLAKE2B 5589fe7154425e3eb144170de1f3a024df3fd2b642731f4565abc21498d16dc424613cae78f8b30f0d4341bd9ed1712fdb3beec8d0436192d3d8612c7db9b7c4 SHA512 ae91bc559b2380b04af0bacbaf419deb042e9a9235c596c1afdbbb3933e59ba4f895c6e7ebf8fa4884702d5b39febedfdcce109ab912d6ef4f51b3696bc82c18
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
index 6b1240b93ac0..22a08b31e904 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs epatch
 
 # from 10.8
 MISC_VER=31
@@ -53,7 +53,7 @@ src_compile() {
 	)
 
 	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by coreutils
+	# tsort is provided by corepatch
 	for t in leave units calendar; do
 		cd "${TS}/${t}"
 		echo "in ${TS}/${t}:"
@@ -73,7 +73,7 @@ src_compile() {
 	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
 
 	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by coreutils, findutils
+	# only pick those tools not provided by corepatch, findutils
 	for t in \
 		apply getopt hostname jot kill killall \
 		lastcomm renice script shlock time whereis;
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
index ac663fb5ffc7..31bcef5f5324 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs epatch
 
 MISC_VER=23
 SHELL_VER=118
@@ -36,7 +36,7 @@ src_prepare() {
 
 src_compile() {
 	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by coreutils
+	# tsort is provided by corepatch
 	for t in leave units calendar; do
 		cd "${TS}/${t}"
 		echo "in ${TS}/${t}:"
@@ -60,7 +60,7 @@ src_compile() {
 	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
 
 	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by coreutils, findutils
+	# only pick those tools not provided by corepatch, findutils
 	for t in \
 		alias apply getopt hostname jot kill \
 		lastcomm renice shlock time whereis;
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
index 44d350ee68c1..a1c0717e3ba7 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs epatch
 
 MISC_VER=27
 SHELL_VER=149
@@ -44,7 +44,7 @@ src_compile() {
 	)
 
 	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by coreutils
+	# tsort is provided by corepatch
 	for t in leave units calendar; do
 		cd "${TS}/${t}"
 		echo "in ${TS}/${t}:"
@@ -64,7 +64,7 @@ src_compile() {
 	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
 
 	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by coreutils, findutils
+	# only pick those tools not provided by corepatch, findutils
 	for t in \
 		alias apply getopt hostname jot kill killall \
 		lastcomm renice script shlock time whereis;
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
index c7af5ec16977..1da616fd20ec 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs epatch
 
 MISC_VER=31
 SHELL_VER=162
@@ -41,7 +41,7 @@ src_compile() {
 	)
 
 	local TS=${S}/misc_cmds-${MISC_VER}
-	# tsort is provided by coreutils
+	# tsort is provided by corepatch
 	for t in leave units calendar; do
 		cd "${TS}/${t}"
 		echo "in ${TS}/${t}:"
@@ -61,7 +61,7 @@ src_compile() {
 	$(tc-getCC) ${flags[@]} -o cal calendar.o easter.o ncal.o || die "failed to compile cal"
 
 	TS=${S}/shell_cmds-${SHELL_VER}
-	# only pick those tools not provided by coreutils, findutils
+	# only pick those tools not provided by corepatch, findutils
 	for t in \
 		alias apply getopt hostname jot kill killall \
 		lastcomm renice script shlock time whereis;
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 62622bb95b9d..6a41e8d8afef 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,6 +1,6 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
 DIST debianutils_4.11.1.tar.xz 157536 BLAKE2B 2093568ff6e779d25ff2960b1bc6b12bcd451eaf9ad586ee48d6a6f52bcb0d53c58cb01697eee3fe47d22bf9019fedb5e2857fc8bb358b1449f65079cab1190b SHA512 8283e42f190a9c59c54817a745e219fcc9a1f8995204d62aff84f755ace041e433fe707d3b4373060207a70c9c01d958234281061f77e6e6fb6c560c79711772
 DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
-EBUILD debianutils-4.11.1.ebuild 912 BLAKE2B ab957374835ccb707a397e8039ca176804822429e1641a3e959df05ba9fda3afbd818a7aafda525115270b750f0c7cfb952bf7d650939f6ff3ea388f80d2be3b SHA512 8f81748727bf9a8d4e3af8165f3859a544c80e96108f83c87c97ac8b3a9a2e5771b724707d7534e2409862f3803e14133c3344c16f4bb74a90db5d91579f73ae
-EBUILD debianutils-4.11.2.ebuild 934 BLAKE2B 48f99a9d5c1ad125ef6cb120f39f2a3ea97f0a4238b4e153ba906436786280cb6c9a3e0bc28d9a1ecbb5594b741897d4e49097ac84ab011f0c209a1450875eae SHA512 6c286ff2e91e212e2aae39a389608f27c18074f4a8edde2127e7aca181aeed85e858fa65501b362c6a7702804abe672fb0e0736b3f0c3d3358896286069a5b82
+EBUILD debianutils-4.11.1.ebuild 913 BLAKE2B 6dd33615956b6b34509f8dd34a28636736d1b724de3ea6e56ee331dd11b3e6c1c1e307873cc3a2bba1ac5cabbc16cd576c4f338ef179224c15b4f05d8473fd69 SHA512 b716cd042ce6a4e96f77cb989fdd39d43b36e75a284db233d9e05300545c6e051b47530a71f3db1d446619c41209e8ae933aa16ce51833672dd1fca497707623
+EBUILD debianutils-4.11.2.ebuild 935 BLAKE2B b02267258f6285fe997d10d55b0d66b7b57b9cf06fed5b569272cc9b43c4276867e637de35b94eb8887136182b360f5a9e87cd2e2fee40f670e7d9e102624a39 SHA512 062c35544f1c3dd8e876fba48a9afd234857e3494401cac2774f966a45d8ff61325f25d1a65ba4ee6d19cf455312c796ac8f3da1009d4d3877bcf7a41437dfdc
 MISC metadata.xml 445 BLAKE2B 82971a9985ae487b4333505a1279ed6a642f7eb18880a693c6b0470a270c90b0508d7fcab5039a219a11bcb8a2d05ee3855c7f5bd93ac1172ebe7ed8d7542973 SHA512 1382c27ab6b70c086132eee442ac149ab41fa73bc33958fc93bcf1598c34c43658138c5f476c1291428c71983dee148abdcd630aad128d9b7ccc7c2309870db6
diff --git a/sys-apps/debianutils/debianutils-4.11.1.ebuild b/sys-apps/debianutils/debianutils-4.11.1.ebuild
index 20486d2d14c8..aed53a2826c1 100644
--- a/sys-apps/debianutils/debianutils-4.11.1.ebuild
+++ b/sys-apps/debianutils/debianutils-4.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="+installkernel static"
 
 PDEPEND="
diff --git a/sys-apps/debianutils/debianutils-4.11.2.ebuild b/sys-apps/debianutils/debianutils-4.11.2.ebuild
index 574dc9bc8357..b2f49f05f042 100644
--- a/sys-apps/debianutils/debianutils-4.11.2.ebuild
+++ b/sys-apps/debianutils/debianutils-4.11.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 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 ~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 c938cdbcea2a..3975d629751f 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,3 @@
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
-EBUILD diffutils-3.7-r1.ebuild 1178 BLAKE2B 6c06908ec0f5b348ec7efe85cd83dfe5a009f75ed77828b51b7d14a78d43b3e0f78a1765cb8621e8fa6b2c310a89be5990cb0166ee28a781802b0effe6accfbe SHA512 f08a62f5df058a94f53380d99d81f71f3c4f9970ec656cd0c8cb729c3032c145eb63ffc6784ba792902bb83537cb598d11c8b5248f77355c80fc2f36f4a2ea7e
+EBUILD diffutils-3.7-r1.ebuild 1179 BLAKE2B aa0c831588bceba6c855b67d53b51fe853b94659c70f63e829540b46e61be3a87fa2dc3889f81640a819ff4ed1a0db2a8d2903b707f27f59bf5b839916271209 SHA512 3a4287c690502ea4890850726d42ae937f726821a712435eb749e1ef82ef40ab415739dc3981872c541a2007596b22319aea7909e1dabee721c3f076d733599c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 7a31a9305625..bf54a0da3b24 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ 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 ~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 )"
diff --git a/sys-apps/dmapi/Manifest b/sys-apps/dmapi/Manifest
index 72606c4d4edf..12f7c17d8a3b 100644
--- a/sys-apps/dmapi/Manifest
+++ b/sys-apps/dmapi/Manifest
@@ -1,4 +1,4 @@
 AUX dmapi-2.2.12-headers.patch 354 BLAKE2B 83a2e4de5882c30a1ead955768c8033099c461ee955fba2021808a288e552ab0c97f3b13198270e367cc7c2e035094a631c7bd1b1454b13c82b9d0b1737c15cd SHA512 b087227085d3e068323f2a01c1c7044e1885e47b04caa1050e8552ced50dddfab871608bdf67a027989c359f2852cbcedcffeb6708e182d6d5dc3bfc9609489e
 DIST dmapi-2.2.12.tar.gz 367318 BLAKE2B 7d74f3081f8430c43d3ea961bd4ad2743a3ab65a016b0653a68074353ed60fa0c1a01a77aa470326aa1b10e731a5058355ab887cae00d21196958563ae6c4ee8 SHA512 aa44c0c7857158fed198deb9d1e00abaab549e3c22a7ce0e24e6088146bde56ecf967405b1b61a589460981ddcfaffbb1e9a2e677088efec317e3a7cb44abe4f
-EBUILD dmapi-2.2.12-r1.ebuild 1096 BLAKE2B 7ee703ffb2891f6e40c37b13668485682e6d4405c6cb5eec4c80ef82e8d599fa2f925a2c8e8f5cdc7ab375fce9dc9ef3f80929c2061516a8d28d4ce0b8ce3376 SHA512 9f0fc0fe08f22b15b30e8124356ba771a98cbc938d442c75d8dd436145979c6ba3a0e88a1ed9484f89400d2030e5bc143d8cc01a6b5fd6a8e2ffb8f511101bc0
+EBUILD dmapi-2.2.12-r1.ebuild 1097 BLAKE2B 635c50d44545b68a5534ee40cb544802083d1012e9f8b7341069ce77a60932dfc587fd59d4105052365d6aa948b52df3b2de29cb27ffe65aedbf43b8d655728e SHA512 6db14746dcca212eadef5bd89927628153b8ccc542aaf03af20d2faf915ca3d5272750b09a240036f3de25b777c2b063d2e372eb9e99d2ee5ff1e3080025e4db
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
index 33e8a3bb876c..21619fe1a122 100644
--- a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
+++ b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils toolchain-funcs ltprune multilib multilib-minimal usr-ldscript
+inherit epatch toolchain-funcs ltprune multilib multilib-minimal usr-ldscript
 
 DESCRIPTION="XFS data management API library"
 HOMEPAGE="https://xfs.wiki.kernel.org/"
@@ -12,7 +12,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 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"
 IUSE="static-libs"
 
 RDEPEND="sys-fs/xfsprogs"
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index d1fc7bad2c24..4a018b5e2a79 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -3,8 +3,8 @@ AUX dtc-1.5.0-fdt_check_full-visibility.patch 259 BLAKE2B db9ba9d714c16c07d3b138
 AUX dtc-1.5.0-gcc-10.patch 1693 BLAKE2B 4887f0fc548343605930dc434a1a426435446d0c1d44cbf633218aa3cf90001bb97142b4a6851d5a163b893f138bd282f18d47278a1d782647c4ba1fae46be50 SHA512 2b0cf9e111b461684da7900f7f13062514c46be4c071f39ae7895be56456d80fa6a73a3798f533017a14d769194eca5458504fdebc1c9740eab149c5a2f29811
 DIST dtc-1.5.0.tar.xz 152936 BLAKE2B 4ad9cf8f8fd0ccde0c7b8b66c0039eb9b012ed26e51387c06c03fa7950ca194878bbb23b50be5b80c4d4e18140d6316092a9f0eea87e5d713856635dcfc1b0ec SHA512 fd1e692a1b7bf7987f921ad17d9be6719f7b3aa7915873b45fa86f4ecb1398a0a62cdf53c1fddf98a0f7fed9bf34a79f684018bd01a2b5e88746b50879bf7102
 DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
-EBUILD dtc-1.5.0-r2.ebuild 1663 BLAKE2B a819481eb057a777ff6f405b06a90c0af5e45f27d644b71835954af2e1f5fcb6a268a1553fba2119058516df17120da7221fc5a85fcc4e1da7dcc8a1bd784555 SHA512 7feab3bfbe64fda933b8034e1aee397244e7937502fea343512f6908709e9ae746aa43cbb8b25ba27ffb94ff90269a3d881cd08fdf9a764c05ed0bd90a2fdd4d
-EBUILD dtc-1.5.0.ebuild 1296 BLAKE2B c233996dc4f35d0ba521de4ede3a3eb37533c8cfd7655dac83602c70cb55093fa631e16785469ad41244dbf61836ef4cabf541ec166694c34e8960b0576f75ad SHA512 7b5dacd6a422da8e2353047f36cf47269a473e4c39809e0b71401e99bc27b7d37a2be743afe033fe444f00ed244e329bc82999d3cfef005504a3024160e918d1
-EBUILD dtc-1.6.0.ebuild 1500 BLAKE2B cbae40f52e97c439937b52fa7f4ae101efc4d95b0a3568a883318e246b4aa887bcc17e7ffec2fbf400aa51f92779a71215b42707e8a2aee63d5d6b74cca67ac9 SHA512 a82144428f31989a932d6b7d19f73b5643e77aae246dc7e1c6c0d87108e1ca4319a0d892e31c5eb780b19717dfa78532a0c326260031fe29b11531f685efed6e
-EBUILD dtc-9999.ebuild 1506 BLAKE2B e5a5878e19541b6e4072b448e0fdda5538a6a7a5db03d7d9ce7e692894a851728cfe88c1993837c110302acdfc2ee1bc14f1565c230e4daf295e54631f97c573 SHA512 11061dea5cdd017080d32a56f4aefa534d67de2d816249ef570f924ce02866d8fe5cb1d72697142e22dead7f9d4bb9c51da0d17afc6977abb6ea76d86fdccc76
+EBUILD dtc-1.5.0-r2.ebuild 1656 BLAKE2B 50d2f998146dcd8ee69ea61d89c3c6010df74a0beee5fb9601da0d5cf350f874a50b3581590b18b0e734d245625df4747926a2e1ab51aebee909b0c18d17e9c6 SHA512 4b169ab7af760114a48d7e06226d0a7ca13be1bd3b050ed2123209ae14a6afd174b89f28c938597ff59b4826b0f5b243e405368ed4b149afca20678539ab3933
+EBUILD dtc-1.5.0.ebuild 1308 BLAKE2B b71c0e6bd467077ad49a5ced32974949312b6fec4a74869d1a87bd612b1606389dbc6801d9311ecbfef1eea00d0c1e5fad882d303206c3f0e5ba8e56ad476ff2 SHA512 fe50c8c3a2afd99a77c22ffc7915612518607cc956477d6243fad40924ba70e8a7f5705f1c66507b3e7be6732dce122442f52d08d56679df4969efd02070a210
+EBUILD dtc-1.6.0.ebuild 1493 BLAKE2B 8c2466971cf6bdeb03e7d2977c4b8eedd3d0b93ce63934330186027197224ac055ac01ed502fed0f87ace2f5ee42977fff277ff9c24f40da2a0152587680518b SHA512 6cfbc8bf75bbd486d901ee86360d32229a887d47f51da004e8e13ac106354f9e4f09b2bf6dd3242c5e8c5c5cf9330f5ee75d9d7f45318ec667c5d59fc0cf64d6
+EBUILD dtc-9999.ebuild 1499 BLAKE2B 0e1e0e145cdf465c12f949370dca806e0f5802e2b2124ddfc77b93bf0ba393883d8a803b8897451f05135d75dec2c3dd4e84fcc95fad759477d573809cc19d29 SHA512 a2a30c33918122552f5a81357501e46f89a716c65e0a14966a38c65db2c798db443caa87e1a70419caa49f8b642568c2e68df9ba86f3fb456f562e62482e9305
 MISC metadata.xml 491 BLAKE2B e57c27c911b37572b2836c634b03b2fb52bae256c22972af19637113f467e3eaa270e8dca070dbb9522495db5bad1f1b4441fcaae9d47e7eff8efd0b4127628a SHA512 9e328b8fd47363cf6caaf40832df015d9055ae746118dd9c501311af24a12d5377781cfb2ad8d42d2c82539709597310c1dbded4e522d0b0272b23859735506a
diff --git a/sys-apps/dtc/dtc-1.5.0-r2.ebuild b/sys-apps/dtc/dtc-1.5.0-r2.ebuild
index ac119788204b..3394d77c0623 100644
--- a/sys-apps/dtc/dtc-1.5.0-r2.ebuild
+++ b/sys-apps/dtc/dtc-1.5.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib toolchain-funcs eutils
+inherit multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
index f2284dee2e44..1a41da72cf8f 100644
--- a/sys-apps/dtc/dtc-1.5.0.ebuild
+++ b/sys-apps/dtc/dtc-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit multilib toolchain-funcs eutils
+inherit multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
@@ -22,6 +22,7 @@ IUSE="static-libs"
 DEPEND="
 	sys-devel/bison
 	sys-devel/flex
+	virtual/pkgconfig
 "
 DOCS="
 	Documentation/dt-object-internal.txt
diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
index 12c3ff004ae9..41acb4a8a9bc 100644
--- a/sys-apps/dtc/dtc-1.6.0.ebuild
+++ b/sys-apps/dtc/dtc-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib toolchain-funcs eutils
+inherit multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index 5d8cb20a5b37..00244f88a148 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib toolchain-funcs eutils
+inherit multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest
index e46cc566a8e0..8295916f7087 100644
--- a/sys-apps/earlyoom/Manifest
+++ b/sys-apps/earlyoom/Manifest
@@ -3,7 +3,7 @@ AUX earlyoom-1.3-test-fixed.patch 1425 BLAKE2B 47231739b8bbb5a4a290266b85900dc18
 AUX earlyoom-r1 138 BLAKE2B a95a6db627133ed3d9e4fa02505a1fb8abfc17c345a16df9956d7842c5cb9b7cefd1c68b82d7cc42ad101dcf65c06ac526e0e1241989d4aed0fc87b62d8e7bc9 SHA512 f7223b7ad2780ae121ef91d19b177d6fda50eb8d4f3995ac47b34f843448917a5a5290b8e657a9d7ed7fb8a958b362172d8a6453c5d5e43ff8c78cc25456d6f8
 DIST earlyoom-1.3.tar.gz 31399 BLAKE2B 3867540afb23493fbb532bcb72a5cfacca4ed297a053ff5e2c7e394bfa3640887e3e7c6430789bc1eda4b7a68680d8a74ab56b641fe9e5d4caa4406e2edb0667 SHA512 c5de742289e82c2098bd88c61dcb3e20eb022905a015b4894c95a4de3978ce18d794a9e7c17c97851ca9f8888728908f7bf978c014b3b69799bffa8b546d258a
 DIST earlyoom-1.6.2.tar.gz 49006 BLAKE2B 85a02d4171ba1bb94d5ddf573b8f5ac58d28a0cf9766f4fb2c96be5b45eee7aab853008c36f9e3aac76685b70008051faa2fe339797ecf9137469f089935a6b3 SHA512 d622a5347591d2017f6e62255940482af431e647acf1b35ab035e0dbfd44da7fc52633e6dd6433e42a1348fd294d766550ba092260f3ec59bd51e545f08e466b
-EBUILD earlyoom-1.3.ebuild 1026 BLAKE2B c2ba3edd30c90944e7a6dd1a41ec1fef4a186c66d567e9aaec5125feb46de80c78644fc38d5bb59780d7addcec63d0127b61b57bdaee7bf0ff504058a917d4d3 SHA512 d7dfa94f1ab30048a310a8eb5b0e11e4cb2cec2d8e92259628fd63460c274c84d7a1bc08045b1dc04f5d46132fa7c7ed3fd4d1d23156f7816a68834c03a98342
-EBUILD earlyoom-1.6.2.ebuild 1052 BLAKE2B ca42a2f1f26797f1df2a427c3ed69ef5ab9103f3e822d863b11dd9bb08d2e0651c016110281a871f9be6118d406399341283c66315e775f0b63f8ce4e437d509 SHA512 313ac556da928390138721020b2d0b01a29eb2d272c179a97d4a13d1991c97acb9dfd413c3861d8179944fcf581ae0d62d691d7d460b93a768b70155e6547242
-EBUILD earlyoom-9999.ebuild 961 BLAKE2B d301882263b9c070e014cc7a36b07c102b572eb6944bab310361a0308c2fbd65a721d01bd9463340019e445e6d758716757ba0dccc2d59ec8c6e02670ae965d9 SHA512 d4331553f6520f3151b200b93d0484be376ab20b1122c3c7e4d1363d7e919707475f5f0637f507d4e2fda64f332ba5054cedf5dd2aad3d441e7cb5122258d14e
+EBUILD earlyoom-1.3.ebuild 1035 BLAKE2B 64ab6ed459eb6138383569f8b1e03fad94bc4573353ea749ca65a564b2be47f398072974ea5a26c40d3521aa40e27296ebc2a4cd794a01376a652fdcce4dc304 SHA512 79d26e8b94db7b379a9745f2a4a3268fa25cfd97a53897ef29caf7267ab9428b3e096744861c64d6c64afa54cd55e4a565faf3c568a296323d486207ce0a7595
+EBUILD earlyoom-1.6.2.ebuild 1056 BLAKE2B 1d55010ddc8d720a57fdccefdaf2b645e84d9063e8711d9a124f99cf5fcdb511685fd70a99bb14f615a4acd210e9badc33f14c21af7740c5dd7577f1674001be SHA512 ef844ed96e78c9cf8776b422623d6523926e7d835445e30bb3d319325a86ca680f10288a80101a063e4b73bc6795437e8eedbd3c66d9c7091670184040699778
+EBUILD earlyoom-9999.ebuild 970 BLAKE2B 88a517b48f7367e9abac73dcbc1661e0f0344626506c8e5380a88e6d61fd7b996d93696952fa10b057c579cb5a5490abfa516cecd90a6f916f28f834343cb1df SHA512 342d48f9a0ebedeea82a6995a3ae456745d95d099e61f9ba2d27122a7193df2d8566e139526aa95286e9c12ac401971f1704d029d42783f8faf6956f128e2b10
 MISC metadata.xml 307 BLAKE2B e51a83c88fdb7b817981979a1de41249b2255900e6575eb555489bbc6e924e0bb0ac41d1c214279e0e4e87cba96eb4c0dd92b8dc591a1a1fa7f83e7b6fa9eda5 SHA512 28e7739c241e47e235f1cf897bf4fe5befbcdf783451906ed200c7fac9da0b57c24c6b79900493379709aebbd0a81b4999436d070ad2557cce3886a1efc4c806
diff --git a/sys-apps/earlyoom/earlyoom-1.3.ebuild b/sys-apps/earlyoom/earlyoom-1.3.ebuild
index cae1f13f3b86..f752572222e8 100644
--- a/sys-apps/earlyoom/earlyoom-1.3.ebuild
+++ b/sys-apps/earlyoom/earlyoom-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v$PV.tar.gz -> $P.tar.gz"
+	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 x86"
 fi
 IUSE="docs systemd test"
diff --git a/sys-apps/earlyoom/earlyoom-1.6.2.ebuild b/sys-apps/earlyoom/earlyoom-1.6.2.ebuild
index 196ec0b0a555..fbc56b98e496 100644
--- a/sys-apps/earlyoom/earlyoom-1.6.2.ebuild
+++ b/sys-apps/earlyoom/earlyoom-1.6.2.ebuild
@@ -14,7 +14,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v$PV.tar.gz -> $P.tar.gz"
+	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 IUSE="docs systemd test"
diff --git a/sys-apps/earlyoom/earlyoom-9999.ebuild b/sys-apps/earlyoom/earlyoom-9999.ebuild
index 898c4fbac557..6a2d2be6cf4e 100644
--- a/sys-apps/earlyoom/earlyoom-9999.ebuild
+++ b/sys-apps/earlyoom/earlyoom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v$PV.tar.gz -> $P.tar.gz"
+	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 IUSE="docs systemd test"
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 9445e27042e9..97b663622c02 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
 DIST ed-1.16.tar.xz 68432 BLAKE2B 222ab30f72fb466372cd7ced75807e9324a916ca5962c6829d562476ae1d9ae9c01235a130e58f952bd6029b931f6362d2a695b35963ca32bb3cfa539dceab0d SHA512 45b29fb86c7e7d8569c02c8177a9c7f7e691e08e913bc07b301b34210b6dc27377858ce60dd695feb950ef436c86d7059ade90396364c95aefa3c1e7a9d3a2a4
 DIST ed-1.17.tar.xz 68516 BLAKE2B 975e6547f0062dc980bf4490bbbc98e0ac77fc18b2960e18a4c86a6c9190dbd6e1afb155678a1b7d891dc6cb1c5f5c07612365bbf3ffae15bf7575989e4b67d7 SHA512 ebe755ea7d12a7f54379ad8e03b703e9c0dd9aec26b4a79e5014db4368ab2d2926ae094f2ef1aef90cc9b2d541746a81af472578fa44cdf5bfe78aff5882451d
-EBUILD ed-1.16.ebuild 988 BLAKE2B e5b78961d557678be89e600f5c25939ac0337d88ce89e7474b5ce2db94281e4f27055839a1f29986ca1be4c7d79f6a49b4afad74a8b1e3890cebfcedbca1c1f4 SHA512 d017d4aecaa044458ca946c935dab5dabb46fd8d1b68c8076c14afac80a400a9c22a98c698e8a7e8ac840f036a45d52c0c3cb2ce8b622bae227b04fec22ac0a2
+EBUILD ed-1.16.ebuild 989 BLAKE2B 697a8d5dc80ba44a0d3b2fe6f2187f930d5c5d2100113dcb84e037872a5757884c14a38e566c01491dc55a8a0aed4ce41b7da843279c7e1b3221c7703be739c8 SHA512 227498282c7d3f349617e11e6c809e79c8eb20292fe6dc07ea68a388099d82a50f82ec157c88d5fcb704c5302278d4d001795103af5181e9a39f62566b507869
 EBUILD ed-1.17.ebuild 997 BLAKE2B 129c0bb2e7b206d9823281f94ac14680de98ad217067384d98ed6b6f92ac99ff4ae21229c51dc75a42a61a1f40b202aa2eda94069bd526beda30dedc440b1b12 SHA512 48ae2f43b8e415ec3959bfe9927f7095084a652cd5226d109436d5abb26f91537b20615c1bee1fd5c9453614bb3dd017d5a8e04ac04baf89ad1127448d4a7d6a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.16.ebuild b/sys-apps/ed/ed-1.16.ebuild
index 573eddf03f08..36d23d4f679a 100644
--- a/sys-apps/ed/ed-1.16.ebuild
+++ b/sys-apps/ed/ed-1.16.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-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 ~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=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/edac-utils/Manifest b/sys-apps/edac-utils/Manifest
index 9fb447581fc7..821cc6905ad8 100644
--- a/sys-apps/edac-utils/Manifest
+++ b/sys-apps/edac-utils/Manifest
@@ -1,3 +1,3 @@
 DIST edac-utils-0.18.tar.gz 285909 BLAKE2B 7d2662daf94c4ff796760b4863837861015397016bb79202baaa194608b61450d6749981cec621571267ac818a09af758167d2d768513e7d5bf7e763aed7ee51 SHA512 5c81b11c28e8fb3198f2d656171493877393024d9e31233c252d358d8029aa83065e7b66ea87d742518f710466c9ba7dfcf57a1641374ce169cf95fd379101fa
-EBUILD edac-utils-0.18.ebuild 1081 BLAKE2B 5dc1243572cdee9ad7bb323eb90678c67f7cbe8a64ca9dc7c923822533e5d219663b26934bbe5288196cf8a926427bcb43a7f3c661d66300591f3435da77c6e1 SHA512 62f198bdfc1d28395836df14112497e0aceecab58ae2e97ed8575c427bebf0c3e1cabdc64327c9f1b9a67903e03f67233c9d7911166a69fa22542e99b0d4ab9f
+EBUILD edac-utils-0.18.ebuild 1081 BLAKE2B 5b908382e61359ab98b9ee9b48e0d5b03f897c2ace823d025471162fe182bece523b4547936bb1824fc4498daad19f424dc8901469fe6d1e4d1a06ca8a6fe490 SHA512 9a8ab22e0ca78384d1f516a0006779f41173ea3c6e5c2585e4c242fe4c020e68be29f7c759fe5e3dd39f9aa3c9cb5b00d8deefa406520d1f58e4a547671f626f
 MISC metadata.xml 254 BLAKE2B 1392a93224819fb2dcdf8e7842fad36812de4dcee5e7424e55932c71885354ee8e308b407a8c7ff5f22b3fde199c17a83c2fc743f0f56d8d21e92dc5b3a43252 SHA512 ef70b7addb82535bb76effbc086b2e94c868c0eeefd321bed35d554f4117007ff5dba431561b16e90ff42a23011568b877959d9d59eac6c7c59642ed9d46bd91
diff --git a/sys-apps/edac-utils/edac-utils-0.18.ebuild b/sys-apps/edac-utils/edac-utils-0.18.ebuild
index aff815880bb3..c0e1edb052e8 100644
--- a/sys-apps/edac-utils/edac-utils-0.18.ebuild
+++ b/sys-apps/edac-utils/edac-utils-0.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils ltprune
+inherit ltprune
 
 DESCRIPTION="Userspace helper for Linux kernel EDAC drivers"
 HOMEPAGE="https://github.com/grondo/edac-utils"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/grondo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="debug"
 
 DEPEND="sys-fs/sysfsutils"
diff --git a/sys-apps/epoch/Manifest b/sys-apps/epoch/Manifest
index 4f3cea8a99f1..bc41249faaa1 100644
--- a/sys-apps/epoch/Manifest
+++ b/sys-apps/epoch/Manifest
@@ -4,8 +4,8 @@ AUX epoch-1.3.0-fix-main.patch 631 BLAKE2B c9513ad352d9a2f8644595a6b1d3a881ec9bb
 DIST epoch-1.2.1.tar.gz 66718 BLAKE2B 1fc75001ead0f65df6a303ae4933995eb5607e4f8f2de21c2b74b95f7a8a5ca0be21bf6c509826d36c79795905a1f65c18a755b7944d0eceb0364abc1d58613a SHA512 2d0c767165ec41452d1dabf338c8ea31772f1a8cd1e1dbd60c8469f2f235bb1f0cb60b467189f1fd1079dfc223b0687c1cfe5e729e1142ebc63323b1f9c0cf93
 DIST epoch_1.2.2.tar.gz 229377 BLAKE2B 0f2c00df56a7d35dd224b8a1b22c78dae943c09eabb78c72cddc1085d5596cf6ef23b4d0c240191bb6b69e511a97f0bdb9f0cf99a4146097211867ae1beaf213 SHA512 9e3e38ef95c20237a3db4f47c9464f27e893a665f0692200d89e96b12f6b2e3af9b84d951356b7b354f19ea4fbe372e2e0ba406fdfeb8819914d46cfed3024a3
 DIST epoch_1.3.0.tar.gz 70681 BLAKE2B 7ad2ab4c7f6c5544138aeb29a9b3a3f8889ade23b448abf1ec257fc7bbf811f4f6b01f0c9c81005aec56fe243d1f1e53a2daacdcdc4ff935bfcbd707fb8b2ab6 SHA512 1e4a8bee26d8819303cbeb67265ee74e294502acfb3f5e594222bb7bdcb2d077fe19e73c40e9111a6ef9af788d767434f5a9a357430b59d6a0cac0e36a3b8f9e
-EBUILD epoch-1.2.1.ebuild 1851 BLAKE2B bcbc5374913a6b63d3cd7972d3a825cd3a3748895749e68a4b7410088ef7e2e69616f0bf28a569bcab672a2199ad3e743fbbc3d73c95a33b01bd6b9e80c2f214 SHA512 63f30d59fcf9edd299f1d07db79b459a123c31549b3af015ba85f32aaf9c11365b3e477b5a6a505ed7da41a844a751ad1ea2ef3178a6df3f1ff32a8fc8be4ccf
-EBUILD epoch-1.2.2.ebuild 1821 BLAKE2B 3db39f5fa148003c6f49ca0273aa6a735ca3408956183ebf73fe0c5967b2ed30d711c312305f5bbe91142605bde8f2d3a1773e26dd391d389878a16e3fcc3a6d SHA512 24a8f7578ef01bcd034c7da7e05a13b1243ec3353b6c01e3b0d417e0575cd56201aa9868461721cd74a930ea1822303153c3a22164e905650b1892d9e711bf62
-EBUILD epoch-1.3.0.ebuild 1870 BLAKE2B 810b9c928f92e891280147ec0f6ed5df7b403bb76e5842f4887ca6f5358c332dd807ae041dc144bcda02dc232822ff98dbbf954bc216b8f6c905480d1eac841f SHA512 db0a6c6d0a6f8e1f6b5f28d88987e340b27841f281780a0a72f26a209275167dde6ba810da66da29714f812e2b6a833578455f18dbba7b4a0ff61da29c18b6b7
-EBUILD epoch-9999.ebuild 1816 BLAKE2B 66d14b8cf6c7d41fcf224d24eb21b816332ef69820843752e8953f794cb35066381e2a413c68343e40e74fe148dca28d02c8a54d5ccc6a484533c3cbd6ac5303 SHA512 55871d86034356b54f5616b64cb4c3058f074eb09fa2d05113160275e9d58f2903f2c0444c84dbc97aa96cba277241d9644e274d7b984842c74e3602800b2c86
+EBUILD epoch-1.2.1.ebuild 1848 BLAKE2B 7f8b52344040a2e3832735dd43cdfc6170b1e70b50df351eb04667de382bb1fecb2b5f14b1ae3b3ece4beb83e69445366522baff437af26e86b9ff0583983f2c SHA512 6d5a03c2ebabb0e40a5771744cd703eecac16adf4eb37e3deeebefb40b53f808f87176f8f226cf6e390d03540e369578b947a7878928a6480d2a5428d30fbde7
+EBUILD epoch-1.2.2.ebuild 1818 BLAKE2B 15777f6382a6c5c6dad9dacb7bfd52b5df3d93892b65d9db05deb9482fad8bd215a1cbb80d00bc8de527b8b7995f20dd80b97e7e5ccfb7e63a3de474e2f5208f SHA512 ec88610743e15cf38e5fa028cffd9d9e801cf2398cfc8fd39964e28e4d503ed7bfd985e1f05cef2bef7e20491e69973244cd5b3dc5c08761d50999deab4b03bd
+EBUILD epoch-1.3.0.ebuild 1867 BLAKE2B 255ee90b14302b5bf81c818d9292da5872bdbe9538cee6b039e89d366feea7dcd5747d294c16a25cd9004f830b42b678b1a5830f673c61c690bc4fb3725a4dc1 SHA512 5082ce94571599d5396b27ce542eb4eaec367344fb2c4c6f209593b3c349104b7de029ca10ba3d3ffab9dd4fbde72ece7d0fcb9778661e4d2dbe8e2880d9b483
+EBUILD epoch-9999.ebuild 1813 BLAKE2B 2053480d5b90cfddb11d32c084dcdda42cce3006c460f098dbf13b360b7bc2e6c44d225d2acf8673ceae0ad3da98131eca721429379beb7cc7372006c623fb15 SHA512 68178acc8e4781240eb700d69df4d765df522df641ee87f62f536f7546b702d4b496993263ed0de27cc737734ec14e57d5b9892653fac2624dad6941d631f625
 MISC metadata.xml 978 BLAKE2B 6f3be05ee3ca19610cc5bd15ba11b6958c18566da60de46db61e85919b895fcfb33f40a73b8a9aecd574a7fb24f87b41486e090adf16a40ece4a8b3abef2b57c SHA512 02fb290226b7fb30061110eeaed6989a6dac611373634b57d19b01eab8d6444dd3eb7ea12f08c96851bb41efecdf80434e5c42d7da590b2048bfc23aff6ea261
diff --git a/sys-apps/epoch/epoch-1.2.1.ebuild b/sys-apps/epoch/epoch-1.2.1.ebuild
index 16daffeeac89..865e15dc24b2 100644
--- a/sys-apps/epoch/epoch-1.2.1.ebuild
+++ b/sys-apps/epoch/epoch-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils linux-info
+inherit epatch linux-info
 
 MY_PV="${PV/rc/RC}"
 MY_P="${PN}-${MY_PV}"
diff --git a/sys-apps/epoch/epoch-1.2.2.ebuild b/sys-apps/epoch/epoch-1.2.2.ebuild
index 4bb4a8d5db24..af18fc85b21a 100644
--- a/sys-apps/epoch/epoch-1.2.2.ebuild
+++ b/sys-apps/epoch/epoch-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils linux-info
+inherit epatch linux-info
 
 MY_PV="${PV/rc/RC}"
 MY_P="${PN}-${MY_PV}"
diff --git a/sys-apps/epoch/epoch-1.3.0.ebuild b/sys-apps/epoch/epoch-1.3.0.ebuild
index 9b6a3f67f14b..a37c2f912f6a 100644
--- a/sys-apps/epoch/epoch-1.3.0.ebuild
+++ b/sys-apps/epoch/epoch-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils linux-info
+inherit epatch linux-info
 
 MY_PV="${PV/rc/RC}"
 MY_P="${PN}-${MY_PV}"
diff --git a/sys-apps/epoch/epoch-9999.ebuild b/sys-apps/epoch/epoch-9999.ebuild
index f35febe3564b..007de0c5e28b 100644
--- a/sys-apps/epoch/epoch-9999.ebuild
+++ b/sys-apps/epoch/epoch-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils linux-info git-r3
+inherit epatch linux-info git-r3
 
 MY_PV="${PV/rc/RC}"
 MY_P="${PN}-${MY_PV}"
diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest
index ed97ca7fa64d..22f5e9342a2d 100644
--- a/sys-apps/ethq/Manifest
+++ b/sys-apps/ethq/Manifest
@@ -1,6 +1,6 @@
 DIST ethq-0_5_0.tar.gz 15830 BLAKE2B b18326f1564d08f94500aa934838053a3b84b78f3d6fa90984c3730ac8922fbe3fd5141d5e9ff4a2c8db54bb8d2c2e493f5583f46b287324d4327583f29b8bf5 SHA512 989978e0dfbb553497f5325807f2d09e4e2842de9df5f5717e832312141adba3e99ef1d57dde4ac0fdd2919c9f5a0eadef5b5f76a300ab4ac7e881c8509fbbec
 DIST ethq-0_6_1.tar.gz 23475 BLAKE2B 04d933294ba432ed69108022b0a2b13c47537902f66c6969bbd5afca144a977a6215a2164cbefd975d0f599bd8503feca79ef9e38856d8c9e6943c2cd2c3f99f SHA512 72c38ecb0cb6c7d6f522d99f2a6ec08bd2c42065d5f83d86890706a52420006fcdb5774a1457a66ccd5e174113e09c2a4285d311af334616a01c32ad8753126d
-EBUILD ethq-0.5.0.ebuild 1134 BLAKE2B 28624d6aa8f9a8d19fbbbb08bdbea6436846f078ed761226b5a6b2bb8da977f524454c2128f7bc43619c52edbe26b787eea0b9ff5e2ca6bd98bc4bdde8d2963f SHA512 680a0d4041432264376a487034a5623713c24fd16c173b0dd58c91d22faf9c9c2f2f4cd7d1bbebf6fac389e5b9c17980d8339e9196954894ecd0a3825d1b3bd2
-EBUILD ethq-0.6.1.ebuild 1108 BLAKE2B b5a7190f422bc8550c3f28ea2cd0670500d0cae8825bb87b6f605b6684cd6c569156f93339972b430dc709a98792dae1ffa9e4ab16a646553f3b701b815f60c9 SHA512 f994c61f5ca592f26f5fa68c3fbe117429b55e470109cc5807ed656f256c69b4561decd5bd1b10b68c3bf645fee1c954d35f4a2e913cf4c97b89f165940ce304
-EBUILD ethq-9999.ebuild 1048 BLAKE2B a3128ed96ad614d415fd69d8b24a56991571d1f4c814e4e05eed7f7e7af69b71777ec8a56e5bf66cd4e507d96bbfd7caece1c1a8cdb88b56b225da0c57bb4d42 SHA512 04f9165e4af08224f2b6d9c3e04b68cf41b474e3bd74556ebf84c22e8928d5c53f882c589d0750d0567539177665543501974d8d6c1425a8a9de3c835e5ee34c
+EBUILD ethq-0.5.0.ebuild 1163 BLAKE2B e44cdf337ce09cd74b5acd6181e42ee3770b1c0dd6208103c6124520bfd37f58a5f80ea937575cbe77f067561847b9f71c590cef9f6509aca4e84ea5ddda562b SHA512 c008cfb872f7f0521e441ee51f3da5b74ebc17529bf1eaed7a9e4d7c23e36e86421708a44f42c463e94bc945af8cb8c9b78c20a0e5cd178eb30a9d5f223e69fb
+EBUILD ethq-0.6.1.ebuild 1137 BLAKE2B 9247848c08414e60a0b838c2b3a49676e28092065b32bc848a616b701d1b90c27b92f7c596d9213d68b34c8ad8e914cebc3fe919d2b9334b0f5f56c881d3011c SHA512 ac371c13b88fa8dc7bc5e87ae5c72b96cd18627e5b8b7cba40c14292121f22a81a4dc49460bdff3927b0d6781aefccaf585b519ab69c365fa7b0813ab10900dc
+EBUILD ethq-9999.ebuild 1076 BLAKE2B 976a1e0cef839705b93cb7f4292067b551272ff3b211d2cd539c09423be59247f6e7dd74811ae2f815914c5f93d07789c97850e3135fab4484ab0ddbf819decd SHA512 faf0a96368a6165e0a37ea82db076d8b8e6e8c9e89db38f5bbb35e8c2838afc1bed04c13e9d86048b902d15540903f6ca066ca257a3f385dff397af318e99d4f
 MISC metadata.xml 657 BLAKE2B 42d6c240e11da7194084ce27240208ed46bd4b2352dc63851a2c2e2c51c2bc90f596766e985bcc395a10477c19b641c9a298417cbf36511efa14a31342792e01 SHA512 be3db53a8ff0ac2bc3c54febec669d34b949363c1e5087cd414c521395629123df47ba832c397c5d7f79586f5f75a79b26b03917445d4ee82f72cb47bd07cc7b
diff --git a/sys-apps/ethq/ethq-0.5.0.ebuild b/sys-apps/ethq/ethq-0.5.0.ebuild
index 937e95dba856..a22a412539ae 100644
--- a/sys-apps/ethq/ethq-0.5.0.ebuild
+++ b/sys-apps/ethq/ethq-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-libs/ncurses:0"
+DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/ethq/ethq-0.6.1.ebuild b/sys-apps/ethq/ethq-0.6.1.ebuild
index b5718cb8f726..6749cb3094e6 100644
--- a/sys-apps/ethq/ethq-0.6.1.ebuild
+++ b/sys-apps/ethq/ethq-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-libs/ncurses:0"
+DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-9999.ebuild
index 59fa6fa3cdc7..930a13b4f96d 100644
--- a/sys-apps/ethq/ethq-9999.ebuild
+++ b/sys-apps/ethq/ethq-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,7 @@ RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/ncurses:0"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index fed1c05da4fa..f08cb7884480 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -4,8 +4,8 @@ DIST ethtool-5.10.tar.xz 310536 BLAKE2B acc91ff2f7cf233a5a7bc85e32fbcf78e3923b24
 DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
 DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e
 DIST ethtool-5.9.tar.xz 307792 BLAKE2B 0cb5b56f6367bba18c92b1d420471be0b203e05d36fec1495f18de7a2e793fb12cd57b3f2f79369327be1b76a9ec749a65b91801c90da79de9d23da62e628fcb SHA512 9166a06b823373188e754b3085cf8e8f71455d83d1bcfcaf1350433b21bdbc6ae851f62108d3d2e3bbbca33ca595382cd2c68966ce4824b55f7f59eb0996bf36
-EBUILD ethtool-5.10.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f
-EBUILD ethtool-5.4.ebuild 458 BLAKE2B 6590591fb947e2daeca4953ab424b0c1e08f8f84db21fca88f9cbf3c86a2de47c0ab2046a71d7181849908364d9ba70c7b23d2a5cadd61f85d8ef532f63a681b SHA512 38763c6c35bb51e877f1ad4fd218f05e0609176580848a63f1b8adcabab5ed7195bf6e1166edad41ea69f930dc8c8399f7a0c2658a1899e09cf61224ea407cc9
-EBUILD ethtool-5.8-r1.ebuild 683 BLAKE2B 53dd3107b350a45b34aa891af4ffd6d5286862ae3cf38227fc64b137ff41d15beff0ab98c407150d390aaafba0c48cb1963e218064713f9add653dba109ca664 SHA512 2368d7d4a16f74d0c926eac1c37e4c39f8b002bd23970cffcc4890bfd679d616aa780e049fa6b0d4e39f449f88c4dc14bb6ed48ada9cf5a9e3b6a336e633cfdd
-EBUILD ethtool-5.9.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f
+EBUILD ethtool-5.10.ebuild 591 BLAKE2B b5c8ee339ab24f7738596a35ce897d6ccdac5819e659375b3986997c05f6cb7e87ba1c904775bc59aa00c96d95889a81f65999ad79893b2dbf3fe28eed0ca057 SHA512 b2eceda29fe07143e041ab129af00320a7e9001cf3e9b432fcf784137ad21297a1332e5a7619034ce0a8a0ee1b76d3cfd0af7178eb0d34ca6d0594f3c0580381
+EBUILD ethtool-5.4.ebuild 459 BLAKE2B 10c7df1a3e8df3cc1d1d2eabb54fd33fb1d59bc99486aaf5b1545bf62c663e5f4544b24e8bf7776fc9f92aacff48f2a86b38f4de80d98d4d8702e63f4be2b939 SHA512 bee519fea3dd8981660009d6a40c004d168a0fe9c06a7f45ff9a9cb757fc44889741fcc8df6ba97feefdea5961a44ab338344d51cc3bf6e85fc71b080c19cbbe
+EBUILD ethtool-5.8-r1.ebuild 704 BLAKE2B 7d5dd8bc5702829eacf956bb324dc8002ea9caf9e4f7d62df11fbf47d60dadf15b1f99c0802b4364c54f6ac6a2e387928a0ed4da28252692984156516f877a0f SHA512 2ed3b6e06e2dfcc4d76c58f7b4db449298bb43fdaa3223efe38db27ddf630af690fe19886e4ac6a472b9e31d868d44940df3d268926edb9066e65baefcd32fb3
+EBUILD ethtool-5.9.ebuild 591 BLAKE2B b5c8ee339ab24f7738596a35ce897d6ccdac5819e659375b3986997c05f6cb7e87ba1c904775bc59aa00c96d95889a81f65999ad79893b2dbf3fe28eed0ca057 SHA512 b2eceda29fe07143e041ab129af00320a7e9001cf3e9b432fcf784137ad21297a1332e5a7619034ce0a8a0ee1b76d3cfd0af7178eb0d34ca6d0594f3c0580381
 MISC metadata.xml 992 BLAKE2B e549f4afab6b9e4642ccbf9b14f95e7182f6b2d8a9bb0913a30372ea1ff0be92e7a119e708741932ba90183bdd40d2bc314f980e61437b974a6ae590f3598186 SHA512 73a3fe59ca21626b769dc63e428761d33c9796fce642e2da48805a8d4ad59b103a3c7a6a1b17788bfed35ed79fc1e4adad265a16676cb03df0e19e6a6615a69b
diff --git a/sys-apps/ethtool/ethtool-5.10.ebuild b/sys-apps/ethtool/ethtool-5.10.ebuild
index 804cce9dde3e..b9870d909410 100644
--- a/sys-apps/ethtool/ethtool-5.10.ebuild
+++ b/sys-apps/ethtool/ethtool-5.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,8 +12,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+netlink"
 
-DEPEND="app-arch/xz-utils"
+BDEPEND="app-arch/xz-utils"
 RDEPEND="netlink? ( net-libs/libmnl )"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	econf $(use_enable netlink)
diff --git a/sys-apps/ethtool/ethtool-5.4.ebuild b/sys-apps/ethtool/ethtool-5.4.ebuild
index 25a67f41d620..159377da21d0 100644
--- a/sys-apps/ethtool/ethtool-5.4.ebuild
+++ b/sys-apps/ethtool/ethtool-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,4 +11,4 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
-DEPEND="app-arch/xz-utils"
+BDEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-5.8-r1.ebuild b/sys-apps/ethtool/ethtool-5.8-r1.ebuild
index 74ba8d2656ba..8e1cf0073e37 100644
--- a/sys-apps/ethtool/ethtool-5.8-r1.ebuild
+++ b/sys-apps/ethtool/ethtool-5.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,8 +12,9 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+netlink"
 
-DEPEND="app-arch/xz-utils"
+BDEPEND="app-arch/xz-utils"
 RDEPEND="netlink? ( net-libs/libmnl )"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.8-avoid_bashisms.patch"
diff --git a/sys-apps/ethtool/ethtool-5.9.ebuild b/sys-apps/ethtool/ethtool-5.9.ebuild
index 804cce9dde3e..b9870d909410 100644
--- a/sys-apps/ethtool/ethtool-5.9.ebuild
+++ b/sys-apps/ethtool/ethtool-5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,8 +12,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+netlink"
 
-DEPEND="app-arch/xz-utils"
+BDEPEND="app-arch/xz-utils"
 RDEPEND="netlink? ( net-libs/libmnl )"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	econf $(use_enable netlink)
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index bdb3d51ee924..61e3a43e3ca8 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,3 +1,4 @@
+AUX fakechroot-2.20.1-glibc-2.33.patch 13065 BLAKE2B 3ed7c151bd07c323c3bf0e6eb925d6964dcf18fbb92c17cee3537ec0c707ce727e624a17335ad60fa74f06c86a41abd011f3c0f1f1fa50a2f58b4c35cd1bfdd7 SHA512 8cddb31f70d819ffe1058f5f764d12634b5bf290379f709e6d3a08796b7c8ba2a97157a19b7fe9c886f65f495a7e42ca84fa3f9651d3692df11b0f69e9588be0
 DIST fakechroot-2.20.1.tar.gz 504343 BLAKE2B 73459895319c1fd6297ab455e0d15f4b9985f433d958598d8581a35268e4df0f631b39d026061fe5c00ec6b805f3bf4f5f261039b93176db460b6f936c0de1b8 SHA512 9ddc715ff5c550b700c2384284c9f0cf6c2a99353a06d8e4c3b8363f4affdf9a11757ed5d1c9b85c83499b3bec054544290508a20f2ee16d46e66dc824a924ed
-EBUILD fakechroot-2.20.1.ebuild 566 BLAKE2B ca5f78363d136c7ba8b369d28e9b27a2a9c3736b6da6aabf902622873a065845c254fb9a31eeb4604a855386fc5b55f7e131d6b0ccf22b7123fc2bd58e8ff757 SHA512 ce35cd103fdc77360c694ec0ff710a0cc7f03dabf10ad7e0a947f35c2a5c45ec56fe705459147778e4dd7bae0d515d497e9752384ec03a955b51899ad65b4d90
+EBUILD fakechroot-2.20.1.ebuild 629 BLAKE2B d73a6d8658653e8faa6b177494fd3405b616b8744ee88d738baa867ba72b42aaabff8bbfbeaa7eb4c5dd075506030dfeaa6c64980b89410e537769ba4c9b2155 SHA512 759acc61dcd8f58c91292782c8f232b542c68007dfb778bd16850e14886b34ce48adca1c4f06f4374c4653fc0bbc4b71e24b2374f89709eed4c412f294e3070e
 MISC metadata.xml 249 BLAKE2B c28e86a35ce07ccc4abb7f53597931333d12ba3676c698252179744b361ff822b6346565d8eaa3d1ccd699569240dfd11387f8a80c456bdcec42707863e9377f SHA512 3a7a3d57ead4b33905b475bd13d7a4e6db1c9badcc8d5954d2a9fc4232146e8ace0fecff65c66070fa47ed989b5ee68b87ec5351daacc88d7c9c06f02c8d2b64
diff --git a/sys-apps/fakechroot/fakechroot-2.20.1.ebuild b/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
index 75ca647e8b96..f5bfa37c4782 100644
--- a/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
@@ -13,6 +13,10 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/fakechroot-2.20.1-glibc-2.33.patch"
+)
+
 src_configure() {
 	econf --disable-static
 }
diff --git a/sys-apps/fakechroot/files/fakechroot-2.20.1-glibc-2.33.patch b/sys-apps/fakechroot/files/fakechroot-2.20.1-glibc-2.33.patch
new file mode 100644
index 000000000000..31c2dd784393
--- /dev/null
+++ b/sys-apps/fakechroot/files/fakechroot-2.20.1-glibc-2.33.patch
@@ -0,0 +1,469 @@
+From 534e6d555736b97211523970d378dfb0db2608e9 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Mon, 22 Feb 2021 21:44:07 -0800
+Subject: [PATCH 1/6] tmpnam.c: fix heap overflow
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ src/tmpnam.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tmpnam.c b/src/tmpnam.c
+index ce60817..917ee6b 100644
+--- a/src/tmpnam.c
++++ b/src/tmpnam.c
+@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s))
+ 
+     expand_chroot_path(ptr);
+ 
+-    ptr2 = malloc(strlen(ptr));
++    ptr2 = malloc(strlen(ptr) + 1);
+     if (ptr2 == NULL) return NULL;
+ 
+     strcpy(ptr2, ptr);
+
+From 75d7e6fa191c11a791faff06a0de86eaa7801d05 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Mon, 22 Feb 2021 21:46:36 -0800
+Subject: [PATCH 2/6] declare missing bufs, remove ver from lstat
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ src/lstat.c  | 8 +++++---
+ src/lstat.h  | 2 +-
+ src/mknod.c  | 2 ++
+ src/stat.c   | 2 ++
+ src/stat64.c | 2 ++
+ 5 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/src/lstat.c b/src/lstat.c
+index 3f6d819..54e3263 100644
+--- a/src/lstat.c
++++ b/src/lstat.c
+@@ -28,9 +28,11 @@
+ #include "lstat.h"
+ 
+ 
+-wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
++wrapper(lstat, int, (const char * filename, struct stat * buf))
+ {
+-    debug("lstat(%d, \"%s\", &buf)", ver, filename);
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("lstat(\"%s\", &buf)", filename);
+ 
+     if (!fakechroot_localdir(filename)) {
+         if (filename != NULL) {
+@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
+         }
+     }
+ 
+-    return lstat_rel(ver, filename, buf);
++    return lstat_rel(filename, buf);
+ }
+ 
+ 
+diff --git a/src/lstat.h b/src/lstat.h
+index 751c1ea..ee48303 100644
+--- a/src/lstat.h
++++ b/src/lstat.h
+@@ -26,7 +26,7 @@
+ 
+ #ifndef HAVE___LXSTAT
+ 
+-wrapper_proto(lstat, int, (int, const char *, struct stat *));
++wrapper_proto(lstat, int, (const char *, struct stat *));
+ 
+ int lstat_rel(const char *, struct stat *);
+ 
+diff --git a/src/mknod.c b/src/mknod.c
+index 52fd33b..2771037 100644
+--- a/src/mknod.c
++++ b/src/mknod.c
+@@ -28,6 +28,8 @@
+ 
+ wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev))
+ {
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev);
+     expand_chroot_path(pathname);
+     return nextcall(mknod)(pathname, mode, dev);
+diff --git a/src/stat.c b/src/stat.c
+index 7845662..7b37793 100644
+--- a/src/stat.c
++++ b/src/stat.c
+@@ -33,6 +33,8 @@
+ 
+ wrapper(stat, int, (const char * file_name, struct stat * buf))
+ {
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("stat(\"%s\", &buf)", file_name);
+     expand_chroot_path(file_name);
+     return nextcall(stat)(file_name, buf);
+diff --git a/src/stat64.c b/src/stat64.c
+index aac9c75..a360f66 100644
+--- a/src/stat64.c
++++ b/src/stat64.c
+@@ -34,6 +34,8 @@
+ 
+ wrapper(stat64, int, (const char * file_name, struct stat64 * buf))
+ {
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("stat64(\"%s\", &buf)", file_name);
+     expand_chroot_path(file_name);
+     return nextcall(stat64)(file_name, buf);
+
+From 693a3597ea7fccfb62f357503ff177bd3e3d5a89 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Mon, 22 Feb 2021 21:47:09 -0800
+Subject: [PATCH 3/6] fix glibc 2.33+ compatibility
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ configure.ac        | 20 ++++++++++++++++++++
+ src/ftw.c           |  2 +-
+ src/ftw64.c         | 14 +++++++++++---
+ src/libfakechroot.h | 15 +++++++++++++++
+ src/lstat.c         |  2 +-
+ src/lstat.h         |  2 +-
+ src/lstat64.c       |  2 +-
+ src/mknod.c         |  2 +-
+ src/mknodat.c       |  2 +-
+ src/stat.c          |  2 +-
+ src/stat64.c        |  2 +-
+ 11 files changed, 54 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8cdb32..9cc2e77 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY
+ # Checks for libraries.
+ AC_CHECK_LIB([dl], [dlsym])
+ 
++AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33])
++AC_MSG_CHECKING([for glibc 2.33+])
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++       #include <sys/stat.h>
++  ]], [[
++#ifdef __GLIBC__
++#if !__GLIBC_PREREQ(2,33)
++#error glibc<2.33
++#endif
++#else
++#error not glibc
++#endif
++  ]])],[
++   AC_DEFINE(NEW_GLIBC,1)
++   AC_MSG_RESULT([yes])
++  ],[
++   AC_DEFINE(NEW_GLIBC,0)
++   AC_MSG_RESULT([no])
++  ])
++
+ # Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+diff --git a/src/ftw.c b/src/ftw.c
+index 92fc126..a9abc85 100644
+--- a/src/ftw.c
++++ b/src/ftw.c
+@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *);
+ # define NFTW_NEW_NAME __new_nftw
+ # define INO_T ino_t
+ # define STAT stat
+-# ifdef _LIBC
++# if defined(_LIBC) && !NEW_GLIBC
+ #  define LXSTAT __lxstat
+ #  define XSTAT __xstat
+ #  define FXSTATAT __fxstatat
+diff --git a/src/ftw64.c b/src/ftw64.c
+index 7cc8cdf..cee1f2b 100644
+--- a/src/ftw64.c
++++ b/src/ftw64.c
+@@ -18,6 +18,8 @@
+    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+    02111-1307 USA.  */
+ 
++#include "config.h"
++
+ #define __FTW64_C
+ #define FTW_NAME ftw64
+ #define NFTW_NAME nftw64
+@@ -25,9 +27,15 @@
+ #define NFTW_NEW_NAME __new_nftw64
+ #define INO_T ino64_t
+ #define STAT stat64
+-#define LXSTAT __lxstat64
+-#define XSTAT __xstat64
+-#define FXSTATAT __fxstatat64
++#if NEW_GLIBC
++#  define LXSTAT(V,f,sb) lstat64 (f,sb)
++#  define XSTAT(V,f,sb) stat64 (f,sb)
++#  define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m)
++#else
++#  define LXSTAT __lxstat64
++#  define XSTAT __xstat64
++#  define FXSTATAT __fxstatat64
++#endif
+ #define FTW_FUNC_T __ftw64_func_t
+ #define NFTW_FUNC_T __nftw64_func_t
+ 
+diff --git a/src/libfakechroot.h b/src/libfakechroot.h
+index 4cf199f..64ff15f 100644
+--- a/src/libfakechroot.h
++++ b/src/libfakechroot.h
+@@ -200,6 +200,21 @@
+ # endif
+ #endif
+ 
++#ifndef _STAT_VER
++ #if defined (__aarch64__)
++  #define _STAT_VER 0
++ #elif defined (__powerpc__) && __WORDSIZE == 64
++  #define _STAT_VER 1
++ #elif defined (__riscv) && __riscv_xlen==64
++  #define _STAT_VER 0
++ #elif defined (__s390x__)
++  #define _STAT_VER 1
++ #elif defined (__x86_64__)
++  #define _STAT_VER 1
++ #else
++  #define _STAT_VER 3
++ #endif
++#endif
+ 
+ typedef void (*fakechroot_wrapperfn_t)(void);
+ 
+diff --git a/src/lstat.c b/src/lstat.c
+index 54e3263..fa38323 100644
+--- a/src/lstat.c
++++ b/src/lstat.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#ifndef HAVE___LXSTAT
++#if !defined(HAVE___LXSTAT) || NEW_GLIBC
+ 
+ #include <sys/stat.h>
+ #include <unistd.h>
+diff --git a/src/lstat.h b/src/lstat.h
+index ee48303..c46a2b9 100644
+--- a/src/lstat.h
++++ b/src/lstat.h
+@@ -24,7 +24,7 @@
+ #include <config.h>
+ #include "libfakechroot.h"
+ 
+-#ifndef HAVE___LXSTAT
++#if !defined(HAVE___LXSTAT) || NEW_GLIBC
+ 
+ wrapper_proto(lstat, int, (const char *, struct stat *));
+ 
+diff --git a/src/lstat64.c b/src/lstat64.c
+index b6212fc..a332d7c 100644
+--- a/src/lstat64.c
++++ b/src/lstat64.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64)
++#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC)
+ 
+ #define _LARGEFILE64_SOURCE
+ #define _BSD_SOURCE
+diff --git a/src/mknod.c b/src/mknod.c
+index 2771037..aeb750b 100644
+--- a/src/mknod.c
++++ b/src/mknod.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#ifndef HAVE___XMKNOD
++#if !defined(HAVE___XMKNOD) || NEW_GLIBC
+ 
+ #include <sys/stat.h>
+ #include "libfakechroot.h"
+diff --git a/src/mknodat.c b/src/mknodat.c
+index 732a22b..3239b35 100644
+--- a/src/mknodat.c
++++ b/src/mknodat.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT)
++#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC)
+ 
+ #define _ATFILE_SOURCE
+ #include <sys/stat.h>
+diff --git a/src/stat.c b/src/stat.c
+index 7b37793..5ef57ba 100644
+--- a/src/stat.c
++++ b/src/stat.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#ifndef HAVE___XSTAT
++#if !defined(HAVE___XSTAT) || NEW_GLIBC
+ 
+ #define _BSD_SOURCE
+ #define _DEFAULT_SOURCE
+diff --git a/src/stat64.c b/src/stat64.c
+index a360f66..993ce80 100644
+--- a/src/stat64.c
++++ b/src/stat64.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64)
++#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC)
+ 
+ #define _BSD_SOURCE
+ #define _LARGEFILE64_SOURCE
+
+From e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5 Mon Sep 17 00:00:00 2001
+From: neok-m4700 <neok-m4700@users.noreply.github.com>
+Date: Wed, 24 Feb 2021 17:36:57 +0100
+Subject: [PATCH 6/6] wrap fstatat and fstatat64
+
+---
+ configure.ac    |  2 ++
+ src/Makefile.am |  2 ++
+ src/fstatat.c   | 42 ++++++++++++++++++++++++++++++++++++++++++
+ src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 89 insertions(+)
+ create mode 100644 src/fstatat.c
+ create mode 100644 src/fstatat64.c
+
+diff --git a/configure.ac b/configure.ac
+index 9cc2e77..5b3053e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -218,6 +218,8 @@ AC_CHECK_FUNCS(m4_normalize([
+     freopen64
+     fstat
+     fstat64
++    fstatat
++    fstatat64
+     fts_children
+     fts_open
+     fts_read
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6066345..eb311c0 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \
+     fopen64.c \
+     freopen.c \
+     freopen64.c \
++    fstatat.c \
++    fstatat64.c \
+     fts.c \
+     fts64.c \
+     ftw.c \
+diff --git a/src/fstatat.c b/src/fstatat.c
+new file mode 100644
+index 0000000..ca7578b
+--- /dev/null
++++ b/src/fstatat.c
+@@ -0,0 +1,42 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org>
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include <config.h>
++
++#ifdef HAVE_FSTATAT
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#include <sys/stat.h>
++#include <limits.h>
++#include "libfakechroot.h"
++
++wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
++    expand_chroot_path_at(dirfd, pathname);
++    return nextcall(fstatat)(dirfd, pathname, buf, flags);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+diff --git a/src/fstatat64.c b/src/fstatat64.c
+new file mode 100644
+index 0000000..1863372
+--- /dev/null
++++ b/src/fstatat64.c
+@@ -0,0 +1,43 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org>
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include <config.h>
++
++#ifdef HAVE_FSTATAT64
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#define _LARGEFILE64_SOURCE
++#include <sys/stat.h>
++#include <limits.h>
++#include "libfakechroot.h"
++
++wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
++    expand_chroot_path_at(dirfd, pathname);
++    return nextcall(fstatat64)(dirfd, pathname, buf, flags);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 2eefe6f6d81e..fb05a20aa165 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -1,15 +1,16 @@
 AUX fakeroot-1.19-no-acl_h.patch 915 BLAKE2B 2392343f314e5cc3fa49def14a245cf2898902d99ff2fbe4bc0a883e70ae1382ed5c4c506533545b9c428958f8e4be54e795601063d48dd8ffe9e80d56ec267a SHA512 d077e8ba2bc4407ba1a57fb5920f2a866bdcb13fa359c2245e479019bbc19a3aab398cc25220079edf7c42c4d09429e57326b606ff5795f83de24c7a31835717
 AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d72497145bcb8e5e1b2acf43608dd03f1a2b9ee688fda8859491d79c898e6f412eded6a5c8a24734640e2479eda95319a265 SHA512 824e71169877702c5d98970d62866d5074d1a728d5bc52460483117610f50f6869f65714608313f20e40b7432ea4c50cf9f47158d8f2f9ef4a3c00220ccbd52c
+AUX fakeroot-1.25.3-glibc-2.33.patch 13646 BLAKE2B 1a83706a9e26f9c11d9851c24659086206df2d518c3103354971436565d59e8c5cdda47eaf40dc6645d7b09542e766593d57f731d7d8946ef96a1852b12ea2b0 SHA512 3f5402763d32a0b7461ef817e5aece42ff4807780ab886a7867d03019d0a4c501350a3520932e1ba6dcd592ae0cb9548c2cdf1da5498bfb6092f4cb6b4a09096
 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
 DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5aaf82f4707ad8f810f954373a31cf5f390ef57dcc71ba630a1d4a578df95ac9beda9c93b3c75adffcbc89860f442b69 SHA512 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036
 DIST fakeroot_1.24.orig.tar.gz 522497 BLAKE2B fb08ed6512a3e26538662ceb28a197b85fd4a05c37b543529df6880e01c64bd774037bed1230bf7d7fe0bde798364c2fd0fcfab257fff4d3e6ae9800c076a5b0 SHA512 b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487
 DIST fakeroot_1.25.1.orig.tar.gz 126880 BLAKE2B ea92815d005422ade80a91d1351c500614f7628b2173caf23bab2192f9395440ba4429ac773723c79a0f0205b7c750db9c1cecbefe7e9e2c442c8a92938df0cf SHA512 0e340aacfb49558ee6719aa11aa297ccda2afe2f66209da8fa10e45ec7954d5db689717db38f30cdfb9d89b75ca63ec6aed42e2cc314fd25c60262aa735eab0d
 DIST fakeroot_1.25.2.orig.tar.gz 126876 BLAKE2B 13c4457aed3d6df08fef0f3af6093eea05bcaedff280146a7d09e96a1e73d0615c2527ce32bc4999a0acc0478610241440ec9a70ee27860cd61d799f636c30d3 SHA512 3afc0d6c82bef4968f1eac293174d12f957788f173fa8b69753c422f0f3bb54e012d350eaa8e535501dd62185479c1d4cb1c6e3f605930ae5987a7f622c450c2
 DIST fakeroot_1.25.3.orig.tar.gz 126884 BLAKE2B a6a860a8714bb2a43f2820bc586cac38d25df8b8cb32b219064618c845d0308b57929108bd582b46c15b2fe4b2fc00d662ba72458a9e9ffcf7d035dce515eb55 SHA512 b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346ff72e857087243ab0efe9fa82faaa9f9c3309cac4b5af0ea00908c2e5eb6e
-EBUILD fakeroot-1.22.ebuild 1068 BLAKE2B 24eb5e3273be5f6bf771c1930cf01495912a2a043ad39c80b3501abf211024b7a4bc8f09656fbb2b711368979377dfe46baa16528ee8de53890177e673082ab4 SHA512 096c63a170619f68f38b95013616e96881750c39b3f4d19d12bd5ff3cfae8c493f1b3ea5695ee8f584217d5d52d44c3ccb3041558db7f9770d53c5d8b0453a32
-EBUILD fakeroot-1.23.ebuild 1074 BLAKE2B e0f810e84eae6eea778b7b23b8bd6e8cf9c83db4f9b58cd9e6705bb1811f8ac2f626959507865cd8b234577434a4e2aef6b77082b0422eac481e1e63a2907722 SHA512 76fe90adcfa947f794365bd641beb1d63ab76295bc6d5dc2541800c856594d61fe3c34aa1bb9c62e7463ed73986c59461cd8bbb5b421d493336ed313c2632904
-EBUILD fakeroot-1.24.ebuild 1081 BLAKE2B 83324f005105c63853a8609a59095032ba7c559c6a211257f5e834eccc331f0d6760ff46586ed64ca0847c2fcb4190160449538a201b3c480ecffac867d1d9c8 SHA512 aac064b0369eed287f53944cd7ce1be7455d8bd2eb647b2d7499b67d306def045a32dd994245d64c6ef632b7d240cbc258405563bd777e3239f154ec524ca531
-EBUILD fakeroot-1.25.1.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5
-EBUILD fakeroot-1.25.2.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5
-EBUILD fakeroot-1.25.3.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5
+EBUILD fakeroot-1.22.ebuild 1037 BLAKE2B b54f10e687853be1dfe56bacb01955086074150c1b5b0b31f85247843631df123b7ae28a546a536b703ce7ed73535f2a0b0dd002f6466a8edbfed7d8c64ed222 SHA512 a0cba5dbef10e56f65753266abb39b16c5ca749a6b2a6788737c99bb396b29a5b687ab102cb3dee28e55bc686b3ee741c909fe8d2e7d182d322e3d18ca944ca1
+EBUILD fakeroot-1.23.ebuild 1042 BLAKE2B 397a3e3eb5b8cd664ae33968c0f0f3f252d0bba0996bc3885b403ce7f0de37b6b4fe68fb5e67d09632f082be3f3ced19e489615ee1e8a26a3c57482b8f2b98d0 SHA512 4ffa843ad9ff3a35b7d51f9d5655641010f1cd835d747dd8318d65bdd2eec81057c3fde221481f677e7e3d4695c5a0d6d8032b628d4c79e9594d6ecfbc448af5
+EBUILD fakeroot-1.24.ebuild 1049 BLAKE2B 0a15c82db4fc1c07e1b8ca8a4b518d25f08709e9dbedde5207cbe99e0c42602e932dc591d5f62997df29259a5e40abd5084b79b3636524f1dea4593ae0e8acb3 SHA512 64731f11ed5eee897e2cb6564b16aeb5ccf1a564a7c37132eca91e13acf27bc06a7dfd715786bc2743944558d8cfaf9d43f6e92f5c011c39c643979d9461425d
+EBUILD fakeroot-1.25.1.ebuild 1153 BLAKE2B 4b8ae014196e34b7858663d1141f3f7951780d2035751aa691a5ce90805a4216f56aec081b501be9be02f444453c61ce1ecacb0ea8c77e8f7a2e30c7d9950cb0 SHA512 ec9769a0ff90e7f89abefae9f6b881c37435b320530a3bf8cc187496b3bbc57bc1a95a0739243c5344621f5687334ec9e79397066313229fa17b6b49939dc4e9
+EBUILD fakeroot-1.25.2.ebuild 1153 BLAKE2B 4b8ae014196e34b7858663d1141f3f7951780d2035751aa691a5ce90805a4216f56aec081b501be9be02f444453c61ce1ecacb0ea8c77e8f7a2e30c7d9950cb0 SHA512 ec9769a0ff90e7f89abefae9f6b881c37435b320530a3bf8cc187496b3bbc57bc1a95a0739243c5344621f5687334ec9e79397066313229fa17b6b49939dc4e9
+EBUILD fakeroot-1.25.3-r1.ebuild 1283 BLAKE2B dca56bb4cffd09daf635e3b9f57ae4d202826eee3ee445571e4229d0355b566302be59dae1c55270c1f363e980195a91d342d734b331a83e542c037ea76437a0 SHA512 d7a0d8b3f4fe46be037ad992f1f11c3f4068864949f3f6c98114c64c8535f4f66d985166e3321348409b711b6852ddfe22b37debf6966f9976e079ac044b2949
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
index 1f8e88f9076b..de5c08838429 100644
--- a/sys-apps/fakeroot/fakeroot-1.22.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,8 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug static-libs test"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -36,8 +36,7 @@ src_configure() {
 	export ac_cv_header_sys_acl_h=$(usex acl)
 
 	use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
diff --git a/sys-apps/fakeroot/fakeroot-1.23.ebuild b/sys-apps/fakeroot/fakeroot-1.23.ebuild
index c0f5629f8051..8ff11f2bd082 100644
--- a/sys-apps/fakeroot/fakeroot-1.23.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug static-libs test"
+IUSE="acl debug test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -36,8 +36,7 @@ src_configure() {
 	export ac_cv_header_sys_acl_h=$(usex acl)
 
 	use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
diff --git a/sys-apps/fakeroot/fakeroot-1.24.ebuild b/sys-apps/fakeroot/fakeroot-1.24.ebuild
index 1145abde6854..c0433bfb258d 100644
--- a/sys-apps/fakeroot/fakeroot-1.24.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 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 static-libs test"
+IUSE="acl debug test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -36,8 +36,7 @@ src_configure() {
 	export ac_cv_header_sys_acl_h=$(usex acl)
 
 	use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
diff --git a/sys-apps/fakeroot/fakeroot-1.25.1.ebuild b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild
index eac32e7e9542..acc86b8534df 100644
--- a/sys-apps/fakeroot/fakeroot-1.25.1.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 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 static-libs test"
+IUSE="acl debug test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -41,8 +41,7 @@ src_configure() {
 	export ac_cv_header_sys_acl_h=$(usex acl)
 
 	use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
diff --git a/sys-apps/fakeroot/fakeroot-1.25.2.ebuild b/sys-apps/fakeroot/fakeroot-1.25.2.ebuild
index eac32e7e9542..acc86b8534df 100644
--- a/sys-apps/fakeroot/fakeroot-1.25.2.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.25.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 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 static-libs test"
+IUSE="acl debug test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -41,8 +41,7 @@ src_configure() {
 	export ac_cv_header_sys_acl_h=$(usex acl)
 
 	use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
diff --git a/sys-apps/fakeroot/fakeroot-1.25.3.ebuild b/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild
index eac32e7e9542..86101250865e 100644
--- a/sys-apps/fakeroot/fakeroot-1.25.3.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.25.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,8 +11,8 @@ 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 static-libs test"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -21,31 +21,36 @@ DEPEND="
 	test? ( app-arch/sharutils )"
 BDEPEND="app-text/po4a"
 
-DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
+DOCS=( AUTHORS BUGS DEBUG README doc/README.saving )
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/fakeroot-1.25.3-glibc-2.33.patch"
+	)
 	default
 	eautoreconf
 }
 
-src_compile() {
-	# Create tranlated man pages
-	pushd doc &>/dev/null || die
-	po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die
-	popd &>/dev/null || die
+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
 
-	default
+	econf --disable-static
 }
 
-src_configure() {
-	export ac_cv_header_sys_acl_h=$(usex acl)
+src_compile() {
+	# 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
 
-	use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
-	econf \
-		$(use_enable static-libs static)
+	default
 }
 
 src_install() {
 	default
-	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch b/sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch
new file mode 100644
index 000000000000..87ae9e18b746
--- /dev/null
+++ b/sys-apps/fakeroot/files/fakeroot-1.25.3-glibc-2.33.patch
@@ -0,0 +1,413 @@
+From 03bc0ee07fb6e293d081ffd8af1654788b434f6a Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Thu, 11 Feb 2021 20:59:25 -0800
+Subject: [PATCH 1/6] libfakeroot.c: define _STAT_VER if not already defined
+
+Based on patch from Jan Pazdziora:
+https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ libfakeroot.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 3e80e38..14cdbc4 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -90,6 +90,16 @@
+ #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
+ #endif
+ 
++#ifndef _STAT_VER
++ #if defined (__aarch64__)
++  #define _STAT_VER 0
++ #elif defined (__x86_64__)
++  #define _STAT_VER 1
++ #else
++  #define _STAT_VER 3
++ #endif
++#endif
++
+ /*
+    These INT_* (which stands for internal) macros should always be used when
+    the fakeroot library owns the storage of the stat variable.
+-- 
+GitLab
+
+
+From feda578ca3608b7fc9a28a3a91293611c0ef47b7 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Thu, 11 Feb 2021 21:00:04 -0800
+Subject: [PATCH 2/6] libfakeroot.c: add wrappers for new glibc 2.33+ symbols
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 48 insertions(+)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 14cdbc4..d75c51f 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath,
+ #endif /* HAVE_FSTATAT */
+ 
+ 
++#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33)
++/* Glibc 2.33 exports symbols for these functions in the shared lib */
++  int lstat(const char *file_name, struct stat *statbuf) {
++     return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf);
++  }
++  int stat(const char *file_name, struct stat *st) {
++     return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st);
++  }
++  int fstat(int fd, struct stat *st) {
++     return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st);
++  }
++
++  #ifdef HAVE_FSTATAT
++    int fstatat(int dir_fd, const char *path, struct stat *st, int flags) {
++       return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags);
++    }
++  #endif
++
++  #ifdef STAT64_SUPPORT
++    int lstat64(const char *file_name, struct stat64 *st) {
++       return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st);
++    }
++    int stat64(const char *file_name, struct stat64 *st) {
++       return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st);
++    }
++    int fstat64(int fd, struct stat64 *st) {
++       return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st);
++    }
++
++    #ifdef HAVE_FSTATAT
++      int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) {
++	 return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags);
++      }
++    #endif
++  #endif
++
++  int mknod(const char *pathname, mode_t mode, dev_t dev) {
++     return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev);
++  }
++
++  #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT)
++    int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) {
++       return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev);
++    }
++  #endif
++#endif /* GLIBC_PREREQ */
++
++
+ #ifdef FAKEROOT_FAKENET
+ pid_t fork(void)
+ {
+-- 
+GitLab
+
+
+From d074aaa34d6928989308a3870738d6b1c28f2bae Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Thu, 11 Feb 2021 21:00:20 -0800
+Subject: [PATCH 3/6] libfakeroot.c: fix compile error with DEBUG enabled
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ libfakeroot.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index d75c51f..31480f8 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -2525,7 +2525,7 @@ int statx (int dirfd, const char *path, int flags, unsigned int mask, struct sta
+ 
+ #ifdef LIBFAKEROOT_DEBUGGING
+   if (fakeroot_debug) {
+-    fprintf(stderr, "statx fd %d\n", fd);
++    fprintf(stderr, "statx fd %d\n", dirfd);
+   }
+ #endif /* LIBFAKEROOT_DEBUGGING */
+   r=INT_NEXT_FSTATAT(dirfd, path, &st, flags);
+-- 
+GitLab
+
+
+From c3eebec293e35b997bb46c22fb5a4e114afb5e7f Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Sat, 13 Feb 2021 19:32:08 -0800
+Subject: [PATCH 4/6] configure.ac: fix __xmknod{,at} pointer argument
+
+Switch default to assume * and not the absence of *.
+
+On glibc 2.33+, there is no definition for these functions in header
+files, so the compile test doesn't work. But, we can default to using
+the pointer (as is the case with newer glibc), and use the header file
+on older platforms to fail the test and use no pointer.
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ configure.ac | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 73415d2..d85566f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,13 +183,13 @@ AC_MSG_CHECKING([for type of arg of __xmknod])
+   ]], [[
+        int __xmknod  ( int ver,
+                        const char *pathname ,
+-                       mode_t  mode ,  dev_t dev);
++                       mode_t  mode ,  dev_t *dev);
+   ]])],[
+-   AC_DEFINE(XMKNOD_FRTH_ARG,)
+-   AC_MSG_RESULT([no extra *])
+-  ],[
+    AC_DEFINE(XMKNOD_FRTH_ARG,[*])
+    AC_MSG_RESULT([needs *])
++  ],[
++   AC_DEFINE(XMKNOD_FRTH_ARG,)
++   AC_MSG_RESULT([no extra *])
+ 
+   ])
+ 
+@@ -210,13 +210,13 @@ AC_MSG_CHECKING([for type of arg of __xmknodat])
+        int __xmknodat  ( int ver,
+                          int dirfd,
+                          const char *pathname ,
+-                         mode_t  mode ,  dev_t dev);
++                         mode_t  mode ,  dev_t *dev);
+   ]])],[
+-   AC_DEFINE(XMKNODAT_FIFTH_ARG,)
+-   AC_MSG_RESULT([no extra *])
+-  ],[
+    AC_DEFINE(XMKNODAT_FIFTH_ARG,[*])
+    AC_MSG_RESULT([needs *])
++  ],[
++   AC_DEFINE(XMKNODAT_FIFTH_ARG,)
++   AC_MSG_RESULT([no extra *])
+ 
+   ])
+ 
+-- 
+GitLab
+
+
+From 01671986b4ee8eb76dc7f63dfe034a7faf4a4c28 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Sat, 13 Feb 2021 19:35:31 -0800
+Subject: [PATCH 5/6] libfakeroot.c: fix fts_read and fts_children
+
+Apply Debian patch from [0], since glibc is usually built without LFS.
+__USE_LARGEFILE64 and FTSENT64 should be used anyway for proper support
+of this, if needed. See [1] for more details.
+
+[0]: https://sources.debian.org/patches/fakeroot/1.25.3-1.1/eglibc-fts-without-LFS/
+[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676428
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ libfakeroot.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 31480f8..169f4da 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -2066,11 +2066,7 @@ FTSENT *fts_read(FTS *ftsp) {
+             || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK))
+     r->fts_statp = NULL;  /* Otherwise fts_statp may be a random pointer */
+   if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
+-# if defined(STAT64_SUPPORT) && !defined(__APPLE__)
+-    SEND_GET_STAT64(r->fts_statp, _STAT_VER);
+-# else
+     SEND_GET_STAT(r->fts_statp, _STAT_VER);
+-# endif
+   }
+ 
+   return r;
+@@ -2089,11 +2085,7 @@ FTSENT *fts_children(FTS *ftsp, int options) {
+   first=next_fts_children(ftsp, options);
+   for(r = first; r; r = r->fts_link) {
+     if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
+-# if defined(STAT64_SUPPORT) && !defined(__APPLE__)
+-      SEND_GET_STAT64(r->fts_statp, _STAT_VER);
+-# else
+       SEND_GET_STAT(r->fts_statp, _STAT_VER);
+-# endif
+     }
+   }
+ 
+-- 
+GitLab
+
+
+From f5e0a89ab6f0024f3d3bec5fd9cf631676b44f6c Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Sat, 13 Feb 2021 20:05:17 -0800
+Subject: [PATCH 6/6] OS X portability
+
+OS X portability work from OpenWrt.
+
+Cc: Felix Fietkau <nbd@nbd.name>
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ configure.ac   |  1 +
+ libfakeroot.c  | 36 ++++++++++++++++++++++++++++++++++--
+ wrapawk_macosx | 10 +++++++---
+ wrapfunc.inp   |  4 ++--
+ 4 files changed, 44 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d85566f..35f9ecf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,6 +146,7 @@ for first in size_t int; do
+ #include <sys/types.h>
+ #endif
+ #include <unistd.h>
++#include <stdio.h>
+ #ifdef HAVE_GRP_H
+ #include <grp.h>
+ #endif
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 169f4da..7593dd6 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -122,8 +122,16 @@
+ #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER)
+ #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER)
+ #define INT_SEND_GET_STAT(a,b) SEND_GET_STAT(a,b)
++
++/* 10.10 uses id_t in getpriority/setpriority calls, so pretend
++   id_t is used everywhere, just happens to be int on some OSes */
++#ifndef _ID_T
++#define _ID_T
++typedef int id_t;
++#endif
+ #endif
+ 
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <sys/ipc.h>
+ #include <sys/msg.h>
+@@ -135,7 +143,6 @@
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <errno.h>
+-#include <sys/types.h>
+ #ifdef HAVE_SYS_ACL_H
+ #include <sys/acl.h>
+ #endif /* HAVE_SYS_ACL_H */
+@@ -198,6 +205,15 @@ extern int unsetenv (const char *name);
+ #undef __lxstat64
+ #undef _FILE_OFFSET_BITS
+ 
++
++#ifndef AT_EMPTY_PATH
++#define AT_EMPTY_PATH 0
++#endif
++
++#ifndef AT_NO_AUTOMOUNT
++#define AT_NO_AUTOMOUNT 0
++#endif
++
+ /*
+ // next_wrap_st:
+ // this structure is used in next_wrap, which is defined in
+@@ -1969,7 +1985,7 @@ ssize_t fremovexattr(int fd, const char *name)
+ }
+ #endif /* HAVE_FREMOVEXATTR */
+ 
+-int setpriority(int which, int who, int prio){
++int setpriority(int which, id_t who, int prio){
+   if (fakeroot_disabled)
+     return next_setpriority(which, who, prio);
+   next_setpriority(which, who, prio);
+@@ -2570,3 +2586,19 @@ int sysinfo(int command, char *buf, long count)
+     }
+ }
+ #endif
++
++#ifdef HAVE_OPENAT
++int openat(int dir_fd, const char *pathname, int flags, ...)
++{
++	mode_t mode;
++
++    if (flags & O_CREAT) {
++        va_list args;
++        va_start(args, flags);
++        mode = va_arg(args, int);
++        va_end(args);
++    }
++
++    return next_openat(dir_fd, pathname, flags, mode);
++}
++#endif
+diff --git a/wrapawk_macosx b/wrapawk_macosx
+index 088a7f4..f783219 100644
+--- a/wrapawk_macosx
++++ b/wrapawk_macosx
+@@ -46,26 +46,30 @@ BEGIN{
+   argtype=$3;
+   argname=$4;
+   MACRO=$5;
++  argtype_def=$6
++  if(!argtype_def) {
++    argtype_def = argtype
++  }
+   if(MACRO){
+     print "extern " ret " MY_DEF(" name ")" argtype " __attribute__((visibility(\"hidden\")));" > headerfile;
+     print "INTERPOSE(MY_DEF(" name "_RAW)," name "_RAW);"   > structfile;
+     print "#undef " name                      > deffile
+     print "#define " name " MY_DEF(" name "_RAW)" > deffile
+ 
+-    print "extern " ret, name, argtype ";"              > tmpffile;
++    print "extern " ret, name, argtype_def ";"          > tmpffile;
+     print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " __attribute__((always_inline));" > tmpffile;
+     print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " {" > tmpffile;
+     print "  return " name, argname ";"                 > tmpffile;
+     print "}"                                           > tmpffile;
+     print ""                                            > tmpffile;
+   } else {
+-    print "extern " ret " my_" name, argtype " __attribute__((visibility(\"hidden\")));" > headerfile;
++    print "extern " ret " my_" name, argtype_def " __attribute__((visibility(\"hidden\")));" > headerfile;
+     print "#undef " name                                > structfile;
+     print "INTERPOSE(my_" name "," name ");"            > structfile;
+     print "#define " name " my_" name                   > structfile
+     print "#define " name " my_" name                   > deffile
+ 
+-    print "extern " ret, name, argtype ";"              > tmpffile;
++    print "extern " ret, name, argtype_def ";"          > tmpffile;
+     if(argname){
+         print "static __inline__ " ret " next_" name, argtype " __attribute__((always_inline));" > tmpffile;
+         print "static __inline__ " ret " next_" name, argtype " {" > tmpffile;
+diff --git a/wrapfunc.inp b/wrapfunc.inp
+index f7ad186..556af34 100644
+--- a/wrapfunc.inp
++++ b/wrapfunc.inp
+@@ -146,7 +146,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid)
+ initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group)
+ getgroups;int;(int size, gid_t list[]);(size, list)
+ setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list)
+-setpriority;int;(int which, int who, int prio);(which, who, prio)
++setpriority;int;(int which, id_t who, int prio);(which, who, prio)
+ #ifdef HAVE_CAPSET
+ capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap)
+ #endif /* HAVE_CAPSET */
+@@ -198,7 +198,7 @@ fchownat;int;(int dir_fd, const char *path, uid_t owner, gid_t group, int flags)
+ mkdirat;int;(int dir_fd, const char *pathname, mode_t mode);(dir_fd, pathname, mode)
+ #endif /* HAVE_MKDIRAT */
+ #ifdef HAVE_OPENAT
+-openat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, flags)
++openat;int;(int dir_fd, const char *pathname, int flags, mode_t mode);(dir_fd, pathname, flags, mode);;(int dir_fd, const char *pathname, int flags, ...)
+ #endif /* HAVE_OPENAT */
+ #ifdef HAVE_RENAMEAT
+ renameat;int;(int olddir_fd, const char *oldpath, int newdir_fd, const char *newpath);(olddir_fd, oldpath, newdir_fd, newpath)
+-- 
+GitLab
+
diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest
index 0bd7204055ee..5bc1d7ceac8a 100644
--- a/sys-apps/fbset/Manifest
+++ b/sys-apps/fbset/Manifest
@@ -1,5 +1,5 @@
 AUX fbset-2.1-add-linux-types-h.patch 275 BLAKE2B 177b56c3989bf360609d3f4541537b279e6a57e3f83420c2f55edb472a5b685602dc73b852626232784afb044a79e0532cee0107ee2a4204b42cf68fbb820b2a SHA512 fb13052aed519da65e1197d81b1c583cae0c6528c362966caa3c65b324a115345745550e2589a92e0c8bab49215dd99252c14704dff71a2950332281ae83749c
 AUX fbset-2.1-build.patch 458 BLAKE2B 93340436783aed64145832fd491223a085a4497adfcfe44a7d3ed100171e0f4dfc608beda73e2659fe93dc9a965d0df47eaf0018a4e91087cabcd5482fbffdaa SHA512 97d8df2776c634ccdcf49433bb45e8e7d944e5d7cc34fe0f55085f76f0f5dfc216323a0f4e58d256767e83987dd73e96be3393bd727d791edd12f0b63ebed819
 DIST fbset-2.1.tar.gz 27721 BLAKE2B 3d078a41d178ed5347d3e8907fa4ff55c1971ccfcca3ac07ec251f7f2949b7133b4589628e349eb29c344e9a5969844b8bb3c423b329f99943a5a5f93e152d65 SHA512 7e0380760f77b0db7dcc128f6375a3ed8da4b8521d1926faba27812c5cb20e6f1a62f3a539591a81a6b7e7986940db4cd83e03d6de487e0ab7f0760ed1d21b28
-EBUILD fbset-2.1.ebuild 749 BLAKE2B ce9cb40ffab4ccc50d2328cc0f48f4ff371263d60286bc22e315635e1a0f8fefb79df45c0156eb4ece6990cc3dffb41f8adb7801d27d7e86a6d05f307f2715e9 SHA512 0debd81cb517984175257bf3b03af379ecd157f0a020d722bf4a5e28dd958456ec1fe0bb1383e60d48e38dbc35508a6a72e162b59d57f59713fbce17823af9e4
+EBUILD fbset-2.1.ebuild 750 BLAKE2B 2b128941a28747ad558cedf3733ecc23bcc05ece13dafedcd4e1736242dfdb9bfe228fb9398cf0ccfc20eff0617afc6ca1cbe17f98a6d794f777423a3c0018d4 SHA512 95103486a99b4f45ff0a4b8e10bbef467ad40943380df1706165c3aa43666611c2ae81c39c96ac7a8f7c202ce1ef09fb9a9486790c43c36f1b9f724ca288ac71
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index 282b230b79a3..398f486926dd 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://users.telenet.be/geertu/Linux/fbdev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static"
 
 BDEPEND="sys-devel/bison
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index e520841378a7..6d6e9720bec4 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,17 +1,8 @@
-AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f574aac769c7728bada7b622fd670616efc12d42cabf95b32a8a98c811e171059af2e127c170c1935dc00def4a1fc05b6 SHA512 3517e35db03944bcca6da28ddac9f0d08ce052b03d1508d26851fd6691bedc89f3974822a1559576987c8c10a0343bc8788cc7df52406d66a591ddcd39b23a5c
-AUX file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch 1184 BLAKE2B a2b6a11c1d89ac5683422e9d9734990d5b54dc14cc295853920c5ebfe28a5de2055c889d5f708ab55d8e292a514ce51fdbd260f0e15dce74ee048fe0f8a7d93b SHA512 7a710d32232d3484923937add7dd56e6d4c6160e32da4d65cb9b4083fbc85df229af108728f3cdf9313291bdf96259c7471c1b6c4b3548033205de47e0280e6c
-AUX file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch 823 BLAKE2B c2d4c40224d2fa3db4ca0069e1f5bf111cc782879c97f642d91dc4d545544af22ed11bade5c014494838d75ac8e4d607009af77d0dc9d3457d1eb28d8e2ea192 SHA512 4ddc901be88b61ab860817daeb9f4021a6dff1473d0a64ff6409b8327e07011b1d86f2a2c54e1751d03518fa5def25fed644c1a6cd691f2737b526e43098603c
-AUX file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch 813 BLAKE2B e0d0168f41eb868131cbed1e657f4a1e4f4d1f29d22f4a4685b43a6bece5a9229a25a1d96bbc4deca065dcb6342d388ebe86e984e3dda66729f974bcc4e7a32b SHA512 eae1267cf6f49d448cad51f3ba97cd1f8598bebccc014b8702cf3ea330184718dacd1570f20efdd119951b55fe57729392197cb86f89dcce23654e745c846417
-AUX file-5.39-add-missing-termios.patch 917 BLAKE2B 12a0dd712fe7b3755e5fa6dcda0d3a5586be36b0e4fee237ba86b9dcc7b533e57f6094e49599489b8563756764c8a7d6c31d9d20245cb3971c4944ee05413cc2 SHA512 a56a617a212f2e0e348d358e09076ea25bd396f426ce4ab7c090ba702d2d20fdc5b425e2a7baac5abc78bab0320fe1b917b511c0a87b40067f7f1489508107e3
-AUX file-5.39-allow-futex-seccomp.patch 473 BLAKE2B d575e64d3d3b7f772b240bb30ad171a85e69b5282dbef43ece466dfcfed4b1ead9c8f038948010e00d7c0a029d8896d32e252ad02789725eb9fa2d61f3abf1b0 SHA512 c22098f467b41f23f9b94dae91d89008c01b5bf7534df662541bd86170feb64190a4b742e2d7130fd57973b4d565d8bc63d0d67d83399afec943e00f2ad5b847
 AUX file-5.39-portage-sandbox.patch 604 BLAKE2B d755d85ae85826df5d2beb2d05f570e230af671c23f27bb1e3e811d1f2f710ae3d4f14d271f9dc4da4d1aa4e71070561d1121deaccf8781de72ff9aec059caa3 SHA512 a65368ed9225b0ca6e7341283a20b308c5d5ca38838849d5228be762d4d87de0438084af8f7cd7b6ee1a707125226940490a80cc1eafc2c817fc865a6211c890
-AUX file-5.39-seccomp-musl.patch 1021 BLAKE2B ffb395d7ebf1a96a7f74c8c8462e561f31a6d46bf8d0b047b370edd0bc9ada254ddfdf1de6217e0d1e85a973880c1f55add5c8dbd40b9db4c693c36d15c5250f SHA512 d5742e169c0a5b40e8dfe3830caf5c6ee21d09122ae409c4b3f357cb517abb8a39c6af2ba6a51fa9155437ae6aa5f30b76b1f8f3d31be9bcd6e6e4e666be1a87
-DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
-DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
-DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6
-EBUILD file-5.37-r1.ebuild 3153 BLAKE2B 19df45e9db45ca58085f3758d9396a074b6cd3a2475228ff7774551e85adb321203091958ae36eaa2aa12bbbfc2bf7aa79ad1e8b95345a106accd20fd621f54a SHA512 786d0ad8abe705e1e5ed1c3604dc4d6e4ae00ab27150368dd00475baefaeb37ec72c45297fd68def3fcb276b2ee29a8b8982e0010223d87df55450d49c8a1d76
-EBUILD file-5.38-r1.ebuild 3366 BLAKE2B cde302d8a08639b8b2a5f8aec2f4f00a0dce1bcc7a9b34b7ce9e2786cbc421659fba7acd50d81b90604dcdca84ee3ef9d8fb7bb431d01a98a2e47c7a82832e37 SHA512 af1fae92b1c27efb812b4a6b6944f9ebbdd35e0cf852b6e69bde503bcc9c5c08e97d4e7eac7139e674c4651650eb5e853dd3e3d4ee094d234d54606dd66b13ff
-EBUILD file-5.39-r3.ebuild 3390 BLAKE2B b8443b97f7364c7958ead19c0485321f821fe2a3c5d489be5c25a2dd9257faa0937cd0ddf900f860bd1790a2c196cc8d8566c65139619777335d742605e3d9f0 SHA512 6f8ff5ff5658fc9abe9d7803058763cf76ff63f269482c74956756befc95b993d2587f94b428305e19e5b66fb6b95f04d4eb32be4264bdf60cff07cbedbe0088
-EBUILD file-5.39-r4.ebuild 3450 BLAKE2B 236f6da314ad6971e594e40853efc87b2fa32e4389553fa2a11b7cc3dbf4c1291e74285e0e2ed6489a5b67d843319d16b23471f1a74e0e201a9935bb2d4db63f SHA512 3056f15679b56f34406a2e9669ed56c33ea7185435c8a7c0b75b3e58480ddf1e204955932ff1b31ef09a7cf71ee7f1e3533606bf87d3f4d65b9501df60448886
-EBUILD file-9999.ebuild 3296 BLAKE2B 6e56f6436decee04e4c97dfccbe87d5942e328b003a7898e4ae12bb8a9c8c5150c0cb4b304cc3488f6698f2b33456e2d296dddda709cc351f69d07ac95378647 SHA512 4842d01087da26426d0ebe4438e2d20da6653e258e3848f2e01b0433856a9c08258a0391b6a6455714682baab67423660570f01cdd927bd0ed3c5fb4fcd2438c
+AUX file-5.40-seccomp-faccessat.patch 1006 BLAKE2B 80a33bec7dd36e146c713c8bb639744f11f2fb094f0870d10071a472dc3e6036cfe6cce4a1570a0876fd6c7c3f8f7f4e1ae39aa46f7cc39ee7e49ea1c9c1b22a SHA512 a475835fac9556ef4a799a5b406acdbbdb7bd09233a5563a386f110355a8e5a4581eed69bcc968df12985f6e910ea7da0deec9f510dd891b633b369afd816ff8
+AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c80567a83d89c609b731b84f2d5e0b8fe54d060f45b6db38258ece2e2af1e0d0674e4fdf5b62df6217695d06042bb86ad72f5b SHA512 5e5364659e2c96e438000e698f9099be1d2bee94890c51ed849f6e0d139ba637a8026d975200476636cd8282791b6c3e5b71326fb8519323d6c07604975b5b0c
+AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5
+DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
+EBUILD file-5.40-r2.ebuild 3418 BLAKE2B 05d0f47c954197f1105e0ce284a0986f0352072caf98b4dd3af439e58cc6e1015786f1cd4196fbf5950d1def62717a5bbbf3a58aacf2a012d6bb4dd3b1d73842 SHA512 d9fd16e393b90d09edc074cb0f58f972e99f5f7a22d8a106ed74db95cd30f508a48aaf5a476f900d2914b6b3c6668c6a09a7fcb11ca46efaa61f65069414738b
+EBUILD file-9999.ebuild 3272 BLAKE2B d585df4df18b289e21ef901b9abcde83cbf99aa234107013fe896974018176cc78d02f92c49fe13785b2ee2f9350d017993f38a78897ef20617214f14c9dd481 SHA512 bf305f9f9e635cdf3edd8c33cad98c0cc05a6bbb190ffb3df9d8cb46517fb50b66089becf395fd44457c69f5ccf91dcb64979fcf4e1507bfc9488d26e21cf90b
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
deleted file mode 100644
index 8daeba6eac10..000000000000
--- a/sys-apps/file/file-5.37-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	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"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="python static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )"
-
-PATCHES=( "${FILESDIR}"/${P}-CVE-2019-18218.patch )
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README.md python/README.python.md || die
-	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-libseccomp
-		--enable-fsect-man5
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		tc-export_build_env BUILD_C{C,XX}
-		ECONF_SOURCE="${S}" \
-		ac_cv_header_zlib_h=no \
-		ac_cv_lib_z_gzopen=no \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} -static" \
-		CC=${BUILD_CC} \
-		CXX=${BUILD_CXX} \
-		econf --disable-shared --disable-libseccomp
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT README
-
-	# Required for `file -C`
-	dodir /usr/share/misc/magic
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/file-5.38-r1.ebuild b/sys-apps/file/file-5.38-r1.ebuild
deleted file mode 100644
index d318c4e309e9..000000000000
--- a/sys-apps/file/file-5.38-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	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"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
-	"${FILESDIR}"/${P}-td-is-for-ptrdiff_t-not-for-off_t.patch
-	"${FILESDIR}"/${P}-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README.md python/README.python.md || die
-	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-libseccomp
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-	tc-env_build econf "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-
-	if need_build_file; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT README
-
-	# Required for `file -C`
-	dodir /usr/share/misc/magic
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/file-5.39-r4.ebuild b/sys-apps/file/file-5.39-r4.ebuild
deleted file mode 100644
index 14b4cbfa64a4..000000000000
--- a/sys-apps/file/file-5.39-r4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	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"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/file-5.39-add-missing-termios.patch" #728416
-	"${FILESDIR}/file-5.39-seccomp-musl.patch"
-	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
-	"${FILESDIR}/file-5.39-allow-futex-seccomp.patch" #771096
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README.md python/README.python.md || die
-	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-	tc-env_build econf "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-
-	if need_build_file; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT README
-
-	# Required for `file -C`
-	dodir /usr/share/misc/magic
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/file-5.39-r3.ebuild b/sys-apps/file/file-5.40-r2.ebuild
index b64fe567d8eb..036079303892 100644
--- a/sys-apps/file/file-5.39-r3.ebuild
+++ b/sys-apps/file/file-5.40-r2.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 ~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"
@@ -37,15 +37,16 @@ RDEPEND="${DEPEND}
 	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/file-5.39-add-missing-termios.patch" #728416
-	"${FILESDIR}/file-5.39-seccomp-musl.patch"
 	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+	"${FILESDIR}/file-5.40-xz_magic.patch" #784773
+	"${FILESDIR}/file-5.40-seccomp-faccessat.patch"
+	"${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857
 )
 
 src_prepare() {
 	default
 
-	if [[ ${PV} == 9999 ]]; then
+	if [[ ${PV} == 9999 ]] ; then
 		eautoreconf
 	fi
 
@@ -87,9 +88,9 @@ need_build_file() {
 }
 
 src_configure() {
-	local ECONF_SOURCE=${S}
+	local ECONF_SOURCE="${S}"
 
-	if need_build_file; then
+	if need_build_file ; then
 		mkdir -p "${WORKDIR}"/build || die
 		cd "${WORKDIR}"/build || die
 		build_src_configure
@@ -109,7 +110,7 @@ multilib_src_compile() {
 }
 
 src_compile() {
-	if need_build_file; then
+	if need_build_file ; then
 		emake -C "${WORKDIR}"/build/src magic.h #586444
 		emake -C "${WORKDIR}"/build/src file
 		local -x PATH="${WORKDIR}/build/src:${PATH}"
@@ -134,7 +135,6 @@ multilib_src_install_all() {
 	dodoc ChangeLog MAINT README
 
 	# Required for `file -C`
-	dodir /usr/share/misc/magic
 	insinto /usr/share/misc/magic
 	doins -r magic/Magdir/*
 
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 8e6aab3b29e6..67c33d9f4859 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -43,7 +43,7 @@ PATCHES=(
 src_prepare() {
 	default
 
-	if [[ ${PV} == 9999 ]]; then
+	if [[ ${PV} == 9999 ]] ; then
 		eautoreconf
 	fi
 
@@ -85,9 +85,9 @@ need_build_file() {
 }
 
 src_configure() {
-	local ECONF_SOURCE=${S}
+	local ECONF_SOURCE="${S}"
 
-	if need_build_file; then
+	if need_build_file ; then
 		mkdir -p "${WORKDIR}"/build || die
 		cd "${WORKDIR}"/build || die
 		build_src_configure
@@ -107,7 +107,7 @@ multilib_src_compile() {
 }
 
 src_compile() {
-	if need_build_file; then
+	if need_build_file ; then
 		emake -C "${WORKDIR}"/build/src magic.h #586444
 		emake -C "${WORKDIR}"/build/src file
 		local -x PATH="${WORKDIR}/build/src:${PATH}"
@@ -132,7 +132,6 @@ multilib_src_install_all() {
 	dodoc ChangeLog MAINT README
 
 	# Required for `file -C`
-	dodir /usr/share/misc/magic
 	insinto /usr/share/misc/magic
 	doins -r magic/Magdir/*
 
diff --git a/sys-apps/file/files/file-5.37-CVE-2019-18218.patch b/sys-apps/file/files/file-5.37-CVE-2019-18218.patch
deleted file mode 100644
index 1cd02b778abf..000000000000
--- a/sys-apps/file/files/file-5.37-CVE-2019-18218.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-CVE-2019-18218
-https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84
-
---- a/src/cdf.c
-+++ b/src/cdf.c
-@@ -1027,8 +1027,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
- 				goto out;
- 			}
- 			nelements = CDF_GETUINT32(q, 1);
--			if (nelements == 0) {
--				DPRINTF(("CDF_VECTOR with nelements == 0\n"));
-+			if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) {
-+				DPRINTF(("CDF_VECTOR with nelements == %"
-+				    SIZE_T_FORMAT "u\n", nelements));
- 				goto out;
- 			}
- 			slen = 2;
-@@ -1070,8 +1071,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
- 					goto out;
- 				inp += nelem;
- 			}
--			DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n",
--			    nelements));
- 			for (j = 0; j < nelements && i < sh.sh_properties;
- 			    j++, i++)
- 			{
---- a/src/cdf.h
-+++ b/src/cdf.h
-@@ -48,6 +48,7 @@
- typedef int32_t cdf_secid_t;
- 
- #define CDF_LOOP_LIMIT					10000
-+#define CDF_ELEMENT_LIMIT				100000
- 
- #define CDF_SECID_NULL					0
- #define CDF_SECID_FREE					-1
diff --git a/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch b/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
deleted file mode 100644
index 240edc11f680..000000000000
--- a/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c9d21a58bea2ecb2dc8876e09e471094d54a25e4 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Mon, 13 Apr 2020 01:08:12 +0200
-Subject: [PATCH 1/3] Revert "PR/93: iaeiaeiaeiae: Do as the comment says, and
- count as dynamically linked"
-
-This reverts commit 24c9c086cd7c55b7b0a003a145b32466468e2608.
-
-Fixes misdetection of shared libraries as statically linked as
-reported in bug 717264.
-
-Bug: https://bugs.gentoo.org/717264
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- src/readelf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/readelf.c b/src/readelf.c
-index 40bcfab1..afec31d1 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -1638,6 +1638,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
- 		/* Things we can determine before we seek */
- 		switch (xph_type) {
- 		case PT_DYNAMIC:
-+			linking_style = "dynamically";
- 			doread = 1;
- 			break;
- 		case PT_NOTE:
-@@ -1653,7 +1654,6 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
- 			}
- 			/*FALLTHROUGH*/
- 		case PT_INTERP:
--			linking_style = "dynamically";
- 			doread = 1;
- 			break;
- 		default:
--- 
-2.26.0
-
diff --git a/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch b/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
deleted file mode 100644
index bb211f355f77..000000000000
--- a/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ed971e5e3ae79bd28697d16c8b78b693052484e4 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Wed, 12 Feb 2020 22:17:33 +0000
-Subject: [PATCH 3/3] The executable bit is only set when DF_1_PIE bit is set
- so it is fine.
-
----
- magic/Magdir/elf | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/magic/Magdir/elf b/magic/Magdir/elf
-index b5a2e00b..f5e1af9a 100644
---- a/magic/Magdir/elf
-+++ b/magic/Magdir/elf
-@@ -50,8 +50,9 @@
- !:mime	application/x-object
- >16	leshort		2		executable,
- !:mime	application/x-executable
-->16	leshort		3		shared object,
--!:mime	application/x-sharedlib
-+>16	leshort		3		${x?pie executable:shared object},
-+
-+!:mime	application/x-${x?pie-executable:sharedlib}
- >16	leshort		4		core file,
- !:mime	application/x-coredump
- # OS-specific
--- 
-2.26.0
-
diff --git a/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch b/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch
deleted file mode 100644
index 09fcaef151ea..000000000000
--- a/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c49dc91df427f89ebcf9cdec556b8fc88cdfc3c1 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 17 Dec 2019 15:27:27 +0000
-Subject: [PATCH 2/3] %td is for ptrdiff_t not for off_t.
-
----
- src/readelf.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/readelf.c b/src/readelf.c
-index afec31d1..8ac3b7d6 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -1349,8 +1349,8 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
- 	name_off = xsh_offset;
- 
- 	if (fsize != SIZE_UNKNOWN && fsize < name_off) {
--		if (file_printf(ms, ", too large section header offset %td",
--		    name_off) == -1)
-+		if (file_printf(ms, ", too large section header offset %jd",
-+		    (intmax_t)name_off) == -1)
- 			return -1;
- 		return 0;
- 	}
--- 
-2.26.0
-
diff --git a/sys-apps/file/files/file-5.39-add-missing-termios.patch b/sys-apps/file/files/file-5.39-add-missing-termios.patch
deleted file mode 100644
index 0614f52dd275..000000000000
--- a/sys-apps/file/files/file-5.39-add-missing-termios.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 471e2c6c61ecd30ba6e304ae0444d364cfd44254 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Thu, 18 Jun 2020 16:25:12 +0000
-Subject: [PATCH] PR/168: gyakovlev: Include <termios.h>
-
----
- src/seccomp.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index e667adfe4..68c56485d 100644
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -27,7 +27,7 @@
- #include "file.h"
- 
- #ifndef	lint
--FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
-+FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $")
- #endif	/* lint */
- 
- #if HAVE_LIBSECCOMP
-@@ -35,6 +35,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
- #include <sys/prctl.h> /* prctl */
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-+#include <termios.h>
- #include <fcntl.h>
- #include <stdlib.h>
- #include <errno.h>
diff --git a/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch b/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch
deleted file mode 100644
index 8d9e3d1eb660..000000000000
--- a/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-In some situations, futex() is called even when lzma
-support is not compiled in. Let's enable it unconditionally
-for now.
-
-https://bugs.gentoo.org/771096
-https://bugs.astron.com/view.php?id=241
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -175,9 +175,7 @@ enable_sandbox_full(void)
-  	ALLOW_RULE(fcntl64);
- 	ALLOW_RULE(fstat);
-  	ALLOW_RULE(fstat64);
--#ifdef XZLIBSUPPORT
- 	ALLOW_RULE(futex);
--#endif
- 	ALLOW_RULE(getdents);
- #ifdef __NR_getdents64
- 	ALLOW_RULE(getdents64);
diff --git a/sys-apps/file/files/file-5.39-seccomp-musl.patch b/sys-apps/file/files/file-5.39-seccomp-musl.patch
deleted file mode 100644
index 72836de67e58..000000000000
--- a/sys-apps/file/files/file-5.39-seccomp-musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 93c91e2ba8042d499fee168e27cbd526438454c6 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Sat, 5 Sep 2020 17:20:32 +0000
-Subject: [PATCH] PR/194: puchuu: Handle muslc syscalls
-
----
- src/seccomp.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index 68c56485d..db9364ae4 100644
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -27,7 +27,7 @@
- #include "file.h"
- 
- #ifndef	lint
--FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $")
-+FILE_RCSID("@(#)$File: seccomp.c,v 1.17 2020/09/05 17:20:32 christos Exp $")
- #endif	/* lint */
- 
- #if HAVE_LIBSECCOMP
-@@ -220,12 +220,14 @@ enable_sandbox_full(void)
- 	ALLOW_RULE(rt_sigreturn);
- 	ALLOW_RULE(select);
- 	ALLOW_RULE(stat);
-+	ALLOW_RULE(statx);
- 	ALLOW_RULE(stat64);
- 	ALLOW_RULE(sysinfo);
- 	ALLOW_RULE(umask);	// Used in file_pipe2file()
- 	ALLOW_RULE(getpid);	// Used by glibc in file_pipe2file()
- 	ALLOW_RULE(unlink);
- 	ALLOW_RULE(write);
-+	ALLOW_RULE(writev);
- 
- 
- #if 0
diff --git a/sys-apps/file/files/file-5.40-seccomp-faccessat.patch b/sys-apps/file/files/file-5.40-seccomp-faccessat.patch
new file mode 100644
index 000000000000..4aeb88cfe875
--- /dev/null
+++ b/sys-apps/file/files/file-5.40-seccomp-faccessat.patch
@@ -0,0 +1,34 @@
+From abcd583135bb0762e6bfd0f2e06c50bea1fb3cd0 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Tue, 6 Apr 2021 22:02:17 +0000
+Subject: [PATCH] On ARM64 Linux access() syscall is no longer a real syscall
+ to the kernel. Instead it's emulated by glibc with a new faccessat() syscall.
+ (Icenowy Zheng)
+
+---
+ src/seccomp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 0da907ff7..81842cf5c 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -27,7 +27,7 @@
+ #include "file.h"
+ 
+ #ifndef	lint
+-FILE_RCSID("@(#)$File: seccomp.c,v 1.18 2021/03/14 17:01:58 christos Exp $")
++FILE_RCSID("@(#)$File: seccomp.c,v 1.19 2021/04/06 22:02:17 christos Exp $")
+ #endif	/* lint */
+ 
+ #if HAVE_LIBSECCOMP
+@@ -171,6 +171,9 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(dup2);
+ 	ALLOW_RULE(exit);
+ 	ALLOW_RULE(exit_group);
++#ifdef __NR_faccessat
++	ALLOW_RULE(faccessat);
++#endif
+ 	ALLOW_RULE(fcntl);
+  	ALLOW_RULE(fcntl64);
+ 	ALLOW_RULE(fstat);
diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch b/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch
new file mode 100644
index 000000000000..57d04e5f40cf
--- /dev/null
+++ b/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch
@@ -0,0 +1,29 @@
+From e3d0265a147878b6c2903bcc83b9842dff68ceb4 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 23 Apr 2021 15:00:42 -0400
+Subject: [PATCH] seccomp: allow fstatat64
+
+This is needed for the libsandbox LD_PRELOAD wrapper on Gentoo Linux.
+
+Bug: https://bugs.gentoo.org/784857
+---
+ src/seccomp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 81842cf5..43abc684 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -178,6 +178,9 @@ enable_sandbox_full(void)
+  	ALLOW_RULE(fcntl64);
+ 	ALLOW_RULE(fstat);
+  	ALLOW_RULE(fstat64);
++#ifdef __NR_fstatat64
++	ALLOW_RULE(fstatat64);
++#endif
+ 	ALLOW_RULE(futex);
+ 	ALLOW_RULE(getdents);
+ #ifdef __NR_getdents64
+-- 
+2.31.1
+
diff --git a/sys-apps/file/files/file-5.40-xz_magic.patch b/sys-apps/file/files/file-5.40-xz_magic.patch
new file mode 100644
index 000000000000..e4fed0421f78
--- /dev/null
+++ b/sys-apps/file/files/file-5.40-xz_magic.patch
@@ -0,0 +1,37 @@
+From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Mon, 19 Apr 2021 17:01:45 +0000
+Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
+
+---
+ magic/Magdir/compress | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/magic/Magdir/compress b/magic/Magdir/compress
+index 64d11a736..41a65738f 100644
+--- a/magic/Magdir/compress
++++ b/magic/Magdir/compress
+@@ -1,5 +1,5 @@
+ #------------------------------------------------------------------------------
+-# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
++# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
+ # compress:  file(1) magic for pure-compression formats (no archives)
+ #
+ # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
+@@ -265,14 +265,13 @@
+ 
+ # http://tukaani.org/xz/xz-file-format.txt
+ 0	ustring		\xFD7zXZ\x00		XZ compressed data, checksum
++!:strength * 2
++!:mime	application/x-xz
+ >7	byte&0xf	0x0			NONE
+ >7	byte&0xf	0x1			CRC32
+ >7	byte&0xf	0x4			CRC64
+ >7	byte&0xf	0xa			SHA-256
+ 
+-!:strength * 2
+-!:mime	application/x-xz
+-
+ # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
+ 0	string		LRZI			LRZIP compressed data
+ >4	byte		x			- version %d
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index ea6dccf0814a..cd3ad3e8e058 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,5 +1,5 @@
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
 DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e
-EBUILD findutils-4.7.0.ebuild 1647 BLAKE2B 5ce7a4a9ed1df65f4e7fff84ea0657340af44b5c030c5a0a3ffa1d22bc827238e7ef0d299b0648159dc45c7c30b8c2d2971080f24d3f12245661f391da240cdd SHA512 5d11f2a2c4a3704e118d38971b2c421707d2bd0b71f9742bbf72ac9d26bb65436158d5624bab55a6ae90d50ae8ee8600c643207a4ba00f1e375b4d7cb492b8e3
+EBUILD findutils-4.7.0.ebuild 1648 BLAKE2B 25c2b7765f22e7f568dcc0c277189f86a1f2068a640686701990115b1b86fbebd42915be85bbdf4c6c364b788ddfd928e7b9c2622b826e51b1418ae8d7c0c1a0 SHA512 5efa3ec30e2fd0d8599debd73e649bbcdc0eb60f28de6ac2e5102a9701215f886a0552082d76e50ba2219635858e03b18dcf928e3a1272c84b85163540fa02ed
 EBUILD findutils-4.8.0.ebuild 1655 BLAKE2B d339685af7c75c4a271e5dca2e1b1450c02facea9d9aed5fd2984817dc46fb494a8a0affa81a18cfb6e33ac1af8a9566449f2aa4322a8f5ec90917e8b2fe3ec1 SHA512 57f1d599017d16f52292a451e87e0c9f9d850efba95e1da30a2a2f808ef6b27efa00a710987cb1d3aa53ad22f555132e31df1cbedd28a23d5a045bca8672f8a1
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
index d2bc6103e747..611bb9a6662a 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -13,7 +13,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 ~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 )"
 
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 5846a48c389a..c687169760ab 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -2,5 +2,5 @@ AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f70
 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 4333 BLAKE2B 7aff14f2c2dfa58af2ab24d59908e3194adc05887e9e3faf0a617914e067409f1426c8cf1825ba1399e104fe82bcda63746498727e6351dc44b01dc0eeef8dad SHA512 39af8a0ccf443284c26766c8034b2cdf51c0eda686fef506255e5c4859e7638f0a872762e932a42c7f5134ef4dde96d2b66c94f6a6d2c9b3d2fde9c9be7e8abc
-EBUILD flashrom-9999.ebuild 4494 BLAKE2B be2488baa66fe2ba326403f686fe29132757c6ae29afb7859c99697f61288bc47f9315d60f37ec8868180b947893753b62fd04c945fb12f2a5b35ed1c0247ad8 SHA512 4033afcec2a2450ce4426b71960a1a86583a09f0dcdcdb51f2efc7f58aabbc8f3b9baea71f51af531c97a452d61a954dbd13c090ce906ab2c01bb00d6258c5ed
+EBUILD flashrom-9999.ebuild 4522 BLAKE2B 4f56084b6fa495cdad7df4ebe4991df07f4210d3dff115f2a42abc994ae1fab159add3e4dabad6d98d916acebb4c74ed77c04627dc1b0d7bf36644a4e120101b SHA512 1d700fbea79892e5cde4197c5e22780f9180db56c283c320ad4ca359f225231c40ed4882b394a78d02f3c4489f195c3dd3ac79e19f78ff9bde3c3f2c208f7211
 MISC metadata.xml 5037 BLAKE2B 3027f42fb0ab5965684cb79857991888772126fbf48e2f9c314a0e01c831cf38474a20ce846964631ea95dc459629396c3796fc89d858b35f239f2a3fb343c1b SHA512 8602f9ad7419bae5f10620400f9451d16c43d12223173873ab53191c93064bf0bdb72c78ee5cde8dc9fa091ce1c6c80575cf586141080c13c971370fa0ac85f8
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 64c28bcfbecc..fe588c7916e0 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -97,6 +97,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	sys-apps/diffutils"
+BDEPEND="virtual/pkgconfig"
 RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
 
 _flashrom_enable() {
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index e0b98090754b..8fe790156b38 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,17 +1,13 @@
 AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b2600bae6ad6ef750c579b7d51023615fc7f0569011aa88e73cb72030c4112f1d26e924676bc6fd1cb9e9c9a7fef76f8800 SHA512 148a5af93d2c3554239c5529d63e5f85ed70192856ca375ce0126c183babda7d7de5cf345e875f7cd88c6cce52f409f05f1689625ea6dde14bf330c9e11d98b9
 AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8afbb58a44b9af69726c86d4c1720a202d1721d74a83e35bb431b2c4e6e56281249353975954a69145a80f8e8b9b0152eea SHA512 f9b72f1ca470ac2e33428e03d3287420877d20597a83bf8db21510e3ab4980a26f1832091a087888f38891be4e912cf29e1568fc67d2e604622c28303cb5701e
-AUX fwupd-1.5.6-gusb_deps.patch 1553 BLAKE2B 799957e4902ae31d94a1a5f304c6a814862c7b4d4c5020e47fb24210f5ab80fca4977d9fec102c751d7944ce7f4dcc76ce8a6c712c78346f578c949783b3881d SHA512 295a00515968e4beea761f2552e4de32bb7b6028cf889412988fd4df7df61f352551c46639a4c4e5d9cf33f6d89af58711288f50d71c0215055e25eb442ef813
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
-AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 AUX fwupd-r2 315 BLAKE2B fda26d20febea2564cc670df466fdde76679e69731d1d1d621ea2c0c8a6318a93cd17885cdf154540d62eb915ce3888a6a143143e4ba2c4f30c3beb7393efc22 SHA512 68328ad9e11eaf899f186f3ce0bfba09e1a8145af4001b52298f2a6cd9e54ba8cd24c67742db52a74d1f559989a4664517c77c07c975865def767d54b247a2dd
-DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
 DIST fwupd-1.4.7.tar.gz 2370660 BLAKE2B 8f04ced69610278576e41c12c7c51e326bdfbea8e1470ae586795b0c20f6a5fd4385701583195f49e14d749016987a7e02fb0d071b5315cca635f69d99bb63d6 SHA512 9d293adf6e9eba9537c4be9b7a4ccc26cd5519843f1bf94557148fabef8076e4846f7018949d8ad83afd01ce4874833bf8984c2ee3981fc6b1309ebda8e313f9
-DIST fwupd-1.5.6.tar.gz 2480802 BLAKE2B ab9d9cffaf74b4ce6a9de47ef37aa05efae0c0b353f879eb3d0573fd4153c0893922c3a47b68188998752c2f9a75ca340ecb7af94e6c85890060f3826900f812 SHA512 6a04151b53c4446c15527f6b1396ba238b749c6f767dff4171849ccbdab8db2619fd1e3f0e146fd67681263621d55f20008709c7bac10a6d34f27f06c7118cfe
-DIST fwupd-1.5.7.tar.gz 2498618 BLAKE2B ff0bf4d07a7df84232e90f5c85321dde3e08edd12f5ebf7a48130f076a52344e8654232bd0227d992fa5efbb3ce03e353da8b1511a9f39e5eab07c888b499463 SHA512 340a114123bd31a7a31370faaaa10e6517316d8f9c2b06f22d8b70bef64b7e6d9427682b8ceeea05570c8960eb7854ed5fc91aa450ff53d114fb97be43065213
+DIST fwupd-1.4.8.tar.gz 2375361 BLAKE2B 14951c8ec7d59ec53fed7b98bf0e277a7544f04f72f6a827971d45f9996190ebd46767e373850b269d8d718ec8c2b9df41bdd44614e5065832bd21c4071f012a SHA512 25c49f5a814aaf5cd614074936f6a222c513a0e74446a48ddc19aa51fc3d3e9e79dfa77e9b80055a4e3755bca99f13d260c2e4ddf6853ba0a583162523fe7d47
 DIST fwupd-1.5.8.tar.gz 3708769 BLAKE2B e18738d5f681fd9016a609ce9d48e452628c32e731b2a1f3635ff4897ff2a910b1ca0d7836bd12f14b27254c23eb2b6d74a2c35939ac5c8484e2050ab89a33a3 SHA512 d4fecd13a223e7f544026a5ac684bd570af2b63fb509a21e98ef72ccc4d7818f32abf730e2a40943bc762f04ecd5af03bf71201518d55090bb95fe6e9dc6969e
-EBUILD fwupd-1.4.6.ebuild 4056 BLAKE2B 061c425224845a2f3d3947abe7bcedcd11c3d859b111c68ee12b438a2788297e37b296d0ea8b7b2118fda490fa37a3bf9f801735ec4b2b9634b63ccd55000a9d SHA512 84b58cf5c6aef3d0bd5645cb19114b01e173049e1a263276ecb195d4925e22d2d36f248df1c3254e3fb6520e7cf72de35cffc4554bbe0353222d682b12ddc47a
-EBUILD fwupd-1.4.7.ebuild 4058 BLAKE2B c8ea9e8560f5a62b622e110facb01b9db44ca39d28ed05632ef5aaae7bafa1d42462d5b0b56dcf9523fcefccf7b626664da2a7437eaa7261136bef6e8a392283 SHA512 7f00faeaf03285a3d130dccb173bbad5eb4c0609645ad29d1f4e43c374e74d536dd82877719c9cecc5168c0688f69131de7dc3f7f1d90eccf31829a147b57d20
-EBUILD fwupd-1.5.6.ebuild 4440 BLAKE2B 4c12a21a99aa943aaa16020a6ad61858c7397599654fed0cbccf5d3e644aea74e4ff8985d61bc6cf135e9769d5f7e47b9e46f94f5e6aa92d6a84b56208761ba2 SHA512 94b058117ca1707880df50ab4c4a375f58451382b6f31475f85ab5f80c027ee9b8fedc1ac49acc9ca120248073178c94923bb75809a2c6b5cf34c9b9dc32a674
-EBUILD fwupd-1.5.7-r1.ebuild 4449 BLAKE2B 8dec374ff84fc59a9a6fe3997e5edd32b6793d4b24bf0b5bc800692d35c6bc1f9ba57eedc8dc033e8863c473cd5ab9cd654557877b6e8ce1a708964bd435f541 SHA512 e1ab69e2c4df76b65c137820b34e80dab7ae6f0993a3e9f26e797111dd9ce5e4f9bfe33635f308daa22fa2ea66f5de08bcf2261d69151ec4ee8bc6ae964a9b5b
+DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
+EBUILD fwupd-1.4.7.ebuild 4070 BLAKE2B ccea5065c6839de0f81cfbe441e9cb10f968aaf7da32ab3234f8708756b11a40828c3362d12fba0b761f0a89b6d8bed6cad452d6a7621c1b420ffb91749a0ff0 SHA512 d01e9b10d509915a4bb3996123d16fece081f3d1a7f32e6566999a2f680aebb035cb629ce515859c79e4cb63d2dc4bad8485d36e2b56883e7e08f84e8f490063
+EBUILD fwupd-1.4.8.ebuild 4058 BLAKE2B d79ac644532c0efc0a15c6356ceb485e179ff473f8a5125fcf7bbf4d5f808956648355fa3ea23d1b5d60e6f6fad770543f29161af1e596d3fdb7cb16a31cdbcf SHA512 ff26f4ce3f0b841b937699920de414dfd4f3389b84120bc777aa63f6e7f7cbaffb72481dbb7eac7f52f882529aaf02cadb9f8fe8b724a11d0fe8ea944a8844ad
 EBUILD fwupd-1.5.8.ebuild 4449 BLAKE2B 8dec374ff84fc59a9a6fe3997e5edd32b6793d4b24bf0b5bc800692d35c6bc1f9ba57eedc8dc033e8863c473cd5ab9cd654557877b6e8ce1a708964bd435f541 SHA512 e1ab69e2c4df76b65c137820b34e80dab7ae6f0993a3e9f26e797111dd9ce5e4f9bfe33635f308daa22fa2ea66f5de08bcf2261d69151ec4ee8bc6ae964a9b5b
+EBUILD fwupd-1.5.9.ebuild 4449 BLAKE2B 8dec374ff84fc59a9a6fe3997e5edd32b6793d4b24bf0b5bc800692d35c6bc1f9ba57eedc8dc033e8863c473cd5ab9cd654557877b6e8ce1a708964bd435f541 SHA512 e1ab69e2c4df76b65c137820b34e80dab7ae6f0993a3e9f26e797111dd9ce5e4f9bfe33635f308daa22fa2ea66f5de08bcf2261d69151ec4ee8bc6ae964a9b5b
 MISC metadata.xml 1142 BLAKE2B a7b7aa9cad916ad7c23a3f7bb405a62a4e8f2c83049412901f7b5055477465b3a0bfa7ef5617a4de704b49fdefb094190b764e7b4b4c8004225ce3d45feaf2da SHA512 6266ecd35bd0426ea76b434b053c1955a894b8d1faa389ec6b55b824507bca3dcb6f9d757ef03d09eeb1073d8d1592ed63276e1874c487a804ce88810aa5533e
diff --git a/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch b/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch
deleted file mode 100644
index 00c79d7853b8..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c74992c62a32080208baf137d61f7d73b0cade2d Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 16 Feb 2021 16:57:36 +0100
-Subject: [PATCH] system76-launch plugin requires gusb
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise the following build error happens:
-
-  ../fwupd-1.5.6/plugins/system76-launch/fu-system76-launch-device.c:117:9: error: ‘G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER’ undeclared (first use in this function)
-    117 |         G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER,
-        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  ../fwupd-1.5.6/plugins/system76-launch/fu-system76-launch-device.c:133:11: error: ‘G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER’ undeclared (first use in this function)
-    133 |           G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER,
-        |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
----
- plugins/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/meson.build b/plugins/meson.build
-index 138c47a4..12c7cb31 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -25,7 +25,6 @@ subdir('ata')
- subdir('elantp')
- subdir('optionrom')
- subdir('superio')
--subdir('system76-launch')
- subdir('thelio-io')
- subdir('wacom-raw')
- endif
-@@ -59,6 +58,7 @@ subdir('solokey')
- subdir('steelseries')
- subdir('synaptics-cxaudio')
- subdir('synaptics-prometheus')
-+subdir('system76-launch')
- subdir('vli')
- subdir('wacom-usb')
- 
--- 
-2.30.1
-
diff --git a/sys-apps/fwupd/files/fwupd-r1 b/sys-apps/fwupd/files/fwupd-r1
deleted file mode 100644
index 4a4865ef15af..000000000000
--- a/sys-apps/fwupd/files/fwupd-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Firmware update daemon"
-pidfile="/var/run/fwupd.pid"
-command="/usr/libexec/fwupd/fwupd"
-command_background="true"
-
-depend() {
-	need %SEAT_MANAGER% dbus
-	before xdm
-}
diff --git a/sys-apps/fwupd/fwupd-1.4.7.ebuild b/sys-apps/fwupd/fwupd-1.4.7.ebuild
index a7632e3964a0..f2da993af1f0 100644
--- a/sys-apps/fwupd/fwupd-1.4.7.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
@@ -31,8 +31,9 @@ BDEPEND="$(vala_depend)
 		sys-apps/help2man
 	)
 	test? (
-		thunderbolt? ( dev-util/umockdev )
+		app-crypt/tpm2-tss
 		net-libs/gnutls[tools]
+		thunderbolt? ( dev-util/umockdev )
 	)
 "
 CDEPEND="${PYTHON_DEPS}
@@ -125,7 +126,7 @@ src_configure() {
 		$(meson_use systemd)
 		$(meson_use test tests)
 		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
+		$(meson_use tpm tpm)
 		$(meson_use uefi plugin_uefi)
 		# Although our sys-apps/flashrom package now provides
 		# libflashrom.a, meson still can't find it
@@ -143,7 +144,7 @@ src_install() {
 
 	if ! use minimal ; then
 		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r1 \
+			"${FILESDIR}"/${PN}-r2 \
 			> "${T}"/${PN} || die
 		doinitd "${T}"/${PN}
 
diff --git a/sys-apps/fwupd/fwupd-1.4.6.ebuild b/sys-apps/fwupd/fwupd-1.4.8.ebuild
index 0b4925f443b8..3ec65898041a 100644
--- a/sys-apps/fwupd/fwupd-1.4.6.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
@@ -31,8 +31,8 @@ BDEPEND="$(vala_depend)
 		sys-apps/help2man
 	)
 	test? (
-		thunderbolt? ( dev-util/umockdev )
 		net-libs/gnutls[tools]
+		thunderbolt? ( dev-util/umockdev )
 	)
 "
 CDEPEND="${PYTHON_DEPS}
@@ -143,7 +143,7 @@ src_install() {
 
 	if ! use minimal ; then
 		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r1 \
+			"${FILESDIR}"/${PN}-r2 \
 			> "${T}"/${PN} || die
 		doinitd "${T}"/${PN}
 
diff --git a/sys-apps/fwupd/fwupd-1.5.6.ebuild b/sys-apps/fwupd/fwupd-1.5.6.ebuild
deleted file mode 100644
index 605097ca1b75..000000000000
--- a/sys-apps/fwupd/fwupd-1.5.6.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-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 ~x86"
-IUSE="agent amt archive dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-	uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		thunderbolt? ( dev-util/umockdev )
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	virtual/libelf:0=
-	virtual/udev
-	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-		x11-libs/cairo
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${PN}-1.5.6-gusb_deps.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use nvme ; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-	sed '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use archive libarchive)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gnutls)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use gusb)
-		$(meson_use gusb plugin_altos)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_pk)
-		-Dconsolekit="false"
-		-Dcurl="true"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-	)
-	use ppc64 && emesonargs+=( -Dplugin_msr="false" )
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r1 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.5.7-r1.ebuild b/sys-apps/fwupd/fwupd-1.5.9.ebuild
index 5e5f2c55a63a..5e5f2c55a63a 100644
--- a/sys-apps/fwupd/fwupd-1.5.7-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.9.ebuild
diff --git a/sys-apps/fxload/Manifest b/sys-apps/fxload/Manifest
index 2fdaa5a35e02..dd4bd0abf6d1 100644
--- a/sys-apps/fxload/Manifest
+++ b/sys-apps/fxload/Manifest
@@ -1,3 +1,3 @@
 DIST fxload-2008_10_13.tar.gz 23926 BLAKE2B 61401b6ea11bfafe8bdb4128dd1658123cac83c1e2b7995a1554b5c9dfa9cf25c2f261bb76a2fc0946940c64ec69fce021e187c383201f4f7a3561a68c3f8ac8 SHA512 f8a654c51a392ac95672a24962ac3b83ea4e0cb62d51a0696f6bdfdefbc7b5cfb033aa9cd80ee676a6bb00061bd635d7eb3920769f982188d8733c862838bc32
-EBUILD fxload-20081013-r1.ebuild 736 BLAKE2B 26896133ee9a010a45286de72e4bab5f9f2a0fcd66e1d2998d6a9b641eeb1439d49eff877bbcb64d935f3abad2388b0f96f42cf0b72c8aedc5c49a7a42fad1ac SHA512 2340ba9c1f0a996c4b359d838e7374131b230ee5719c465e04d480134eed99dc2bd94d44807b3ba703c77f2675f54e5d84ecec6219ec4b851ddf4fbf06be4fbd
+EBUILD fxload-20081013-r1.ebuild 726 BLAKE2B 936c86f1a56cacf5a533838aba0585b15af5ff2471e137c39e84cfa06e27988a719c6b41ecf5b954f160ffa41d91dcb546bcd813584cde4662751c3730c0d071 SHA512 67e1630d7af508f9c0c209b380665b3df2a74f382e9e51be34ea8d337c477c789ffe23560567c7eb6829733e949421cda5c8dfec2ed952ef12d38a00cd7d2693
 MISC metadata.xml 250 BLAKE2B 78bfa62c2b315a16f4c255dae1c32ed1c9184c0638658cb5a8a83641deb97c079b73789e020c754731d6d3153d397df00f546c59781855b7d3f8e01933b626a2 SHA512 bc48eb750cab3e4f45a71b1ccea94faabf8dc43826df2b701320cc03318700234bfea551ab12963356f775932fb62d22fb1182d5ac083c3eafd63b3feeb1b0fe
diff --git a/sys-apps/fxload/fxload-20081013-r1.ebuild b/sys-apps/fxload/fxload-20081013-r1.ebuild
index fb1c041f177a..e5da4db9cfe4 100644
--- a/sys-apps/fxload/fxload-20081013-r1.ebuild
+++ b/sys-apps/fxload/fxload-20081013-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 # source maintainers named it fxload-YYYY_MM_DD instead of fxload-YYYYMMDD
 MY_P="${PN}-${PV:0:4}_${PV:4:2}_${PV:6:2}"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 9169fa77665a..5eac25c4b372 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,7 +1,7 @@
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
 DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
 DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
-EBUILD gawk-4.2.1-r1.ebuild 2133 BLAKE2B bda40ef737dd0c86073fde724ead8f94b5d814c4d4f83d0256ca3de3237daf25ded4d9bd9760b6634f45eec216d760ee81203b7c10796ac703d5df096256cde6 SHA512 6afcd8f8f9f1f8a466ffa5ab062da8f4579bf1488207c05e7370fa45863daea88ff9989e818a29e94dbc0c99ff7803c63c3162e20de25ff84b938feea0d15a55
-EBUILD gawk-5.0.1.ebuild 2191 BLAKE2B f61b493313e45da8983998cb68c8667a73be172b8f98b1903347fa6c7bf307cd77b91164ccb92331f3c7e14aab1b8393f12818ccb015684da90e11782bb2d7c9 SHA512 d103af362cdac77795d8745724b00edce51415a369bf5d9ee9e85c03780b9424895d13046e6cd6ad04efdb077945277ab80c5d9970d49208e9a08dfa78875110
-EBUILD gawk-5.1.0.ebuild 2240 BLAKE2B fc5283efce617fe0e20f634ead37292b24efca7c3441beeaf1743cb53b71d68494e51b8cf5af9e139c9840db8218bb4583c3ab2fa3447cd90ed2d603e594f281 SHA512 5f27987d3cf2dd21ccc7b3ebf34ffa3af6e6235b653abc42094c169bf9dea5879a614d2c12d9c7985bfd252b50704bea30ea332f3a5ea17cf5657eaf58b7c001
+EBUILD gawk-4.2.1-r1.ebuild 2134 BLAKE2B 255819f4770c9e4796b12afba955c8f630b0a172355046a1f82784cc05831bd6a100560ccf48bb613a5c72b44f03ec5e73e8d3a13274b0ddbcc439c9dcaf92c4 SHA512 c08ca0cd2b39c6363f584c1c7f282716463212c412e4da669093e4b1993f1cbdffe0295895ff05423df140f4a120c6c249320df88a3d9e27bc4ca2b6fa730e22
+EBUILD gawk-5.0.1.ebuild 2192 BLAKE2B e375f9837533cf752da243d6b57654e9ffb7fa48f9c373326ce52d0f0e3e7472d415510dfb0f55359143dd3b6a2c904b61c6477477608d3904faba634e6771ca SHA512 77592089b5a3874b9da86656d4d5e23cfdeb4915a4ced2b12e103f69544313ba85675a372002a79e418dc2a7576aa4d8080d668c138ee1749ba173b91926e0fc
+EBUILD gawk-5.1.0.ebuild 2241 BLAKE2B ada491a20edaadb144bd0e74b0e17465ee9f1279d7db8aa7f0384816dc3d2c9fbfb625143626a99e60ce616e47742180b2dc78c1d352f888bd088f6472ffca3e SHA512 79f4156c388d0ef5fcd39df99df35e17620871a30c07d9e30939b006e675a6a263cebf70e2324e7fc3090d3ce19b4a74a58201f06b4d99c1de91c73d6579c368
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
index 62e8aecbcd67..0fb4a83be30e 100644
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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="
diff --git a/sys-apps/gawk/gawk-5.0.1.ebuild b/sys-apps/gawk/gawk-5.0.1.ebuild
index f253f21675ac..4d4f28b7627a 100644
--- a/sys-apps/gawk/gawk-5.0.1.ebuild
+++ b/sys-apps/gawk/gawk-5.0.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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="
diff --git a/sys-apps/gawk/gawk-5.1.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild
index 6850a412e15b..3ab54c018ff1 100644
--- a/sys-apps/gawk/gawk-5.1.0.ebuild
+++ b/sys-apps/gawk/gawk-5.1.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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="
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index cc930639a8eb..e7cc845eb3d3 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
 DIST gentoo-functions-0.14.tar.gz 11330 BLAKE2B 72543941f2954e35d3671c1c482eda44ae00cf0c636a1d706c5b90c56dfbb985d20c156b6de650e5d33ff9fac0abaf9fc50b1172832c2bd5276f6adfe5baf3b8 SHA512 e1e0fee9f3e8b79478aaf2b9a54c8623c858e62f72f2885ea88f7006631cf513bdfaac7122f2a5fc97379bde57851793bf7d6c63a1c63a6923a7f13a73d803fc
-EBUILD gentoo-functions-0.13.ebuild 855 BLAKE2B d70ec2f0f5dd09d5031b6117b9764ef6e2276a7a424eb64a22309b0c598f54939b16cb80fbada96cab4b92b0778838e0be294696d65dc14e30ded1a218b46ed3 SHA512 8bc116b065b7a25bbd8db1b87a061a075092baf5637f0d67e8124c076f5d45ee9f81edfb3d7e03d2b3630187135674022423852aee57b6d35796e6f3e553745d
+EBUILD gentoo-functions-0.13.ebuild 856 BLAKE2B a6b02beaf3908fcce0a652d49d2168992be2a5ea96c106606b8415a80c965f347a3786b06f62b0bee0727ef894990f9673fb0184768939856abb9e4f7c50c4ca SHA512 053d4d88f29f95f54320a1663f361a8a012591d2b9e5c1872a1772c8f0fc64f86e7b54311aca3e96e77f78714507f9bde9e779cab23fb6657b85f622a5a3df4b
 EBUILD gentoo-functions-0.14.ebuild 864 BLAKE2B 7516cfa9a50f69cbcd702945da6b83fa6975727f2f03af81243f18c8da302ea31fede39cb5831507e2e77ce50c9b8f336bcaeb20ae69a854bb4c2c86cfe112e8 SHA512 1c0b8e1d97910207d2d128998631799dd39ac3af3393cd3da8c11e6bfed58046afef8473953af2bec9b2b32f1107484d3dc26c773e69e5645205b1cd028ab506
 EBUILD gentoo-functions-9999.ebuild 864 BLAKE2B 7516cfa9a50f69cbcd702945da6b83fa6975727f2f03af81243f18c8da302ea31fede39cb5831507e2e77ce50c9b8f336bcaeb20ae69a854bb4c2c86cfe112e8 SHA512 1c0b8e1d97910207d2d128998631799dd39ac3af3393cd3da8c11e6bfed58046afef8473953af2bec9b2b32f1107484d3dc26c773e69e5645205b1cd028ab506
 MISC metadata.xml 492 BLAKE2B cd68fc088438ae1171d801f7aeb93ac09a21dd2e628ab14c11e2f3f28fba3ad3653005d087ab5c44362b9b6fbc66b1c14256176c6f181313cbf3aa6a01c6739b SHA512 991fa3c3f302d26f4beb103c5dab1b943599aa83ca538b04a785ba608059471047061296d219b637a8b16185105c0ace8b0ff511ec2d94c840be27d96ac8e3c6
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
index 7ccbb3427ae7..a750147b5940 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.13.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 ~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/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 4af3b35c9b39..042d862d9041 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-disk-utility-3.36.3.tar.xz 1373276 BLAKE2B 445aeaf68aa6b56dd6731e69e8fecdd1ca0385ba481bd0c8cd2ed411f7b117261f7acf47651f5354d0832141c479a6cd1b0727257d6f533159dd2d437edc59db SHA512 160283e1b0864e08ba6feb9368791e4cd3b287dc628553a69a1c276fa66252b37b1d906451b4342d953504a4669056aed0ebb3233ff61cbb761e612258ca078f
 DIST gnome-disk-utility-3.38.2.tar.xz 1375128 BLAKE2B e437eead1273bb2931462ac6c7a7dfea75c603c5325af003d403f4b5130b28e95496724c1939e5dd2e3c8b517eb0d3cdf51952299451546b41f9f5eaddcf9e63 SHA512 3afc0a40e82f0ab3608302af3d83acb15a758581122188125f9572e95a802359d1af0a1e99fb0cd8fb612413aac09e3d33404d08a2d5e189b79d4f284c92cb82
-EBUILD gnome-disk-utility-3.36.3.ebuild 1384 BLAKE2B 37135b54a03394ffb218821ade9332fb528994772bfcb69a0e665376ee4ce8107906ad865e2ace1db9949ba48be319b4297f9383bfb27945da3bb1839dca1283 SHA512 024bbfe9275316bd5e6beac2fca0bddbf1450310c9df2724ac6f67aa4cf1c1f00899dfd1a6ddbafd5ac8acb13e633ecb7fa44bfc0441e9efc68e6bad700ff52e
-EBUILD gnome-disk-utility-3.38.2.ebuild 1386 BLAKE2B def2335d9c7ff5ed1b174e4322a6ec81873e207c72f675e90599c50fd586d23c13f8f4385b21c3cc7e421446667c6c1c6af035d136806b17ac57b346452ee639 SHA512 f003a4b2a35324a78046b3eb3ef83e032434c775a258d8f17c8bd99446c6742ad86d5e7e95c3501db27b4f3fad8c109bfc70d6268a3832d6477009d64e65918a
+DIST gnome-disk-utility-40.0.tar.xz 1386880 BLAKE2B 680057797dc820197adbb3a8dea53c9545343ef03037d22ac3f3f87f34a0727d02c2b602a5886006e30acf97a1c1358258ff6f947be2192d835f955020b366cb SHA512 c53e1bef93dc024bc69be60848825f8175841319a2a7b92a75f48432423c5465151536f597c69707ebff37e5bc8e2c96d8a10f0f0e7ebe7cdc961a74841efd80
+EBUILD gnome-disk-utility-3.38.2.ebuild 1384 BLAKE2B f5e559be1ecd9842ab766d6b4e9e2a69159fd7d5b038773ab9098ea13e8078fd8f8eac9e28fd011335ad010f766b6a9ee7c347003c2fd171eed5d6db03c43dc9 SHA512 8b14526b8fddd184c6bedb70866ed94e04149117b4ae3d024783ebfc775f00fa72a32d03fb0cda7275db784434bca25eaf7df1f619dfd52bc38d79563fbdbd3e
+EBUILD gnome-disk-utility-40.0.ebuild 1417 BLAKE2B 1dac5bf2964ef979ea0b72d13b17f7409bd2558c20909a028aa58cd716bd60063a018d869bd75543f65a28d4724a881b437204f0511d4456e69c4c2e01cdccd0 SHA512 c266092beed51eb7747ec2c4ce6e68b5749a8885f26ea736236b6aeb7c5ad9a436a693eb9af4b8e6c051d7a377f984ef4d13d2a445e6d5581efde84faa65e4ff
 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild
index fd8e8d3461c8..6168bb1b1391 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.38.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat elogind gnome systemd"
 REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	>=media-libs/libdvdread-4.2.0:0=
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.3.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.0.ebuild
index 19aa489c4f18..3192512980a0 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.3.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,13 +12,14 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat elogind gnome systemd"
 REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="
 	>=media-libs/libdvdread-4.2.0:0=
 	>=dev-libs/glib-2.31:2
 	>=x11-libs/gtk+-3.16.0:3
 	>=media-libs/libcanberra-0.1[gtk3]
+	>=gui-libs/libhandy-1.1.90:1=
 	>=app-arch/xz-utils-5.0.5
 	>=x11-libs/libnotify-0.7:=
 	>=app-crypt/libsecret-0.7
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 52918c41860c..cd33f9a21541 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,7 +1,7 @@
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4
 DIST grep-3.6.tar.xz 1589412 BLAKE2B 86be3af6718ea3bf29982e1618c0ea9afc135f07e452a7ac8b618b863c0754a979482d4d418e558e703e03a4afcef7818a84ebcbe119aa63cd2892ad09e1a772 SHA512 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90
-EBUILD grep-3.4.ebuild 1496 BLAKE2B 7abaf611e588c187df417df78d2b3e91d38455ee29ded09af8d7f7b5855748d9acf2b97a74a0c870e7716ed2d6ff7dc1745ea4f893cff21c75e646071e3cec73 SHA512 5dcf6ce5e50442ec490cab1f5e8ac5f68541e3b1609468c48680cffd8ba51f4bb245944763d40424e7e416b8e06f0ee0514c1c2d4510b79a2904023e464746c1
+EBUILD grep-3.4.ebuild 1497 BLAKE2B 0636337bf9ffff4e59273390408831eaa1f3eabea247712850e0e622bf415869e293dde7c6829a78654fab88efe1b2657ba738e08e75d252ccae37f4b2d95bc2 SHA512 f9964eefb816efd635f992566777385a86c2c429c1d2bbee8117057f88f8c8072d46a1fe0c55e52924bb7feeb8376351ec19aa307ba2d928c139a3b73fcb3c53
 EBUILD grep-3.5.ebuild 1783 BLAKE2B 6e1d754fe158ba0a919db4e2f1a9f365450067dfdac4072621a8f5a2ded5dc2d63c06e1741ca6939ecb40042718c76c42a0a8bbc9b37ffbad38f6c0a66feea68 SHA512 b9b92a7572712a2127bae0763cc7df70db86a5b2bafa9a7665d575d4e4b96f05889bf0473b579cebf38e2372852338be14d71c3ba336cd9010c74c3debd54e14
 EBUILD grep-3.6.ebuild 1760 BLAKE2B b642c2ecb17b684a16d4c4a89c03880e93b044d2b1b13c49cb0ecba1995119d88d7e413531bebc725575b4efbbaad4a4ece9281656b7b41e147e3d68268e939e SHA512 7adc72cb0669c752c84dfb8583b458c9359c70e550c225ababec1999a8e39622f18c1ac3ad2492da9bce629e99af0ac789669ceb0649559cd9f80744d6b75088
 MISC metadata.xml 334 BLAKE2B 9b080b3e11ed75688b2a917ec2068dfbe3e1809637ee4806f24f0faecec971eac04892498961172b96493dc250c1fed7c12e6d46104b0d3e54e13bd91011b096 SHA512 a6f238cbf49e79edfa41fa6c296c86378f8477c08fe1d581d399d00d485b8472a31b69311d26f2e399ac8fefe056ddcdb9f59f08dee1a50c77ee1dca97e0bedd
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index a33a051b2f6b..f5d5e94847ea 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -12,7 +12,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 ~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"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index c19ee177d995..acfadbe0dd2a 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 2561 BLAKE2B 6a525c7d600dcffa276b15a6755ad0072c68434ddb5cff628ab7f7f6c97469fa500792915f959cb96ae53ec87b90b4f3b235b4d7e7c036cdbb8ebe08a5f2c2cb SHA512 192fe962721594878bd767eb97edaf6ba05748ec0bba7bcfaedd9249ec76612a48ac217e12d609be60b5a2c3936546d86f295c281c281da8ec721006278832d0
+EBUILD groff-1.22.4.ebuild 2562 BLAKE2B b70a2bb0eea2c899834d9ab6bf1aa585885aadd8558ea75e99ed101aedadd0151078262bdd502615cd64a20d5afac7bf64f90b9ab1edf6ee3c766cd6bbf4e21a SHA512 dda884b21148859a5e453ae9d5ad9fc3ac432145a3619a98dbcdc717ec8b6ce0ecefac01e3ad9fd851bc2c483fefec2e137f275b17e8c6f823b4d8b2464b9b91
 MISC metadata.xml 365 BLAKE2B 0cf4dd1abdfcb39494154dc55c2e86b43d23638caa9644b6002e2e7919b05503feda2e7ab85c0a620a8a29b7c2fef7d699795c7d3185fe24afb6c863af80336b SHA512 4fcb10e056f0c0933c7877635fe42b565f330e0b99946855f223fb6624bc3a756a94d9170bfef89ae6eddee4f751a6c0234f3a126f0a11e456c70fd931927544
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 9b743edaf3b4..722ce444a7fc 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -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 ~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/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 6d749432d793..623b627d1c27 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -4,6 +4,8 @@ AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
 DIST hdparm-9.60.tar.gz 155220 BLAKE2B c09a2bd7a61a77d87f7bbd45881d5956392dbedf1f329be59049de68ee8491857b1958f8e5e85086ed53deaad37fc476cfb87f45bf27084719c07d25608ffdc0 SHA512 e40b3b48b409014acd0ec0bd7ff821e850b127627b1f5114c442eeaf0b93f02c6933f93a221037255499b741071c0a5cb4d9cf7f9a06ff92a416caf82673a0ed
+DIST hdparm-9.61.tar.gz 139879 BLAKE2B b67ed28dad06870fed9fc7b7f1513887e17456babacf8b37530d0b90bc5ebef022dbe169b8729b215a94862d46e23cb667c173d54b7033a8ba7c7d4988494000 SHA512 d46c7681d9000d09a8f59b0b6084bb80118c806e124fbfe8903411aafb05101bb2134b8890bd96f1c542fa1061e660ceb546c369ce008961ca0d263eebd841ce
 EBUILD hdparm-9.58.ebuild 981 BLAKE2B 3cb2bcba7e7ab6de5188938cf8626461601e72a24c360e429fde43846da7402407354f89b382a378afa76ba0648d121d6d8b2508b9a14ee62f4ea2096e7beb86 SHA512 ba0df4eeefac220f82269c1bfb53c9524a93be8adcc19dbca499017f7b1e1565a7cf9930c7a5f94e428568531e0111ccfbf1c74a49314632a60d9efa5366766c
 EBUILD hdparm-9.60.ebuild 988 BLAKE2B ea610b08465de0b0788d96ac5f7271a2d01fbd8b845245401ccc38168184a42ddc65c1e206f006961dcd9ecb4b395ce92ccd92bee27b0f09f53e90c806559195 SHA512 bf97a9e3a65131058c88aec29d6675666eb68fb2c9fb1aa6343364d4536706aaa39eaed4da6dca47ea23835eb910ac9104acbf55b37879d268f9117fb8d788b6
+EBUILD hdparm-9.61.ebuild 988 BLAKE2B fdc31e4932d872c2dfc8246a33ebcf7d517106940d237d1a664901b655fc4b520ea40d7e3ebc4f433b1bdece03063184a3663b7f629244b90251f15cd31701f0 SHA512 3fc00828d1727a695ec584002718b7fa0cef349dbf37f77c1943b5803eba91fdce3063db0a565dca079c46986aaad2afc698f4a05afbca68d55b8f992c781d3f
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.61.ebuild b/sys-apps/hdparm/hdparm-9.61.ebuild
new file mode 100644
index 000000000000..f0bb282156d7
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.61.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="https://sourceforge.net/projects/hdparm/"
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+LICENSE="BSD GPL-2" # GPL-2 only
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.60-build.patch
+)
+
+src_prepare() {
+	default
+	use static && append-ldflags -static
+}
+
+src_configure() {
+	tc-export CC
+	export STRIP=:
+}
+
+src_install() {
+	into /
+	dosbin hdparm contrib/idectl
+
+	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
+	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
+
+	doman hdparm.8
+	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
+	docinto wiper
+	dodoc wiper/{README.txt,wiper.sh}
+	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
+}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 2c3bf4e26912..64daca76679b 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,8 +1,8 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.47.17.tar.xz 211476 BLAKE2B 67b1ccd4b6b66510a2fff424663bc2051e49e93c37c7e2a2b4631f3781d3773a97fd1773f96ca5ca2ba644bcd79ae35338931eff857ce199a847cc312d778b0e SHA512 185cd04aa6db6d8a4c898b61ad6a0aded7775659c7f02244b45927310eb3f8cd932fe9dd725ccac3e793aa22c656338b5d16f291f3a0420ed121681d4a4bac25
-DIST help2man-1.48.1.tar.xz 210500 BLAKE2B 9993e1f0c1102025f80fb64fa1afe31efe982ef54c9d5ff88bed9038bcfe1f4d5624737e0953abeb252df78cf92a645bbbd8f3b44939d70a2b50494c22110991 SHA512 506e7a0e6571facc570df57b875d6d6b911b281b38af1831d3a058a6de658c3656e3a5be970fa3d89c053ab6eafd4853527512b48524ceeff6da60f946f1ecef
 DIST help2man-1.48.2.tar.xz 210304 BLAKE2B ea13932ae4d181be6f08720f402e4fdedfd0b88eb9c2f3b6201a2c0893846ea5fb777423f010551c375758deb81f564128b4ebdef04f6a54eb6ba50e1311c351 SHA512 ddd3bde5b9b0e84e21cc03dec713469562b02aac7f4b465fbf18844fc9534e8975ec41f44474fcf1b06816eb9b4e0578eb974a6c9712b6f099d7be813f6d7528
-EBUILD help2man-1.47.17.ebuild 1034 BLAKE2B dc7c42555d1efd3896ba09d0602017ad721ab5aa94cc2dad5b9cc4f127f191a64fffc19f47f838ed81d2f4918d5262189ff369c220e9afd4f02d6a2dc6f11bb9 SHA512 e6dac61eb7d535c184cc15ea54c70bda3e0745a21cb8d47acaf6186780fb836e90f92d1869c9335433f857a44b9d6be24cc21ffe25986320cd33b8bd4e2054bc
-EBUILD help2man-1.48.1.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
+DIST help2man-1.48.3.tar.xz 211504 BLAKE2B 407cc87b1238242c202d37c0c4cd394e0efba95759b86a88026aef7c05d6a097d1946614547ebfab45f7fe0c1ddd057724234629246d32e94862c3d633b78c31 SHA512 e000e7380604c0986b14cb64b852d55eff48595884bddd389e876056dde6ce72b37aa16d92230e6f8f6e128003b819954bae4aa90933a58b51d3665d3c0ba356
+EBUILD help2man-1.47.17.ebuild 1035 BLAKE2B 2bdcaea0a0b2256abf60dabc5f212b586ff59113f8d3ae541ce21d2f5c7c9a294b18280d741f116ea9dd75d9bdb24480ae6bfd5ac332456174d4ce942ffb997d SHA512 d1bfe5663fe13784f5d08e077f216f3155e44bcddba456413fc495dea90e799703a866f0210c690e4764f8826fb7f2732f8912df095b6e9c1f209432911aae0f
 EBUILD help2man-1.48.2.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
+EBUILD help2man-1.48.3.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.17.ebuild b/sys-apps/help2man/help2man-1.47.17.ebuild
index 8832b330c3db..31a7f04f2fc2 100644
--- a/sys-apps/help2man/help2man-1.47.17.ebuild
+++ b/sys-apps/help2man/help2man-1.47.17.ebuild
@@ -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 ~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/help2man/help2man-1.48.1.ebuild b/sys-apps/help2man/help2man-1.48.3.ebuild
index 2f5c10989e9b..2f5c10989e9b 100644
--- a/sys-apps/help2man/help2man-1.48.1.ebuild
+++ b/sys-apps/help2man/help2man-1.48.3.ebuild
diff --git a/sys-apps/highway/Manifest b/sys-apps/highway/Manifest
index ef4d2002edef..06b5481ecf25 100644
--- a/sys-apps/highway/Manifest
+++ b/sys-apps/highway/Manifest
@@ -1,3 +1,3 @@
 DIST highway-1.1.0.tar.gz 319516 BLAKE2B 40df25eb139433f759ca98724d18bea8c324138fd26c24dce6899c899bd86d5cd86d1a16cd5631c0986d76f324d53e9b4e96ebf3582557f1e6699a9faa448a3a SHA512 c30c90f5b601a775e64a684037d668acc6c1a8b6e64f7aa1204c184978c49079a3cd07683ebeeab674a9b64932223da0c067fdb184b5918bf88eca7e113c05fd
-EBUILD highway-1.1.0.ebuild 412 BLAKE2B 00a9b6bf64c6ca449923234feb9d32d947f8a0066b27597dd40f182f068aa5f9f36007e189c9246135a80755c5a51b4f223bbdd9d4c0e94b5c9bbf5d4c3d47e1 SHA512 fc3e4372483dc908b77d8d11b61a3afdcb6cc93e75f3f4ffbc832ff734422bfa6a806a3b114ef8d41dbfacb5dedce8c973fd2fb6438f7bb6c016058bc2dd275b
+EBUILD highway-1.1.0.ebuild 409 BLAKE2B 881f6cc31eb483efe17427766dbabae3fd518ad7e145d410ef47e6bd568ec76467fc46fc7ce8b9e1fff9c1d6ec00edfa4170c4d8e7ef3cb542a272491de3529b SHA512 6be557e488304d910d914315267d1305418aa5c9b84e09514eec0136daae89717b04ba84332d8d286d204baa021112cf50de8289b6dd0d08b253e2c056edaf75
 MISC metadata.xml 586 BLAKE2B e5c3da8b3d48193b7518945c95afe62b446f5aca864a2ad793231708726506b7a3122ab186480658f18c522fb5b276754c045eafea8fea9e734f06f971f234da SHA512 b303ef0f903a9aac18779d4dd87ad16362c168e37c725d36921b32a436465dfcc3f836528eca0dfed89ff5566ae27818c83447ed55cc850700d10e598bc0cb3f
diff --git a/sys-apps/highway/highway-1.1.0.ebuild b/sys-apps/highway/highway-1.1.0.ebuild
index 812b73d8fffa..4528ce2862bd 100644
--- a/sys-apps/highway/highway-1.1.0.ebuild
+++ b/sys-apps/highway/highway-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,8 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-src_prepare()
-{
+src_prepare() {
 	default
 	eautoreconf
 }
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 2075bcf3cd8b..49cb0581c9ad 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,6 +1,6 @@
 DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc
 DIST hwids-20201207.tar.gz 3749352 BLAKE2B a968e6daf5686c4f73d9d900fbe80a5b3844c006102ed8801f88e378dc43c1bb66aaeced42bc2703a9c8ad624a1a7167bba485b1bf0c0d0e6043920e015c9177 SHA512 ec638edd1bbf00bd66e9baa50e3b9c9a5004a96a359e6bea306f1509c69bb3c7ede3569174007ab8bde11d49300da452b06be96136cde6bd2d84a76cff9251c2
-EBUILD hwids-20200813.1.ebuild 1669 BLAKE2B 8e070debcc0dcd428d49726af36a640642e699e7811706694cbfcd6f03d07251e7dcef29759eb5b9da36ff8c72a33fb50fdf365c81304b179e155b2307e73707 SHA512 d32cc90225945dc8a6f4b9dace7e99fcec8369116f1e9e04a447c6dc83ba7ada6054c5bcad706ea554b2836f1eb4d91c237a0a31123f4bed52eefdc614188dfe
-EBUILD hwids-20201207.ebuild 1670 BLAKE2B 4ae3be878772dab32d7da2e4fd9c48c2c0742004f925fa2b76e4f5006ff930a6361dfeecbbf0d58564abc73b13959b9e630016260e7f85729145b4b4194d522e SHA512 fddec03837b238ddf2a62492ea1053a13155e317346d6f4fe309a2365a24f7845da243e0141e4f40c56d273824c2a89e69dcddb4bddb8eaa99a056d3744cedff
+EBUILD hwids-20200813.1.ebuild 1670 BLAKE2B 729c93b24243abfdc354a0df2c8dba699cb5055aa4364370ce5bb779051412dfd1ed64c4f79372e1851226472d113514a271b01804f087db5709234ea243173a SHA512 e3c44b55bb0b1bd0d93aab507b04d4b70f20999eefe325f814e5c14cc9bd549b4880ee43619a72b9ad2ce5f604199bb58aba091416d6b537c211fb9fbda3e747
+EBUILD hwids-20201207.ebuild 1671 BLAKE2B c7740e0c4a2b694af30d91f420052ee16c4fac29e6e632ca6d9cbfc9803b774c0c53e7ed8447d30f567e48215bf6cf5323d48cb74041465db14b0f67d603393b SHA512 c8fe09cb6e4523afca06a06fc271414062d89248fd56ae729dcdf513c34c3c9834cb64369a359d97df0b80f369b44b7fb711530b42666dfadbfeeb29147ee674
 EBUILD hwids-99999999.ebuild 1679 BLAKE2B 6f3c0dc51d9598239348f1abfaf3f2c691b5c060dd21ab31fb79ccf4d9c240791a7ea061ae31aae201b15456459981ce1e06d15838b5dc136526c940dfc5c4d2 SHA512 f3a949dbda15206076e48d996bcbf6d9b1568a4338511dfbc05e87d6102eb5b08dffedf23cc24f06d2f9f17bc7247802e6229f01e23c5098b49b3768c0eb9c58
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20200813.1.ebuild b/sys-apps/hwids/hwids-20200813.1.ebuild
index 13c9146d0919..59c05f9466ef 100644
--- a/sys-apps/hwids/hwids-20200813.1.ebuild
+++ b/sys-apps/hwids/hwids-20200813.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
 	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	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"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20201207.ebuild b/sys-apps/hwids/hwids-20201207.ebuild
index 03bc78831389..bc8ac535bc86 100644
--- a/sys-apps/hwids/hwids-20201207.ebuild
+++ b/sys-apps/hwids/hwids-20201207.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
 	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	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"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 0bfdc996a155..c9e9df3d9ed5 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -3,5 +3,5 @@ DIST hwinfo-21.4-1.1.src.rpm 781525 BLAKE2B 83c6d0b3d15a7b4354223eef8b976643ec65
 DIST hwinfo-21.72-1.3.src.rpm 926285 BLAKE2B b8a38b2f04649e268a6d6fbebabd724a0c678e81ea9c09c3453ababa26e91ba5fe55c7feccf157ab81ab676e6610ba1700ef1691bdd06fbcbc1cdd86806282d2 SHA512 4e51ee4f8e03eee82317557aa39b5018cc2370b33bfdb280ecb8716687d951f8c34fa7598a1e0eff03025991eee654af488e3343d93167e4cf16380d047c2de3
 EBUILD hwinfo-21.23.ebuild 1284 BLAKE2B e5ea1d3ec4faf5f0aa8a837a2a9763744ab2a75c259533ec0566a950ef12506281cfd807a69b36aae81c198ca14c8a4a22dc23316677108d104a8d53510d1065 SHA512 e0b9312a65f8227a2e0d87ad5c96f875f6a20ee4f1972bf0a3b3876b7efd26d9c549732737323a6431bce58f268c56e72fd8fd42d5099747ac31ea60b137e51e
 EBUILD hwinfo-21.4.ebuild 1565 BLAKE2B 3f0b88f238a63e2e05f0163d8d7168ee0f3821ddd87e5daf367c55b1a4fa150d87943f6fad285915c175dcc3d011584a69f2c33a9fcaac6deffbdc7f809d2efb SHA512 0037b450bce00f7264967ffcb8ff07fcfc9a6508ab3a981c799207f67d959680b55324708714e970c20fba865ea49f8b60fe89c413f88ae417415bbae89c0958
-EBUILD hwinfo-21.72.ebuild 1380 BLAKE2B f7c6a80e123f97a2333ad25635dd96ca77d862e4e7e27b149233ad3bba11fcea0372e6e0cf850458aef46b991088a5317f5d2299c6db750dae7800ec5d9fd9ae SHA512 8f5f69ccc76c0b25ee3c50b74e3b30a4f3b2588700aa9189643d387894ed30e038bdf14dfb52e5b9bf13ca7338ec694eb4f0e5231dcdc0c8685b6caf6fc0f35a
+EBUILD hwinfo-21.72.ebuild 1377 BLAKE2B dd5ca41d5f58ef3149c13490b6ba9f1b0a3583cf6a3ea839e5af6c80f9990cd6fbf921847ce2a9468306e176108c93131a0d60aba9378cba01e007c49cbd26c7 SHA512 973c96a71d3701e726d1c121a4ce375e84a914478ce74616d7eea666ecf6f1c33434841d831528817f4bf33fb0ba29f51e96bb9b903d52ded6a343536b662e14
 MISC metadata.xml 334 BLAKE2B 08e4d837af5734c290c474fe28c4082531eb9b07be2fddef29e16e4dda6aee904bc8674830842b1c1f9736a92a4ccf21992ffdb6f0f3b7e62be73f3d3e93c6d5 SHA512 94c2a056338c3e3e40737e45468d77e170341185017098fc8892cbac1a0993321a1ee8dd007c075430d999fce90508f1e3d4a4f71fda6bfeb6f7c15b199c2405
diff --git a/sys-apps/hwinfo/hwinfo-21.72.ebuild b/sys-apps/hwinfo/hwinfo-21.72.ebuild
index 0ba8bd099676..56ec5be6e5ce 100644
--- a/sys-apps/hwinfo/hwinfo-21.72.ebuild
+++ b/sys-apps/hwinfo/hwinfo-21.72.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.3.src.r
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/ifd-gempc/Manifest b/sys-apps/ifd-gempc/Manifest
index 704d74330c45..be1981135b84 100644
--- a/sys-apps/ifd-gempc/Manifest
+++ b/sys-apps/ifd-gempc/Manifest
@@ -1,4 +1,4 @@
 AUX reader.conf 246 BLAKE2B 9d8f4b1066d8b30577de625966f40455e4de7773c3387417da454d0a513604c4205b93cab32bd7443c3527fb921082aeb3b1bade369a93f630c3e8f3a084965e SHA512 57ae0939bb88fa67224583fcce555eeb4d088c5c0667a4ddd02323a45554f391a1d9b6d5a124b7e3e9dc933806b0067deb7f159611a9df89e922d8a3f23e737c
 DIST ifd-gempc-1.0.7.tar.gz 76712 BLAKE2B 5ae734ff97865a66d993fc67a2ee5537875773b8275a2125c8853ddf0006cea61f20cd38571be44126cb2cfeb16a6778d6917fd056616e24997a3aed85226e76 SHA512 dde143bd2ca46cca91f979ddbb300f0b5fea37ecfa0c67058d887fcd56edf58adecce85dd05c7af25329fdfcfdf5bf7a52d4dc24061231a234180aad3df44a93
-EBUILD ifd-gempc-1.0.7.ebuild 1533 BLAKE2B dce7e61eac74b7b1101e6edd9d9f3a28d464193763c6d2bb2cf5a67fb1d8ad974c648d07568e96bb3cf44de99eb832fb2f80bface4f51ee421e74e0c5aa38963 SHA512 bccb36256cdc07db90ea81463db0b66f84b5167cefd26712414a13f8fbc88c88ecb185e9a9061965cdf8347d1f0d27ba501ecdb11936924c556a774700720a4a
+EBUILD ifd-gempc-1.0.7.ebuild 1542 BLAKE2B 704037969eecbddd3139dac305b0631ea8fb006560197733d34df99d097895fbc758be0416030a9da178233969f8f12333cb5f8a0fbd638ae7a115c951edf713 SHA512 1fc4b3d5cfceb56287fd8f620eb77f1e0aecb87e839c60cfe240f9d99287afd6a553a990eefffefc42ba50994694fb4a9c9f13c902f9d24144934d0d1185baa2
 MISC metadata.xml 323 BLAKE2B 2ee45beb0620e037d819dab92d0849da60b391d9ac33eb004b77de9d5b14ad8afbf1021eeacc005819b59b9191afffcafbbeafb027687996ec39a8cd73c674ad SHA512 e8e4055840bec6320a0bd76fd12cffd63fa63e96f53dd3623f2ae9697fbd992cb7961d5d7eb327b296dae035eb0f645848bfe1bb30a09958efb60543a6459fa2
diff --git a/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild
index 7e89f583238f..8c3677634c1c 100644
--- a/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild
+++ b/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ src_install() {
 	emake CC="$(tc-getCC)" DESTDIR="${D}" install
 	einstalldocs
 
-	local pcscdir="$(pkg-config --variable=usbdropdir libpcsclite)"
+	local pcscdir="$($(tc-getPKG_CONFIG) --variable=usbdropdir libpcsclite)"
 	local conf="/etc/reader.conf.d/${PN}.conf"
 	dodir "$(dirname "${conf}")"
 	insinto "$(dirname "${conf}")"
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index 41f875c931a7..aa575be0309e 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -2,5 +2,5 @@ AUX revert-openrc-management.patch 929 BLAKE2B 58d0fa10956bf930c176a84573a5b780f
 DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16
 DIST init-system-helpers_1.60.tar.xz 40584 BLAKE2B ad21a65ef3c4bcec16b14fc4db890fb7f83df625d1038fe217c20e9391404914df189ae31506b9bbef0442cdd333f46bd9c4d9009b7d671d9ae2deb6b05eee8e SHA512 3739613fa8afa1fa6032f47f8cec67c526171987a7d1eae31d479db9cc1e49ae3cd397a858130c17680d62becb9c6499bd1da1268e9ed25b044337ab69f0dd88
 EBUILD init-system-helpers-1.49-r1.ebuild 880 BLAKE2B c09d877d803227f4fad496a7792f572815d4e1672db33039eccdc4035c3bbc27ce793cf38b2e7f9cc5e70680842bbc55d6a7afaf714400389106eccae146f1ee SHA512 d55404655ef89bc03a2fb2a10467cbe529287969ac9ff530a563899f660fdd18c18b6eb0caaff1a529d2a003212e519be5959062567a61cabb2981b5ad56e293
-EBUILD init-system-helpers-1.60.ebuild 982 BLAKE2B f6359e737f907df2ced6fb068710c6549212d1d027d36583bae1bdf73a34ff361692a7240a291374017eebf07992b70e1dfec04cdeec08efbd17c372f02d90f0 SHA512 4ea35046b48276d18f4be2582ee71af622d4fefa2d82664fb8d4c1f70f24265b30a96ca85073770e9ffcc24f335e643f060727bf5d99a274aed993b016f2abc0
+EBUILD init-system-helpers-1.60.ebuild 987 BLAKE2B e25d42f0dfd517a1602a02a3bf748685a262928aedd53cf89d561f5e081513751e759ae15773f47e573feef89d038592d60a8db761cb6d4399ecd5f78e80253f SHA512 156efbb7fc9d6478320f330984af2b0db96fff2d885840992f69e5fb18882518b2db61ff6b40968848f1afbaf159628ea6825d05c715676a6ee72e691c8888ee
 MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild
index f42c39be7445..0f57827e826f 100644
--- a/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild
+++ b/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="dev-python/docutils"
 RDEPEND="!<sys-apps/openrc-0.33"
diff --git a/sys-apps/input-utils/Manifest b/sys-apps/input-utils/Manifest
index ba7c53452cb5..606b5eadde22 100644
--- a/sys-apps/input-utils/Manifest
+++ b/sys-apps/input-utils/Manifest
@@ -1,5 +1,5 @@
 DIST input-1.2.tar.gz 22809 BLAKE2B efef0701ccbdd1bf934049bf687f921194d1a4328882b94e7b2844ec55f25c5c2293eb76ff869d7ed44dbf5e8efe3b2ebd0bb5b657b2b411da5ef83b39520db4 SHA512 75a5e2d5b778ae93fb2d29ed7c8b0ec564233a385d88d0fe3a9e5ecd55259f14014bf269c318b5872ddd1379110565d354a1a043eb0a4693c724d52b6ca12173
 DIST input-1.3.tar.gz 23755 BLAKE2B 45a9d138f55677da596298d86e18af5849a81f5cff7397dab028c4939b6b385cc3116fc48bd23844edc36330d0f25456931fb903af9adcdc60aa21d8267cf725 SHA512 4f864301e6b7d40882327b26780db1d9b7e37215cb558653738f93b74ea2781f64676e41a440fbd2659f14bd30640c7af6c709315cce4dcc6a157d80ac2cb60d
-EBUILD input-utils-1.2.ebuild 803 BLAKE2B fb4ceb520a0799372d893eca5b86f2b0ab1b9fabe1fe42ce1a4bef730de5825de6be74858ac69d49f295f6ef27738242ca57be91da1dde773cc298527749761b SHA512 3a0ccbdda953cc234fa7405c5a4cd5fb590afa95cb084e17f8cec126efb191f9476db4f737fd5e3dc8dcb648836589d43e07c2591ccc7d662525acb64f3901e3
-EBUILD input-utils-1.3.ebuild 593 BLAKE2B ef39d0dcd798c5247db46a1d1659b6f7f34f31b78e3485a98e4a3f38a73c06bcdb7085afdced21bb9c48ed9e2472cc360c4647e4defcfedb9b8027b02518ce45 SHA512 8712a660dbc11dbfa9c13d61746692fb0ef1c6b59ac1fa1ea2bf4c62f2b7f64b1d21baad603b2d534e0c1a7cf2c88c34cf22a569aa05185e5f41e08b6b14abb6
+EBUILD input-utils-1.2.ebuild 774 BLAKE2B de46fd6d116c5f14cfbc9970ae083e99fcf1e696eddab2b1692dcb88c98945a76616230856e955dbff23fe027805e53fede8322af5fdbb76506e739cebdb3bc3 SHA512 44318008509ab352105052b4ca7f6a81c0ca8a72bf7e811c94dba207d7fcebbf839337fcaf4b8edd0c81a4051751901c512d8fbe48a8d2ba695355aef87e01f9
+EBUILD input-utils-1.3.ebuild 563 BLAKE2B 1e980e694a0d14be800110e0f21b637c1c21d5ed8b28117332a312c1c52d42b3792b196b82b0726f610075bc0acae1ad8a832010a49b75bf33847ea938c950d0 SHA512 6d5fd990373f6ece92c61e9fee8901ec05ae90dd41bee785dafacae7e7893f442efe18873379460994aa1d1c926c5a9939d0321c4f939fcbe35c5fad255e6a72
 MISC metadata.xml 579 BLAKE2B d49e0ab5401b5894ed919e3f1d5ed066328ea3224c4390298eda52305900302b2ecc80cddaaeef5dd97c262e87006cdf4e3e9287e3b21f54275287739cbb0297 SHA512 91c9d5676036617c6fe240ae29c7d5ebd904bf048802b50d1a5e783dc656b85d7927f81d2955ae5638fd7e0c9789583a6feaba66bd6db8fadb64c247a26dc3af
diff --git a/sys-apps/input-utils/input-utils-1.2.ebuild b/sys-apps/input-utils/input-utils-1.2.ebuild
index 5bd6e7f4694f..1589052b4e13 100644
--- a/sys-apps/input-utils/input-utils-1.2.ebuild
+++ b/sys-apps/input-utils/input-utils-1.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils
+
+inherit epatch
 
 MY_PN="input"
 MY_P="${MY_PN}-${PV}"
@@ -14,10 +15,6 @@ SRC_URI="https://www.kraxel.org/releases/input/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/input-utils/input-utils-1.3.ebuild b/sys-apps/input-utils/input-utils-1.3.ebuild
index 3c39e5a2ee89..d47716258637 100644
--- a/sys-apps/input-utils/input-utils-1.3.ebuild
+++ b/sys-apps/input-utils/input-utils-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,6 @@ SRC_URI="https://www.kraxel.org/releases/input/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index 672d2823636c..b9e6c946c9fd 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -1,8 +1,8 @@
 DIST install-xattr-0.5.tar.bz2 16136 BLAKE2B 8973584d4819b9f500dcfb76ed0eaddce725b78e72dfa73ccff52c745e6f041926f8f930e5c5035fa888402c6b530207546098864266268dee2c897404bf7c74 SHA512 0bbde3a548fc5062041b38f90ac09c402f3cb0aebf4f0c331552fc44d39dd3d5e4d73bca0811de36c53af8afa5d22e543a7c90107d272f2a1b97c819b244eb7c
 DIST install-xattr-0.7.tar.bz2 16200 BLAKE2B bdddd4610e5fbb6f6ccfcdfb37abacff00ada5ca5fa18a6a4ad254b623ebe6dc9d0a2c8931f919f8623ed8f64e9c09584d6beabffbf3c72088f80383b198a2d7 SHA512 1cb4a4e72a9c5820081e032bd0d681ef985a228ad9bb025d5eb31c7b57678348d772f270def803376f2d9d4f8e6ebcede9629ce65eef917b3e8a06d6f40eec44
 DIST install-xattr-0.8.tar.bz2 16359 BLAKE2B 25c483211ea6d01f46d9739fd3f1327e543e8b986a252d97e8b012ff6169a9b6430dc0ab7c184bf04c6665182c242eb37f7059d2d23cecececea723bde74cb56 SHA512 3af95a724d95286854767fe28679b024de8d257ce2d21addecbd40906e10bf48cfd4263609c6c2f436c6a807e91d24118110fda041091fadbefd848c892af778
-EBUILD install-xattr-0.5.ebuild 907 BLAKE2B 5a98d92dd904ca6f39e75d2004ee27fcd5951b005b2026a0c2313369a27ee0266c4aefe565c1944cbf4a2ee829c193dde426b5d492e2316e4aece29dbb2d3ce3 SHA512 bac54f3da17f9bde071bc545804611c576e5a4211389e4903569544b04d7547ff09b64d167bd1e50bbbf19b94063229445d53b7e98b298ace9d68d0daeaa330a
+EBUILD install-xattr-0.5.ebuild 908 BLAKE2B 8f91f6213000e7d5155e418f7d39c2d85a1718696cd972c1d5044d9a9b3caaa370735a9fb194d763c70dfc80839f00436654375175274ef3566a60ac6e8fab6f SHA512 1401a1aacb7ada949577665bfba6dafb7bc17e7c4402aa586c1399088fa0dbff52784f11332322a6cc8ea789560062b99187b4bc0980b099662f847aa78c8610
 EBUILD install-xattr-0.7.ebuild 1007 BLAKE2B ad60a837a7388bb01f7c0e7af39ff536973143c9f75281952e45629345e11690d63cd1649032ce1f55448e6dbe56ba506ddb489175f1265cbf41fca55eeba589 SHA512 ce4545fee470b395c9d7b6df65f9bfdccff526e1de3a64976f45717713b6053c5bcf93fd9661642ac6ca294dcc49ba5d2a82e41b731f9faf93949964e2c57025
-EBUILD install-xattr-0.8.ebuild 1007 BLAKE2B ad60a837a7388bb01f7c0e7af39ff536973143c9f75281952e45629345e11690d63cd1649032ce1f55448e6dbe56ba506ddb489175f1265cbf41fca55eeba589 SHA512 ce4545fee470b395c9d7b6df65f9bfdccff526e1de3a64976f45717713b6053c5bcf93fd9661642ac6ca294dcc49ba5d2a82e41b731f9faf93949964e2c57025
+EBUILD install-xattr-0.8.ebuild 999 BLAKE2B ce5c7a8deb8e24069b14f9c34de53df122617610a61038e1cd0cce28dfb8e5b6b16963b710a31ec2477e4a92da724202b7ebe11cdabf635b8e400c1f27cef4eb SHA512 61719944927bebd43367d254e24480eebdc4f9a25529e4683730d23851a830319dcc11d7c53368109f1e4fe5fabb488280738e362b176b034d099be95901b1c6
 EBUILD install-xattr-9999.ebuild 1007 BLAKE2B ad60a837a7388bb01f7c0e7af39ff536973143c9f75281952e45629345e11690d63cd1649032ce1f55448e6dbe56ba506ddb489175f1265cbf41fca55eeba589 SHA512 ce4545fee470b395c9d7b6df65f9bfdccff526e1de3a64976f45717713b6053c5bcf93fd9661642ac6ca294dcc49ba5d2a82e41b731f9faf93949964e2c57025
 MISC metadata.xml 330 BLAKE2B c6c9d215cd38a95f824fac1761bc4e6048ac50688318fa33a94d6d97739e726efaff57e4e0814d16b5336cf4481498580d4e2743404a619cad0d81c052880b6f SHA512 6bca1bac9701b2dde509f25dd18dd819d769cda23669faf680800747a37369002eb3954606fc6541dec324473eb13a78bc0c8a97085436072ee076d85e7a2345
diff --git a/sys-apps/install-xattr/install-xattr-0.5.ebuild b/sys-apps/install-xattr/install-xattr-0.5.ebuild
index 8fea04f5cca6..1f82857f7016 100644
--- a/sys-apps/install-xattr/install-xattr-0.5.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/install-xattr/install-xattr-0.8.ebuild b/sys-apps/install-xattr/install-xattr-0.8.ebuild
index 44b01b811bb3..b797b164d5bf 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-2020 Gentoo Authors
+# Copyright 1999-2021 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/intel-performance-counter-monitor/Manifest b/sys-apps/intel-performance-counter-monitor/Manifest
index ebb9a122d1c4..4694b3f4bd41 100644
--- a/sys-apps/intel-performance-counter-monitor/Manifest
+++ b/sys-apps/intel-performance-counter-monitor/Manifest
@@ -1,3 +1,3 @@
 DIST IntelPerformanceCounterMonitor-PCM-V2.10.zip 950922 BLAKE2B 3b3b0cf3e12e1f57241e25b13848253157624ac49c1aaec74a0ec8fd2cf92dffa56e5c25299189bd886cb069897dd5a7117a71b5189487be89ee704a377bbc03 SHA512 a9a219495d9e99f8a8ffdae729c56e565c63856b81d71d7d188db2543d8d656535bb88f5701351a41aee948aeeeae304951cdf99dac7e6628bd43ba79bda757a
-EBUILD intel-performance-counter-monitor-2.10.ebuild 1272 BLAKE2B 521cb60f84ed33c45db378a37269f8758673df9291eafc5ce09eb39a44ed938052f6070aaeb480f9f2fea79b582aeaf99377fc0dbfd31dcb67309b41acedeca7 SHA512 32228ee77fa382bdcd77bf5bfeaa68f098f056c4559d3ca76cfddbef86362c3a7a7ffbcaecca1b6077fa95e7f4d08b6363b96136be7aa1f9373873047e337782
+EBUILD intel-performance-counter-monitor-2.10.ebuild 1257 BLAKE2B 57126cf0dd98af8761c7f32c86293779e8d53deda83a455ab00c451a5e4e9b8b8a3dc21e5127183179b18cb996a3f27d27fc171b594daf3c5776c15a9e3248b9 SHA512 213e53a11cf1ac420f07a4af5ea8087ad423bddaa1a54160a58b6d6a4e49807e8190301a4cca9ce2182ea6884c519b3bc6dd53d72640b1accbb35d7bc13dbe3e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild b/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild
index 775ebf6f9022..db62c90558ad 100644
--- a/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild
+++ b/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit versionator fcaps
+inherit fcaps
 
 MY_PN="IntelPerformanceCounterMonitor-PCM"
 MY_PV="V2.10"
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index cee39d617bf4..57279d86e65f 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -8,7 +8,7 @@ AUX log_bmc-1.8.18.initd 570 BLAKE2B 7b21b7888f386953c001a635fa4d1fd3b79a1eb9920
 DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67862eb4dfd6dc29b192afb20ad0c908cd93a16b4103c5de64d042df012417c8cadc03000f2b2a00779bcc582a430603cad5f3cf SHA512 4a854a56e8ed51997c320cbfba041d43cb98b14743ef80b67e701942068d3729604abaedb617655a83ca21a7e20ea5a622ede4de317ca492cefd46da784d28f3
 DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433
 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
-EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4495 BLAKE2B fdf837eab3a1076a83e47b8df62bae3df3e89ac7721bd9acdd18220b51cb1de8da85206dd7072046b4d54ce25b827920ffe50ecf920a965fd29d8a5e8ab0f67e SHA512 17d83c2b8bbfb8970fdb3033a1d721dedf89cf276615f20d2c4ed188d7ebbc2c5d979c73ed996de399b4d837d01861948a48ec0f549ac29033be7709fb3a7d6d
-EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6220 BLAKE2B 9608fa55683cdbcb0b0afabdc0044256be88ac8492a04b845ecfd1e2da0a8267c031cafba11b12d7815dc2611e41c14da2456f3be7e0348c498e70c7a689c875 SHA512 4858ff4eef24c6bdee3b24dbb1944cd6208fd3f08d495a97be5497a1d51107a7b3ad18d4fcd9953f642cc240d4a4d139d77be2be3056b32ee41bd59207aa54b8
-EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6312 BLAKE2B cfa1b6d13f738a9f2b2227e816f784ec89667db41cd134779a227158df77fa4ca5355dbcab2c3c42504af551e9ac899d63fb2b1c03602011988921d96ab505f7 SHA512 ec03196f6f4745aa7d37d3939e7877462dae6ef20bcef3639f1008c36b416f0a085b5b70c34c86aada78090819b79e44ff169f25abd2a600df6f42ee97daaf0c
+EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4497 BLAKE2B 791b5ba4fb2fce684a72d0622aef615e9e9b5a6ff4e092e3dc46107500208c4eef324e540232dc91e14f94aec4093c0224c504aabd6e371a065a67fb24bc80e8 SHA512 581138a855b3d47a1ca62d57c679f447de738c76406220b4bf3a24e92782e8f64fd029b6c7defa026bd144698c0374f134a0886ec3cdd2d67f7f487087b85add
+EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6224 BLAKE2B 02409ca6ac3eed979d64377d1c378cf3a2e4c45d63d339b7f1894c942ae0757e059e424cf9a887a5ee6448c622c1550e8a4494aa1f03948fd38fdc785e8e3fdb SHA512 1847fbdfcc4a21cb553a9dd7145c1566eb4288493728187606fe76ecb99dae51cda58e3529a7d446a48b3b99da17e4519d8ff2d1b9e55b5a5b8bd03577942a4d
+EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6316 BLAKE2B d4d6e2e6a271448489bb6cf61ba56d293a13bbfdd8b842819a45ff83e176532ca38d59d82f20c99280634ba7a43fffa028c5038414a059220a06b5782b6f9d7e SHA512 716266706588d142db36ca1a3bcf368146ca49f93b932727db802c334c4bbe129426e4e865441599eb4bee4023418968b38b60031f66f3548d615181aa7bc9f0
 MISC metadata.xml 633 BLAKE2B e7fd815396d39f0d1c4aac50925382df6c245fbf3499f67b8d3a7448821aed48894725e468d6c2b724ad7a706ee12b4126f0b6f7c4c32388de6e34e05333b782 SHA512 53ffd0f2970d1d128e9d12247b5ed502bac4b9550029d57b221f2c2fd84d316831bbb8ddb890a1344b171612f890170847a3de02d52857d75c75f1a593cdebb8
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
index 2bf4240201b7..de306acb3fb8 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
+
+inherit autotools
 
 DESCRIPTION="Utility for controlling IPMI enabled devices."
 HOMEPAGE="http://ipmitool.sf.net/"
@@ -61,9 +62,9 @@ src_prepare() {
 			-e '/0120-openssl1.1.patch/d' \
 			debian/patches/series
 		for p in $(cat debian/patches/series) ; do
-			echo $p
+			echo ${p}
 			if ! nonfatal eapply -p1 debian/patches/$p ; then
-				echo "failed $p"
+				echo "failed ${p}"
 				fail=1
 			fi
 		done
@@ -84,7 +85,7 @@ src_prepare() {
 		#"${pd}"/0010.0010-utf8.patch
 	)
 	for p in "${PATCHES[@]}" ; do
-		eapply -p1 $p || die "failed $p"
+		eapply -p1 ${p} || die "failed ${p}"
 	done
 
 	eautoreconf
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
index d8df773c1c7a..906eff1c7181 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils flag-o-matic systemd
+
+inherit autotools flag-o-matic systemd
 
 DESCRIPTION="Utility for controlling IPMI enabled devices."
 HOMEPAGE="http://ipmitool.sf.net/"
@@ -62,9 +63,9 @@ src_prepare() {
 			-e '/0120-openssl1.1.patch/d' \
 			debian/patches/series
 		for p in $(cat debian/patches/series) ; do
-			echo $p
-			if ! nonfatal eapply -p1 debian/patches/$p ; then
-				echo "failed $p"
+			echo ${p}
+			if ! nonfatal eapply -p1 debian/patches/${p} ; then
+				echo "failed ${p}"
 				fail=1
 			fi
 		done
@@ -85,7 +86,7 @@ src_prepare() {
 		#"${pd}"/0010.0010-utf8.patch
 	)
 	for p in "${PATCHES[@]}" ; do
-		eapply -p1 $p || die "failed $p"
+		eapply -p1 ${p} || die "failed ${p}"
 	done
 
 	# Gentoo chooses to install ipmitool in /usr/sbin
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
index c395dcf36941..2e108b64bdd8 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils flag-o-matic systemd
+
+inherit autotools flag-o-matic systemd
 
 DESCRIPTION="Utility for controlling IPMI enabled devices."
 HOMEPAGE="http://ipmitool.sf.net/"
@@ -62,9 +63,9 @@ src_prepare() {
 			-e '/0120-openssl1.1.patch/d' \
 			debian/patches/series
 		for p in $(cat debian/patches/series) ; do
-			echo $p
-			if ! nonfatal eapply -p1 debian/patches/$p ; then
-				echo "failed $p"
+			echo ${p}
+			if ! nonfatal eapply -p1 debian/patches/${p} ; then
+				echo "failed ${p}"
 				fail=1
 			fi
 		done
@@ -85,7 +86,7 @@ src_prepare() {
 		#"${pd}"/0010.0010-utf8.patch
 	)
 	for p in "${PATCHES[@]}" ; do
-		eapply -p1 $p || die "failed $p"
+		eapply -p1 ${p} || die "failed ${p}"
 	done
 
 	# Gentoo chooses to install ipmitool in /usr/sbin
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 1d3057310777..73637fd8ff7c 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,13 +4,15 @@ AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc8
 AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad01f7cd3a932085519255f661dd898462ccb5e8f11c2a57e015d6c19d8c917c82eb76f4b9c779ff91b4cfb7b874fcdda3088 SHA512 5e46e5870e41c15213f04582f40bef18c081f5058f8b530c844fab4f42f56935386f461f0d46f33d17352eebd79a167bb9b6f1edc93bb62b805283cc3872f4f9
 AUX iproute2-5.10.0-configure-nomagic.patch 6511 BLAKE2B f7e75bf8db95c6af4798fbedd936ac7ce1d470c9cf5d31809fda9df8475ce2dafbca2b6d80ab1d2ced544ed1a3310d1db2898a3288e24356d691d08f633b14bd SHA512 025f60975f7579dae9dc9cf0410fa8cef4ee96f954133af17e9c4f8a860fba4c33086845a568f46e68f2a4f4088f84e57c200fd4b4bc417e6f3c48d7cf9e7bcb
 AUX iproute2-5.11.0-configure-nomagic.patch 6701 BLAKE2B 8e4176b88adca58d5cc9f7a168a68718db3830173399375fb23b4e861b7a3684c731f61854dfa5647767e1af9dbbf30161240bed33ed8a47ea353119a4251d9e SHA512 1d51c66909c92ba4ca096bf53f067712a7740ab4e8d4c893dfb47b3bea52ded89995ff9f36cc0364a0a21e7486909e390f457ca62fef2b28b519d867b31ce971
+AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb797901886032bbbfc78b3116b548d317038144307a52ba86a01dc49460fa8b4524f03de3abc5b56f4901a9cb24f1f6cacfbd7a5b92cea7145 SHA512 a6184d1fc150717ab40a278c2a6ce439ea04e9967d55f1d10fecc8162452a1a38a6e11c2f736c5aebfe0ffe726bfa80e154169004ccc571b89dcef9c0dbe1242
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549a6687257498676a23e4fdc4a590a7215bfdba3c7ac4b1ccde6c38ba8e3eb222eea2532374fa9680633aa198d347 SHA512 a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13
 DIST iproute2-5.11.0.tar.xz 822044 BLAKE2B e52e2334a4f6271a23e9393a3b11fc7e8e070ecff178bda1cf87705a55b59018edc8c28751e4fc6a7d877c19e6da772765afbdc5944800f98bf176513595e5bb SHA512 f592728ec819fc34cba04b1c04275e783aed86084fe31948e1776e6e473c8c1416aaf8101c19b51ddb4044af1cd2157827c0f91546b33badb448466eae9a2fda
+DIST iproute2-5.12.0.tar.xz 835880 BLAKE2B 8e3e1b7188d7ab5014d06d7edaae2cb0c1dc65862999a2ca9f31902256d7f3d166de8a1c76e4e137acce2b445d72ea6850bfec3640d1919cb82351d45dd3e47e SHA512 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac
 DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634
-EBUILD iproute2-5.10.0-r1.ebuild 4771 BLAKE2B 03551c0a547730d53f2387eb86c6d7c377fa799ab608379599e645f7391b134149190c5304c45e7ec62d4f756df76f325ba5b7ef1d99788aac02e652cb1d54e2 SHA512 f83663d9e9e8d6e7a2e9e3552c14f0a30feab37ac98316d57dc0681b1aeccf0e4c828632f5cac3d04fa9455ac203c8f31ceb6dd0fa28be1232a90add70d19831
-EBUILD iproute2-5.10.0.ebuild 4715 BLAKE2B 436d2515eea3e7cc76ecb20b64f258dde2acf285507c1f18410fba83a986a8afd455db1ee16156712dcad63e989966db62fcb9a0f79f0d8f92534ab44eba3491 SHA512 f38456873d3c321e8dd5fd78571068d1dc178537825400bd0d2906c539752512c0c269a27f8728d13d01219fe24141fb3deef7029f26be9975d002b68a106847
+EBUILD iproute2-5.10.0-r1.ebuild 4769 BLAKE2B 076801f62b9a7c70fb66ed5c399a24caa0ba2ca59ea3f021aff2e1373d8b84fa83013498a792d5e44e766e5d23d4a12bf0820e16161f64cf9868a24a8ec5a733 SHA512 ebd299882b533fcc1f7f9f020ff13b31984db86b153c4db6450c4501c82c26e984ef9aa270be068944e0d237c6f74be1f07fb8bd8a2b58085b1c60e6e20dc377
 EBUILD iproute2-5.11.0.ebuild 4842 BLAKE2B c26d2d8f73d132acea6513632596a74c9da54fe994e1b408ef90e319042a25ca657942e9059e9d2b97851f7d25d9e2c83034145d36792eb408047d6f75cdb2f9 SHA512 281edb2a65ea6ed65661b82a6d4fa100ff44896336d3d8eb5d2c3511cdd0d0dee262599bfbe3531e5d03074782276488ccd6c52e203b4cbdab71f87f7e198ef5
-EBUILD iproute2-5.7.0.ebuild 4487 BLAKE2B 2eef7dccd0a2cb4ec5aa8a6163204457650a09800fb61a4d62f580e0ec96b93c199251544c663734e039f3736c44712156f7cfdf079cdf020be1fa7b4ed7cea9 SHA512 7eb534a873a76ae2842aa5e6041ba2c80f74b9379c473cbcddab78989b6a52c12208dc4d64167572ee1a6e9a071b462705af6b871790fd0d79fcaa391fed10d9
-EBUILD iproute2-9999.ebuild 4866 BLAKE2B b18977a8458ee8d52ec34673977e4d58d60b7748871b03acf5ed9411300bc99e82be592bfa44992d1441591cfa93013a210fd265fe2614a4d778833afba843e2 SHA512 dfca284bf0b4e5084d6542c48f073ac4da4aa531699ea5fb345385c7d028e5f3daf3d9bfbbbd2657911594876d2c307740f048f14b0efeaecc220926b58f7ac2
+EBUILD iproute2-5.12.0.ebuild 4867 BLAKE2B 8646b979a436352fd9ef16fda6d8fdfe90600ee3473f0c89ac1999baae5e72f6cd53b94cfa31cd24556c387b24afeb4b67e13c144c4ae3cb634cc8e0d79485c2 SHA512 f1b7a387a9982727b71d7740562114e8b4ebc1be47161b0612a7c556256d7af7f6f83130c9274f3d1d9127df0589f941a52df604c1d324b299ef3e913523e8f0
+EBUILD iproute2-5.7.0.ebuild 4488 BLAKE2B 0ee24f1fbe3cdb8830e216cf2a576338d44201666776272f3c51d4f71eb3899f3bfdc2d65c39bf2ce65c39ab0f9cff5c9edf093e01e898248ed1c7e7bda76333 SHA512 40a60eb833e58b6df996acc1e70f1de952dd17febf8ef38e77a4cf900979d2a32369a454f9fcd083b362967e38d41784cc2228fd7fc1c49c056a6645b4a41f7b
+EBUILD iproute2-9999.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58
 MISC metadata.xml 813 BLAKE2B a34634416583a3d6a75a0d02e5e2c89b8e3dd0766a33e13555ee66515dda7bd10c711226701e00adb1b92fc6443d7793adc25e6b446a8ecb901afe268c7e978f SHA512 8fd774dd6bdde1265ace7e9b3f96f19a8afa782bbdbb5633b0e4024663e2877fd4db8e0aae48870c81fa470467ccaedad52c95b0fa9cd2b64829aa1a07e6f061
diff --git a/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic.patch
new file mode 100644
index 000000000000..7dbb3a6dcb1f
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.12.0-configure-nomagic.patch
@@ -0,0 +1,245 @@
+The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
+a variable as well as modifying CFLAGS & LDLIBS.
+
+If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
+are still in place.
+
+Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
+are only passed when correctly needed.
+
+Prior Gentoo testcase for reproduction:
+USE=minimal ebuild ... compile.
+- Linking with libbsd, libelf, libmnl & libcap based only on presence.
+- Links based on libselinux based only on presence.
+
+Closes: https://bugs.gentoo.org/643722
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
+Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
+Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
+Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler <polynomial-c@gentoo.org>
+Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler <polynomial-c@gentoo.org>
+
+--- iproute2-5.12.0/bridge/Makefile
++++ iproute2-5.12.0/bridge/Makefile
+@@ -2,6 +2,7 @@
+ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ all: bridge
+ 
+--- iproute2-5.12.0/config.include
++++ iproute2-5.12.0/config.include
+@@ -0,0 +1,32 @@
++# We can only modify CFLAGS/LDLIBS after all the config options are known.
++ifeq ($(IP_CONFIG_SETNS),y)
++	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
++endif
++ifeq ($(HAVE_ELF),y)
++	CFLAGS += $(HAVE_ELF_CFLAGS)
++	LDLIBS += $(HAVE_ELF_LDLIBS)
++endif
++ifeq ($(HAVE_SELINUX),y)
++	CFLAGS += $(HAVE_SELINUX_CFLAGS)
++	LDLIBS += $(HAVE_SELINUX_LDLIBS)
++endif
++ifeq ($(HAVE_MNL),y)
++	CFLAGS += $(HAVE_MNL_CFLAGS)
++	LDLIBS += $(HAVE_MNL_LDLIBS)
++endif
++ifeq ($(HAVE_CAP),y)
++	CFLAGS += $(HAVE_CAP_CFLAGS)
++	LDLIBS += $(HAVE_CAP_LDLIBS)
++endif
++ifeq ($(HAVE_LIBBSD),y)
++	CFLAGS += $(HAVE_LIBBSD_CFLAGS)
++	LDLIBS += $(HAVE_LIBBSD_LDLIBS)
++else
++	CFLAGS += -DNEED_STRLCPY
++endif
++
++# Rules can only be declared after all variables in them are known.
++%.o: %.c
++	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
++
++# vim: ft=make:
+--- iproute2-5.12.0/configure
++++ iproute2-5.12.0/configure
+@@ -195,7 +195,7 @@
+     if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
+ 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
+ 	echo "yes"
+-	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
++	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -238,8 +238,8 @@
+ 	echo "HAVE_ELF:=y" >>$CONFIG
+ 	echo "yes"
+ 
+-	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
+-	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
++	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
++	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -357,8 +357,8 @@
+ 		echo "HAVE_SELINUX:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+-		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
++		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
++		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -370,8 +370,8 @@
+ 		echo "HAVE_MNL:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
+-		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
++		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
++		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -411,8 +411,8 @@
+ 	echo "no"
+     else
+ 	if ${PKG_CONFIG} libbsd --exists; then
+-		echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
+-		echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
++		echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
++		echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
+ 		echo "no"
+ 	else
+ 		echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
+@@ -428,8 +428,8 @@
+ 		echo "HAVE_CAP:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
+-		echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
++		echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
++		echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -512,7 +512,3 @@
+ 
+ echo -n "libcap support: "
+ check_cap
+-
+-echo >> $CONFIG
+-echo "%.o: %.c" >> $CONFIG
+-echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
+--- iproute2-5.12.0/dcb/Makefile
++++ iproute2-5.12.0/dcb/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
+--- iproute2-5.12.0/devlink/Makefile
++++ iproute2-5.12.0/devlink/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
+--- iproute2-5.12.0/genl/Makefile
++++ iproute2-5.12.0/genl/Makefile
+@@ -2,6 +2,7 @@
+ GENLOBJ=genl.o
+ 
+ include ../config.mk
++include ../config.include
+ SHARED_LIBS ?= y
+ 
+ CFLAGS += -fno-strict-aliasing
+--- iproute2-5.12.0/ip/Makefile
++++ iproute2-5.12.0/ip/Makefile
+@@ -16,6 +16,7 @@
+ RTMONOBJ=rtmon.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ALLOBJ=$(IPOBJ) $(RTMONOBJ)
+ SCRIPTS=ifcfg rtpr routel routef
+--- iproute2-5.12.0/lib/Makefile
++++ iproute2-5.12.0/lib/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ CFLAGS += -fPIC
+ 
+--- iproute2-5.12.0/misc/Makefile
++++ iproute2-5.12.0/misc/Makefile
+@@ -5,6 +5,7 @@
+ TARGETS=ss nstat ifstat rtacct lnstat
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_BERKELEY_DB),y)
+ 	TARGETS += arpd
+--- iproute2-5.12.0/netem/Makefile
++++ iproute2-5.12.0/netem/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ DISTGEN = maketable normal pareto paretonormal
+ DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
+--- iproute2-5.12.0/rdma/Makefile
++++ iproute2-5.12.0/rdma/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
+--- iproute2-5.12.0/tc/Makefile
++++ iproute2-5.12.0/tc/Makefile
+@@ -4,6 +4,7 @@
+        emp_ematch.tab.o emp_ematch.lex.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ SHARED_LIBS ?= y
+ 
+--- iproute2-5.12.0/tipc/Makefile
++++ iproute2-5.12.0/tipc/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
+--- iproute2-5.12.0/vdpa/Makefile
++++ iproute2-5.12.0/vdpa/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
diff --git a/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild
index 98e5c3cf25bd..cc079e1e1d94 100644
--- a/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.10.0-r1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.10.0.ebuild b/sys-apps/iproute2/iproute2-5.12.0.ebuild
index 8747ab940d69..475fe98775ba 100644
--- a/sys-apps/iproute2/iproute2-5.10.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.12.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
@@ -18,18 +18,19 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
+IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux"
 
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
 	!net-misc/arpd
-	dev-libs/libbsd
 	!minimal? ( net-libs/libmnl )
+	atm? ( net-dialup/linux-atm )
+	berkdb? ( sys-libs/db:= )
+	bpf? ( dev-libs/libbpf )
 	caps? ( sys-libs/libcap )
 	elf? ( virtual/libelf )
 	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
+	libbsd? ( dev-libs/libbsd )
 	selinux? ( sys-libs/libselinux )
 "
 # We require newer linux-headers for ipset support #549948 and some defines #553876
@@ -46,8 +47,8 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
-	"${FILESDIR}"/${PN}-5.1.0-portability.patch
+	"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722
+	#"${FILESDIR}"/${PN}-5.1.0-portability.patch
 	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
 )
 
@@ -62,7 +63,7 @@ src_prepare() {
 
 	# Fix version if necessary
 	local versionfile="include/version.h"
-	if ! grep -Fq "${PV}" ${versionfile} ; then
+	if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
 		einfo "Fixing version string"
 		sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
 			-i ${versionfile} || die
@@ -101,6 +102,7 @@ src_configure() {
 	popd >/dev/null
 
 	# run "configure" script first which will create "config.mk"...
+	LIBBPF_FORCE="$(usex bpf on off)" \
 	econf
 
 	# ...now switch on/off requested features via USE flags
@@ -118,7 +120,8 @@ src_configure() {
 	HAVE_SELINUX  := $(usex selinux y n)
 	IP_CONFIG_SETNS := ${setns}
 	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	HAVE_LIBBSD   := $(usex libbsd y n)
 	EOF
 }
 
diff --git a/sys-apps/iproute2/iproute2-5.7.0.ebuild b/sys-apps/iproute2/iproute2-5.7.0.ebuild
index b3f552ae70f1..bc327d2142f7 100644
--- a/sys-apps/iproute2/iproute2-5.7.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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="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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index fb33a26ea6af..ae69e78cd831 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -47,7 +47,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-5.11.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722
 	#"${FILESDIR}"/${PN}-5.1.0-portability.patch
 	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
 )
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 6bbb9de36c88..e45bd3876c39 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,7 +1,7 @@
 AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
 AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c
-DIST irqbalance-1.6.0.tar.gz 55310 BLAKE2B 67589a40541e9034a0ac09d60a2293dde7a0cf524620794e25b60b4d78f2c91270252f6cebc2c91c66aed105536a211d51aeb29305fc1235112d96b714dc80bd SHA512 ce89dc41eb3aab5950a56b4b1c817aae5e87eaa84bc69bf88618caf53386513e488bb0b4724a600ae175c96be509367cfc418c7f85531007f80e02f7de549b16
 DIST irqbalance-1.7.0.tar.gz 54209 BLAKE2B 1213b21c7d3979c9ba7d2298c21f7f0b75217d251ecfa02660ea0602a032d62c9c9b0254bf158e07e0fdcf55b35f332f5a17f929c7393dfdb894ca952dad52b4 SHA512 2fa29c738275dda2fac38d78ca0ec4619826b72529e8eda7ad8ddcda5768bbf282e2260dddc16a8b46d4296289b25dc59684575ae1badca0c6c6ae30b1e9b5ea
-EBUILD irqbalance-1.6.0-r1.ebuild 1328 BLAKE2B e5964f3030ca33c236e2418b506b7c24154308fee412680d36e85a29aeb1346ce191711d5fd9a8c36f346c1a1bc3e541b65b024da3c22416cfd4838fbcf431b7 SHA512 8084138972ac5c3a7d2191caea86e3cabd86358a8f63c8430ef75a16543419a86fe0987cb861c3299cb1249a3287a552390e6571967a8a19c3693ff90dc2b86b
+DIST irqbalance-1.8.0.tar.gz 55238 BLAKE2B 0181ee57c4ddbdb55e1529cfd7da4b875320eff65cb606f925f0b4f4243b51e1349d4aba38690a78d7deab6d3f55ae8d6c45af44a904f03d7127678202f288db SHA512 3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740
 EBUILD irqbalance-1.7.0.ebuild 1326 BLAKE2B b016fd1bd29bd101ba2f7d9fe779d7d2f89e2c6bab9ef24b9b6e8ee1cff5251d4d4bfe5e92e091beaaaf6d84a23ae3340710031a822bdb7a99639cde5a7621aa SHA512 27be7fc08b8a4f8a3d767b7caecdaded2e203bff3e427cc361ff7972e74c5e71aabfe4dbb5095506cd7f383f408dc0716d6f56c779939d682a82b5f2e4c80558
+EBUILD irqbalance-1.8.0.ebuild 1331 BLAKE2B a99bd8fefbf7839d7fdbf8e578b18e9efc3d93242d22faa1bc53fea87ba8d6d26739f6d27d07edebaeeb5b1dd6c47dd8d5e568a53b3168edcb352c543defdfa8 SHA512 f5b577811f4aa86a9fd4a4cb14b04d32b1282774537cc3708d55ff57a03225f4686f2cd81f77c80934f2e48106c07d94589d6ead2fb7dd3c8cac2b136dfcae2c
 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04
diff --git a/sys-apps/irqbalance/irqbalance-1.6.0-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild
index 918aff3e877a..9702732fb4b5 100644
--- a/sys-apps/irqbalance/irqbalance-1.6.0-r1.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~x86"
 IUSE="caps +numa selinux tui"
 
 DEPEND="
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 8356c355f47f..710dd18995d1 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -5,6 +5,6 @@ AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba
 AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
 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 3878 BLAKE2B d86332485aa58d81586b9f4abcaa050b62076225d23828c6cd0f1c288a147f5a898db3dc9ac53c504939edec240e774335d3dec9d8089c285d3322a4e6e48521 SHA512 4f36a474a9062524acb5437884a96f7ad96cfb0fb57ec5eabcf387a6736e04d41e0a4ef1ecedb5ecbd450b5c4f9e734d9d267d0bc93fea3503381eed86dc09ea
+EBUILD keyutils-1.6.1.ebuild 3879 BLAKE2B a9e264f0338bff757b45d35362c193e7ff1e9ceb8f84ac2bb595d48ea84f8594dac61ab013c69b9d22b73e469e6991d777b5a28f4fcec1c7d33b5f2ced3defbf SHA512 5570ebec1856e06fdf5627a0d0280d06950b4fcf55484df12b1585d0d33d35992e21cf352f64a16e61aebc1e62d48ee5be5d781f1f7068d6b5a98ec254a54846
 EBUILD keyutils-1.6.3.ebuild 3786 BLAKE2B 4c9ea1e6a0df38009e35bd67838edb161690b81ee552a674005da215c3cc87f86012ea5519a59e270fc88845e63d69fe64b637138d2fbb4e2e0e07aa7698d31a SHA512 b017e18f118abf50c16f100a86dd8b152c64e233c44f90b7b7a0d561af2393ded77fd400bb3118e5107ffaf29ddc48051624161d8b86bbe9944e3c42ff7a4b2c
 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 3189087a0eff..35de8f2bff11 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-2020 Gentoo Authors
+# Copyright 1999-2021 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/kmod/Manifest b/sys-apps/kmod/Manifest
index 1d58e11229b2..cceee126209d 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,7 +2,7 @@ AUX kmod-27-depmod-do-not-output-.bin-to-stdout.patch 1521 BLAKE2B 3b1f0808198f0
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
 DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
-EBUILD kmod-27-r2.ebuild 5266 BLAKE2B fdaaf909ed59811f502c721f1c616c8c0145afecb62df6bcd13b163a477b2dbd3110edc28baf3bf824c6e9d3bfc95a01f5ce69b7dc6345fa393370f0008ac529 SHA512 8863d4522fa38fa7425ea1ee4c733b57e89b4e794f106e50edf1be40424f3f5c549423a3c3ee1db938f657cb8e04b54656273979350a1097ebce6bb0355b0add
-EBUILD kmod-28.ebuild 5287 BLAKE2B 36b748cc728a80090ea297b4fdbe4fb20526fe2107d088394f443c7b0d5ba34bb28ad6ea855f952ae9ec388391482b93f0afc00c624a10194de4aa31e399dfe7 SHA512 3403f581327fbc1f23f8e7a79602297ef7902c56a3e30944385a9322ae40925a8628fba094e6d3557523892d3bbf689e5d573703ca6ba2c2ae63d9d0f1a022d1
-EBUILD kmod-9999.ebuild 5300 BLAKE2B 1be8c47e29ac88475b5ab201147c5870e5b10fa9c1340b627ae690603c87aca6928587baa592e22fb1b9a7e3101236a2ad843974b6ea97cf795f589b01aab17a SHA512 9027d8b39b45a30c7721576a220a923c8a1a18adfae7348128c9303cce30aa7bbfc889de44c37addcb8b5c4aefae2084128c678403fd6d3da28f704396e0bc89
+EBUILD kmod-27-r2.ebuild 5267 BLAKE2B d57a986acc394e6429a75b146ea2f322d2a8db867aec2c90652c4164022c3000c8df136d81f08f849e0115c5d3adad2291b0a3b4ec11ad33289644c2cdd8602c SHA512 094e256d0914073ba61ecc509a946beb185f0dd5ce13a74c077888b8f360a40e02d0421e3029b0b6116237dea4f690f5086c30247c60631a0b1b1f8b35eeb98f
+EBUILD kmod-28.ebuild 5288 BLAKE2B 01361611c062c28cfea1d02c131c917299f66b0c6d1d78256c7a95bd7871da1442d10d73441fc96ffcf4a4929dd516529f9feb6ec9d36b5b8045df9f84ea8334 SHA512 95461da418ea57db7f29184932a6850ee796922facef5767a3240f17bc39ebaea399ddc90133a7601442fa4fd55f2fbdde636ec235a373bb750bb67bb6dc5ad2
+EBUILD kmod-9999.ebuild 5300 BLAKE2B 35d2369c790062accaa546d58f46b27bb7af159ce1999008c10c2773ac2c79f72fbe24a54982d87f54bada29548d2a0f3555ab128faac015a68c83320aa83b85 SHA512 57997f391cffb6c91fc5cf081761e646c8c61996ad698ed908aafe71cef6073bb18235b27f41093622de3bbb0a0ef6cc607d2487c6b2f91db65a147888ac3226
 MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed
diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild
index 2f6ec83339bf..c086f244d301 100644
--- a/sys-apps/kmod/kmod-27-r2.ebuild
+++ b/sys-apps/kmod/kmod-27-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	#inherit libtool
 fi
 
@@ -70,7 +70,7 @@ src_prepare() {
 
 	if [[ ! -e configure ]] || use doc ; then
 		if use doc; then
-			cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
+			cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
 			gtkdocize --copy --docdir libkmod/docs || die
 		else
 			touch libkmod/docs/gtk-doc.make
diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild
index 3a10626ae5cf..b631bb43ef36 100644
--- a/sys-apps/kmod/kmod-28.ebuild
+++ b/sys-apps/kmod/kmod-28.ebuild
@@ -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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	#inherit libtool
 fi
 
@@ -70,7 +70,7 @@ src_prepare() {
 
 	if [[ ! -e configure ]] || use doc ; then
 		if use doc; then
-			cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
+			cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
 			gtkdocize --copy --docdir libkmod/docs || die
 		else
 			touch libkmod/docs/gtk-doc.make
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index cf4d5e008df5..462317680995 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -70,7 +70,7 @@ src_prepare() {
 
 	if [[ ! -e configure ]] || use doc ; then
 		if use doc; then
-			cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
+			cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
 			gtkdocize --copy --docdir libkmod/docs || die
 		else
 			touch libkmod/docs/gtk-doc.make
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index b720b3a1f917..b82fdc3fdf6b 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -1,8 +1,3 @@
-AUX kmscon-SIGUNUSED.patch 385 BLAKE2B 0384e96bb5809d7b8c702f2cfe79e885bd469b4bfc44eda7f313c0b4caf0b72e278a537c5b0d4a053dcef604baa3cf6acacba61e636c23fa6cf46803d38642f2 SHA512 5bbdbd7f3f8a11d4fb8b5ff01455214de2aef5b65ee04c8da868d62ab1bba75f4bae0f348d15cee8667586d935afb7a8165a041f2c7df5f5e79d1f6fb6baaa36
-AUX kmscon-sysmacros-fix.patch 339 BLAKE2B c088bf8bad2ac171af219e763f404b6311c67541ac4febf0e8a02349783c49720912eebbc31f0a7c124b563394477ef9de4e2461931a20ae8c4448a1dd0ea593 SHA512 2b227b6cfa959002938209e85e0aac85d4bd4c567a7023ce0734f5d2131b001f29bdb3a62304d295747adb487ff10da9df4080c87139120da2eb9c8dda6f18df
-DIST kmscon-8.tar.xz 950068 BLAKE2B 7c4bbcc6eb0967d8e38e05a3e6fac60109a0ce468bc8967364b621274a9af4dd12a31af692be2efe0cc234af36f760836ec421b6567460efd4b7b1c3d913f44b SHA512 ac1581c2520a9c30406848dafc27231b38d392b2176e3ed4dd95b03cd54e256dd22f09e04057fc089effbbe08eb25546164bb885e0e5cbdbd752d4c27d07a41d
 DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf0c05e1e2bb4268435e17adb8858439ac6bf0e1783cfdd24a48fcb2dcf7c1cb20eee09aeb90db08c2e94224d01efeff7 SHA512 2ccdc5b30df6d96ac7a75d01d674b295bcdb0d445169716638a20c9884b090bbfe509e0aee79cb674a2d9b0eb18ea6284b9d4e2939cb5bf290cade4c1a02487a
-EBUILD kmscon-8-r1.ebuild 2978 BLAKE2B 778c7acd8c5d2fec8d9f3adea8e47f9f1d8b27688f18dcfcf92fca9e0bba15ab32aedff2000907ed88e12f9412ea54fa6d813c29e92fc181ff5222ec8c588fe8 SHA512 e762b0372dd21c6afd8b7a46572d5f005eeb8f18ccaa50f5dd05f9f0fd63bb12d448b12fa44c398ccd50f6a7e2ea4430cfc92322aaaf816643f5058e449fb173
 EBUILD kmscon-8_p20180906-r1.ebuild 2914 BLAKE2B 5ae857b7cc683e7e634b37d4902964d302ade0fc77863b8e2ffda7a61232273dcc8a844d245e8eafa51263358f95c6b31959d9cc524ce51b033d51080565f001 SHA512 e596373113c4f1294fa7cbd6eaee31111ae15eb9332b6f3e1d97d856242ab75020016b214df8e9c19bf59c53f6d931c8635e0cded8faf3790f0133af7c7bf01a
-EBUILD kmscon-8_p20180906.ebuild 2856 BLAKE2B a794c5360d3214ec1b6928525b5333e721c313d73bcb5df7be4bbc2c48624a2dc52971bb5af43db18ccd50b38cbbc070340491681108d1f9fd63311874ad1fe5 SHA512 a07cce39e1db29f5efe8291a53141b7a3fc0e5d267d45e62bfc5f101966fb4fb6ec60c68e8b2727897d5b3b37093e6915ad3c6d2728ab406da5f93ad83c8ee6b
 MISC metadata.xml 664 BLAKE2B 3e24275e972d23c41dbab76a90f4a47b589f652f580f5e019b44d5e926556ac2e5138a23f36beee31c53f3f5c344908832ca0d008826a720256d756425048063 SHA512 96f2c383dda46a41505e4aaf01376ed51cb2856516b800652d9ddb43c4794c1f57840368d31b822230ed3f16b6009699ee0ccec62f4967cbdaa8781a845d96b3
diff --git a/sys-apps/kmscon/files/kmscon-SIGUNUSED.patch b/sys-apps/kmscon/files/kmscon-SIGUNUSED.patch
deleted file mode 100644
index dc69f7700c67..000000000000
--- a/sys-apps/kmscon/files/kmscon-SIGUNUSED.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur kmscon-8/src/pty.c kmscon-8.new/src/pty.c
---- kmscon-8/src/pty.c	2018-01-10 09:03:09.477962638 -0600
-+++ kmscon-8.new/src/pty.c	2018-01-10 09:04:21.620658836 -0600
-@@ -299,8 +299,10 @@
- 	if (ret)
- 		log_warn("cannot reset blocked signals: %m");
- 
-+	#ifdef SIGUNUSED
- 	for (i = 1; i < SIGUNUSED; ++i)
- 		signal(i, SIG_DFL);
-+	#endif
- 
- 	ret = grantpt(master);
- 	if (ret < 0) {
diff --git a/sys-apps/kmscon/files/kmscon-sysmacros-fix.patch b/sys-apps/kmscon/files/kmscon-sysmacros-fix.patch
deleted file mode 100644
index cd8a374e5ca1..000000000000
--- a/sys-apps/kmscon/files/kmscon-sysmacros-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/src/uterm_vt.c b/src/uterm_vt.c
---- a/src/uterm_vt.c	2017-08-12 12:14:46.213183769 -0500
-+++ b/src/uterm_vt.c	2017-08-12 12:16:12.011069210 -0500
-@@ -40,6 +40,7 @@
- #include <sys/ioctl.h>
- #include <sys/signalfd.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <termios.h>
- #include <time.h>
- #include <unistd.h>
diff --git a/sys-apps/kmscon/kmscon-8-r1.ebuild b/sys-apps/kmscon/kmscon-8-r1.ebuild
deleted file mode 100644
index 831393bd22a7..000000000000
--- a/sys-apps/kmscon/kmscon-8-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-
-inherit autotools systemd flag-o-matic
-
-DESCRIPTION="KMS/DRM based virtual Console Emulator"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/kmscon"
-
-LICENSE="MIT LGPL-2.1 BSD-2"
-SLOT="0"
-IUSE="debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode"
-
-COMMON_DEPEND="
-	>=virtual/udev-172
-	x11-libs/libxkbcommon
-	dev-libs/libtsm:=
-	media-libs/mesa[X(+)]
-	drm? ( x11-libs/libdrm
-		>=media-libs/mesa-8.0.3[egl,gbm] )
-	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
-	systemd? ( sys-apps/systemd )
-	pango? ( x11-libs/pango dev-libs/glib:2 )
-	pixman? ( x11-libs/pixman )"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xkeyboard-config"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( dev-util/gtk-doc )"
-
-REQUIRED_USE="gles2? ( drm )"
-
-# args - names of renderers to enable
-renderers_enable() {
-	if [[ "x${RENDER}" == "x" ]]; then
-		RENDER="$1"
-		shift
-	else
-		for i in $@; do
-			RENDER+=",${i}"
-		done
-	fi
-}
-
-# args - names of font renderer backends to enable
-fonts_enable() {
-	if [[ "x${FONTS}" == "x" ]]; then
-		FONTS="$1"
-		shift
-	else
-		for i in $@; do
-			FONTS+=",${i}"
-		done
-	fi
-}
-
-# args - names of video backends to enable
-video_enable() {
-	if [[ "x${VIDEO}" == "x" ]]; then
-		VIDEO="$1"
-		shift
-	else
-		for i in $@; do
-			VIDEO+=",${i}"
-		done
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/kmscon-sysmacros-fix.patch"
-	eapply "${FILESDIR}/kmscon-SIGUNUSED.patch"
-	eapply_user
-	sed -i -e 's/\[libsystemd-daemon libsystemd-login\]/\[libsystemd\]/' configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	# Video backends
-
-	if use fbdev; then
-		video_enable fbdev
-	fi
-
-	if use drm; then
-		video_enable drm2d
-	fi
-
-	if use gles2; then
-		video_enable drm3d
-	fi
-
-	# Font rendering backends
-
-	if use unicode; then
-		fonts_enable unifont
-	fi
-
-	if use pango; then
-		fonts_enable pango
-	fi
-
-	# Console rendering backends
-
-	renderers_enable bbulk
-
-	if use gles2; then
-		renderers_enable gltex
-	fi
-
-	if use pixman; then
-		renderers_enable pixman
-	fi
-
-	# kmscon sets -ffast-math unconditionally
-	strip-flags
-
-	# xkbcommon not in portage
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_enable optimizations) \
-		$(use_enable systemd multi-seat) \
-		--with-video=${VIDEO} \
-		--with-fonts=${FONTS} \
-		--with-renderers=${RENDER} \
-		--with-sessions=dummy,terminal
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit "${S}/docs"/kmscon{,vt@}.service
-}
-
-pkg_postinst() {
-	grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \
-	ewarn "It is recommended that you comment out the ERASECHAR line in" && \
-	ewarn " /etc/login.defs for proper backspace functionality at the" && \
-	ewarn " kmscon login prompt.  For details see:" && \
-	ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797"
-}
diff --git a/sys-apps/kmscon/kmscon-8_p20180906.ebuild b/sys-apps/kmscon/kmscon-8_p20180906.ebuild
deleted file mode 100644
index c24fedc3f965..000000000000
--- a/sys-apps/kmscon/kmscon-8_p20180906.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT="01dd0a231e2125a40ceba5f59fd945ff29bf2cdc"
-SRC_URI="https://github.com/Aetf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-inherit autotools flag-o-matic systemd vcs-snapshot
-
-DESCRIPTION="KMS/DRM based virtual Console Emulator"
-HOMEPAGE="https://github.com/Aetf/kmscon"
-
-LICENSE="MIT LGPL-2.1 BSD-2"
-SLOT="0"
-IUSE="debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode"
-
-COMMON_DEPEND="
-	>=virtual/udev-172
-	x11-libs/libxkbcommon
-	>=dev-libs/libtsm-4.0.0:=
-	media-libs/mesa[X(+)]
-	drm? ( x11-libs/libdrm
-		>=media-libs/mesa-8.0.3[egl,gbm] )
-	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
-	systemd? ( sys-apps/systemd )
-	pango? ( x11-libs/pango dev-libs/glib:2 )
-	pixman? ( x11-libs/pixman )"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xkeyboard-config"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( dev-util/gtk-doc )"
-
-REQUIRED_USE="gles2? ( drm )"
-
-# args - names of renderers to enable
-renderers_enable() {
-	if [[ "x${RENDER}" == "x" ]]; then
-		RENDER="$1"
-		shift
-	else
-		for i in $@; do
-			RENDER+=",${i}"
-		done
-	fi
-}
-
-# args - names of font renderer backends to enable
-fonts_enable() {
-	if [[ "x${FONTS}" == "x" ]]; then
-		FONTS="$1"
-		shift
-	else
-		for i in $@; do
-			FONTS+=",${i}"
-		done
-	fi
-}
-
-# args - names of video backends to enable
-video_enable() {
-	if [[ "x${VIDEO}" == "x" ]]; then
-		VIDEO="$1"
-		shift
-	else
-		for i in $@; do
-			VIDEO+=",${i}"
-		done
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Video backends
-
-	if use fbdev; then
-		video_enable fbdev
-	fi
-
-	if use drm; then
-		video_enable drm2d
-	fi
-
-	if use gles2; then
-		video_enable drm3d
-	fi
-
-	# Font rendering backends
-
-	if use unicode; then
-		fonts_enable unifont
-	fi
-
-	if use pango; then
-		fonts_enable pango
-	fi
-
-	# Console rendering backends
-
-	renderers_enable bbulk
-
-	if use gles2; then
-		renderers_enable gltex
-	fi
-
-	if use pixman; then
-		renderers_enable pixman
-	fi
-
-	# kmscon sets -ffast-math unconditionally
-	strip-flags
-
-	# xkbcommon not in portage
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_enable optimizations) \
-		$(use_enable systemd multi-seat) \
-		--with-video=${VIDEO} \
-		--with-fonts=${FONTS} \
-		--with-renderers=${RENDER} \
-		--with-sessions=dummy,terminal
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit "${S}/docs"/kmscon{,vt@}.service
-}
-
-pkg_postinst() {
-	grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \
-	ewarn "It is recommended that you comment out the ERASECHAR line in" && \
-	ewarn " /etc/login.defs for proper backspace functionality at the" && \
-	ewarn " kmscon login prompt.  For details see:" && \
-	ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797"
-}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 47a5770722dc..e57e78bfb7f7 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,7 +1,7 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940aa3624e968045557bbfef6ace49b791f4b9efff86bf43df9fe2a04a160e76718396e0dae17f0bdaa62fb SHA512 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535
-DIST less-580.tar.gz 348881 BLAKE2B f518ea569201daed6f1772df890cbd2a8968937d9b8fd7b36ae277dc4b1f928892da073266fe39e4135cba15f2d52e0e540a6033cb56de9cc7577153e41e05c8 SHA512 52ff06854f58b5f41bc49fa13334a1ba11fae9316bb99f877abebbe8eb90226991b1820fcccfa85ab8cdfba87f6872160c1177edb044df2e9dd9c1c7d44e3c13
-EBUILD less-563-r1.ebuild 1364 BLAKE2B 3ec233e47b0061ca470790d05ac51c37230ce367458263e3b583d7bfee362be31a7a31ea73f61adf8e7da040ac02542ab712ef499f60a9009f5e8cbbccd226e6 SHA512 06c13fc26c49bbad4e78d02ec0e6f193b1cc02f7b19d83371e2671c7a714d6b68569a0e19cf9ce3b090470dbdc3fa1a45040527b9d37498ca2e937561185ef9d
-EBUILD less-580.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
+DIST less-581.2.tar.gz 349230 BLAKE2B 3f9d3c94f3d9eae5ecd033c5f16a575bd3a179ca335b0318e097a916c6713379cafbe6c57459e86866e890a432fb02be9102726b35c46d9bdd07ca1b35f83058 SHA512 b1189396c798d7cb8655175f31b1af6163dcf8e8d7a72531161cc8396e72e0cf5858ce7b39173be603f9f16eda498f2805cf42c2b92ec6970fd9d2b603fb7b92
+EBUILD less-563-r1.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53
+EBUILD less-581.2.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
 MISC metadata.xml 327 BLAKE2B 581c56f3073ebd542d8edf73fca5effb7cacd1eb3778b427e9b5fae6ce174931240f957be61951d2233feeb899e5eb08317f9d05f223532b532dd2467856d101 SHA512 dd40867f5f419a029deca5f613b89651fbc6fc71fdd9bf18600f063358295de781390037a1b2c0d28cfc8f65b56e71e9923f231a16a672dc8bc1284104462b95
diff --git a/sys-apps/less/less-563-r1.ebuild b/sys-apps/less/less-563-r1.ebuild
index 3b0f698785b3..10671e00e64e 100644
--- a/sys-apps/less/less-563-r1.ebuild
+++ b/sys-apps/less/less-563-r1.ebuild
@@ -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 ~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/less/less-580.ebuild b/sys-apps/less/less-581.2.ebuild
index c91345dc9f3b..c91345dc9f3b 100644
--- a/sys-apps/less/less-580.ebuild
+++ b/sys-apps/less/less-581.2.ebuild
diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest
index c6d47bdc60e4..191eb48a2c5b 100644
--- a/sys-apps/linux-misc-apps/Manifest
+++ b/sys-apps/linux-misc-apps/Manifest
@@ -1,5 +1,5 @@
 AUX freefall.confd 147 BLAKE2B b8fcd23306df7122e47e765dcba00cbec0fa7e2d9758d606e7e80cd3195b3fb7bce976fafef801812b425827f99689cde668106430119fcb57767bc816de635f SHA512 556472ab75ab8d3ccbedc44902a34bdef433430aa86fe5d8a125b27101f81e9c7c77e5a1fdfa84aef35078046e4b27a33eeb17d1745871f9e1f41e0ef64b2ba9
 AUX freefall.initd 1111 BLAKE2B c9c5de16da61124a4e984b47ca7cfa368cb5d02bfa85286f2cb9eaa50557da1b55d86b7a5beba5a5db60653c4a84b57276edc982782b7f8509d9a33cf45956e9 SHA512 e4d4d724276d9b64b80b29be5c28b9efc15556dd31545c85e45253aec2305d37af4b60a0be3f2f279c76c27aba5a968053a9bab7d08f2d559277701fd84375f4
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-EBUILD linux-misc-apps-5.8.ebuild 6542 BLAKE2B 3fc4c24460611e65d8b72bfd51a7a671f3e06cbf946e043278528ef90975028fa721ecfa10dd6ef036fdbc2a949bc489e053dc171dfc987ab68a29c23ab8824a SHA512 07a6b499ca3164a73a496dcebc5e2bb2871f2725a83ab133e4ff98bf324334222c6efeb03d3f89dd1785958cc54f957148761d0e3c9a832b95d1496bc9bf5f99
+EBUILD linux-misc-apps-5.8.ebuild 6544 BLAKE2B 28a99d9acc4bd41c57b3ccb4beb2f51c276daa30d9f001695a87ac258d3debd28d67a3aaac19405832e83d61bb012d457acec79769b26c6b58890b111980314b SHA512 1c6c083cb8e32fb3cdd4a70417ef070ff7fe959759911ca9a5f67b82ddcf28964b5859e58d6085c8c661ed813b027ac58ff970de91a1c1dcad2b70d6a3193689
 MISC metadata.xml 318 BLAKE2B 87a15c795438a1025ba5624d0c00bfc1e3de3172205b20a4cdb27d5a0d524bc35d1aeb64e58b8c5fadd08d151a82913c35454c36ee5e653da86a6031ab707d24 SHA512 c5b90254b92fd0bd40596718daed1e9b5fd2c0039a814932811e33fb6827eac660aadd324bd45117d60ca56148b2f8213a075be1b255d6e8c006e2702f76833d
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
index b6ac148f3e6c..305b9ee03e9a 100644
--- a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs linux-info autotools flag-o-matic
+inherit autotools flag-o-matic linux-info toolchain-funcs
 
 DESCRIPTION="Misc tools bundled with kernel sources"
 HOMEPAGE="https://kernel.org/"
@@ -18,7 +18,7 @@ MY_PV="${MY_PV/-pre/-git}"
 
 LINUX_V=$(ver_cut 1-2)
 
-get_version_component_count() {
+_get_version_component_count() {
 	local cnt=( $(ver_rs 1- ' ') )
 	echo ${#cnt[@]} || die
 }
@@ -29,7 +29,7 @@ if [ ${PV/_rc} != ${PV} ]; then
 	LINUX_PATCH=patch-${PV//_/-}.xz
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
 		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
+elif [ $(_get_version_component_count) == 4 ]; then
 	# stable-release series
 	LINUX_VER=$(ver_cut 1-3)
 	LINUX_PATCH=patch-${PV}.xz
diff --git a/sys-apps/lmctfy/Manifest b/sys-apps/lmctfy/Manifest
index b15ceffebf75..787ab4cd1103 100644
--- a/sys-apps/lmctfy/Manifest
+++ b/sys-apps/lmctfy/Manifest
@@ -1,3 +1,3 @@
 DIST lmctfy-0.5.0.tar.gz 2447650 BLAKE2B f40126ccb16b43921e39c23b82ee81a982e97c8bcd7e316568a313e3dd854cc0995f18aba7f6dd48418c3754a3ab92516b2c896136d00006d162044e6f6cd0e6 SHA512 638472b3e8cc98e7ff7ecc48eb0f58fb6a74600db22b7a1962ac3fe137d3549233f3f3b0c97f5783dff6f1851f9c3f9b0607fedea91cb23c1124ed8e2b54aea1
-EBUILD lmctfy-0.5.0-r1.ebuild 757 BLAKE2B f0d2fce9e00442751506b2363824ff67aaf1758639146b8370fcd74aa08280812e317614f6ae73a09f9981c40551897471307ecb56673a34bb9b3d58ade7527b SHA512 7a6d014cd5e6d282cca9e1b3fd8e2b17c02afab6e2226160bfb9a78172443a9e0347a1d6d7834600bf729ccaa9b244931c34541707558ad277f97441af1fd647
+EBUILD lmctfy-0.5.0-r1.ebuild 741 BLAKE2B c54012c8d2c91f64c53faa0a474abc4eea31eb219c256ea4c4191b7643b1ee9129ea2d1ac88e574a8072a23553a9d721bd2e74e819cdace575d5ec084e9b1d82 SHA512 2ec763efcbbde9ded5dc50cfb42c712d953489dd9d61bb73184036d7d920398b7967052a15a208af969c701b7cc85b7d3f370f690af55912ef7570eb9346bc36
 MISC metadata.xml 335 BLAKE2B ea4fa6ebfc263db5fb52d6f5a30f46799eb5c7488287b7d77ac34a6d791d8e53576424a21b346c67185f293bc689787744287223c43fa8eeee6e5d157bb500e2 SHA512 ae6e68f29f452d34b44b2afb53623f3fe0fdcc76d32d5aa7c5f394cb7f1caad288b320ccf3f1e628a4f42ce8a7f789fd4e8216d07eb539ffec7954632ea68c5c
diff --git a/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild b/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild
index b55a5841ffc9..6ca084097656 100644
--- a/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild
+++ b/sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
-
 DESCRIPTION="Linux application container management from Google"
 HOMEPAGE="https://github.com/google/lmctfy"
 SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sys-apps/lnxhc/Manifest b/sys-apps/lnxhc/Manifest
index 9531042852dc..76bf95baca6b 100644
--- a/sys-apps/lnxhc/Manifest
+++ b/sys-apps/lnxhc/Manifest
@@ -1,5 +1,5 @@
 AUX lnxhc-1.2-ifconfig-path.patch 654 BLAKE2B 6872b7412c63a1ca3e4d63831269c5a77062f5be777dfb63cd9090131dc045dd0e203ffdec7c5f805788518094b5047e30909e6a61c8d237f3cdf927f42f9adb SHA512 a29bc332e918e44fe3659f520c32df34ca293edc1545534853495a41182f7e28cb049e20e746f4cbf83c30140f4ae450d034e806a4c87e4d642f4ff2cce27cc1
 AUX lnxhc-1.2-usrlocal.patch 1455 BLAKE2B 8d154c43ba460a09366e0b7d93c4fb69309682a49a1346b94c4410e4b49098718c9bfcc3a8a1c5df9ce2dcbef485f65f28d6e6bea08920904dc7ee70ce25b444 SHA512 43be5d638f46caee028802e8675621a7e6ec8499f4490ed1f9df167a8b9b82a3002bac5a28ab3116507eb0eccaad33d865cb64f6cbc4b134717541cd2424087f
 DIST lnxhc-1.2.tar.gz 360869 BLAKE2B d92321f02be65ea8aaacdc55d19c480031c03d162e80207b306ef70f512917c506a27075e9326ff4be67e1ddc233096fdd44cf0ab06073a6b29ff8255f49ead8 SHA512 200ab6443c3b8f4dd99928d2f18b31e8e05c1f9c1f976052017a643430ed87fa08a399e9e8430eafb2925126bd2d90fc4f65ce1c220d6100b71c31fc0505aab0
-EBUILD lnxhc-1.2-r1.ebuild 481 BLAKE2B 4896345dceb4e2ff3b6f47f5114d344c82d24fb8241ba68e23d1ed5fd9364121fd451e72ff211f7fb0613a4815d2432cdbb9673fe7a83858e4c3f1e441a3d524 SHA512 e82e4ab73e589b07a471d855589ef686d29b19d5d60cfe3650cc0ac9679da204a8f8782ef3b0484ab09a6c5fea522e8944761973677b12819ce727a2e826eb5f
+EBUILD lnxhc-1.2-r1.ebuild 478 BLAKE2B 8a559080a0ffcc31d44a128aa2e9bd3a460e985d022bb4a0bfec18eb261bdb4fc37c5ed7e1acf6fc27f4956f03ab0ebfacea97bc06a498824ff07d1a2ec12635 SHA512 077981873855788cbcc11f684b8faea428919bd986c8e1d7336046769a8d5b645511bde5cd4c5b879e6afbb5177162a40784de3a72470688ea47a89ae5c94581
 MISC metadata.xml 242 BLAKE2B 869d8b0b4c7fa3b941911743f4a3c17d6a2c608cdbd3ae4cc1e3a84a12282f5197c263d99d1c5836f64c3868ad986d22d40e98f9083e24a8de41da5e305c8db5 SHA512 24a593f580269cba11ab3b8b83d8199b577480e448bbfe04cd2ee49da165537423dc4d38f9f2366a44605c8c70ca43ade3140da5718cc2cad01fc549d217f9c3
diff --git a/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild b/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
index 2b878ef587d8..e45de7621e9b 100644
--- a/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
+++ b/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit epatch
 DESCRIPTION="Linux Health Checker"
 HOMEPAGE="http://lnxhc.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index f8ef5e760f4a..311782191a86 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -1,4 +1,4 @@
 AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca31b87fd910b770b212f1d06aef668f184343f7d961aa38a1ba35e2bc1628750bd1680a70b7405271fab59c5f732fde66c SHA512 289795f45144071f5f166a3dfd387267fd3327767bae9d8e9c48818de0c60b961ac35952eb8b42b3ebfd415b337c096fa2db8009fdfbc218814a3ace633a8483
 DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
-EBUILD lsb-release-1.4-r3.ebuild 904 BLAKE2B 1ed7678cc226354fd3c35be6afead4817a714d1054cb389dc6c8e81c66ef737f5fbde84435e3cf164d2858ddd1fc624b37f06b580a7a5a6e2f4c081f744b4524 SHA512 2a029b9ebade00e225973b49f493328bacf69eb5cf1c3e1f6fc8b8e3db24ddd7ee5d8697b2b93df89974cf04c7721c28dadf5966f56e0aa72f82633252da4056
+EBUILD lsb-release-1.4-r3.ebuild 905 BLAKE2B 906bf53a6780d2e5b928df28417644ebf7ae2dbdb0ef8080fa690915b3bee4c205ce59ecc58e5007f87982c45b0338e9861e5fc28fe4eb76439edb076f90fb84 SHA512 b6ba1930983fe26b6af0ec01471d753dc945fa2a1dd51afab0bccc59f90e5a2b977287065298155b4a2fc96ce2a515dd08f6ea4e085e84eb8c6e910483f243c5
 MISC metadata.xml 808 BLAKE2B cb931504b70813859d35bfda6408cb28f2bd56cb4f0cdca944c051b9731c2c1e7c38d87bfab70cffabf82d4f537ea68eaa88bf05e2c90e27899238315fe29ad5 SHA512 cc252166fb933fc78a5b5479c9cc2a49a0d9224371cd14635cb92e7e3c4c801bdc6f837b6680704d20f63dc0b8872b67c72b952361e9328dc12305f9351f7a87
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
index 02f6bc5de4cf..cac335bca5cb 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils prefix
+inherit epatch prefix
 
 DESCRIPTION="LSB version query program"
 HOMEPAGE="https://wiki.linuxfoundation.org/lsb/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 # Perl isn't needed at runtime, it is just used to generate the man page.
 DEPEND="dev-lang/perl"
diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
index fb952fd8de3a..0ba55b23c100 100644
--- a/sys-apps/lsd/Manifest
+++ b/sys-apps/lsd/Manifest
@@ -16,9 +16,11 @@ DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1
 DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.15.crate 150581 BLAKE2B 89f1fb1840e7d25e226f4ca1100d85a8d02e0e386a5820bc68c8b5fca8eb94eafa01d90ad895a8b3e2c237f79593056f48a4a0954b6bee1a6eebb5d6f53e7cde SHA512 64ec4c7fad26ce7dd107e3e1b176507cd8f4b10c3ff47940c45ccec0b882858dc35d5cebed36b64e2bd1b611ad8b48dfaa7cfe4a7b687887b4f0a8be1de24dbc
 DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d
 DIST chrono-humanize-0.0.11.crate 11546 BLAKE2B dc0627852f00daa020f529fc37d5caeefe4c4847c1864c51fa2538769c9c8cea2c45176910f594f7e208c8bca8d1479ceac27c41fe393a02187572d508836bb6 SHA512 47ca23567abf41975007025bdbb2b30ae9a59d8381069408716ff9d2c60f77bcd8c9aadd5cb672902d73cb85b3123b7818c20c8823a27f3a99cecd50cae47cd3
+DIST chrono-humanize-0.1.1.crate 11737 BLAKE2B 7a4ba416febbec63ac4bc17948a6e59370d99f1dff9fe36080a0c474a29dc8313f312860c1d5e4f0481d95e54d12dd14618697dc9dd14e5adb95710622ed1d8a SHA512 26bc8d9a0209adbf3b52ad7e3029e171f50f1a5723bf777fddcf96f6f4d3d76f30a5ac2f68a762804d656bf9414091a8c3559e9c2f7f63a2c314309e72f6075e
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
@@ -40,23 +42,28 @@ DIST globwalk-0.7.3.crate 12714 BLAKE2B ec9d0036c2556010111edd645494be456664e4f5
 DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9
 DIST human-sort-0.2.2.crate 3024 BLAKE2B 0e112295ee73e6450bbf6431ff6841c9584de5daefeac077eec9eced452de61bebb8d3c3e13edd48b9e1002c421a8903da57a6a23a4c42576f2abaa7c6f02560 SHA512 062259992075a1be4c923379489410d856485682950cc31a05ad6ab6d04129f7e52dab016047c4de30c18f2ccc5c094c4469d9a920da0f450de3865a713bc987
 DIST ignore-0.4.16.crate 52343 BLAKE2B fa232eec0a35a2b144225ac804f2d8d198a95ab58d63d9a80378fcd9e9dc99b7aa800d8855da59d51a6004be496bb51a3eb9d318bcfc6c38b257c1de68a86abd SHA512 23d0205d25dee02067a6af9ccaab9abcf1eb812e309d029697f0b0a3fd6062e33d8fb1dcae8c78494867e82132ee6797bd4af716d7c1523afc29feebed6d6698
+DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.55.crate 400416 BLAKE2B 157b4f9d221f562e37ccfdd662a6777c8c6c45d1d2c9f9ff0f9d4d1bdf1aa66dac9f61a220e5be65fd7bc01273335eed86291e158f64da26bd7b398af26663e2 SHA512 649155c45a098dc043a42a0df19a7a43100f104bda1ce1a3bad9e5070b5a9c3a73f67197e286fb508c9257315b2e1d2a6eb4cba35f909ef0a2b1f61e1a29b196
 DIST libc-0.2.77.crate 507233 BLAKE2B f02ee13e41dfa6317a6cf7f0724f891cc9f98a68cd25e865e744ebbe49d93c86f16c2fd71ef4410ff28e0b386c5b4dff605c1236db83bdb91292ae48d0900782 SHA512 1e6dbd6f646a50fffd294ea56146c42dec6c4e027f2cd886ce2bbab9a5a2d036e4787f95201c448bef9ceddd52d863153c849343791d92900bf1378fbacee0f7
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
+DIST lock_api-0.4.2.crate 20375 BLAKE2B 0b24bdf98aaee9870f558971f437e728c8e52a853cc886a0de30cb9a84c2733175e6152a2d7ff1f28a83df5443091b16ac5410cb67d05ce464e01db64ba98cb0 SHA512 815de5198ba4a952490fbc7e08e899ce855588d794c22890839ad55caa81642745fa6bf81a2a2fc8f6713575f0d1b801a2f2107ed7c405101011927b6b40be31
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST lscolors-0.5.0.crate 15937 BLAKE2B 27c9d42fbdfa32ce9f01fc627c2a758544dccd72f2b63f232b4984287f61f5f4dc8788a30ad60ae92ddc374b7b993b577bbc0d11a03c61756af81cc672300fc0 SHA512 97d881cf248dee1a744e6016941abb80579518ede0883e419b6c452215ddc0b2a6336c6c6c254e4f463cfa7f3a648ea56fef1df0ff044daba98c2d03e1731013
 DIST lscolors-0.7.1.crate 17986 BLAKE2B 927e3d9155591c5223fccf78f011dfce21f29c7f9322de0e3a97703eec2b27ff1eb93890b9ef62cb0916ceb06bb88660b34443ef815aef621801f7917ff46b31 SHA512 65c618c25624b360a98f98142e0867d524d19e7060887993f35899a26a812e360d8b8d627d36a72fa3c604a1cb5615d6a425850087183b694083b9649e120776
 DIST lsd-0.16.0.crate 39872 BLAKE2B cdf78606856d689e22edad5cf1f4f555edff2030e1b10ff0e706f7dbbe98c5836ef4a8ad6d061fd3c968f8499815b79c97595d0fff43d513e8fec40a4f3a632b SHA512 cd761e039f810c6fcb925228bdbc284ea0a3a9b16a11038de3086bf89ad1f99b442e33a0020612079bc40e7adb1a3ae056565f4022e2714bc9cc47767e7fc03e
 DIST lsd-0.16.0.tar.gz 43284 BLAKE2B fb8813f33fa487afea428a3dd3a01fe6c9e56616a8c69e7a97430e41deb4a0ed0cd5b4c6ee79ba02d145267d2fd2ee2167365b81fdcf868bec2cdce0a98a1535 SHA512 562c070d3e716af26ff3a54632cd176a1b95471fbb7e947f8175f89df483ff5b337d1a0d7578fa6ee41f77fa7ed1a618d37e91ebf1b8428e6a857918b415aa39
 DIST lsd-0.19.0.tar.gz 69118 BLAKE2B 32f5fe37e2fd4d5b714101ba19b6f36d9b0d0d71e88e1d8e715e32c2c804735366d8ab517e5abf5193e478096c6dc2724be2a6bd68b75c2603f0954926ac315f SHA512 f9a1202f49b0e02746ba4034b199142a4b5224ba6cee8690a6fb01c18c046a26c531d0b4480838a28b3ca8de7ae522451bdc5ece43f902605a61f18571fb07fd
+DIST lsd-0.20.1.tar.gz 72380 BLAKE2B dcae55c795daa10abc71f6afdb78b4202a83832664cd2054abbb5008f45aa11f3482658ca463d01f2fce37a79e5a5128be26e05f269d681e5c5e5f3e611e20a6 SHA512 d4e340947c1d94fa675d85b8cf07df4be5da28441b0d93449d4ab266bdfae8a0556f98ec320c07b968094a07250dc9e41a0165d6c27fc153e5a1730bfeb5d549
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
 DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
+DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
+DIST parking_lot_core-0.8.2.crate 32142 BLAKE2B fca96047d33b5501fa34655e6f32ff204d72f07c9501e5bb2465fd4b9f7b50a6501cea295d10d1c994c89803b6bf4b6e73a174120e769fec2e2353cbe60553d8 SHA512 0d705f348fa125312a7adcf392001ba79eb3932d489f4e9a3c9a2c1b9f65175458561a61e456830999d3d1eb95f3558f58ee80106c8b01720427c1dd4b602d51
 DIST ppv-lite86-0.2.9.crate 20933 BLAKE2B 493fb977d0db8eb4699893ed1d05758ee7cf1b5610b767a2ec352f3f430edf3d1a3bacefae554fb16eb2786fe4fb9b574c7b9961458a938da9a79b9084f062a8 SHA512 d9fe88a221733197b43db2a2a608dd2acdd9aa37129af07ad2405d66171b6f9f4c1a61530013c7f9ad69194a2e52e7480ba80c696e97cf2adaea7677052cb010
 DIST predicates-1.0.5.crate 26097 BLAKE2B 4adc79981c706796bef11e75e4a87cdfc5ff7f5066869f8d26f5ba0f3699c292edd6e5dd1be8854ff9e8b2604bf24904f1242056719e1d863951ca6f5ad042ae SHA512 696890cb9ed83b6ebd1b46e42bde95b148fe067174b0057e4ae83d9b3a4d2043dcedf0cc58b78e88b36a460402cd6359580356018986b4a136cba9e1afde55b6
 DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4
@@ -88,9 +95,13 @@ DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe371539
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
 DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
 DIST serde_yaml-0.8.13.crate 37683 BLAKE2B a6739f29e638fa77516ae106314a332a6cc86022db4a029eb7615e5deca712b67669330f02ba0d04cc53b9e3f661a5e970f7ebe723be18cd44c309218123a74a SHA512 12621a641ccc68f90a962e9a6d84ab922d9b30e58be88c26e8fa0cf921981f573bb929113108cfd08f47988902997d4b685db2cd361cbf83119612e95ff6e686
+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 smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-1.0.48.crate 225747 BLAKE2B f7bfc4c38dec562a6dc7ecb7120c6df5e25ddc8591762bf5018ee0efa506613c9462a79e0e9cbd952cf5fa083abc164608d594bf2a47d226de4b4bdf02da050c SHA512 16b022a418eb9a7e5d651197561c329f749050a1710ff03b1af9a5f580543d00a1724826e0ced044d6ee4ad55dc615fff5a71ad72755e1685c429dc5853d93b3
@@ -134,4 +145,5 @@ DIST xdg-2.1.0.crate 12444 BLAKE2B 616b52f46f3904f3da7584fba331b730a3fbc78e2b41f
 DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
 EBUILD lsd-0.16.0.ebuild 1392 BLAKE2B c1b8865714c255758cce5d34664ba768436fc50e4eb86eb9b5d6cd1794f6e7f0f902be5f586f44e3546765261345b0725340351403351a50284b841d917930a4 SHA512 d5e9098898f97cc1e6e5e2c796c90c66f6965967164871aabf876277f95b8214fcc552dad926ae8d4b27c91bdfc3a2a582055d185bb83fdcdec1e3bb0f7384c7
 EBUILD lsd-0.19.0.ebuild 2064 BLAKE2B 18d8629dce22033901a6baf22c888d06fd7f5c5b24eb7b5738fa212cabbdeffcf8854311062c37e99c7643047d24c6dba700c6b80be0ecd919a4c7916f83022b SHA512 8596e21e238b81c3fe14955dec85e528358580610313816ee8d872d45573dad6ebceacc0ccf3d0f023dd9788a6b43ac3b17696adb2819f6ba4d5c885aa49ef96
+EBUILD lsd-0.20.1.ebuild 2602 BLAKE2B 446e01519bafd2bbe8acaf79112cdc7e1d7f4957ed6e0da410559a6215d7435ebc737d7976fd6a6d093f84a901aa29c0d322847629c56e5aa4ed7e6f39d364d4 SHA512 851e2d845cc773d67249adbd328b52d7814d3d680853f84e2cfc74178c4827247b31ca0941385fdf701e3d27f0a2d62037a3490b5361b665a3318d0aaeeb432b
 MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599
diff --git a/sys-apps/lsd/lsd-0.20.1.ebuild b/sys-apps/lsd/lsd-0.20.1.ebuild
new file mode 100644
index 000000000000..d21203f06999
--- /dev/null
+++ b/sys-apps/lsd/lsd-0.20.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.13
+ansi_term-0.11.0
+ansi_term-0.12.1
+arrayref-0.3.6
+arrayvec-0.5.1
+assert_cmd-1.0.1
+assert_fs-1.0.0
+atty-0.2.14
+autocfg-1.0.1
+base64-0.12.3
+bitflags-1.2.1
+blake2b_simd-0.5.10
+bstr-0.2.13
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.15
+chrono-humanize-0.1.1
+clap-2.33.3
+constant_time_eq-0.1.5
+crossbeam-utils-0.7.2
+difference-2.0.0
+dirs-3.0.1
+dirs-sys-0.3.5
+doc-comment-0.3.3
+dtoa-0.4.6
+float-cmp-0.8.0
+fnv-1.0.7
+getrandom-0.1.15
+glob-0.3.0
+globset-0.4.5
+globwalk-0.7.3
+hermit-abi-0.1.16
+human-sort-0.2.2
+ignore-0.4.16
+instant-0.1.9
+lazy_static-1.4.0
+libc-0.2.77
+linked-hash-map-0.5.3
+lock_api-0.4.2
+log-0.4.11
+lscolors-0.7.1
+memchr-2.3.3
+normalize-line-endings-0.3.0
+num-integer-0.1.43
+num-traits-0.2.12
+parking_lot-0.11.1
+parking_lot_core-0.8.2
+ppv-lite86-0.2.9
+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.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.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
+same-file-1.0.6
+scopeguard-1.1.0
+serde-1.0.117
+serde_derive-1.0.117
+serde_yaml-0.8.13
+serial_test-0.5.1
+serial_test_derive-0.5.1
+smallvec-1.6.1
+strsim-0.8.0
+syn-1.0.48
+tempfile-3.1.0
+term_grid-0.1.7
+terminal_size-0.1.13
+term_size-0.3.2
+textwrap-0.11.0
+thread_local-1.0.1
+time-0.1.44
+treeline-0.1.0
+unicode-width-0.1.8
+unicode-xid-0.2.1
+users-0.11.0
+vec_map-0.8.2
+version_check-0.9.2
+wait-timeout-0.2.0
+walkdir-2.3.1
+wasi-0.10.0+wasi-snapshot-preview1
+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
+xdg-2.1.0
+yaml-rust-0.4.4
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A modern ls with a lot of pretty colors and awesome icons"
+HOMEPAGE="https://github.com/Peltoche/lsd"
+SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 BSD-2 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=""
+
+QA_FLAGS_IGNORED="/usr/bin/lsd"
+
+src_compile() {
+	export SHELL_COMPLETIONS_DIR="${T}/shell_completions"
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+
+	local DOCS=( CHANGELOG.md README.md doc/lsd.md )
+	einstalldocs
+
+	newbashcomp "${T}"/shell_completions/lsd.bash lsd
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${T}"/shell_completions/lsd.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins "${T}"/shell_completions/_lsd
+}
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 4a962f84c521..aab09158ea69 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,11 +1,11 @@
-AUX lshw-02.18b-gentoo.patch 4819 BLAKE2B 54e08c0373308bccc39c9217da4152fcb853a108fc6f29c6cb62d2a3a64d4de5412be7a460ba217f0ba625aec5cc4efb7ff9c0750cd14073f3b0783a883c1dd1 SHA512 c9492cf301ba06f225d8afab62ab889572f9acede7b63cfc0ae665275b1056981dd85b02d4d49fc6294194a71fc405ded6bf27b3f461e550b0e5a3dc6fb939d7
+AUX lshw-02.18b-gentoo.patch 4709 BLAKE2B 5e07b8bba96f5ddd6717bb765965962a64638d8137ad1008a760b685b8dafc5da1a79862adad35612aa7038de096337e7d8506267328da70f22d916acfadd750 SHA512 42d2b966207173ba78926610100d7567f8e115d20378b02231de962d6949bee5de2cfcec1ac1399478b144ec19cb739e37f314d2c02b9f58c7895f9e099d5988
 AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895fe70cbf93ed6d648478f6ef6332af8f56a58b687425f70ac95a40b57b84de9045e916c6ac4a3e35de2199a26acd6ae762 SHA512 60f09dcfbb6813fdeb06e7ca3161c768e4b138a65a2a1c27a19d241ddabbc8e511e31922a998c15e944056bf79eafd907073e419e0887c09180b87de24f4d5ee
 AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9
 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
 DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5
 DIST lshw-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
-EBUILD lshw-02.18b-r1.ebuild 1779 BLAKE2B cdcdef6003f3c8daccd8ea442822908813914f2b155887f9f3c2f0a4b843ff3833380e5bb0657b50293af35de36b305cfd741dfdd61b30d38063b98cf705d4d5 SHA512 b5a21f8effa23ab0154249d1e37fc7c966a4b6ac1896943903bfeb66a1105c682a2e9a7fc1e603179cf1ce5ea8955d162276681c8946e3bd3f1c98d7665a926f
-EBUILD lshw-02.18b.ebuild 1721 BLAKE2B 51a1020346e3ac0856d1c7dbbe5827c430db0b017b35ae70876e6b8fcfcea7d134f942dc507b8158ad9010242cf9f94c92b8521b981b8d569137cd0fb0eb0273 SHA512 9065cd8709e623d6ee770f2fb499bb433bcf383795e8b280171da3b7a2d9a93e32956aaaeaa347dfbedd81d29c4bd964f8839d7ab98124c86d9fb65e7feb07cd
-EBUILD lshw-02.19.2b.ebuild 2143 BLAKE2B a2ffef5fd6e729e670b13a596f6aac6d15e33d8388c02efec0e410f6ffb5fbfff64ac8ae15c97adfea61cee639e9dad29fd7f8bb4a50e5a89502f96ff4ce3c0d SHA512 98d66f43361a8fd5a7e39cb939804392e9f5c763affd448217a18a45b6276588e1f8e11a775fbc9ef1953ffca5f77f1a7ae0b807182341fab42efd0c847958bb
-EBUILD lshw-02.19.2b_p20210121.ebuild 2147 BLAKE2B faad40e16dc2e37e0c92805e3f8f6287ee41f30b2f82935fdbf4cacca8b19d44955f12f6c980bb22b7a201e3a47f3a6f137c0880e9590be9812ae528775cf604 SHA512 e6aaa0917953fe2483f474c256b062725801c6e7a7dfb84a1baddb9622ed909aaf079ebb520aa4e621d2dc12a6fc1ade9256ec8b40d0bb88312c37639921d5c3
+EBUILD lshw-02.18b-r1.ebuild 1786 BLAKE2B 827c53ca19545e3435c1d797000d2460b4fb170226958f523467705821bc9086f8fa145bc2090c4660369df2788faf7ed64f4572d39f92dde5ce4e56586bf1b8 SHA512 3bc735eeab8d1ba80326cc2c2fe432ed7a44915d1653f2a8bd8147e5299eeac5de63aa2aa3af210fe8d6d71ca1c066c0928d3b27d54e29b9119618f6289be8b0
+EBUILD lshw-02.18b.ebuild 1728 BLAKE2B eb1cd904c324bd1e3e4256aa882e2895d3c12daf11dc46dfe208f645915c22b04bc04196beb828bbd69edcfd1841b6df0eb6cea7d5414c6e668df0f4bb9f18cb SHA512 44adbbb8b82c816b5a36cff686e251023ba0263e0c64fa596baddd5a096018d4147e128894666738f725c0680adb2843732c89fa92bb7edc318185e5bfb2d4b3
+EBUILD lshw-02.19.2b.ebuild 2134 BLAKE2B d71b2f4cd8a0ae26bfb414bbfec683452edee62aac75a218fed8bb5ae899f00aa7bce577edf2a909b7309b1b5106bd8b5240ed401bd4e05a7cbe771a463d713c SHA512 033b096652d7732fbc256344b1de2fa4e4345a8375f090fd27ec6db1f020ab8f71b0df238ed0174c2d871913a2a2e95cccd897df266744fb17f4e7f3dcafbfd9
+EBUILD lshw-02.19.2b_p20210121.ebuild 2227 BLAKE2B ccf17dd0b2f86b8bfac33423a815cdaf0479cd05a8574b848e6c47226fc1731117c9e7c625a6d4436a10bb7c4d73908f38c353ebff0cf2987a25243a9d095db6 SHA512 4c2f06c4109ba86f7cb435b37f6242c9f80a16e7c889b0aae1d545961fd6fa759ff44463928aaf1d9cbb6af2423124f7fab99a226ad6cccab417d6379ec98ca3
 MISC metadata.xml 461 BLAKE2B 85843f85ec415a571d44f8c7bd8b04baa11e58141cc6bc7c0a0561628e858f9c8881d5737314873f5d4ba6788b36d54a9bb434ccdba3d2f1c435957b3972acce SHA512 b824f0e4251e52f1bb5283faba663d74b93c35bc23963e84826be85eeaffb6481b66ffc2548736cc66227be24bfb230cbf77cfe9d72d7ac7053abb26f980c6b3
diff --git a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
index 0a50e9dc868c..dd42df9b5282 100644
--- a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
+++ b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
@@ -1,5 +1,5 @@
---- lshw-B.02.18/src/Makefile
-+++ lshw-B.02.18/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -21,11 +21,11 @@
  CXX?=c++
  INCLUDES=-I./core/
@@ -82,8 +82,8 @@
  
  .timestamp:
  	date --utc +%Y%m%d%H%M%S > $@
---- lshw-B.02.18/src/core/Makefile
-+++ lshw-B.02.18/src/core/Makefile
+--- a/src/core/Makefile
++++ b/src/core/Makefile
 @@ -1,10 +1,9 @@
  PACKAGENAME?=lshw
  
@@ -97,8 +97,8 @@
  LDSTATIC=
  LIBS=
  
---- lshw-B.02.18/src/core/pci.cc
-+++ lshw-B.02.18/src/core/pci.cc
+--- a/src/core/pci.cc
++++ b/src/core/pci.cc
 @@ -17,7 +17,7 @@
  
  #define PROC_BUS_PCI "/proc/bus/pci"
@@ -108,8 +108,8 @@
  
  #define PCI_CLASS_REVISION      0x08              /* High 24 bits are class, low 8 revision */
  #define PCI_VENDOR_ID           0x00    /* 16 bits */
---- lshw-B.02.18/src/core/usb.cc
-+++ lshw-B.02.18/src/core/usb.cc
+--- a/src/core/usb.cc
++++ b/src/core/usb.cc
 @@ -27,7 +27,7 @@
  
  #define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
@@ -119,8 +119,8 @@
  
  #define USB_CLASS_PER_INTERFACE         0         /* for DeviceClass */
  #define USB_CLASS_AUDIO                 1
---- lshw-B.02.18/src/gui/Makefile
-+++ lshw-B.02.18/src/gui/Makefile
+--- a/src/gui/Makefile
++++ b/src/gui/Makefile
 @@ -1,5 +1,7 @@
  PACKAGENAME?=lshw
  
diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild b/sys-apps/lshw/lshw-02.18b-r1.ebuild
index 5df82efaafaf..f3e16336e3f6 100644
--- a/sys-apps/lshw/lshw-02.18b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild
@@ -5,13 +5,13 @@ EAPI="5"
 
 PLOCALES='fr'
 
-inherit flag-o-matic eutils toolchain-funcs l10n
+inherit desktop flag-o-matic toolchain-funcs l10n
 
 MAJ_PV=${PV:0:${#PV}-1}
 MIN_PVE=${PV:0-1}
 MIN_PV=${MIN_PVE/b/B}
 
-MY_P="$PN-$MIN_PV.$MAJ_PV"
+MY_P="${PN}-${MIN_PV}.${MAJ_PV}"
 DESCRIPTION="Hardware Lister"
 HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
 SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index 74e8e232c50e..8243b8bc20c7 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 PLOCALES='fr'
 
-inherit flag-o-matic eutils toolchain-funcs l10n
+inherit desktop flag-o-matic toolchain-funcs l10n
 
 MAJ_PV=${PV:0:${#PV}-1}
 MIN_PVE=${PV:0-1}
 MIN_PV=${MIN_PVE/b/B}
 
-MY_P="$PN-$MIN_PV.$MAJ_PV"
+MY_P="${PN}-${MIN_PV}.${MAJ_PV}"
 DESCRIPTION="Hardware Lister"
 HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
 SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild b/sys-apps/lshw/lshw-02.19.2b.ebuild
index 471abbf1b243..9ddf5f85eb28 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -70,7 +70,6 @@ src_compile() {
 }
 
 src_install() {
-	default
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
 	if use gtk ; then
 		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index 20087b02f948..bf17c8b0223a 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PLOCALES='fr'
 
-inherit desktop flag-o-matic toolchain-funcs l10n
+inherit desktop flag-o-matic toolchain-funcs l10n xdg
 
 MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1"
 MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
@@ -16,7 +16,7 @@ SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"
@@ -71,7 +71,6 @@ src_compile() {
 }
 
 src_install() {
-	default
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
 	if use gtk ; then
 		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest
index d90ad8a24696..a0d73a6ae268 100644
--- a/sys-apps/lsvpd/Manifest
+++ b/sys-apps/lsvpd/Manifest
@@ -1,3 +1,3 @@
 DIST lsvpd-1.7.11.tar.gz 90366 BLAKE2B 2dfbbc92921106247580395ac663731bc4486d9380b052cfaa0867939a22b4c10d130adcb01260316e5c0fa5a093eb8c95c0d0b04a5ea17792e5891cb302a554 SHA512 68efdbee6bbfb4fd6673bc83d340aea6a121d48d1e75dcc4f9322521d8a3aa7b04fbe1acbb7e7343c5a7e2dd33f21ecf2e54a32ff5f6f2b9e1e5d6c34b8b25b5
-EBUILD lsvpd-1.7.11.ebuild 574 BLAKE2B 20b45740c87d91ba4393af9841b77bb41d624a416ca82cb04315f8319f5788535d76c189e340bd167988d4038922944d11d2438502a6859c7f2c90390149875b SHA512 2575ab1d7c815bf1a2fe10334cca7bf52c454021fe30f96dd064372bbc1c79e7efdfdb9646e7636462c441c11978892a67e832a4bc6ba38e96636ebaca133912
+EBUILD lsvpd-1.7.11-r1.ebuild 582 BLAKE2B 34afe81d81a3a2a012a8c3f54eeca008a2cf2b9dc14bf8aa0b2f43a65c9b068370bf57a25655a378e39e4c1878460c0fec4d8f21edbc698d1d0154d7ca24e230 SHA512 ae5640d4f8fca09cf00d23e7d1accb9bc80cf809cdff7febdd1185e99043273f206bdd6e75569153f1b680e45dca78d8e719aa2d80eb5c6d3d011f9916abc79e
 MISC metadata.xml 988 BLAKE2B 1029729819fe1c2f8b197e27a127de88fb0a72cd6671a27cb08effdb81108b2be892860bc97012f6cb903d509ca3eb9fe4bf0f59c0642f93b19e0f453e7f276f SHA512 f20dfdcc425ead51943d39d8a5dec0f38baa023cd204a446e63f0f50588d51519a83af3fb6004ede20aa0d0d63ef5d9523d491759fc849951fbceaf96bef254b
diff --git a/sys-apps/lsvpd/lsvpd-1.7.11.ebuild b/sys-apps/lsvpd/lsvpd-1.7.11-r1.ebuild
index ee450bf1b3be..da50d494b20a 100644
--- a/sys-apps/lsvpd/lsvpd-1.7.11.ebuild
+++ b/sys-apps/lsvpd/lsvpd-1.7.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-db/sqlite:3
-	sys-apps/sg3_utils
+	sys-apps/sg3_utils:0=
 	sys-libs/librtas
 	sys-libs/libvpd
 	sys-libs/zlib
diff --git a/sys-apps/makedev/Manifest b/sys-apps/makedev/Manifest
index 9c663cea8e0b..0bc04b33a793 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 1352 BLAKE2B 6849b1526f685b4a83c358cee557b1e571c03f7e5b2fb734ebf17b0c6db917ef7af1ae2d46c5f70e7ed6a6d8168ef9b48659b04bfe83de174d9ebe6d048d377a SHA512 72c08598ebe85a8d1c81d96ed593079b1e3d686b7d0cf9db4f97af3c51844daffd84f30a0ac4a982e537251312474fef9f7646f79d1cb5976b559c2196a79e05
+EBUILD makedev-3.23.1-r1.ebuild 1346 BLAKE2B 041c624f426a6e3e1627b0fcd688550f5f28d1f4cdd3cae2d1ddba09361fd0af30686644f88ce12dcf50377242dee76f5b61769702e53e9c11f1e9ba038aa2b5 SHA512 5baecf59aa6da0a7f10ba2bdf995a96a955344a220ac0b6f81d34e69cb57cfc2d759c702e18b4cb1972b443af98caae93dc5b1a34a22a705bfe24da6e49be15b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/makedev/makedev-3.23.1-r1.ebuild b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
index 4b1c6985f562..bd14e7054c69 100644
--- a/sys-apps/makedev/makedev-3.23.1-r1.ebuild
+++ b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN="MAKEDEV"
 MY_VER=${PV%.*}
@@ -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 ~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 9539aab6c797..3d0404a50d09 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -4,7 +4,7 @@ AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70e
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
 DIST man-db-2.9.4.tar.xz 1909020 BLAKE2B 43427e851f0e661ca1cee55211dd7636f4ffde067c75de7715f525029b22c205728f8e86ac49abff60e47a4a4c9e1fbd78e2c87e70bd37778b88594a3897275f SHA512 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c
-EBUILD man-db-2.9.3-r1.ebuild 4128 BLAKE2B ed8d4f14ecb1a02e6aae0027e0c1f0ef7a878fcffb52ff127ea83f22e16a742cb89880e9f883362b10ec42e21d18276aed615f06d452e93627de4834d2cdb549 SHA512 c0c20b45456d8b8366b6cf67bba32d9371c7e134bde13ce931b91c0c4a8daeb9011973df62c6386e929a177b35e25d6894f1cb41610a0debd6c8aedb6d4b9af2
+EBUILD man-db-2.9.3-r1.ebuild 4129 BLAKE2B 92a05bea3a84a6dfd3945d8aa8c5a9136c8e92a35aff356046de6e2af0ea8de784fd9112595e8a42046fe6eec8f82cf6af87db6231d8476344c73623430efb44 SHA512 4e273cb69e23f49054eb9133f7ddee58837b6cccfd6d08cc8fc70a71d6f74fe3e08d5a2aeb00792df201eef803eeb1f8125b33f50c392a64ddfdc145f7239a09
 EBUILD man-db-2.9.3-r2.ebuild 5199 BLAKE2B aafb16a1685d0cafca99ac54a55fc7a9371d6d1a1c040b09e2c16ec37598a0a679316dce9bde18aec17aefb5fe767079d64771a986a3d0bbe9acb7ef6c602d6f SHA512 eb24108aabf63f6f936dd4c635c1a8b83f6f28a72ba45ad08561ac6e6dc262170c16f05739d11eebd8b8ceb0a835e62301a587b2fbed672086e3acf320edc88c
 EBUILD man-db-2.9.4.ebuild 5070 BLAKE2B 282b6d530643d4f98e1f5618865676f0eed81da88a599238f0c179777030eaa526182e49017e750aff403da713a1f6c598f87167fd8687be565320783e9c975e SHA512 fccf9aacad6d3b6fa86b08b30972a178599aa95eb596c7d0ba9d10284c870cd2dd86cfec77f5d58e5bc6f54ffcde05adba7f0d176bf9a5ded05a6584fd4f6f21
 EBUILD man-db-9999.ebuild 5070 BLAKE2B 282b6d530643d4f98e1f5618865676f0eed81da88a599238f0c179777030eaa526182e49017e750aff403da713a1f6c598f87167fd8687be565320783e9c975e SHA512 fccf9aacad6d3b6fa86b08b30972a178599aa95eb596c7d0ba9d10284c870cd2dd86cfec77f5d58e5bc6f54ffcde05adba7f0d176bf9a5ded05a6584fd4f6f21
diff --git a/sys-apps/man-db/man-db-2.9.3-r1.ebuild b/sys-apps/man-db/man-db-2.9.3-r1.ebuild
index e43583cc2ddd..2dc1438844d8 100644
--- a/sys-apps/man-db/man-db-2.9.3-r1.ebuild
+++ b/sys-apps/man-db/man-db-2.9.3-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-pages-posix/Manifest b/sys-apps/man-pages-posix/Manifest
index fca069121623..fb648048eb16 100644
--- a/sys-apps/man-pages-posix/Manifest
+++ b/sys-apps/man-pages-posix/Manifest
@@ -1,5 +1,5 @@
 DIST man-pages-posix-2013-a.tar.xz 930736 BLAKE2B 4d496a4ea7bcf9f101a9b5c31eaa437317e872d9d266c202a1fcfd16d9b2fa71f968c3653bc9789ba18916a93802736e795c43bb3f87324397f49aed0f6d1556 SHA512 e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14
 DIST man-pages-posix-2017-a.tar.xz 935196 BLAKE2B 45d732c712f8d6b18f151c7383130a367d5774ec9d814cf9e61accb01e9d91ad3e9b49bc4f1b993f28688e9c39cf1fbea91b86b00c05968b0bc0a5665211defb SHA512 dac6bd5bb3e1d5f8918bad3eb15e08eeb3e06ae160c04ccd5619bfb0c536139ac06faa62b6856656a1bb9a7496f3148e52a5227b83e4099be6e6b93230de211d
-EBUILD man-pages-posix-2013a.ebuild 759 BLAKE2B e391bd771a0a017e3836bab1dbab874846a37e3e062dded952398f63e09847e0d9a0bdadfdfa30b65e71c1dfd482186d9c34722b32d4ab5f22be8355b191409e SHA512 59f50c9a6d476fde645a697eab073515ea5d19c8e082e28defc339e45a869d35d7c10fd446f98fe0021b755b406ce827e4fcbd45e0d0318f1267031df68fbb56
-EBUILD man-pages-posix-2017a.ebuild 731 BLAKE2B fe1526eff6ce8dabc613133c6f32207adabbbcca828d821d5efe2b08deffca27306c7a073321fbd62b187f0835744e996f013cfb97d8fd71baf0924c360614a2 SHA512 59a1eda1c3ce2fb15ef1341d49e3445550d477e17b41940b62c3b60c3a67b4ad35db5a196efff15ce53eb1d44748e320037bfa578ef94e82e546ba13ed0d4344
+EBUILD man-pages-posix-2013a.ebuild 744 BLAKE2B df47af71fa4ea35fe848b462e30e780c84e6abd72207742d6b43196eccf6d7d3287719314c6d95b0ad92727539dabfe6b863c806bf449c25d8b53f197698d7d9 SHA512 8552a55b556d90da706955a46ad63e450820f567234fd59b06aea0f64e7913686bcc168ce70f9ae644b647c80eec0a25c01ac040d6b3a38dffb986ec63682f2a
+EBUILD man-pages-posix-2017a.ebuild 732 BLAKE2B 13fdb827ab5bc5acb33da5a421db9b398ecd660877e300e9427b2dddbc789218d3d2335bd371b73a2ce3ff997dfbdbb5b6a7a3c9f94cf2a8dcf851603032f622 SHA512 f53eb1bb86b7b474475d6f6260d0fc868578951228c69c364f8c4edb7d6c2d5bd39198459cdf048da83de5bb841790a85bbbfa03aec480092e0e6d08628bf272
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
index eecfc34e6335..bc2c7caf828a 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=5
 
-inherit eutils
-
 MY_P="${PN}-${PV:0:4}-${PV:0-1}"
 DESCRIPTION="POSIX man-pages (0p, 1p, 3p)"
 HOMEPAGE="https://www.kernel.org/doc/man-pages/"
@@ -12,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 ~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-posix/man-pages-posix-2017a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
index 10385ec76269..f29b60c9e04b 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
@@ -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 ~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 96cce487b714..177c167d5845 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -2,7 +2,7 @@ DIST man-pages-5.09.tar.xz 1740816 BLAKE2B 5434453dc75058a2aef5d1ca04854abe3d2e3
 DIST man-pages-5.10.tar.xz 1747688 BLAKE2B 39da2ec75b0096db7b5af483e6096259b2439bf9ce3b651af82350b612c234375e3e34d70ff84f401c23189c0aa921f29cf77c0979e40efd3fda0f06378a7c2b SHA512 a23f90136b0bf471f5ae3917ae0e558fec0671cace8ccdd8e244f41f11fefa4ac0df84cf972cc20a1792d7b930db5e2c451881c0937edabf7d5e1ec46c4760ed
 DIST man-pages-5.11.tar.xz 1758092 BLAKE2B 45f1f8751f197f616913fd0084ead3ff7e3b3d11d0c3c70ecd43acbc621927cbb3582ffc7df5101887ec5c733e35a9c5321af9ddaf477e06da391c5af9eb6bc5 SHA512 2f57308fb331e0207ed4764d7753711caf74c0b74eef789612bc1869126be529450c7a2a7011fd6413eebea4ff0fee9a1ba0c94959652a3c747c780e83741450
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.09.ebuild 1615 BLAKE2B aef12c4bd4190869ac6ea8ea15728370fcbd536efd75b1e6e746585909d401cbf62fb14644d34a0c456645d750e59600fbd5c5ecae734b1297466ea701e6ba98 SHA512 e18aa04a42cb95b926c076605d1d594faa999a46fa6f680f65364e91a31f061fd9ff058707adaef7f91c5098d27ea2e4006e87714cf35007b200ac04fb622634
+EBUILD man-pages-5.09.ebuild 1616 BLAKE2B 98433096a314fccabec42c902adb32f25f01d7a2379c7d8fec0ef02ee4d2492ec70927e2554ad2770bdfd5171508dba1539948f8513555bb88f46886c0885c04 SHA512 9ba40e4f932c4d29977591439eb4ecbd15cd8fd8968270b17ef647eda7b14ac93925c9cef196cd6a16d7f810680b60321fa9b63cc1561f0ce778a8f2e4abf923
 EBUILD man-pages-5.10.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
 EBUILD man-pages-5.11.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.09.ebuild b/sys-apps/man-pages/man-pages-5.09.ebuild
index 5095446eeaad..58d24ea28c5d 100644
--- a/sys-apps/man-pages/man-pages-5.09.ebuild
+++ b/sys-apps/man-pages/man-pages-5.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index fb115624aca3..28e7c229cc22 100644
--- a/sys-apps/man2html/Manifest
+++ b/sys-apps/man2html/Manifest
@@ -2,5 +2,5 @@ AUX man-1.6-cross-compile.patch 1743 BLAKE2B c94335e791ee5385f747f473ee6d4293524
 AUX man-1.6f-man2html-compression-2.patch 1725 BLAKE2B 314c3f3eccb90db6419b6069679457f24e3f5dbaa4ec466513f7a553886db1e25572a07ab8e74676df5bcb3d7a991ac58aa876d3abb780d5bdb415c4c8b1bfd3 SHA512 c7dc78f75876882e4f241ededd61ab1dad9292e2aa91d82c09e0e4a81c6a97d6537c8bb4b9154a17cb1db47d8716464b8146ccd487545e3f5c317482ad86e0bb
 AUX man-1.6g-compress.patch 343 BLAKE2B b91a16bd5f0a1a5e7a83cf225659c204b6b3fd8785251171bba6a229eb6e1f721c3ff8b04379d09fa39d44984757342139d053ecde821aa6ebcb9de914765af1 SHA512 eab984c95b75bbf29b65ff38029bbcfa870972fa2cff208da5d4d43c89dd0ceeb32a8faceb43836ced9ff50ee5765d2a5c4f1faf51f5507f0ea97b6ffcfe36c8
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man2html-1.6g.ebuild 1197 BLAKE2B 8c5766e2bae26d223b28b0158cece7c87f92b7e47d10b6cb5ca49f56950c9efb4f9034f6008ccfa3b5f28a3bbfc1946814af670e7096810afa85601f0b2c8b91 SHA512 113387ee660eab79b39c8429e6120222dc6c1f28571a0f98edb252e81b4b21f3d8394493f2ad6cf7f377fb49f29d4be228902a0b3eeff9857633e2a45a7cdd85
+EBUILD man2html-1.6g.ebuild 1197 BLAKE2B 405f8ef56cb725ff48f2bda2e6f78ef46092d697dda6d0a8e1f85ac02cabe48a3801681694245793feb9955378141355fe47cb7d509c9bbec73358816e6aa640 SHA512 cb314bfc7144ddb1fc6d70dcb4e84503bd6504c1ad984be60b2489cccc0a117c9c3c0fdcee0108cee27ad998ecac6d57bfe3a58a3522b36f270089b80c3c424c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index b793e4b0ad53..9027484ba531 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 MY_P="man-${PV}"
 
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index daf5992cc07d..ae7f48f1df3d 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,5 +1,7 @@
 AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97ec51f20541863111de4298b7d6eb0911ded757cadc1ba4deefd500d8a6e335693191e2e65286a585 SHA512 8de0df316d8c926bd99515b4c6eb5bc9d51df3925d3dbad49fe0229193e82f008b09a7343c0d1c2cdc9dd35ad8fd7c82e29ba2bd6a7ab6cf882afe78985e9579
 DIST mcstrans-3.1.tar.gz 44598 BLAKE2B 1755c2f56e3d40fa2ea95c349988fe5dd7b52a9f26bef0f42e42bda8f7b94993b9a47d2e333337f746cbabd9dd571118b0a8e1ffb7c22c604db58fc809bcc033 SHA512 21e9b7a8c9d98cbee61f2eb1c440a51d19ac111a5955c24d365a8784e1aa34fb47a22a108e550c8a4cde4f25ec5afc466126a68e9faedfc796bef83eada93b60
+DIST mcstrans-3.2.tar.gz 44596 BLAKE2B 6738acbcb7c25ec67b8d14cd166c601c7790d28332de8eb4caec32e43390b199aeea51750856aee7c4a2bcfc003af3ac01b00a4247578230d42de3956a88ebb2 SHA512 edc7d4c255056d823c67d69d0c0bb49e8da8cf1b69d94b65e1c2cb5f4944dcc0bd26ed795d76cbe310d9c98b98ca69a49eb7e39ed4cd7df3f6ed8bd1b68da6b1
 EBUILD mcstrans-3.1.ebuild 1076 BLAKE2B 95420d079ff83b4a3e4aa7655932d1ded963f53e01e4cefad6b49613f882458c3ac9ec4a9f0771f314e32d341cad58e5684aa56b669e191b0a353c217c2a3a2c SHA512 4c41ad6cb454f39743f3d822298743abb5cba0846a030e2666e7beae9fb245ec8acc60b32762c1ce66131f188cb0dfbe69f1fc933dabcc62d8ae9d2dc5884e78
-EBUILD mcstrans-9999.ebuild 1078 BLAKE2B 1862d557c4f0cf0269328357aa068ebfae379e920e31eeffbd1341191ba0bb08e780da0367f9123d82b6260b7c92a8541b03e02a7e8962ebdf788f56573b7ed7 SHA512 575049fa3e79bb24ca551182a110832463025a56a29f69b1239fbe02e20eb36a0a467d24ccce9daa2465273391c8d5eb68b538bb9cfd3a28e6966ae8a8d59654
+EBUILD mcstrans-3.2.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed
+EBUILD mcstrans-9999.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/mcstrans/mcstrans-3.2.ebuild b/sys-apps/mcstrans/mcstrans-3.2.ebuild
new file mode 100644
index 000000000000..631d654a0a38
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-3.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DESCRIPTION="SELinux context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/libpcre:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index c848c15f507c..631d654a0a38 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-9999.ebuild
@@ -1,23 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20200710"
-
-MY_P="${P//_/-}"
 IUSE=""
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
+	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="SELinux context translation to human readable names"
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 50e41df30c4a..efaa2db56866 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -12,6 +12,6 @@ AUX memtest86+-5.01-objcopy.patch 654 BLAKE2B 34295b2ebb0edbdf007652009de46fef56
 AUX memtest86+-5.01-reboot-def.patch 326 BLAKE2B a17bcde8563a3f1a8e88c50e981b3d93439a19d0b1186c511826f9836be8efb5bcc2f0031c28887bf0c67ef9e8c9942eca641f923f87c458f070507645007f0a SHA512 2309da17ae7bfd32137b02c0533a9d4f30c95d70dea309a009219457f07f36e0b9192e1ac55485513a23d6364247476886a4720ffe83d33a2c493124a82797a1
 AUX memtest86+-5.01-test-random-cflags.patch 679 BLAKE2B 62ccc56c3f127b3e3213d6bb9605094dd8ba2580d2047873583db8b7a3d48db225eb8b7013319903e92ba9c658569470fb6b3de4f4b7f6b3686efdd5f9c132eb SHA512 a000cf28d69396b0707519bb995f086457f8fa5283299164d969dbf02abea86b566016d71fac7e887c6089bc39c58be9e5c885cfb5f8e7eb815ea1741e097bb6
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
-EBUILD memtest86+-5.01-r4.ebuild 2775 BLAKE2B 6f09d52ff4c119a0b2eb64a122fe1fe594ff8c4422baee314d6d65f8eb8b87f59229f3e67cdec6d67b65bf21f05e5edb0fcdfebbd203356f4f37dab376ca7201 SHA512 f27e4bbdefe648a2b88d2db83acf8cc7c8dd7c23faeca535f6140bfa4316ed0aec89f7ad66294c76bf52bdbd544892bf4f901f945c3c14871c17ac1dfb4f231c
-EBUILD memtest86+-5.01-r5.ebuild 2845 BLAKE2B 696ed3d3af4d3850953a603511a60d135e598eb390668810b374783584c4cad5a58f31c05ba90bcd1e5c95b37e089897a9ff907d402039ea7cb0f3317faf9ac6 SHA512 f6a6bd6dcd95251daa2c831e210642939a3a37f28fbaf8368304d86cf1688a358cc3fd4880e45ad7bb3e8848390416ced4cf578d1d736b30ce967e44ad71d870
+EBUILD memtest86+-5.01-r4.ebuild 2775 BLAKE2B c86df4b5113e11b954c1b14e1e1c655a0d989666cc51edb7925b5b3d33839ba79829e4cb0f5cab33df20211420f15f5bb2f4c7ca02748d7a77185ba6b8675fef SHA512 7bd64f7f420f0bdc7bb7a30640f1d6e521ec4b0c02120e51e1f04678a8402d9c94454b97bfe33e269a63dc312647046b0b1aca4b43cf20a2f72cd95900ede79b
+EBUILD memtest86+-5.01-r5.ebuild 2845 BLAKE2B 9a62f987683ada3af2f0d26ea7de22daff3e02cfe21ee081f137d516edf3abd1cb24215729e89b761e29c0e67c64ca2732d4f4a348878cd60c23abaecb4b5f5f SHA512 8af53f7a64d66c36dc84e864ed0cad1824fec1a373619b0cf7bfe58d3ec5097a322c46e1d48e477204c9ac5c67b69b723df9c2b3e9bddcf0b460de5f4deec251
 MISC metadata.xml 563 BLAKE2B bd4e7ef2022ed705fc3902cd113f20b057b672dd50a9cf9362f56d4ccf1be9bab1fdb45d162cd646deb2acdab6829942da59f6dce0475a2d51c060662a33b9dd SHA512 26d725110c8b6214fce06feae590d1c437b64c9884ee5bc5421b4804b9391d7b928e11a270d84421ffbb5ea7a7b551dd26484565706499bdfbe871aef7ffb61b
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index 08cf34af5417..d10fc874b008 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit mount-boot eutils toolchain-funcs
+inherit mount-boot epatch toolchain-funcs
 
 DESCRIPTION="Memory tester based on memtest86"
 HOMEPAGE="http://www.memtest.org/"
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
index 35c3e1085fa3..28e4fdcc4547 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit mount-boot eutils toolchain-funcs
+inherit mount-boot epatch toolchain-funcs
 
 DESCRIPTION="Memory tester based on memtest86"
 HOMEPAGE="http://www.memtest.org/"
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index abb52efd7694..b67d206125f6 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -4,5 +4,5 @@ AUX memtest86-4.3.7-io-extern-inline.patch 1128 BLAKE2B 9ee86f121772490fa1859568
 AUX memtest86-4.3.7-no-clean.patch 636 BLAKE2B a7488c0f556929607a7d1a94de1f727cc00ac6c673b2b03fbbb5ea45a64accf5028df89ca56f49e9d9e97228a5129b8ed4673b287bff05c59249a5eea48d4ed3 SHA512 7bac031e907a10bf66d260d29ef209362395bce3c1a735abf77bebd9a8662f0ecfc3bd2ed33abbfaeebae77da4868b5c53f0814e82a0ac930b4a01fd25a6e8b1
 AUX memtest86-4.3.7-reboot-def.patch 253 BLAKE2B 8213b6deb590a23316fe560493ebb96b53944f368b5f7040d6988296d3bba432b4f070a44e034cf4b9e03dc502cfd9ae8129a4452c70e3f6a06874e6f09665a6 SHA512 0587d2b4de397813f5a2a95859c7a656b0c760653dd711ffe8bd0d0602a64c4ed340c494fbfe2de6825f89aa21021df6a92c4a9e030b72aedf70f83b483a1160
 DIST memtest86-4.3.7-src.tar.gz 125583 BLAKE2B ef74b599f5a0b3a550854c7aba12afcddd9e8115418d60e50aee2b1d83b5a838a7d747039cbdd542e1cc136dd5426e8e803f305147121d38edac1a3de814918f SHA512 f1cee9085e157b399869222310c65e8094c028565d2b21fe40fd485505b988d20cff49b2c56559181ac114c39089b60c6eacb9aa5d7652df78b3f8e7530cb644
-EBUILD memtest86-4.3.7-r2.ebuild 1871 BLAKE2B 99eec4d7eb37698d37ec8cef376875f6f14f09206885f76467eda2da285b51ec65fcb31fb6526153c6b717c1a9cc77bd246e46af5d95c13f08e893d2471b6a86 SHA512 16fbaeeacd1d0678106f65e60473ce798ab463490de9a5419b25995825a8baaf712cdd074d878c45d536f4fc086a9f59a916ea6e6a02e2d87eed9e0786f5ff87
+EBUILD memtest86-4.3.7-r2.ebuild 1864 BLAKE2B 50cf23c800735946659b0fdf77c104a06feeaf8a0fb68a6b01795c80af081bb390820a299046154d1215a743792619e0136f8fd1a617209051ed2240fd2f1681 SHA512 91bd68a6ceade49b7bc55a65eb362b1182a39f91cd6ae7888aed0bbcffc20ee065d135e112722b0233f7b6f02e574ff46b86ee83dc368bce1c27a909c756054b
 MISC metadata.xml 330 BLAKE2B 6f4b07ab61c2988a16203242719afc8653fa5bc4dbe7a0a0e83c1c8ed51eb743228fcc03213cca774d30a746b3947c88c10e141229b6cfb01b63d4f280f37498 SHA512 09543a0051e47f888e650455b2774012b9b4284a0ae01a4605f673b4548bc3f8bd1af0309c7de5887c5a2bafc6dde828d580c2a8e7c1ac74b93d70c6b6180d6b
diff --git a/sys-apps/memtest86/memtest86-4.3.7-r2.ebuild b/sys-apps/memtest86/memtest86-4.3.7-r2.ebuild
index bf0d326968cd..70ce741c82d1 100644
--- a/sys-apps/memtest86/memtest86-4.3.7-r2.ebuild
+++ b/sys-apps/memtest86/memtest86-4.3.7-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit mount-boot eutils toolchain-funcs
+inherit mount-boot toolchain-funcs
 
 DESCRIPTION="A stand alone memory test for x86 computers"
 HOMEPAGE="https://www.memtest86.com/"
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 1afe508a241c..5e0aafca39f9 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,5 +1,7 @@
 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 1053 BLAKE2B 24377f474f8014b43fd73a61826a2ed129a6c7d6b868b979a6d2a60e7a1f506bd179bbfedfcf3798e7f2c6316af244849828310458e57950b466290a0b678bcb SHA512 599d62a07298c51288c5874ef61c376206686bf6328c25dbc3466423ee6ab5d130d097b37a4f0432e1d97de16a61d85c9b59415d6ee20418417ec47bc216001a
 MISC metadata.xml 245 BLAKE2B 99e9ca57f1b154300ca2be7ca1206ed452a161018fbb46c1c8a46b3387e6267f3cb2832ba0d3dac88ef6b71ca3e931fe20f998ad6839d1fbe724bb42baabcb58 SHA512 2997363b86d62fd687ba842015c5fcfe4b3a0055f226291bd2a797d7dab1df44e4dbab56152e4adf288f27ebebf5978d3b5761452840da554fd025cc493d8210
diff --git a/sys-apps/miller/miller-5.10.2.ebuild b/sys-apps/miller/miller-5.10.2.ebuild
new file mode 100644
index 000000000000..f51e05c8091f
--- /dev/null
+++ b/sys-apps/miller/miller-5.10.2.ebuild
@@ -0,0 +1,48 @@
+# 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=( $(usex doc docs '') )
+
+	default
+
+	doman docs/mlr.1
+}
diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest
index 2fe584c3b903..69d02212572c 100644
--- a/sys-apps/minijail/Manifest
+++ b/sys-apps/minijail/Manifest
@@ -3,5 +3,5 @@ AUX minijail-9-makefile.patch 1589 BLAKE2B d2b253f769e79c179fce51b858ce9b7b70dec
 DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2
 DIST minijail-9.tar.gz 118700 BLAKE2B 7d2959d5dd71bd9d8d8a0b7c278dab66771740f73acec20f19502da33990ca858796b4734676ffedc404cef72eee8c419c669ba7092ac00cbafa2e410564aba2 SHA512 6d05fbe8615f410e8314045d11f7a3638f563f3311f7d52b5a0c47cad8692d11b0a7db4fbb45141b56453a9beb0de7683d58e5298f0a27029aa017539bb48717
 EBUILD minijail-12.ebuild 1797 BLAKE2B d28cef527341f960f5d58ea0578ac7a10fe000413bf5e12739ddb6c0b107c8dabb287c282e20798352471ca0e121d0cb7c42918ca70201e474997a229ce7980d SHA512 eb3f04b4b5a586306e6364887e4d728a1dc661db11b639d1c9134a0286f42322d2769c921bdaa04a3fbf11bb0d1ede780cce73ac6e48af571331bd01c31ae11a
-EBUILD minijail-9.ebuild 1691 BLAKE2B 09b11a3b5c8a898c8d4b76daaa79a70cd83fc64860349df50e03f4460170b772d94ac8c7f0e4cc5f9a4fbe1f4bb9f9be9e21e83a61e7ce94ca1a2626e87dc16d SHA512 c6a0292b154fe643628b82858ccd5e6e3ebb1d82fa3744d2463286d78b15fd249e678d941031c404d7158286dab3c141d6775c4018fb87835358e0c612a7eddb
+EBUILD minijail-9.ebuild 1714 BLAKE2B 26d4cfafe924ab1616065eda666a69915f52c337aba699e100d5c18c7e9e711c4f79ea74725f0570dcb9dd71d8c32338a7aa6bde2a5173f426c2cb4e87ed4f14 SHA512 25592129d6483b2713021994a43d25b8eb103bd80fd40e844ed27d7040f16733429f36072048235a1c5ed86dc9150d5db32d7400c158cdb8d30333b27a799c33
 MISC metadata.xml 315 BLAKE2B c2a00fa1d9a8400721a08edfc86a0c416522345a305e810c5781d3edb1415840141ba46dffcc8056be65ddc0902d8afc5a7039c241ed3e8e0141d82b2bfb9f9a SHA512 fe148de8a20f5fd0cf076e83d5a870063ffa0e23ee94c05f27681a8915c9e4f444af1fb0f4d9753e5e68a003991335fb1cf10c538ed69ba8b08ea1c0b64155a0
diff --git a/sys-apps/minijail/minijail-9.ebuild b/sys-apps/minijail/minijail-9.ebuild
index a11b63da62ab..bca6a4432644 100644
--- a/sys-apps/minijail/minijail-9.ebuild
+++ b/sys-apps/minijail/minijail-9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,8 +40,8 @@ src_configure() {
 	export LIBDIR="/usr/$(get_libdir)"
 	export USE_seccomp="$(usex seccomp)"
 	export USE_SYSTEM_GTEST=yes
-	export GTEST_CXXFLAGS="$(pkg-config --cflags gtest_main)"
-	export GTEST_LIBS="$(pkg-config --libs gtest_main)"
+	export GTEST_CXXFLAGS="$($(tc-getPKG_CONFIG) --cflags gtest_main)"
+	export GTEST_LIBS="$($(tc-getPKG_CONFIG) --libs gtest_main)"
 }
 
 src_compile() {
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index cc9356b221e8..6ee30a702c38 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -4,6 +4,6 @@ AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a0
 AUX updatedb.service 117 BLAKE2B 9e85da639464d8b9655ed86a535d19b38329118443c2cf1c0aa76a4f2d3c0dfc412a0a3a6c61ce2f31c659f2fcfba60773aa69389b6d05f66f686bbd57eb9ac2 SHA512 1d7bb023ac05f4054f35168a304e27dae53169b8e7fee325be7bb2fb99d1d71c23d251ba3cce6afce450dfa999cc4c7ab6d0d1454855ee6b6f821572bfbadc52
 AUX updatedb.timer 140 BLAKE2B e5c250a987428f3423eaeb2876d11fe82ba390082d43434cf6bf287e275f1960dbc81d818a994e0af428c0a13c98fa125f0f6cec261ce9cc2da8990da28f7dcb SHA512 5dce1b0096daf73753a3a6fb24f03a77ccab952363a1e6aee6fa1cdb067371b3ace7c909e5d0beee40a8f8ed9bb3c20d5fc47f2b8df254a69cee5db552d452ed
 DIST mlocate-0.26.tar.xz 359204 BLAKE2B 48ff448b0316169b35a3c421970b280632c4a056b7566d8fda7a2c3284ef46d3abaaa96e2411d9e408cc39466577a5bd3f8fde3376178e8b7bcc9e4e01997bd7 SHA512 b1207047e30a551cba39e70812439b554def567ebe9b8b81fed6f26435bb575beafe4875a21cd72876eadd85da4e7bfc942eb28b17c430b537c351690364837f
-EBUILD mlocate-0.26-r2.ebuild 1563 BLAKE2B b6a2e63d27a404c8f617813989c38d6c971a36d129e2fe358bb65e04c56fd9a580305f31b1b5574103a70f6c0a66054f1f422cd9fb7350c8278c4fcad5d6641e SHA512 cf4815bd11127a1e12c5c77e9b160fc572f82fa77c1d63d93d18e08f544c8966d53c7b835270b3d0257565a37faf71702664e47aff1741fb6783ee34ac3dce98
-EBUILD mlocate-0.26-r3.ebuild 1593 BLAKE2B f7d6bb9e94f4abdb723152da0d473706cfe01a0090d9af930902bde4535b0ed4ac888558a85fedaa7d8019febb6f37cd8b616cf7564371431c0a7dc6392f9457 SHA512 9e94887eb8d7123f0babdd8ce7873c4cf829f6c6379b7ee1d702f842ee5d5f2f238b5f88bc1fcda22bade837f05d5d8ad286365bf7e0228739881216a51ff3d3
+EBUILD mlocate-0.26-r2.ebuild 1556 BLAKE2B 01c3dd931c47d995db74d7653b142a2a6fd00aa6679f6d4ae9e4a829d092de8d182c26b19fae5c924d732fdaa2400a7647b29e37a1210067f87e540143f3d271 SHA512 cc09d6a59368162ba5841a482c9968f221d2b82fe15aa79dee9801608796937066b08b31a1a023e3faeef31abbca553f4fbf5ec5571825123084ff272c0441c3
+EBUILD mlocate-0.26-r3.ebuild 1579 BLAKE2B 835743f0c496ca4ab74fff54fa681bda80fbdffc345bc895de1386a47f8f46f5b04df10c490f83a48494eb914078cfa51200474d37b8b596990e25d314ecea69 SHA512 1071414fa9c02e84fa6e548db94ede79f412ba0b655a53ba49680973dca4fecfba04e8228fb972e2377f924c6b8e2401323ed0e9336227f5f216aaa3759fdeb1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/mlocate/mlocate-0.26-r2.ebuild b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
index 904accc0a057..adfc2fe43aba 100644
--- a/sys-apps/mlocate/mlocate-0.26-r2.ebuild
+++ b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils user toolchain-funcs
+inherit user toolchain-funcs
 
 DESCRIPTION="Merging locate is an utility to index and quickly search for files"
 HOMEPAGE="https://pagure.io/mlocate"
diff --git a/sys-apps/mlocate/mlocate-0.26-r3.ebuild b/sys-apps/mlocate/mlocate-0.26-r3.ebuild
index cc1d33e65831..d5874db84b71 100644
--- a/sys-apps/mlocate/mlocate-0.26-r3.ebuild
+++ b/sys-apps/mlocate/mlocate-0.26-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils systemd toolchain-funcs
+inherit systemd toolchain-funcs
 
 DESCRIPTION="Merging locate is an utility to index and quickly search for files"
 HOMEPAGE="https://pagure.io/mlocate"
@@ -10,7 +10,7 @@ SRC_URI="http://releases.pagure.org/mlocate/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls selinux"
 
 BDEPEND="
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index c78233c11d38..9120796ce42a 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -1,7 +1,4 @@
 AUX most-5.0.0a-donot-hardcode-path.patch 969 BLAKE2B 1089149fc01a3081760f422b73d4a691e3078f13df1a7045cf0f94d6991c762e4004088e9a0b89a9b6b39ec70782f1b86edb13c714ef2b2b33bd6ccd9f18435d SHA512 6da3424b5e9763bd8f89998ffe019230cc8e9c7fc9722235cc13830d50647f590f6a934ae025a063fe8fc1e8bdd2b4fc067fbc1569c7a0ebfa220b868b999271
-AUX most-5.0.0a-no-explicit-termcap.patch 6172 BLAKE2B af569f2fc46a341a57823bb6afc57dbaff020547c840acd8e918550e939d9d3ddfa8b4f16d14fc19b6950997fe58273b720ebfbcfde445a6fb994a3bdac064ee SHA512 48a87d66bda3b1464a214614c5ea23a5ba5a820da0da497de4db9ca4205288d7f63f460b08713047a4a14e8911bbb0b6a92ff2521cbec1acdf4e37e86a2c1346
-DIST most-5.0.0a.tar.bz2 131130 BLAKE2B f516b7cd1b37ca274dc8472a258390cde437f44ac320a257ab94cb97e918d574f61e961457809941a3eefa761a62e8f45bd60392e5b95dc60cedc6c1d9f56baf SHA512 0c101777250a15ed9cbe0bfbaa17d0ac5ef973a7e0730d096bd931ba578dbcbd4f244305c99a50bc8fd8aa1937b621a97a6452b3821fee7d72f33a02da278e5d
 DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2
-EBUILD most-5.0.0a-r1.ebuild 879 BLAKE2B 4fe01614ceddbdbe1ab9ef427ade3817621c64e48a9b39e8ba6269e8512e9dbb58287a5f645ae468135a106bc609a03f0e483e6fbfaea0744cc7150421fb9846 SHA512 b504994a06d07fed46481f631bd6e6a81d6fc38d9157a426b8df0845abe04047e097af6416c85769bf5c4751593f0aa0a8056748277f02447c3496b7283c084a
-EBUILD most-5.1.0.ebuild 870 BLAKE2B 74c3ded940f1e5ae127d87bffdf1520d091ec6f7575284f5e2dac2702b75e0bb97e3e933d8ba4d4cfed9a64270881fa9ac0434927ba667b4f86ad6bacc322602 SHA512 4030f523b09d9e45a37a4b1e57572a68260c10e6a40b95f38e77bbe389019f85f4146334bb239510a4ab0040c3f14e87bfc629e4ee2e3cf99c35343583520378
+EBUILD most-5.1.0.ebuild 865 BLAKE2B 3685189fff6bfe88faf0535665e6cf106616ec63d205d106ee534c7da82dece2cb6103009112ee656cbf2c86d7d8805c01e02618db91df3a35940f0fb180f9a5 SHA512 f2c4bb745c7149bb72512df1361a7caec50f803c5e65efb21b9bd91dc63be00f2c57bd6737b0e59709e7a27802ad723d7195792e0e5dfc81bb4e56580b6c46e2
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/sys-apps/most/files/most-5.0.0a-no-explicit-termcap.patch b/sys-apps/most/files/most-5.0.0a-no-explicit-termcap.patch
deleted file mode 100644
index f858f56f7bc1..000000000000
--- a/sys-apps/most/files/most-5.0.0a-no-explicit-termcap.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-Author: Benda Xu <heroxbd@gentoo.org>
-Date: 2014-12-08
-Forwarded: John E. Davis <jed@jedsoft.org>
-
-"most" completely replies on slang to access terminfo/termcap, by
-SLtt_get_terminfo() and friends.
-
-Nothing should be considered by most but to find slang. Therefore it
-should not link against libtermcap in any case.
-
-	* configure.ac: remove JD_TERMCAP
-	* configure: regenerate with autoconf-2.61
-	* src/Makefile.in: remove libtermcap linking
-
-Index: most-5.0.0a/autoconf/configure.ac
-===================================================================
---- most-5.0.0a.orig/autoconf/configure.ac
-+++ most-5.0.0a/autoconf/configure.ac
-@@ -62,7 +62,6 @@ getpgrp tcgetpgrp \
- )
- 
- JD_SET_OBJ_SRC_DIR
--JD_TERMCAP
- JD_WITH_LIBRARY(slang)
- JD_GCC_WARNINGS
- JD_GET_MODULES(src/modules.lis)
-Index: most-5.0.0a/configure
-===================================================================
---- most-5.0.0a.orig/configure
-+++ most-5.0.0a/configure
-@@ -700,8 +700,6 @@ X_EXTRA_LIBS
- SRCDIR
- OBJDIR
- ELFDIR
--TERMCAP
--MISC_TERMINFO_DIRS
- SLANG_LIB
- SLANG_INC
- PROGRAM_OFILES
-@@ -9064,13 +9062,11 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <sys/types.h> /* for off_t */
--     #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
--     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-   ;
-   return 0;
- }
-@@ -9110,13 +9106,11 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #define _LARGEFILE_SOURCE 1
--#include <sys/types.h> /* for off_t */
--     #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
--     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-   ;
-   return 0;
- }
-@@ -9777,42 +9771,6 @@ OBJDIR=$SRCDIR/"$ARCH"objs
- ELFDIR=$SRCDIR/elf"$ARCH"objs
- 
- 
--{ echo "$as_me:$LINENO: checking for Terminfo" >&5
--echo $ECHO_N "checking for Terminfo... $ECHO_C" >&6; }
--MISC_TERMINFO_DIRS="$FINKPREFIX/share/terminfo"
--if test ! -d $MISC_TERMINFO_DIRS
--then
--   MISC_TERMINFO_DIRS=""
--fi
--
--JD_Terminfo_Dirs="/usr/lib/terminfo \
--                 /usr/share/terminfo \
--                 /usr/share/lib/terminfo \
--		 /usr/local/lib/terminfo \
--		 $MISC_TERMINFO_DIRS"
--
--TERMCAP=-ltermcap
--
--for terminfo_dir in $JD_Terminfo_Dirs
--do
--   if test -d $terminfo_dir
--   then
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--      TERMCAP=""
--      break
--   fi
--done
--if test "$TERMCAP"; then
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--  cat >>confdefs.h <<\_ACEOF
--#define USE_TERMCAP 1
--_ACEOF
--
--fi
--
--
-   if test "X$jd_prefix" = "X"
-   then
-     jd_prefix=$ac_default_prefix
-@@ -10858,8 +10816,6 @@ X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
- SRCDIR!$SRCDIR$ac_delim
- OBJDIR!$OBJDIR$ac_delim
- ELFDIR!$ELFDIR$ac_delim
--TERMCAP!$TERMCAP$ac_delim
--MISC_TERMINFO_DIRS!$MISC_TERMINFO_DIRS$ac_delim
- SLANG_LIB!$SLANG_LIB$ac_delim
- SLANG_INC!$SLANG_INC$ac_delim
- PROGRAM_OFILES!$PROGRAM_OFILES$ac_delim
-@@ -10868,9 +10824,10 @@ PROGRAM_HFILES!$PROGRAM_HFILES$ac_delim
- PROGRAM_OBJECTS!$PROGRAM_OBJECTS$ac_delim
- PROGRAM_ELFOBJECTS!$PROGRAM_ELFOBJECTS$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -10906,50 +10863,6 @@ CEOF$ac_eof
- _ACEOF
- 
- 
--ac_delim='%!_!# '
--for ac_last_try in false false false false false :; do
--  cat >conf$$subs.sed <<_ACEOF
--LTLIBOBJS!$LTLIBOBJS$ac_delim
--_ACEOF
--
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
--    break
--  elif $ac_last_try; then
--    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
--   { (exit 1); exit 1; }; }
--  else
--    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
--  fi
--done
--
--ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
--if test -n "$ac_eof"; then
--  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
--  ac_eof=`expr $ac_eof + 1`
--fi
--
--cat >>$CONFIG_STATUS <<_ACEOF
--cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
--_ACEOF
--sed '
--s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
--s/^/s,@/; s/!/@,|#_!!_#|/
--:n
--t n
--s/'"$ac_delim"'$/,g/; t
--s/$/\\/; p
--N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
--' >>$CONFIG_STATUS <conf$$subs.sed
--rm -f conf$$subs.sed
--cat >>$CONFIG_STATUS <<_ACEOF
--:end
--s/|#_!!_#|//g
--CEOF$ac_eof
--_ACEOF
--
--
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
-@@ -11193,7 +11106,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
- s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
- s&@INSTALL@&$ac_INSTALL&;t t
- $ac_datarootdir_hack
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-Index: most-5.0.0a/src/Makefile.in
-===================================================================
---- most-5.0.0a.orig/src/Makefile.in
-+++ most-5.0.0a/src/Makefile.in
-@@ -3,7 +3,6 @@ CFLAGS		= @CFLAGS@ @SLANG_DLL_CFLAGS@
- LDFLAGS		= @LDFLAGS@
- SLANG_INC	= @SLANG_INC@
- SLANG_LIB	= @SLANG_LIB@ -lslang
--MISCLIBS	= @TERMCAP@
- RPATH		= @RPATH@
- 
- #-----------------------------------------------------------------------------
-@@ -44,7 +43,7 @@ EXEC = most
- CONFIG_H = config.h
- INCS = $(SLANG_INC)
- ALL_CFLAGS = $(CFLAGS) -Dunix $(INCS)
--EXECLIBS = $(RPATH) $(SLANG_LIB) $(MISCLIBS) -lm
-+EXECLIBS = $(RPATH) $(SLANG_LIB) -lm
- #
- most_O_DEP = $(SRCDIR)/version.h
- UPDATE_VERSION_SCRIPT = $(HOME)/bin/update_changes_version
diff --git a/sys-apps/most/most-5.0.0a-r1.ebuild b/sys-apps/most/most-5.0.0a-r1.ebuild
deleted file mode 100644
index f57fbba42dd5..000000000000
--- a/sys-apps/most/most-5.0.0a-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Paging program that displays, one windowful at a time, the contents of a file"
-HOMEPAGE="ftp://space.mit.edu/pub/davis/most"
-SRC_URI="ftp://space.mit.edu/pub/davis/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-RDEPEND=">=sys-libs/slang-2.1.3"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.0a-no-explicit-termcap.patch
-	epatch "${FILESDIR}"/${PN}-5.0.0a-donot-hardcode-path.patch
-	sed -i -e 's:$(INSTALL) -s:$(INSTALL):' src/Makefile.in || die
-	export MAKEOPTS+=" -j1"
-}
-
-src_configure() {
-	unset ARCH
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" \
-		install
-}
diff --git a/sys-apps/most/most-5.1.0.ebuild b/sys-apps/most/most-5.1.0.ebuild
index 9268240d6aeb..18b707ef38fb 100644
--- a/sys-apps/most/most-5.1.0.ebuild
+++ b/sys-apps/most/most-5.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND=">=sys-libs/slang-2.1.3"
diff --git a/sys-apps/mount-gtk/Manifest b/sys-apps/mount-gtk/Manifest
index 836d2b545eb0..58880c1b1d0d 100644
--- a/sys-apps/mount-gtk/Manifest
+++ b/sys-apps/mount-gtk/Manifest
@@ -1,4 +1,4 @@
 AUX mount-gtk-1.4.2-c++11.patch 1125 BLAKE2B 25871ab418def7d5723455afbf481be81f022978e563e904595de506f897349659b72a4ce5614e8ecccc5edfa9a71c988da71b5b2bc8650493fcb53795c9faeb SHA512 8ecbbec87ab65d1b69b3a64301c10168589a30a0b1487f841388c269ea705b3b04662b35d196daa8f17e9c708670597a2fe6c10f6dceab3d3cce62fa24318501
 DIST mount-gtk-1.4.5.1.tar.gz 239116 BLAKE2B 94ca6b0b4b9aec8989169c7a52e3e38f65c490e88e07531eb398c06be8c61b4d5ecbcaddabb2286ce7353294991a35e0f3b2d94a7b255817651e6570a6c7be1b SHA512 3cd69b872c278db80b6f91a8f66054c56be964d23f1a4e5a435343de5178c5a64440ba871e6e4b6b76b55bb01e156e8cacc8e4e3c7cfdb4bc55f95680d6dc511
 EBUILD mount-gtk-1.4.5.1.ebuild 789 BLAKE2B ef94101f5aab2dacb2faf251fb0c2aecc77e796256caa22ada2cd86562da19c07e83eae0d451522dec931feca862fcde965445e069f0f873fd5d9423908a564e SHA512 0db26cd5bc2fea834ba6909105830d354d072d4fd322cc4f1fff1d6c2ac3979ac40326ca22d444025d7e4710ad78aa2389296b982546b49bf6cfb851afeb02ac
-MISC metadata.xml 355 BLAKE2B 2057650f632b2f484a75473cf9bb2054392e41704767bd7d33c3182230e4e386b4d99cc1b654b2e3b5b5c0d06cc574cf9f097ae78bd981334abbbcd4eece2d82 SHA512 a2160b97106975c45262beb68b1c6e1412edf2df400868ece4a93c1318a2e24b0a178cca0b0a4ac7c766e0a3c1e98b1a812d0fe079ec1412a05aaa1eb5f8d8e3
+MISC metadata.xml 245 BLAKE2B 99ce6c5debed7306c9d73ead614217d127c8cb7e05faff9fbbe14fdc0804ef42fd28288074b5a1655b74e5143d6992a3489cf79cc429bf23b56de2a5915a3e27 SHA512 5c77c0f76c7c8ab3d0db25b18c0710fe4f9238ff456ac9bd4f60f6dd5bc3db256a66803ecdb89119c392843f8be6fcd11ce6a90e03336678f3e06793b3636821
diff --git a/sys-apps/mount-gtk/metadata.xml b/sys-apps/mount-gtk/metadata.xml
index d5655724c0ba..4ff82cc8913b 100644
--- a/sys-apps/mount-gtk/metadata.xml
+++ b/sys-apps/mount-gtk/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
-	<upstream>
+	<!-- maintainer-needed -->	<upstream>
 		<remote-id type="sourceforge">mount-gtk</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/msr-tools/Manifest b/sys-apps/msr-tools/Manifest
index dee6af8d0e66..c75cfa2ebd35 100644
--- a/sys-apps/msr-tools/Manifest
+++ b/sys-apps/msr-tools/Manifest
@@ -1,3 +1,3 @@
 DIST msr-tools-1.3.zip 7693 BLAKE2B 9ba92a6b3d71bf89e1b4a62226fa1eb2c53a588900fe52f1fa3a84443a471aab547e46e73826874c251ec32dcbb40ef9b787eef80fd93b65f3bb2c5d0312e310 SHA512 9605eed0b6211d0ecbe48a14d66b5d61965770f249c5c1b15416d4f2e9a37a68ecfde171077c3acc74bb6b951749bcff186acbb4d6d8a3051695d2d97c0e332b
-EBUILD msr-tools-1.3.ebuild 617 BLAKE2B f52b69d0380f0d8c77ebb339e4c40509070188f439dd5725e82116013311f90ed6a0d66da927af5d270bb3ca8888122c0f9883d488737bb1eb63a7659ec3b22f SHA512 03f27fe945f5d60c65c5fcf500b961acfca808ead9798ec2cb51e7e7482ed495adc443d2f6bbc615df2675362ef05ffca2589c9ce888e777abfabb395a785fb7
+EBUILD msr-tools-1.3.ebuild 607 BLAKE2B e17fb11b64318693060f25b4747bc0771dfded5eecb0f2241e94dac6b837f387907290fc70fab7d342a008f8388e8a55d234d32217aec2cfa0fc7d4ddaa748bb SHA512 38bcd61294017e77be18e1bd4dc3bf9f113f44e6b112df1b1bfa51d208f1a09d395049bcac66c522d919cec1897ea4017316450b04f670a7025871f040712340
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/sys-apps/msr-tools/msr-tools-1.3.ebuild b/sys-apps/msr-tools/msr-tools-1.3.ebuild
index 424b21ea6e63..8ed18a3caf39 100644
--- a/sys-apps/msr-tools/msr-tools-1.3.ebuild
+++ b/sys-apps/msr-tools/msr-tools-1.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 CONFIG_CHECK="~X86_MSR"
-inherit eutils linux-info toolchain-funcs
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="Utilities allowing the read and write of CPU model-specific registers (MSR)"
 HOMEPAGE="https://01.org/msr-tools"
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index c74ecbf3256b..d03be1d13f2e 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,6 +1,6 @@
 DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb
 DIST net-tools-2.10.tar.xz 229616 BLAKE2B 0d11a5c12f6447282c65ee74428c1b9f6da9fd6d26ca558813d002fac8a4f03fd25a26231a5f4e45f88d821e9a8281e3be1fea4a832bd09afbc2239634a1c25d SHA512 aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf
-EBUILD net-tools-1.60_p20180626073013.ebuild 2450 BLAKE2B bf0d8623306be59d53c0b475e053a2a2905de64c4488b8940080fda7c667d46bc2309daa450b654fbe719b2df1af8096101039b4658da84ff08494923f5ec71b SHA512 5b8917dd63904c5c9a66e8cd856a551b6dcc8e25a662ddd693dd12c2f87cdc4d02d9b20bb684a7b0237edd85873475718533df9de6f4191a308e9deb4a7cddd9
+EBUILD net-tools-1.60_p20180626073013.ebuild 2451 BLAKE2B e97d4e7f39cf1a9d8ea294cc560eced78beddb5d43ada2cc1f9649f8bafa0f036764fd04cf9c3da0c601466c211912ee747b03d941b433965084228723f788e8 SHA512 3cd707e4b0be080097576cf9b83ff81116e051d7a7d2c7f00fbbbc5b4c924740920e6924e4c40c2554435b4fbd37621f2cf1eccd0eddd16df5eef9ed9bda4006
 EBUILD net-tools-2.10.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e
 EBUILD net-tools-9999.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e
 MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037
diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
index b6f687b457f3..bc8fbeabb0ba 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/netloc/Manifest b/sys-apps/netloc/Manifest
deleted file mode 100644
index 96d5ff4be1db..000000000000
--- a/sys-apps/netloc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST netloc-0.5.tar.gz 474646 BLAKE2B 8d6524b6006e2a9b284092288e2bc97064703602362be469990ac396bc9a08840260db4d371748c65cfb97c294bae3284bfe8ac579f529d93125889d1afc6d17 SHA512 88600c59302cd8e5ed024373a57b27e54b288288091ed0ab3852bee59c255a8b520d38c59d64f6c1eafe307f0d5e61d64c799a92e9695c42ecc1e33dcc2df6ba
-EBUILD netloc-0.5.ebuild 587 BLAKE2B 9a956165f649ea5ab675578cd7f7f1b6731ee982bc90e24205e46706aaba3bbbf9633b54d84204f3b6f4d03086d5e1ee1c547986f6369205fec435201bf4a204 SHA512 9f6ccee57b32878af7797e7a167d3fc316cfcc053bf6c7079d62634c4112c92a4d13f248aedda35e09ebf0898eb9414a2484033a74b0df9b88c3603edbed5eb6
-MISC metadata.xml 804 BLAKE2B 05c9a601184026f950fe8e830a1f7a146376f7900bba2501a0a6a5d06b55e5f749fb7f96f6a7904dd18b062bb0f87f93a5baaaac663b7f796484e9cdfba29d54 SHA512 137cc64ca02b01abb060c0a5b14b3d34d0c225ef1bf5af8eef5304df129a621aa8d8644ae2b324610d7405961f17f10fae6d15d50d3ddb6836ca71f1baacc5ad
diff --git a/sys-apps/netloc/metadata.xml b/sys-apps/netloc/metadata.xml
deleted file mode 100644
index 07151826f89f..000000000000
--- a/sys-apps/netloc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cluster@gentoo.org</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-<longdescription> 
-	The Portable Network Locality (netloc) software package provides network topology discovery tools, and an abstract representation of those networks topologies for a range of network types and configurations. It is provided as a companion to the Portable Hardware Locality (hwloc) package. These two software packages work together to provide a comprehensive view of the HPC system topology, spanning from the processor cores in one server to the cores in another – including the complex network(s) in between.
-</longdescription>
-</pkgmetadata>
diff --git a/sys-apps/netloc/netloc-0.5.ebuild b/sys-apps/netloc/netloc-0.5.ebuild
deleted file mode 100644
index 1f68e7c5f381..000000000000
--- a/sys-apps/netloc/netloc-0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib versionator
-
-MY_PV=v$(get_version_component_range 1-2)
-
-DESCRIPTION="Portable Network Locality (netloc)"
-HOMEPAGE="https://www.open-mpi.org/projects/netloc/"
-SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-libs/jansson
-	<sys-apps/hwloc-2.0"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--with-jansson="${EPREFIX}/usr" \
-		--with-hwloc="${EPREFIX}/usr"
-}
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index 0e83085342d0..bd5c06538350 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -4,6 +4,6 @@ AUX netplug-1.2.9.2-downandout.patch 340 BLAKE2B b4089082011cfabc2f91b6480332e2a
 AUX netplug-1.2.9.2-multi-waitpid-sigchld.patch 1865 BLAKE2B c70d7fbf21c27bdaf7043446f7808f8d078e2fbf914f2ee5119ac25628b597e0e0c5e2a35108eff008155757716955b1652163a20dccc6f5709a8c31ebabbcf8 SHA512 d3be3f90e1f676e68e14e54491c832bdd739b44a79290f2c134d8f579e1de03c2c0d6af065a1d255a55247a8bc18e74c713514e549163bb9804d7e2dc124ad64
 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 1377 BLAKE2B 1ae7cc9e0b60712758d738334291d77c70f3f80da431767cea67b1a679aba91a73359f131b7be0f110fdd8062a103716e970026a83c40f2980d9752107dd73c1 SHA512 33cc9f8c2eff68ef1ea16873db91aa7116aa2fbecd540a100f5db38bcd3421e242e0f5b5272e386d5a66ad29f0b90ce9af4f41c4e548aa171b35e9ac0526183f
+EBUILD netplug-1.2.9.2-r2.ebuild 1367 BLAKE2B 623141474c25647e63dbb7353f4e98c8a46046ce0f3731d7561d2020d09f23ea5de1007e437b3395feb13582b7f39921bd1df2c311eed51c1eccff4dbdbc71d1 SHA512 fe7bb9d19ae3e4f649b50ecda9a7669a7e130c4b4136037441760098c77de5df485ea7f3173659f3d722c7b8a5904862d2ba48f13c135be930bdd45af3ae887b
 EBUILD netplug-1.2.9.2-r3.ebuild 1482 BLAKE2B e8824dcc19b0bcf8ea470ad12f9397bc0daed15a2dc290496e05be3a6ce3b25475f1b6a085dc1fb6d7e0610412aa7bd01e41a1559f31a103d3961d92fc8560a3 SHA512 88cada59afc0e373415eb14955141967ebe541bda2f1669354e73cb5018fbca88afb2938be6bf3919050f0878e70c37fdf31d2624c14b6690803fa058d429da0
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/sys-apps/netplug/netplug-1.2.9.2-r2.ebuild b/sys-apps/netplug/netplug-1.2.9.2-r2.ebuild
index 2ff6e599ac24..a3713b1e7b79 100644
--- a/sys-apps/netplug/netplug-1.2.9.2-r2.ebuild
+++ b/sys-apps/netplug/netplug-1.2.9.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
 HOMEPAGE="https://www.red-bean.com/~bos/"
diff --git a/sys-apps/newrelic-sysmond/Manifest b/sys-apps/newrelic-sysmond/Manifest
deleted file mode 100644
index 1e1a2e85ba8a..000000000000
--- a/sys-apps/newrelic-sysmond/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX newrelic-sysmond.rc 501 BLAKE2B 5b7cec04e02b2fbccc0bb9252f84b94785835d6fe5a0c67c629eec40cab124346904208d7799d048f13912f976fa49b9a6a1ac8403f6252507a34d147c6d4c04 SHA512 89096078085eb637b868c67618d5d07e3eb03c4eb2bcd9a48d07f23c72181e7988e3e28d817de30235392c07c0e46383e6695e4b696b3e3c8520b384d57457de
-DIST newrelic-sysmond-1.1.2.124-linux.tar.gz 2177939 BLAKE2B 9b66375e47ab651d68dc28d2a77424c05f97945513c95c1399f308f1b82b9759a0ba2d78bb47879d51fdd32c431afb45e6cdd89a280bef436eefcf9e89d74910 SHA512 beda4b9c3fc089a9cd836790a074f886a65980ee7b471d9e5fb54f56f369ef69172f00661962ae57482f2bffbc84bb27f9484dc01ca7b6a3b5d9a4ad7cf8c4b6
-EBUILD newrelic-sysmond-1.1.2.124-r1.ebuild 1276 BLAKE2B 6236fa49d10370fdda8a65bea6b856610f2e611853fd3ba48be84dd04b82c076fe311a61ee4effd03b0ee3f00a1a64f345308b8201a31d92847ba292656774a4 SHA512 ee13cfcf629f44d6ec6a8384b824f3969c1035f0d72f8df45b1ded1a9a14dfaa883d3e4daa54b0638abd5e3cd18586e3bf874304f4af26e3154c39cdb0d3b1fe
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/sys-apps/newrelic-sysmond/files/newrelic-sysmond.rc b/sys-apps/newrelic-sysmond/files/newrelic-sysmond.rc
deleted file mode 100644
index 93524da5c95d..000000000000
--- a/sys-apps/newrelic-sysmond/files/newrelic-sysmond.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting NewRelic System Monitor"
-	start-stop-daemon --start \
-		--user newrelic \
-		--exec /usr/sbin/nrsysmond -- \
-		-c /etc/newrelic/nrsysmond.cfg \
-		-p /var/run/newrelic/nrsysmond.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping NewRelic System Monitor"
-	start-stop-daemon --stop --pidfile /var/run/newrelic/nrsysmond.pid
-	eend $?
-}
diff --git a/sys-apps/newrelic-sysmond/metadata.xml b/sys-apps/newrelic-sysmond/metadata.xml
deleted file mode 100644
index 1b2becffa26c..000000000000
--- a/sys-apps/newrelic-sysmond/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild b/sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild
deleted file mode 100644
index 6f423204612f..000000000000
--- a/sys-apps/newrelic-sysmond/newrelic-sysmond-1.1.2.124-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="NewRelic System Monitor"
-HOMEPAGE="https://www.newrelic.com/"
-SRC_URI="http://download.newrelic.com/server_monitor/archive/${PV}/${P}-linux.tar.gz"
-
-LICENSE="newrelic Apache-2.0 MIT ISC openssl GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-S="${WORKDIR}/${P}-linux"
-
-pkg_setup() {
-	enewgroup newrelic
-	enewuser newrelic -1 -1 -1 newrelic
-}
-
-src_install() {
-	if [[ "${ARCH}" == "amd64" ]]; then
-		NR_ARCH="x64"
-	elif [[ "${ARCH}" == "x86" ]]; then
-		NR_ARCH="x86"
-	else
-		die "Unsupported architecture (${ARCH})"
-	fi
-
-	dosbin "scripts/nrsysmond-config"
-	newsbin "daemon/nrsysmond.${NR_ARCH}" "nrsysmond"
-	newinitd "${FILESDIR}/newrelic-sysmond.rc" "newrelic-sysmond"
-
-	keepdir "/etc/newrelic"
-	insinto "/etc/newrelic"
-	doins nrsysmond.cfg
-
-	keepdir "/var/run/newrelic"
-	fowners newrelic.newrelic "/var/run/newrelic"
-	fperms 0775 "/var/run/newrelic"
-
-	keepdir "/var/log/newrelic"
-	fowners newrelic.newrelic "/var/log/newrelic"
-	fperms 0775 "/var/log/newrelic"
-
-	dodoc INSTALL.txt LICENSE.txt
-}
-
-pkg_postinst() {
-	elog "Remember to set your license key via:"
-	elog "$ nrsysmond-config --set license_key=\$YOUR_KEY"
-}
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index b70b5ae6507b..ed59c5aecd1f 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -2,5 +2,5 @@ AUX flags.patch 1057 BLAKE2B 4b601dff49cfe1d82cc32b2fbb0c32922e9f049e010d1403b89
 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
 DIST opal-utils-6.7.tar.gz 5320182 BLAKE2B e2fa86a7d5d96afda8f8266875687fb3c2e61ca2932ea5585921b2e5cffe30cb3554d85d078448cda032cbc0438d188ea40b5aad6e7f4c923e77fa4e42e6f364 SHA512 1626d64554c608cd823dc27b58f35206cf6d011afde124746e06fd5f1e8c714c199d9f2b60417415daf01cfbc46208d08d49eef29538a515b539a551b8c5e5c3
-EBUILD opal-utils-6.7.ebuild 2473 BLAKE2B 00b5371a58fdaec4459131e2f762dd9aedcb0713e3de23c9c91c966acac4f6d77c9df6ee9a202247d39295568f44e71d10c7e1acb330e5e5e8cd273e1a67797a SHA512 a65eca0d4c84f7cab5f5541ca7948cebd337c67fae139c2b998ed5f3daa593e74d271ba0395604a4fe8786a04e35619267544755a39dedcd539815a0b6cde137
+EBUILD opal-utils-6.7.ebuild 2475 BLAKE2B de4715513ac5bf263634fd468ba762855ace15e63f678e6bc3b0a8faea353f12a76c1132fc85d29a33834fb1fbec4a2d6eada7299b3499fb82f6d7d4706f040d SHA512 9b22701b32998c75742714ecec9d6860463740ba4c0ff1252ac2b1b8c5b99f087304220302f2cc319c03d49ad459eb4ab3051547d852161e1e8df56b59f04aa1
 MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666
diff --git a/sys-apps/opal-utils/opal-utils-6.7.ebuild b/sys-apps/opal-utils/opal-utils-6.7.ebuild
index 62ba3a2a07e6..fdaa7271922d 100644
--- a/sys-apps/opal-utils/opal-utils-6.7.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 9b799738f9d9..c84001d67def 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,6 +2,12 @@ AUX openrc-0.42.1-gcc-10.patch 1679 BLAKE2B 464fa390a6626538dad9d68d9e1c81195ee5
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
-EBUILD openrc-0.42.1-r1.ebuild 5470 BLAKE2B c0ad9fffd6fa294a0dff8ab4a25a21e7b7a2a3fe0c9c839ef0d8a40515d644df2fc10dac8f0ef5e420f5c20a97e63c4c4864a6863cb27a82c4abcf9891046870 SHA512 4e099110647827915fad4619e3eaea04dfe61e71f47bf941518756bfc398a4828f874598682e1548b6fbdc8b16f4f74ee4911077552ab14843b5ae9b7c87a063
+DIST openrc-0.43.1.tar.gz 240008 BLAKE2B 0db27cca0a6e965c5333ee07a7f9f361dc7c32b82d413efa7ee472ecf253f82be03bb9006f7d9f2ff45af5b8de685b5700095175fde444bb8ba08b8d770f0500 SHA512 0c4590b6cc15872622824ac53d574d831f536ba983ab7171b227e22441651566d36cfd7e69b28223fa25aab9f3457fb889e6e3225069d08552d440df12e6af84
+DIST openrc-0.43.2.tar.gz 240267 BLAKE2B a279833861c2e060aa6a95997bf384407bce395589b3a29cc9ab30c3ec11584da8e16501dfaaebe72ba0342513efdca6fa402995c22ceeb78d5ddd9f1f0d2252 SHA512 ecf55ec003a597bb13f1726082f062f426d23ac98ac680a913486bf4fb340fa6a26678d3e9f5158874b9591266903c5627188aef734a7e946c5e22db3a1b70ce
+DIST openrc-0.43.3.tar.gz 240431 BLAKE2B 4e7326e2cb87fbb9101b616f0ad5a955f38f387e9d940a0ae1d00a8b48e7733411b3f0a4bb70bfc6a63cb4769354d7836cb4accd695b73f601d9b6bab8b8a8ea SHA512 a6b0a3b7eba7624ed00cb33253cec71059b9af194f3828eb7417f9faba551ecdff7c1e1b5132772969a9c868ff60a92378b28e56e54edfe8e0f4e143aa43b8c5
+EBUILD openrc-0.42.1-r1.ebuild 5471 BLAKE2B a3749af382add50151e08b679ac8548f4a229784de8ca796c1c5d113ea190c42980e18ad8bd5598fee43a049538e4d806398aabe7bdfa27a79361529bfdd5445 SHA512 638ff01c5c1de288e462790dbc9c5801b326768051933a96a9338278b36208a39934be4e7b9605ca286e30baa9e83dab58075e50ee9de112ce4e117cc0767b97
+EBUILD openrc-0.43.1.ebuild 5035 BLAKE2B c6fb18f7ce7aff1b5ee7aa242b0b578cc712c71a8cb300fc9070b41fcc511eec632ac9a75896d3c20dd553b0fe9839c7c409382a5c801a6f16eae03e60f64b2f SHA512 cdd691b9a30a2fc8bd064a11bd37d4c93893a26282fb5fa17c177f90c6101eed1d46031138ba3443c8bf28e98768ca8e7cca597da3c9a20e0b3af8d9ea630906
+EBUILD openrc-0.43.2.ebuild 5035 BLAKE2B c6fb18f7ce7aff1b5ee7aa242b0b578cc712c71a8cb300fc9070b41fcc511eec632ac9a75896d3c20dd553b0fe9839c7c409382a5c801a6f16eae03e60f64b2f SHA512 cdd691b9a30a2fc8bd064a11bd37d4c93893a26282fb5fa17c177f90c6101eed1d46031138ba3443c8bf28e98768ca8e7cca597da3c9a20e0b3af8d9ea630906
+EBUILD openrc-0.43.3.ebuild 5035 BLAKE2B c6fb18f7ce7aff1b5ee7aa242b0b578cc712c71a8cb300fc9070b41fcc511eec632ac9a75896d3c20dd553b0fe9839c7c409382a5c801a6f16eae03e60f64b2f SHA512 cdd691b9a30a2fc8bd064a11bd37d4c93893a26282fb5fa17c177f90c6101eed1d46031138ba3443c8bf28e98768ca8e7cca597da3c9a20e0b3af8d9ea630906
 EBUILD openrc-9999.ebuild 5013 BLAKE2B eba47aae6e1d07c2ccd925f2e380268a6ab96aec37e245b3ccf0474d30fc19811a5f45c610a6fd68760a4695f48040733aa524f41c86a9149bcdbb97195ba4a0 SHA512 24970d1219d2fc2c93ecd6ddc22200af0a3e70decb506f06ffd2f3be15a7b3a37398e150f26d6c2477b59f3ece72babf61056ddd3c6e86233b7576f081460cd3
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.42.1-r1.ebuild b/sys-apps/openrc/openrc-0.42.1-r1.ebuild
index 61b6aefded84..24ee8a894fc5 100644
--- a/sys-apps/openrc/openrc-0.42.1-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.43.1.ebuild b/sys-apps/openrc/openrc-0.43.1.ebuild
new file mode 100644
index 000000000000..f6eaa2172d22
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.43.1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		sys-libs/pam
+	)
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	!<sys-process/procps-3.3.9-r2
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBDIR=${EPREFIX}/$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKSYSVINIT=$(usex sysv-utils)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=no
+		MKZSHCOMP=yes
+		OS=Linux
+		SH=$(usex bash /bin/bash /bin/sh)"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+export BRANDING="Gentoo Linux"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-0.43.2.ebuild b/sys-apps/openrc/openrc-0.43.2.ebuild
new file mode 100644
index 000000000000..f6eaa2172d22
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.43.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		sys-libs/pam
+	)
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	!<sys-process/procps-3.3.9-r2
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBDIR=${EPREFIX}/$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKSYSVINIT=$(usex sysv-utils)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=no
+		MKZSHCOMP=yes
+		OS=Linux
+		SH=$(usex bash /bin/bash /bin/sh)"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+export BRANDING="Gentoo Linux"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-0.43.3.ebuild b/sys-apps/openrc/openrc-0.43.3.ebuild
new file mode 100644
index 000000000000..f6eaa2172d22
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.43.3.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		sys-libs/pam
+	)
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	!<sys-process/procps-3.3.9-r2
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBDIR=${EPREFIX}/$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKSYSVINIT=$(usex sysv-utils)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=no
+		MKZSHCOMP=yes
+		OS=Linux
+		SH=$(usex bash /bin/bash /bin/sh)"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+export BRANDING="Gentoo Linux"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest
index a0e1703effa7..0fb1a6506724 100644
--- a/sys-apps/opentmpfiles/Manifest
+++ b/sys-apps/opentmpfiles/Manifest
@@ -3,11 +3,11 @@ DIST opentmpfiles-0.1.2.tar.gz 5614 BLAKE2B d49485535bc3b92ba7e9a2af511969b1793d
 DIST opentmpfiles-0.1.3.tar.gz 5691 BLAKE2B 56d79f0279a46ed3b4e13f94a7f2c7d494df245a17b8533c48cff357c21db56485bd076e375f3b4e2c9a140a65e8ab472a8a1030bbee0853463f734c316f71e8 SHA512 fd0b10ebfeb621466edadede50ec6e8f415861ab3b14b833c75bd71f7296e9c091e59144d39e1f9efd342b6d97776cade5a692c941085e33e9651fd885da7121
 DIST opentmpfiles-0.2.tar.gz 5711 BLAKE2B e1ee7820b2d184d18e63e7e9d93227bb301eb82be8c2b6021c7a1092f55a4ca2bb5dfb7494ff00c3b6debace1963f6c89011ff557f665f0a93c907bd759a4c6f SHA512 bc384cc9156ba6c54d3308ddad4d26b1877f020aa8558e82df2ed49ffa65e0fed5a49eaa11b27193bfe2ad11a4d7368f7cdbc225b820b309af3b299327ddb07b
 DIST opentmpfiles-0.3.1.tar.gz 6843 BLAKE2B 20cb40b34fd8db37da5797dc25912000f7d1feb38952b99c044220666cb21871eb40d3853074cb33ee8bcce8dc4858d102aeccb5730ce28df47e99a7edb50f2d SHA512 1e0985403013ac10c0fe50a7ba61a250357b1ea7ea426f9dc92d7071e97eb0e5209448550cf427734b917599defa5123254044d5352b9dcaa22e562e5ca6821f
-EBUILD opentmpfiles-0.1.1.ebuild 1018 BLAKE2B 59d81bbe686ada0f7e85fe30c3a22d029c7139065feec893fb28e17ca78aa5cb4005f7209a05f962e700c0007433f2ff02b909a082147674dc236f3d08f58c7d SHA512 d4876aa7581160971a545aaa2469b2bec3d54fff5e538904b9fbd0fe30defd7332fb3f2cb00e4e1315f385f4a7a745fda651d21c72083041045571cdd8c6c4a4
-EBUILD opentmpfiles-0.1.2.ebuild 1115 BLAKE2B 015d7932a02633e2b1b01d87e48a2e1d6c674fed500c0647e02e83e2b7110797c58245e21576965b0d37edf60616d9a9fc0ba2dd2d493a8268fa9c6744235627 SHA512 d4d36bbdccffd0bdf611fff46d8f25dce49a9a4941906f782eb820bd1ddb845c6b7cb23e0ba2199b095a1ed32313664727fb1889349a0b6704fe9b2cc45e98bb
+EBUILD opentmpfiles-0.1.1.ebuild 1019 BLAKE2B c0d93987039c42c1427f7067b0e872826c59c984a7f6137d85f9b1330f92d4af24d269f08a9e9142e9fe03eeba7f94d36bee5308a515a4f011934551d6878fde SHA512 2c300a89bfb02c46a8464d87218e976a694b4261ef0171efd09984994c66c53795f6f4a07c6e58f017aef9d71b8538195c1481032f9f088420931f9aad3eda9b
+EBUILD opentmpfiles-0.1.2.ebuild 1116 BLAKE2B 8d96cff81c513ccc21b280365ae18170fa0ca5be7560ad5434b1af6c45356f42d11fea10774a09a6c758de91551681afca3d73068ed670dd46d424c63750185b SHA512 1c6a68a202877c8e02d07549b8d6fc15a9db1d0ff3c18d07c0e3eeb1f4632d393d8d4372044aeff611561376e28b2e4bf86a0901651cf383f84ab340e8d0b7fd
 EBUILD opentmpfiles-0.1.3-r1.ebuild 1258 BLAKE2B aefc898a4e5839475cd4fc253c6598f2542f5d64566fa02b30e659647f9a93cb07e9f2bcfc4daabcf509a9e63dca726e25c4101874a4a8a51d9888ccf3eee1ff SHA512 eaf74899b6e924a95376b2f944cc75a330100ad358de698d5655acfae0f61c68192e9e82e8696df2afd631f559847f566ddc9afbb830178e525c4af5da6eb442
-EBUILD opentmpfiles-0.1.3.ebuild 1114 BLAKE2B 50b2351d9239ae96ce9c9f563d95c48abeead8a243f5dd830a4bd6b2aaa69c070ad488273e437e47ce973b1bd779233483cf170095c9ec60c9a39f6a141c39af SHA512 5848c60335494717d4c7ffd0d3ff329a238a3653fbd9f9e1a4678a502e8d2840a5131a875206890f8b2e98b8fba6a2f53c79a0f8dfb5c937dd827c22834c0233
-EBUILD opentmpfiles-0.2.ebuild 1382 BLAKE2B 8b5fdb30d45b4c1fc3fa10938ca3d2b1b9d2dbe007c7a3c95188dc71af7484b7ac7d2794517affc75e697b7bc6485890e58d8369cc88284e58636f9dbb61717b SHA512 98e815ecf98e4533afc258a0a4837bdad429d78759fd3f8d3884967ab6d443f9f22fca8a96929a2ddd1937963b88f6d6ef1ea398d055bf99d8e625f0471459ef
+EBUILD opentmpfiles-0.1.3.ebuild 1115 BLAKE2B 3dfa3314c2b71c537e6dcbe13e4ee04142a6af9575e710c5247cbc24edbfc82dea6ffc46d07d744cc3cfd66ca658119f6514a804e42186237214418ef497f97b SHA512 f87649de01c82c0557ef628b70d26be4d7c577de3d7a93d5690015092f3ee450ea32637f8a7acfc01fa21ca4546f3ac75476a21e39b041b4e70876fc0f86d0e9
+EBUILD opentmpfiles-0.2.ebuild 1383 BLAKE2B c234440bd0b2256c7049202c15b11618a93e1054f3e2d8e507e7feabfab9b6db35e7ed8c19447816bd10d543953aefdb2e05d486923aaedb923f2c7d6b679cd5 SHA512 f2a4e8623afc2077aa48b7f443afe464ffd08405d26206515b1ccf8e95e5a596a2ef118f13f8f3784871503b7b2a976b7581ac877042afb4689ed1dde3e15cd7
 EBUILD opentmpfiles-0.3.1.ebuild 1307 BLAKE2B b1dbdab5b13c5224327ea089bb25f2fc7a4d7a6334234c51bf270c50e9cd7870d6624527b7be68d931a07409c31a90dcce1d3ea2d66f5f27f5684d310805d2ee SHA512 fcb92fadb887f45be8ec28d9501e5bd383f6d1a70f8c95de945253cd2ee429ee4a36c72b970fa439ec4ed2f6b0ef6f7c2e01a17b3976356a11ddc30bcdde9a2c
 EBUILD opentmpfiles-9999.ebuild 1307 BLAKE2B b1dbdab5b13c5224327ea089bb25f2fc7a4d7a6334234c51bf270c50e9cd7870d6624527b7be68d931a07409c31a90dcce1d3ea2d66f5f27f5684d310805d2ee SHA512 fcb92fadb887f45be8ec28d9501e5bd383f6d1a70f8c95de945253cd2ee429ee4a36c72b970fa439ec4ed2f6b0ef6f7c2e01a17b3976356a11ddc30bcdde9a2c
 MISC metadata.xml 445 BLAKE2B 4aad5dcfe48ca38a0de24e7c5a1fa53ec639827f9caa2f03c71fb2c054d74de487cda2eb7c8efccd20d5012955163bd9cef7f73f892a14e8ffd63bb73878dd90 SHA512 9dd3d1e30ceff27dbe6b5250ca0915d31957f94f830236b385d2cfcf2e28806d8fac23220148d7a7cfd09f73136e0bc728e1c289da77f939faff2c2d5c55dd6b
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
index 9eaf5bbe8c8a..a6b86fd844a4 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild
index 5a2d6b4f872f..bbb0974eb09d 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
index 40ca9a593feb..1bad7f87f314 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
index 961ff750fd52..dd790533d3ca 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 92063f6810c2..33854220786b 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,5 +1,3 @@
-DIST osinfo-db-tools-1.8.0.tar.xz 57428 BLAKE2B daaacd6c2facb7cd8e090ff8aa028b4651d1036399810342f01369ad308fa240b76ca209dc6f8fd30527f27178a1d29d0b5fd44c0efc050a0dc20397afc33e11 SHA512 181531bcc8b644718411b09cd3f0971520a2df8f86c87deb34a8664e03c9b10ec73a0904cde004f045641ce8d087bbe7337c6a124e422c94b93de21088767a7f
 DIST osinfo-db-tools-1.9.0.tar.xz 57704 BLAKE2B 43b25f9d3a32a4d22fb50874b8da5ffa2611b439213c4d41292f954b23515756558e4d6a5a56b53dc0f15a9abebc4f4b5dc08bf8fe9f77fc8c66d8c56ae96acd SHA512 516c57d47649d9425a54863e0050cccd9757caa710b7ef81b339bc75454c7b55bafe6623a69305f0fc3e47e5bcccfd05222475f8487e4a1b0c1588764c87a4e6
-EBUILD osinfo-db-tools-1.8.0.ebuild 1146 BLAKE2B 687a03d25e942634299ad4c403236770171594a93e76563b43703cdd5685617c284b0c731ef7d6b6f8a8f2811f46fdca6401374a5975e922ccdcfecd87caf55f SHA512 21cba760e281abd7b8dc306d463d5d56deff0751814836a00443e9c8d7fc553e98c4dc4b82a2099f470b7e8d8cac1563a481b802ad56ce70823f827570bc43b2
-EBUILD osinfo-db-tools-1.9.0.ebuild 1051 BLAKE2B b7d055619c45dbacb8d15505ba899ef3f2d6a9a536d214b420cc8692b8ba3e8fc8846248960c6480855ba1c7ed5820d8dcef102112f3092a043bf2baf888d8ed SHA512 2062b4a008c30b181f74cb661692c0aa4756e1097084932def5cfc51c6062d10ea84bbac85890b36463b6f19701b925cea5d745ec4d370246577ee7465ad0684
+EBUILD osinfo-db-tools-1.9.0.ebuild 1048 BLAKE2B e81e81f07720fd74bd532aef3ee9bf65e5fec78023e72f51475909e60e072c092bef6eb3d9e1c82e54abce61c2ecfb313629747d2274705a23dfab9c3bd0ceb8 SHA512 bf7c95d66bbc541d7ddaba98a01b33b10b480586900f817e5bccb4c85acb06826a077d176d0b2164d6651af07b31bde382d7a1bafd166d6c53f418b09905e56c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.8.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.8.0.ebuild
deleted file mode 100644
index 56402b1872c4..000000000000
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.8.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit meson python-any-r1
-
-DESCRIPTION="Tools for managing the osinfo database"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Blocker on old libosinfo as osinfo-db-validate was part of it before
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=app-arch/libarchive-3.0.0:=
-	net-libs/libsoup:2.4
-	>=dev-libs/libxml2-2.6.0
-	!<sys-libs/libosinfo-1.0.0
-"
-# perl dep is for pod2man (manpages)
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.19.8
-	dev-lang/perl
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	use test && \
-		has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/requests[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
index e3903da5e692..e81056f2891c 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 48e76999e960..833ccde0c0a9 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,7 +1,5 @@
-DIST osinfo-db-20200529.tar.xz 104668 BLAKE2B cb5b980cfc7753ad76aeb80d79108b125c3f1d3bec8a8878d2e562ce6b11b4369b8f9b0a03f5720ad58aa09abe8e140633652f19a4dc6f40e941e626d918e4aa SHA512 27efed4680d80432541c9e3dc692a381b479811ebce39e9b42382bd8b499d2782b59323a6c29517f38fa63061720d26c87e3c7ca806414adddfb9e4294ee106b
-DIST osinfo-db-20201015.tar.xz 108840 BLAKE2B cbda3fc868e2bd0f240d86dde70b04aa85ab869d6d8275426b60ca6ec63da3738da48b78540d5b4426e4aaea600d7ceb29d698618500fa1f45d6b2a1c3ddf5a4 SHA512 0c75ba6a3410af7e59e5696fff2883dd2285d9beb1eaaed90f12e78f05ad0e3f54352eb30ebfab2a4c4fa19c5c86c83b55931acdf04b25eeb015b19d64f824e6
 DIST osinfo-db-20210312.tar.xz 113832 BLAKE2B 41deacfc739b00d76a50fef95476eb5ef134b30b3fd9c7d0847daf3e49163087c014db49de2bd50e079baa8e2ad1d5727010c97f53220a87579e220b7f7fb3b6 SHA512 f5644e37c9e1aebea2dcf5a63adec1fd7c0f98b7455c4dea8d8b51cba396a388f9d847d5dd5e0ef8426df8da228a9766a297852ff27cb72dacecd01fd9fbf19b
-EBUILD osinfo-db-20200529.ebuild 668 BLAKE2B 5bd9f45c5745d97052e35df92fd9a6d7dd413816f28112c7574f310e792e905ab0b64f8198e968435d9c48c2d3b599edd0a9bf220be99f073ce7669042e9c79b SHA512 27ba85e90d6ec6079ef998b26cf86263345944644b93d86411e029ad8366b3e4570e349abe7579c27c31e5b4200f1b5885ce6dd9ccb7dc46701590b35571990e
-EBUILD osinfo-db-20201015.ebuild 648 BLAKE2B 4cf67103c1a97853fd2eeb9e58f49b718abec82fb7f5aece511568412ebd97efa8b733f7f51dbebde7ea511e668919cf557f30caaf4da27434031eafcb60ce53 SHA512 f9d2541ab25a1a1ae08fdc7c4e74244cc6c1af22c5c17b15159e68542988f6595bcd6e81c00c7414fb96c598257258d6c969c63a69452bafa1ec3b6f16b0dd25
-EBUILD osinfo-db-20210312.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
+DIST osinfo-db-20210426.tar.xz 118640 BLAKE2B 934e738ede6b261d59fcb30e3c12d64db86ece75977709cbd59b2e105297731e1bdb6687b0d4cda80972ba2a20cc445edeca289c49bc5d056668bee5066d1216 SHA512 b5c2ed444559dfd1903e16f6c29cfd55cd279a789db93e7b5a0dd450ee48a3bc07cf59ff057220b8ccf1097a04ca1be4cd77c10fea292570ac58893fd788c0fd
+EBUILD osinfo-db-20210312.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d
+EBUILD osinfo-db-20210426.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20200529.ebuild b/sys-apps/osinfo-db/osinfo-db-20200529.ebuild
deleted file mode 100644
index 32c869734dbc..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20200529.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-apps/osinfo-db-tools
-"
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/osinfo-db/osinfo-db-20210312.ebuild b/sys-apps/osinfo-db/osinfo-db-20210312.ebuild
index b76468286d57..109cfb6ee818 100644
--- a/sys-apps/osinfo-db/osinfo-db-20210312.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20210312.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 BDEPEND="sys-apps/osinfo-db-tools"
 
diff --git a/sys-apps/osinfo-db/osinfo-db-20201015.ebuild b/sys-apps/osinfo-db/osinfo-db-20210426.ebuild
index 82eb2b072ac4..b76468286d57 100644
--- a/sys-apps/osinfo-db/osinfo-db-20201015.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20210426.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="sys-apps/osinfo-db-tools"
 
diff --git a/sys-apps/paxctl/Manifest b/sys-apps/paxctl/Manifest
index 63a1452c9488..8ed3e6dc1dc6 100644
--- a/sys-apps/paxctl/Manifest
+++ b/sys-apps/paxctl/Manifest
@@ -1,3 +1,3 @@
 DIST paxctl-0.9.tar.gz 8109 BLAKE2B b26049dedfa82890e5445b5baca8379d37a184124d468d895339f1dad6142e4d2ac8fe393df42a68c6aec8a03b151cd412c2996a098ed460265f4c7fe9ca519f SHA512 4048544bd05ed6eb37866034ade8482b8d017110ed9a639f220e8d2e32bb3dfb6c913a986c8fd41829e88efa793f7552eaa2a6d6b2af533c44a5754a5ab8650f
-EBUILD paxctl-0.9.ebuild 777 BLAKE2B f8ceddc98a1837fa9877586f012b0dbdd2c80caa638a89374ea8365f9dedfb1b6f05b2aad89028bae81f6c130a5f01bca0642bf593462292400467952cdb7546 SHA512 a2139809e3dd818be863e20dba92b62d9aa31af1e129f41d3c862f444b748d020efb991bbd45d102bf6c51662f73a9689632b9ff498dd96d830e9859be997784
+EBUILD paxctl-0.9.ebuild 778 BLAKE2B 070bc03170498e56fc5ec419e72725960e88bb74179edb56a2231371f358f07a1f9385d8c0998f28f2c5ae1471cf67ddb63c0f4462580ca4199e7e6cafc4cbeb SHA512 16503ee3a12650cb0162a40e8d8d32817d9efea2b41073b8e99dadb6a1424e095a8b3e4a0f8fef84316f0927cc58a31722b90929d3f4468de7f6267fd19c16c5
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/paxctl/paxctl-0.9.ebuild b/sys-apps/paxctl/paxctl-0.9.ebuild
index ce9b3b68d648..4ab860b42254 100644
--- a/sys-apps/paxctl/paxctl-0.9.ebuild
+++ b/sys-apps/paxctl/paxctl-0.9.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs epatch
 
 DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64, binaries"
 HOMEPAGE="https://pax.grsecurity.net"
 SRC_URI="https://pax.grsecurity.net/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index c016d3ba3cfa..80cc0149ac02 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -4,7 +4,7 @@ AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
 DIST pciutils-3.6.4.tar.gz 497675 BLAKE2B 45bbfafbf9ad6aea09fd17fe235bbb11bfe00fff2f31f1223d739eacf3db1a66ba0cd05f0df29349b01cc0a4fc598aeafb6fcf276e2edf2d557b9c21f25a0382 SHA512 001b2f722ee9f5fd57307aa4e8894c97ed3eee42f8b17caba2f29b191ab2fe98dcbfb76438f97dcaa343ea90011f6f6277ab367f361bc45e20d7ed848b439f86
 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
-EBUILD pciutils-3.5.6-r1.ebuild 2864 BLAKE2B 5545b583e7b17384f19d11b447129ae627018e815a1b307b53a1bbec7f1d39aec915407cd0e30c0d3c478646d1eb5fcab04f0759885098e4887d51b801c7d6e8 SHA512 aed14d250ffc1c6086efa80d292f2c4e3f68e269c2fc5060d836f37abb9f95a4ecd614f880a77e3f97c45b9ff99916fef7d3b1313df85e31496c895680c26fd4
-EBUILD pciutils-3.6.4.ebuild 2841 BLAKE2B dd67c56076adab95cdd661c786732b9eae043b43ab87bcf9ec131e0c1c2e04fa5709f286a2dd5e708582342f4383c82e6c4d43b000f4f135c087f00615dfe474 SHA512 b7d42344ba26355a2698a317e61c6b02a7393abb79a6e34561e30d1cb50abd45d1aed757f55967dd1855a7052f85ecd19ab6ac738454d865500e986b5dfac5e1
-EBUILD pciutils-3.7.0.ebuild 2849 BLAKE2B 0023904d2c9df91807ec223276dfb87c73e738f631f98eef1d61a8b3474d02be8ec7cc3026b6b58a6ec035ce847e2f83e80168ab8a435c3a1165e82b533c6024 SHA512 9d96996e6cf4d83884021282f142bd0e904d7205f3e4bb246fdfd3621ca706cdac088f391b26b69a26afff642201f0371ac3460b34b4094e28689e15ced67aff
+EBUILD pciutils-3.5.6-r1.ebuild 2865 BLAKE2B 932cb026107ab0eb3b8961d8e2fe011aa356bc77e090102120b05ebc479f75004aeccab4079a5525d5c221cc51eb6e42006570593ff13ec46064705024ff5a82 SHA512 4e7fea78b0036cd9b7d0720e4f68eb7b2ccbbed6d240d137068500399f49455c0709dc02f36b564add780e10fc3b36a2e2b995c4dab7578891426f7a9e504a02
+EBUILD pciutils-3.6.4.ebuild 2842 BLAKE2B 0a67bbe234aa2ad79d02a151a46a76ff5a9582a1297d1180d969462d404f2532ec46e7c95191b37d1c4d6aa5c407d0c5e504af18bdf5018340b4445bd1445a09 SHA512 717ceab1a44cc5a606412aa6f70e893cf34d1edfcd1ef42f9bc85bee694854693042bf346619cf7a783eb13124230f91178060718a51ba86c9c931bf110bbcb7
+EBUILD pciutils-3.7.0.ebuild 2842 BLAKE2B 0a67bbe234aa2ad79d02a151a46a76ff5a9582a1297d1180d969462d404f2532ec46e7c95191b37d1c4d6aa5c407d0c5e504af18bdf5018340b4445bd1445a09 SHA512 717ceab1a44cc5a606412aa6f70e893cf34d1edfcd1ef42f9bc85bee694854693042bf346619cf7a783eb13124230f91178060718a51ba86c9c931bf110bbcb7
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
index 31bab28faa8c..e40e798ccb3d 100644
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.6.4.ebuild b/sys-apps/pciutils/pciutils-3.6.4.ebuild
index b38747d368e7..b5b0621bd7df 100644
--- a/sys-apps/pciutils/pciutils-3.6.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild b/sys-apps/pciutils/pciutils-3.7.0.ebuild
index 5f2028a86005..b5b0621bd7df 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pcsc-slb-rf72-drv/Manifest b/sys-apps/pcsc-slb-rf72-drv/Manifest
index 2c56d92c13ce..ed9520c61af2 100644
--- a/sys-apps/pcsc-slb-rf72-drv/Manifest
+++ b/sys-apps/pcsc-slb-rf72-drv/Manifest
@@ -1,5 +1,5 @@
-AUX pcsc-slb-rf72-drv-1.1.0-openct.patch 1211 BLAKE2B bc4e93838809a3782d3a7dd8ce325a807057e27ea78fb05a1da827be89b02ea75b86617bd2a4dc3399f783750fb3b1f0fdb27403aeb2f87b463cce4c6b2a7964 SHA512 c2191b78d507d59c0b4d8ab211eac37c0d7205aa9078dc9105129d0dc658a2fb94126cc862e60772272a314726d955e8f8c1d851fd649cfd27c3c48e65e65aba
+AUX pcsc-slb-rf72-drv-1.1.0-openct.patch 984 BLAKE2B 12d85da9c10fec5e7088519f91f715ec1244392a35aa5051fa99c043e40392447456ffcdbc7d3e200dcc3d08416c825f1557028e3db75ec7db570f20376f1864 SHA512 ed99d37e69a52eafc091a4766109b860cddaa170fe7e4359a4da8dbeb10843a6314e4890b528649f09fd8f6b4448d222c0396d70b2d610dabdcef36b019e88ea
 AUX reader.conf 275 BLAKE2B f59922513d20a8b79e8c74a2cd55523b7ac488f76da5932971670060f78e1ff6613ef5c6bed64ea80c4b9514d3034de3ac4f83782bc46d1e2dea71ecdc523c98 SHA512 8c7de2c3504b23ec27b3437e1b321a23dd87db9fef51ead002a8c5b3c569e713e36cebe06a40071c95508568712f10f3b42609d6adb6254f63acf8ecef79f32e
 DIST slb_rf72-drv-1.1.0.tar.gz 53110 BLAKE2B f5ff955ca7dda46d792a0595de8ede4559926014874a1b79183e3a7a311e79784d98bee71f45d701f18fafcc561669eced8b090ad1a0d38c5102ecec92f59ba1 SHA512 93fd5dc9e38d89a0ae3f8c5adcdf2b4cefd8caabf7cac0e0551795b8b4190031ae7c7e30962dc90c6e8c5fcec6db99d4d14f00b8a7787ec043e366ef344ebd9e
-EBUILD pcsc-slb-rf72-drv-1.1.0-r2.ebuild 1521 BLAKE2B c38a257cdd106ddc6b53c4de4b0b12fb4558bcc54e8ed4942909cb1fbd129a4cfd452370264a74b7d913bdc149d9846f1d81b9e298be0eac3932408736d4f65a SHA512 e146786e9d41c9dce890e047783f5a7d24ac00aabce478bde56c2e6a541454b0c352fd013ab4c2233693fe1af0bfb06854232cab7b5c42bdc6781a75f6f69e1b
+EBUILD pcsc-slb-rf72-drv-1.1.0-r2.ebuild 1552 BLAKE2B 824ede585db2af69424a79853bc8cd353b3ed994ce79445a8b7037f6df6d28d109a86bc7a5494b4b1beb414ee864d2660d1bf090b1b84288e0c15ec8aee1433d SHA512 58f27a2de9cb73eecf8171b7128a56bd37b9b78ee50247cd2952864b24c28dc723603fb4deb81dab1f613ee3d5f402c336fbb1dcbc9171b6b51574d4fd12c101
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-openct.patch b/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-openct.patch
index c7ddb87a5a7f..03e0a9589c98 100644
--- a/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-openct.patch
+++ b/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-openct.patch
@@ -4,13 +4,6 @@ Date: Fri, 17 Jun 2016 18:58:05 +0300
 Subject: [PATCH] build: use openct instead of embedded binary ctapi
 
 Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile     | 4 ++--
- ifdhandler.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index cdba2b6..319449a 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -16,7 +16,7 @@ clean:
@@ -18,13 +11,11 @@ index cdba2b6..319449a 100644
  
  lib:  $(OBJ)
 -	$(LD) -G ifdhandler.o lib/libctapi.a -o libslb_rf72.so
-+	$(CC) $(LDFLAGS) -shared `pkg-config --libs-only-L libopenct` -lopenctapi ifdhandler.o -o libslb_rf72.so
++	$(CC) $(LDFLAGS) -shared `${PKG_CONFIG} --libs-only-L libopenct` -lopenctapi ifdhandler.o -o libslb_rf72.so
  
  ifdhandler.o: ifdhandler.h ifdhandler.c
 -	$(CC) $(CFLAGS) -c ifdhandler.c $(INCLUDES)
-+	$(CC) $(CFLAGS) `pkg-config --cflags libopenct` -fPIC -DHAVE_PTHREAD_H -c ifdhandler.c $(INCLUDES)
-diff --git a/ifdhandler.c b/ifdhandler.c
-index cbb3a65..256605e 100644
++	$(CC) $(CFLAGS) `${PKG_CONFIG} --cflags libopenct` -fPIC -DHAVE_PTHREAD_H -c ifdhandler.c $(INCLUDES)
 --- a/ifdhandler.c
 +++ b/ifdhandler.c
 @@ -29,7 +29,7 @@
diff --git a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
index 39b7d34cb31a..6f8c631b16db 100644
--- a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
+++ b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,11 +29,12 @@ PATCHES=(
 )
 
 src_compile() {
+	tc-export PKG_CONFIG
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)"
 }
 
 src_install() {
-	local pcscdir="$(pkg-config --variable=usbdropdir libpcsclite)"
+	local pcscdir="$($(tc-getPKG_CONFIG) --variable=usbdropdir libpcsclite)"
 	local conf="/etc/reader.conf.d/${PN}.conf"
 
 	einstalldocs
diff --git a/sys-apps/pick/Manifest b/sys-apps/pick/Manifest
index 463daece410d..ebe488d09304 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -1,4 +1,4 @@
 AUX pick-4.0.0-tinfo.patch 805 BLAKE2B ab40112024bec12d18f25a84f39cf09850c11f2878acbcdb91bf33fa74c1a35525da04917381c548437017714c70def44aa8ed4697f13639669c64b148c4a0f0 SHA512 d974ded22d5527522178eac47845c85de1fb0c50df626fdc9792798de3439bf6e6ced12f2434d89086a8fe7c5f11a775745d880cd0f58066108e48cae2912042
 DIST pick-4.0.0.tar.gz 29786 BLAKE2B c1d119cfb5dd91bd3c71171d32a6ce92d06ab8ea1cfa5a40c042448b7b90ef5d24c02dc04962b24ef91fd3ea5cb56858b231901c7035f47e2c04682f99e5c61e SHA512 690f8ee174f69ec5897831b71f22bc82dbdaf71329e2b540cfb06e49963231196efe6192d1f564c1c7029c7335736d42f02483850ccbb2bd5bcd1dc52b034f56
-EBUILD pick-4.0.0.ebuild 706 BLAKE2B 4bd61519fda8c56a801352c14bf96618841cbbd5e150ea80d238f9ea007f872cd78edff76fb48026785d969af9704e7c6f375e2b0f5b1c2da55e090b9bbf2b98 SHA512 f3159eab84352e1fa3e131f178313da4ddf706d10ec717d5c70f32703e5ffc253abada95d43e22b4e049e47e6de9ed0e431dd47a7b20f6e8bdbcc17546a2d08d
+EBUILD pick-4.0.0.ebuild 697 BLAKE2B 736aac7eb4f0924e6c48c3b942283604635fcc9c1c46187f28a9c1f6e4f3ee32b87c9d73f04989acff0aac7ff15af892385c864b45e90a96b4bcc49af88763c1 SHA512 41968643d2663e01c6e0dee887f6b56d75f26a0af934896695c64ab7a19b052a6aae1a8a45eb1b2fda7d5e96ff8813ce98dd0660e0d8a6aa3054bde470ee09f1
 MISC metadata.xml 242 BLAKE2B 3917c4e887e59cb27fa14a1ea92192b5a924ce39a4dd39a2cd75d04d7a861f57f7c9e969581a243339ea432f132f6e0963efe9940ad1678b506588317da0ace0 SHA512 03639d79f8e79b78d86d64d217268bfbb6255cfb2d37188a764465686dcae9ffe5e41b01cc746f465a6ba92a3bc2c9d87d56889e00317c96fd759d37b840fae0
diff --git a/sys-apps/pick/pick-4.0.0.ebuild b/sys-apps/pick/pick-4.0.0.ebuild
index 9bf033c64ad7..74ce519db2c9 100644
--- a/sys-apps/pick/pick-4.0.0.ebuild
+++ b/sys-apps/pick/pick-4.0.0.ebuild
@@ -3,20 +3,19 @@
 
 EAPI=7
 
-inherit autotools toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="a fuzzy search tool for the command-line"
+DESCRIPTION="A fuzzy search tool for the command-line"
 HOMEPAGE="https://github.com/mptre/pick"
 SRC_URI="https://github.com/mptre/pick/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.0-tinfo.patch"
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 19eed12fd692..b0a2d83de3c4 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,18 +1,12 @@
 AUX pkgcore-0.10.13-metadata-xsd-2.patch 1202 BLAKE2B 8844f6819579ab54c8ea88f551de2d2671324e494b7321f5d69f7207415f481075742416add7055618b6baaea91588bb82796b764000216f6b051c988837a3bd SHA512 48adb353f4522d682f99c2cafcdd98b51c450579a313a93d3dcb00bcd4e9fc59f7cf6f0ce54377c912c3a4b6af10340a1b6690d845c489e6b77af52b295ac1ae
-AUX pkgcore-0.10.13-metadata-xsd.patch 750 BLAKE2B 93a75ca69597422da66b42aed94e0ad67b1b80802103b90b4306c8967ea5d1723860b9851085186e078c50e3c222cbe8a78bc0fa071ed7c0cf85b4218920f4dc SHA512 d2f2f16167b9d2c32b80783b4d21d04e47328209b3ccff24c057044286ae8896fb3205ec103edbe1f6fd5e20c4ed7871bf3c27b1fc134e8299c76b7ff86ba33b
-DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
-DIST pkgcore-0.10.14.tar.gz 627149 BLAKE2B 05012f21998ae97212364f63ca6d423806e20d0f2fd5785b9a52ec3c535c12675cd2a8f300ed1b3fbfe627d33ab9b138bf28a3a2792c405dbe068045d73243af SHA512 f4e4959d55d412b81306a4e7205163814b95b2f454dd7bb233c9a16d5a5975c0d2e20882e73859266ebf1bd6233e4d88e97291632b2f6cf2c2ae58cb5a680a3b
+AUX pkgcore-0.10.18-sighdlr.patch 1660 BLAKE2B 4e66dff8988cccfcaae4246ae47c3d9bcb6edabd822d1e1d4224da261d5d7e8e33a9ce69e0f664cc6be536415a79f355ee06be9b10b4da0f6224d614769662fc SHA512 5d87c4a741a24e5e6322bf7034ecb1bdb10cf5a010063b861e710d06bb3b3637ee1b0a1587597721ddcf7274d465239b99c0cf05c6e9b81546059e96d6409013
 DIST pkgcore-0.11.2.tar.gz 641792 BLAKE2B 295cc8302badcae333939d69329331be5f76d965549c75140ce809d693cf688fe3d3152c44a9d738aa2d90ed1c9f4aad2cf3c9a9a3a52a067e69cf7dd6c87b96 SHA512 602e7ad03699b3b3f302d6d414a9587f1c7829be83898e055e8e1a46e2a805b535cb715bbbb4d43100f77b8b119e13e8b1e374f45be879b4c9dfe02340f225d6
-DIST pkgcore-0.11.3.tar.gz 641848 BLAKE2B 7a1ff52e9f41b15ec3c211b99ac8666ac16ca1ca40168cce15aba42f3dea6c030623ef4e4ad837297dca860a70396743842467b0ff7305bbc5d3d640d1f2918b SHA512 2d7e4d3228c6ec3bf5aa5cbf8d4235d1b1c0b10c2f4f50c48c84948c68fe1f277eca8effc2bc1310cef2e5227143acb96775c4a0288ab94757de23437f57a084
-DIST pkgcore-0.11.4.tar.gz 643951 BLAKE2B 79567cdf5719b090ec358b51a7482f01a77658728efe267ca5bb217512004f920864f101cc59bdc2ce6f7260a3abc896b2cf4ef168f77500d541c92bfa848f4e SHA512 f290efacc13b72f6bf2319e240b2fba30a1307e6673db2f653dcc6a21420e94928deb63aa0483d9ac632791e60246758fe1de0481316b222c0b60197047dfb10
 DIST pkgcore-0.11.5.tar.gz 637303 BLAKE2B bd7e609039253864bf02c9a6cb084b54971a37b7d18d8c8234dcea3a7f25f25ec6652f51fc451bd991727f147d1341ee8ab7ecbcb37b727966708c1248fef428 SHA512 59a31cc9166ae2b12ec2cb349a5e29ce06999c532f7007af2392773a1e6f91ae7d6fa91c123991368dfe5ebdd7edc4ccc2a23fbf008c22b7e251562c8deb8bf8
 DIST pkgcore-0.11.6.tar.gz 634191 BLAKE2B c06f24006be697771dd3d7569e3a27310dca56c05047ac991c2db359838dddd5eec78c8d424e826b39968cc496be6e7eb366668bfa45082aac438b663015cb8a SHA512 e556d20100c0234d319ed2e15686a3bb9f388f1cdefd7188958c3c0b32d741dd531cbbe8d377b0736662f66b3241e633491a72a1ce84dd86790e9f543b3d0800
-EBUILD pkgcore-0.10.13-r3.ebuild 1247 BLAKE2B d0a3f38b90222ecbff5e8df115e686c3c77ed3f472c08c03b89cc3742093a69677617b1f25cff58ba4bd07727c6668f4a2d0cccefbddaf7fe3ce97fabe3e4a91 SHA512 35476b502934a9f8aa8dc44f1339782db18505e00622631dcbdfb4dc74cef9b3920f12d79135d8672546662939fb901dc21763e5b0262705f88700508dab7f27
-EBUILD pkgcore-0.10.14-r3.ebuild 1205 BLAKE2B 8310cceda556f51b36c89a60e28e0c884b92fede00d27672ecc31e14d2fd348aa2813ec6f5caa5efb5591dbee85f8ab2513a3dedbf93c24aba2e7ddebb8938db SHA512 3d38afe69a523e11e2d930c31ca7cdfab38ca890c2ebe57284a9ce838312acfac9dfa48580057a478b7f43f391ecee4561d74e2878d8189d0e920bbb023e94ed
+DIST pkgcore-0.11.8.tar.gz 631665 BLAKE2B 1e33ce394c1df9418d22fc8653fca4da1b4e27d53325167e3b7231fb8382f3c81daa7a93587ab2226116865546d4ca1ae1dd4265ccc2adc9cb9b27106d9c352b SHA512 42ed7c54db5fa48dffa5e3927afae32d1b4db92da41eff99c8eaa10232fdeae4e0f3f4d39b1e1b4e3881304523822a9a99575648809c554e3bdcf59d9eab485b
 EBUILD pkgcore-0.11.2-r2.ebuild 1111 BLAKE2B 676d166638807895799de77fcf881962d60734dcb86eba10b726b1c2fb43629f7f2e86948a6f2a9770d5a4737413a6d6396212aafdc9e902bda064f8c64b046d SHA512 38fca7cc42e4e87a164d3f6912786fa0feb5bea777ac9028848b6bbf264de3af5f4a43cf1ae6d6c4eb77c66b8fd66336d8ac7ad27e61a1ee505469b817f54fc4
-EBUILD pkgcore-0.11.3-r2.ebuild 1117 BLAKE2B fe299e2de72b1dd790325b75bd7d9f2c02dfeb6e87b4c63a22a46777db3b4ea9053318969f32a259b3514476d0a3c588e8310c84e2a80736036381e27a09ff4e SHA512 7209df6b7170cd2435e124c4c9ab4b3ef377d91fb11fbc3aff0f73bcd29f943fbf8019dff7b742f185e9c7888d2b5cb89c85b68a6cb532c1baec63700a08f508
-EBUILD pkgcore-0.11.4-r2.ebuild 1185 BLAKE2B b54077aab046e546f315df380f64d5ee99b0ec89091d3807b314c2b774937d113b93445791b5001a5a03ddf2bc23c29a08f7501d09b59d54036cae172664b51b SHA512 ce005729bff768aecf9c1fe4870b4a43c3054ca7498204e59c3596ce9aa19ed2a8aad37457acea9dff9754e25f819b6fed96bfaf04661e445275d54619475459
-EBUILD pkgcore-0.11.5-r2.ebuild 1191 BLAKE2B f2230f3a09376a3429ec63ada66384ef67fb9479d0207258abb527b178a82c24876a732f58ff6853edf02796ba532682fc7b26231549d0cdc3259976388d5fcb SHA512 778ad43775ab53863850d42b8d868d55a0ad4403cd9007c5cc02645c856e32a7815fb400c942e1c03f2f13d6534e540a96b9fe28e896ef2ab8122a4efe0ef47b
-EBUILD pkgcore-0.11.6.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
-EBUILD pkgcore-9999.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
+EBUILD pkgcore-0.11.5-r3.ebuild 1228 BLAKE2B 76f7aa64db9f6c222c2fe3e81525d81788d941cbeb2abd28d92f3b95c475dcc7feccebc4e64d0f42fb7490f84f50cd87f17c46088a37f983e546327099a7df13 SHA512 035781e3dcd799fb44bdc8ce84688e4f3919ce49f8db8d7e0f56cce91784caf0f6a83adea07e0309e0523c32f0daa5856dcf300daf2ed95be4c6c6c09acb4aa0
+EBUILD pkgcore-0.11.6-r1.ebuild 1128 BLAKE2B 07288f4d2cc2ceb10cec86371dd088a1d83430d5a10aa3d64ae99e4933581542b95710e70e8c2526d380f3264c5377e0b1513fe57724c02f95b8c547b4b0c3fb SHA512 073f93cdbf01a48789ffb878ef13d25dbb8fc53787f5549e9f38acbe2d09bd7a94b842f5ae23ca1db19754fe40eff49a99076329ade4ce6a548facb5b6a6ed23
+EBUILD pkgcore-0.11.8-r1.ebuild 1146 BLAKE2B 329fc5a8f7b4a514703746a4cfc9a0ce6401aad074cd3f46f0e0bf7202155245e716927b1c919f135844b6891b141655e64b83291f7945e263a3b21818dd2264 SHA512 c934d61f4d162f71ba1b8a946a8d2b6b31dc4e6e602e4532c1172a3f110d9ff74523fdb9f26b6b4424327bcba2d87691e12ed14d13f1353b3455766f8d6f02eb
+EBUILD pkgcore-9999.ebuild 1081 BLAKE2B f59f5bab0d4b3f26c2dddcdb8bebe550aa89462cbb9c4c7aadee461b17679dcd3fa39e37208a8853532592a235d959838af6c17bd6c807381db110a8c35a5205 SHA512 b6fb191a3d84a189f45f1ed6c4ebf2bc02fd729688b10ad98b7bc5767ac0dd16e07f052d015e93a84e21a0e3ed1d6c82f8328a926e24b21ee3204863a6ce1d07
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch
deleted file mode 100644
index f2e4ab15a830..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 780bf8e6a2b83a244461304017ab036bcf8c6eb9 Mon Sep 17 00:00:00 2001
-From: Tim Harder <radhermit@gmail.com>
-Date: Thu, 5 Nov 2020 07:20:18 -0700
-Subject: [PATCH] data/xml-schema: update metadata.xsd
-
----
- data/xml-schema/metadata.xsd | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/xml-schema/metadata.xsd b/data/xml-schema/metadata.xsd
-index 8b8ac0b5..db243abb 100644
---- a/data/xml-schema/metadata.xsd
-+++ b/data/xml-schema/metadata.xsd
-@@ -272,6 +272,7 @@
- 			<xs:enumeration value='gitlab'/>
- 			<xs:enumeration value='gitorious'/>
- 			<xs:enumeration value='google-code'/>
-+			<xs:enumeration value='heptapod'/>
- 			<xs:enumeration value='launchpad'/>
- 			<xs:enumeration value='pear'/>
- 			<xs:enumeration value='pecl'/>
--- 
-2.29.2
-
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch
new file mode 100644
index 000000000000..30cec9114f56
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch
@@ -0,0 +1,47 @@
+From 533f1edd70054a5479ee85719d3cbef0d15627fd Mon Sep 17 00:00:00 2001
+From: Tim Harder <radhermit@gmail.com>
+Date: Sun, 28 Mar 2021 17:18:16 -0600
+Subject: [PATCH] ebuild.processor: register SIGINT and SIGTERM signal handlers
+ on ebd init
+
+Rather than at a global, module level to avoid issues with inadvertent
+issues during 3rd party imports, e.g. the pkgcore pytest plugin getting
+autoloaded by some other project's testsuite.
+---
+ src/pkgcore/ebuild/processor.py | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/pkgcore/ebuild/processor.py b/src/pkgcore/ebuild/processor.py
+index e8c3c2cd4..65437efcf 100644
+--- a/src/pkgcore/ebuild/processor.py
++++ b/src/pkgcore/ebuild/processor.py
+@@ -275,9 +275,6 @@ def chuck_KeyboardInterrupt(*args):
+     raise KeyboardInterrupt("ctrl+c encountered")
+ 
+ 
+-signal.signal(signal.SIGINT, chuck_KeyboardInterrupt)
+-
+-
+ def chuck_TermInterrupt(ebp, *args):
+     """Event handler for SIGTERM."""
+     if ebp is None:
+@@ -292,9 +289,6 @@ def chuck_TermInterrupt(ebp, *args):
+         ebp.shutdown_processor()
+ 
+ 
+-signal.signal(signal.SIGTERM, partial(chuck_TermInterrupt, None))
+-
+-
+ def chuck_UnhandledCommand(ebp, line):
+     """Event handler for unhandled commands."""
+     raise UnhandledCommand(line)
+@@ -332,6 +326,9 @@ def __init__(self, userpriv, sandbox, fd_pipes=None):
+         self._outstanding_expects = []
+         self._metadata_paths = None
+ 
++        signal.signal(signal.SIGTERM, partial(chuck_TermInterrupt, None))
++        signal.signal(signal.SIGINT, chuck_KeyboardInterrupt)
++
+         if userpriv:
+             self.__userpriv = True
+             spawn_opts.update({
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13-r3.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13-r3.ebuild
deleted file mode 100644
index 231497d64904..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.10.13-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
-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 ppc ppc64 ~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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+="
-		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
-		>=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-metadata-xsd.patch"
-	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14-r3.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14-r3.ebuild
deleted file mode 100644
index 59c8183d8a79..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.10.14-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
-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 ~ppc ~ppc64 ~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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+="
-		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
-		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.3-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.3-r2.ebuild
deleted file mode 100644
index 5094000142d6..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.11.3-r2.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
-PYTHON_COMPAT=( python3_{8..9} )
-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 ~ppc ~ppc64 ~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="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+="
-		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
-		>=dev-python/snakeoil-0.9.2[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.5-r3.ebuild
index 2bd302ae4827..7aca2d4c654c 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.5-r3.ebuild
@@ -10,7 +10,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 ppc ppc64 ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -37,6 +37,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+	"${FILESDIR}/pkgcore-0.10.18-sighdlr.patch"
 )
 
 distutils_enable_tests setup.py
diff --git a/sys-apps/pkgcore/pkgcore-0.11.6.ebuild b/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
index d98868c1bf84..b3b0051fd372 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.6.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
@@ -10,7 +10,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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -33,6 +33,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.18-sighdlr.patch"
+)
+
 distutils_enable_tests setup.py
 
 src_test() {
diff --git a/sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.8-r1.ebuild
index 596e3598f7ed..ccaf1c6d4391 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.8-r1.ebuild
@@ -10,7 +10,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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -24,19 +24,17 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+="
-		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)
 "
 
 PATCHES=(
-	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+	"${FILESDIR}/pkgcore-0.10.18-sighdlr.patch"
 )
 
 distutils_enable_tests setup.py
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index d98868c1bf84..cdd33c35e9c6 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -24,11 +24,11 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)
 "
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 820b84039893..d2b7e3a7cbcc 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -3,5 +3,7 @@ AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
 DIST plocate-1.1.5.tar.gz 69090 BLAKE2B 70b398eb1a5d7b36294188966ef5f46843d9db9f41021a294d88795944412b4ef3819771082955a74a9945296fa14c59461a4ab4af197691f7085a40eeb7f0ef SHA512 6169ea7b3587e12e555a42e0c70e149626810f5e6f9f1f03ca1b069d7892d45bc52cabf072324eaa6f14055943dd680a71642914c0218a770e2b00a22c75efbc
+DIST plocate-1.1.6.tar.gz 71518 BLAKE2B 497ff8061e3e880e2502cb3fd13e3c9de06e8c4fffdc6b405e1a9a4e33f694b86f2e32fee93f57f5dd122b52a4a8615f1615ee77c6519448afcc596210aced65 SHA512 d94104b774ad75f60b8de2c044ac203ed28ffd6a0765818cf3e9d50d589d0c53cefbe77510d650c221e2c36b8672f63cd45ccb2f8774b20f9cb4d51de0bb4dbe
 EBUILD plocate-1.1.5.ebuild 1857 BLAKE2B b90e979dd6f7771a0ef4c481e0563f59208f35ab1032b61a3c9a1998dd987cd5793ab0d6d80110822c85abcbcc117ff12d5a613025e8185d1ec3f09c9aef341e SHA512 ed35405d72cc84b4c5469a681dc03869054ca6ea9b7a8155001b2d13361536375a9985c28caddf689d840ec24f2a497363957be9f9b7e15317531656943d2758
+EBUILD plocate-1.1.6.ebuild 1857 BLAKE2B b90e979dd6f7771a0ef4c481e0563f59208f35ab1032b61a3c9a1998dd987cd5793ab0d6d80110822c85abcbcc117ff12d5a613025e8185d1ec3f09c9aef341e SHA512 ed35405d72cc84b4c5469a681dc03869054ca6ea9b7a8155001b2d13361536375a9985c28caddf689d840ec24f2a497363957be9f9b7e15317531656943d2758
 MISC metadata.xml 1285 BLAKE2B 778c722e0b5e673f97f22f3c60fb2ed5cd1ce18ceb6aec3426049010eaa930a51bb68c2bda2b9a3f471a9737dec406c52fc849cb674df913410868d3c9dd5479 SHA512 f558b515d2dabb31d11ace480ad94c8c2a925c5ffab618930bb3fecc29fb710f7ad3ff253955272930004ca96344950ce5aa743bece0862a3a6c1c1675be22ff
diff --git a/sys-apps/plocate/plocate-1.1.6.ebuild b/sys-apps/plocate/plocate-1.1.6.ebuild
new file mode 100644
index 000000000000..4aaa46baf9c4
--- /dev/null
+++ b/sys-apps/plocate/plocate-1.1.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 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"
+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.5-no-systemd-check.patch
+)
+
+src_prepare() {
+	# Pretend liburing dep doesn't exist when USE flag off
+	if ! use io-uring; then
+		sed -i "s/dependency('liburing/dependency('/" meson.build || die
+	fi
+
+	# 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
+	)
+	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
+	newins "${FILESDIR}"/plocate.cron plocate
+	fperms 0755 /etc/cron.daily/plocate
+
+	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/pmount-gui/Manifest b/sys-apps/pmount-gui/Manifest
index af5d42664643..24eaa032f3a1 100644
--- a/sys-apps/pmount-gui/Manifest
+++ b/sys-apps/pmount-gui/Manifest
@@ -1,3 +1,3 @@
 DIST pmount-gui-0_pre20130806.tar.xz 5132 BLAKE2B 7c575f4ab9ebe632eebed0a73ef2dfe3e7ffeb47cb28ab39a3c8928d2f0bb8f0b118e00d8d9a7d9663721016c93fda33c803bcd6c283ad7f4b5e7ea4df401c04 SHA512 97871dcfbd14a26f93186b8e08d5512c6b7d6fbf76c94a9e4f0f8e74404ce7a8e1139bb5d3fd432fb1b228ff48f9f56195124839431f6a5d3d82f43165a2b5ce
 EBUILD pmount-gui-0_pre20130806.ebuild 712 BLAKE2B 23eaa2b94beadc5a07d21940d36d39d520f4ff5fe9041a3251ebb35941c7cd0b7ea47793b47e7f719b3580be0c80a580534113b39328b622fed4329529898173 SHA512 fc69d3ae66631108c93754d4c96d31b441f19b30a743f2b87091b0a51957c0a8bc07ce5d8d040835f1e7eb8d0b8c463339059ea3a60d9bc395316a1e5b32021f
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/pmount-gui/metadata.xml b/sys-apps/pmount-gui/metadata.xml
index 2ba8e9e851e4..7a38bb900964 100644
--- a/sys-apps/pmount-gui/metadata.xml
+++ b/sys-apps/pmount-gui/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index bb2aae96bf5a..c8ae13916dd4 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,6 +1,8 @@
 AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b122b16e88190cad74891434c57fff3d9d4fa2529ac5e88cbbf572e710cf0bc313ffb83d8e80261265c121230f3975900a7ed97093dbd2f8930 SHA512 2e42dcc62be3a224b0bb153c615e12dc7febcb11bc46dca32d1ccafe51a8ceb4e57c63080b6cd8c8e87e16ea901dcfdc6aab9dd9c6f48b691a23da4eadad007d
 DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd6401c9e923d2c775c7c8c47f0e803749feaec4247fec5cc1cb766314954402fd2506370bb397f746437ecfcf65b384f3 SHA512 0592f218563a99ba95d2cfd07fdc3761b61c1cc3c01a17ab89ad840169e1a7d4083521d5cacc72d1b76911d516bf592db7a3f90d9ef0cc11ceed007e4580e140
+DIST policycoreutils-3.2.tar.gz 2817961 BLAKE2B 747cbd7b84ffa9153067340f8f1dc5a652eaf85b037a6e10e116d3d0b31c8e7c9794bc6a46ae212848bef4887478ac167e359a387bebac49e0acd08b727808ce SHA512 d16781d2d61b8b78d6fc242f2b5c3a03f47ea524fb61655823b6b0f0327ff376c65fe7bdf7a53f5863c01e599cf4a7050f21fda0fe6a8f2c2c16f89b156a4346
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-3.1-r2.ebuild 4619 BLAKE2B 7cc7726962441be4d61b2ac8f15d2505d05fe943663f9ebb34f86f381c3319126699626c5f1b37e2d24231af9723e14e58bf79628703565d9e5314095e360c53 SHA512 5f739867053bb98e1f63c3e59512ac31b077163b54f6e420687b833da4d7cc5c4db623147866b3765ee433eb243f12e0e0683736a024641cdd09c8207084fc23
-EBUILD policycoreutils-9999.ebuild 4614 BLAKE2B 3155cdf6c011ebd9c02d687200f6e2697a813efb8d490d535fbc6f5b8d5bf0399a42186949e3178697945db9bba8aa94daf271c8b0066c8c8155179712ebf8f0 SHA512 97c8a8a2791c2b629d53143d89dbb825ec3db30eae93aaed4551b247023251aeff904e358f3b1230efc9939c536456837b9c52861686c5b5f7c4d7348264a100
+EBUILD policycoreutils-3.2.ebuild 4476 BLAKE2B 799b932548e40c807a34fed32d3a6759ba49fa2e03e4d4a41493dca206307949b3a770bef991a4102a002e461998b75b71321f593a67c0e99824f13d364b4334 SHA512 ac6842ca482c0a87216f714195c801ac975263eaad93ef3768c1ad5b3edcb78237d7771dbb36aaab9fe9c9133a1a7a674402ea32a050ed816925f8a0ea60eebb
+EBUILD policycoreutils-9999.ebuild 4476 BLAKE2B 799b932548e40c807a34fed32d3a6759ba49fa2e03e4d4a41493dca206307949b3a770bef991a4102a002e461998b75b71321f593a67c0e99824f13d364b4334 SHA512 ac6842ca482c0a87216f714195c801ac975263eaad93ef3768c1ad5b3edcb78237d7771dbb36aaab9fe9c9133a1a7a674402ea32a050ed816925f8a0ea60eebb
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
new file mode 100644
index 000000000000..fcc4708f1b9b
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_REQ_USE="xml"
+
+inherit multilib python-r1 toolchain-funcs bash-completion-r1
+
+EXTRAS_VER="1.37"
+
+IUSE="audit pam split-usr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	S1="${WORKDIR}/${PN}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	S1="${WORKDIR}/${P}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
+	>=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=
+	sys-libs/libcap-ng:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
+	pam? ( sys-libs/pam:= )
+	${PYTHON_DEPS}"
+
+# Avoid dependency loop in the cross-compile case, bug #755173
+# (Still exists in native)
+BDEPEND="sys-devel/gettext"
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${DEPEND}
+	app-misc/pax-utils"
+
+PDEPEND="sys-apps/semodule-utils
+	sys-apps/selinux-python"
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	S="${S1}"
+	cd "${S}" || die "Failed to switch to ${S}"
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
+	fi
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	eapply_user
+
+	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			install
+		python_optimize
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d" || die
+
+	# compatibility symlinks
+	use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles
+
+	bashcomp_alias setsebool getsebool
+
+	# location for policy definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+}
+
+pkg_postinst() {
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		# There have been some changes to the policy store, rebuilding now.
+		# https://marc.info/?l=selinux&m=143757277819717&w=2
+		einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)."
+		semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+	done
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 44e8c3b34eb6..fcc4708f1b9b 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -1,19 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI="7"
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20200710"
 EXTRAS_VER="1.37"
-SEMNG_VER="${PV}"
-SELNX_VER="${PV}"
-SEPOL_VER="${PV}"
 
 IUSE="audit pam split-usr"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -25,14 +19,14 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
 	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	S1="${WORKDIR}/${MY_P}/${PN}"
+	S1="${WORKDIR}/${PN}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
 	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-	S1="${WORKDIR}/${MY_P}"
+	S1="${WORKDIR}/${P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
 fi
@@ -40,9 +34,9 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
-	>=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}]
-	>=sys-libs/libsepol-${SEPOL_VER}:=
+DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
+	>=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=
 	sys-libs/libcap-ng:=
 	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
 	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f963241f74c7..65c7c1d95c28 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,15 +1,12 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
-DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
-DIST portage-3.0.12.tar.bz2 1049335 BLAKE2B 9f7b17ebfe068559ffbc2bc0799f72901abab8b8b5bb608c8f6afe1f8f7fdaae1026c2a04d9b2256b367711196e32b58c6927ea6fc57146148ed71b295acdcb8 SHA512 6f93f35c06ac765f926f5281e2fac99d52140e8c5d95ee4224796c1ea23ed5f45ed5382acbbfc7aebf9f68a9c585fc1b41b615ef765be2d16577909032de1350
 DIST portage-3.0.13.tar.bz2 1049930 BLAKE2B 092e4a25896d613dcfcdaaa1c75f29d19112688328c4078a8ab2b24edcf1e26fff3273da56a79f8b35aada5e11e3cf7f14ef40aca742da0874ea7e907c4778bc SHA512 a9106fce311053523fd026c6c65cb85562bae69ab6ea6b5ae784044ffedbfeb0e3b1c3758ebea9204b11f885da383f9d8ee31d34ad52ac14f059cf97894e3590
 DIST portage-3.0.17-bug-775053-setup-globals-double-prefix-ff7d78.patch 908 BLAKE2B 51984f04bf9a9b448207f9f724a01e72f76a1df8f3da8a9cf263a870674458e885ed47aba7597b3a01d9ee3c86b687bcb9048356af9d7d2b015dac9c41c97baa SHA512 1aef52afcf4e5dca3afe7d746a868f5ea5a1afb28703e2087d620f5206cebdbf71e0d600d3354693e59f49cd92758f47e3aafb4625539af0cdec80b36109051b
 DIST portage-3.0.17-bug-775239-_test_lock_fn-tempfile-leak-d8a12c.patch 733 BLAKE2B 8281107d270908b49218603ef64b7580c5d6e0bf015eabef4c35f8ee9d76b2b7790f4b75404b9d85fd030c3a0f9183e88894d67bf547978f3fa0bed0630112cf SHA512 5ea4ccc7d517ea79a02fad77d20502d613cedf9df00edebf73972979bd5a469f47c14ae5b69b850f0ce9860b9fdf1b5bb283e138bd7be5b832928697e4bba42b
 DIST portage-3.0.17.tar.xz 970076 BLAKE2B 261d8d3b0da5bb77f37328219365a59d7ac56a22e887de59a6b702fcf895493f7a0aac1af744bc67b80c9e2aa730795e507764e9e1c807c247d1ccbe6f825d2f SHA512 6f4a50b005a67e6eea24600d10179fd48b4aa1de4cdf99bc310854dc303248408f8a31bca4135e4e530fcbd2b3d99c2f89644e4e4240e3a754fd97e949403ffc
-EBUILD portage-2.3.99-r2.ebuild 8492 BLAKE2B f7b8dc5945641519b9a13bf149b172889261f89df30f1878632a4b3b2e84db8bfc5e329a77240afdfd4b4c529928724074fe0d63d8ad282aa3804c9c18d5194c SHA512 b8dc26ab536c251b2be914c8a212c1b92d4832835a058b507d47a94b4f8e5f68410d1c0a2c164c44359219fa9859237ba2a83ac209bff0a6e9fe824f7b7f4e7c
-EBUILD portage-3.0.12.ebuild 8440 BLAKE2B fddb332ecbd05f0db76eafd58c79e3e9f4b0b1637a2f604d928113a7e53db7db714f23582ee498a052ab93b07b50972c20621e7f79d249cfcb1473ddd02c9c58 SHA512 f6a2710b49f5c6e29e105ca72629d8f707eba0f44aead8a8a47d4a0f2bfb095802492c48d51f4e5941974f2d6e51e9eecfebcc031c0d5ba6db7619d636d4a2f4
-EBUILD portage-3.0.13.ebuild 8440 BLAKE2B fddb332ecbd05f0db76eafd58c79e3e9f4b0b1637a2f604d928113a7e53db7db714f23582ee498a052ab93b07b50972c20621e7f79d249cfcb1473ddd02c9c58 SHA512 f6a2710b49f5c6e29e105ca72629d8f707eba0f44aead8a8a47d4a0f2bfb095802492c48d51f4e5941974f2d6e51e9eecfebcc031c0d5ba6db7619d636d4a2f4
-EBUILD portage-3.0.17-r2.ebuild 9214 BLAKE2B eec8b0337168a02f110c52db2b8499f30b9fcb16a595803600da037ad555f427b496ffaf37085ad82917e9d9be1c2f601f1315a656c19d83c2c2762d2b3931fb SHA512 bdc626415e541c9249b422fc2490104ae4663d76252e14f1b2fa8ba828f84bbfce8b39e266abf1dde5a1564cca7c590b8d3a20e4773e352cb17b65e0bc9ec9da
+DIST portage-3.0.18.tar.xz 971692 BLAKE2B 0a8d2062fce1bf85a2f1025d17ddd3eafc987fd93c01f17bcc4487b23841e530451502417e24bbe58175b4fee871ceb528696775116a60f93b7b841d14ecf7a3 SHA512 d3f4b5258748fbef7b8ec000685b7e42804123a5c6b474bb6679666c2696a16e3bd202108df6e647770406539ff223bfd0deb1a3b4240e0a7ba1f2ec52aca2cd
+EBUILD portage-3.0.13.ebuild 8441 BLAKE2B 26181a21486c1bbe225c5fdc09989fe1f9bdfe9c35dcb4b1dce6ac27a9248eef59b5ad518a8b1b20e9debb61b7079d2b8e08e6c27a9431875fd64a5d56c2ae45 SHA512 e1d17faba9d4f2f8ae9506b119eb5ed5353f84e6d6bf583696d8d48722dbb539b88eb4d652fd68c29367cd1ddbdf721a0f470b4da3d45f21b8cca6e11a5a5291
+EBUILD portage-3.0.17-r2.ebuild 9209 BLAKE2B cacc19c415c8c8a7982752319f914c66cfcd6d49972e71056350ff6cce771b48ee39a41298510eb42e7a5d04d06a9a683f558166bfef3c4356fe4a529a3fe50c SHA512 f5764228b3d0503b28a3cf941712ce62bb0dffab044f2a7c3e7e7b4309d87286996a9be20e7db2da915ec8cd51f1761147e634de5a148cb00b2acd69bae05f6f
+EBUILD portage-3.0.18.ebuild 8756 BLAKE2B 27048b15c8fdcae36bd51d56edeb0838b43e77a284930071833901f1484e14617f06090cdd1ed2ce6a166a78d272d9a37193b4d52f93942e9df1203715e09ae2 SHA512 38525aed603cfc379ff01f48f3bf3aa040b5355576c46515724350401ff948772b9aeed2b088f7d93805776ef4a55d32e02afa24b47cdfc7f298437c9019920a
 EBUILD portage-9999.ebuild 7776 BLAKE2B bef58d44947c861ca20767e5204ce67b51f7b63a7209b13e2761a97dce73b60ea153cee09b44769501796dcf50bc45943f3b3631f6c80f22a6545aee75de303d SHA512 0049bfc2225ee65073f56e498237b2862a688d083fdb6976bfe983b5c02722254f656e6571eb71c159b3e7b9daf400e513dea87bdb4001dbb55d2976a14458b8
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-2.3.99-r2.ebuild b/sys-apps/portage/portage-2.3.99-r2.ebuild
deleted file mode 100644
index b0d41add84fb..000000000000
--- a/sys-apps/portage/portage-2.3.99-r2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_7 python3_8 )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 epatch linux-info tmpfiles prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-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
-		dev-python/sphinx-epytext
-	)"
-# 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="
-	>=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:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/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 )
-	elibc_uclibc? ( >=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"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/commit/9738a404e876270cbdef2514f66915bce35d7435.patch -> portage-2.3.89-bug-718578.patch"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	epatch "${DISTDIR}/portage-2.3.89-bug-718578.patch"
-
-	# Apply 03efd1125214
-	sed -e '50s|"EMERGE_FROM", "EPREFIX",|"EMERGE_FROM", "ENV_UNSET", "EPREFIX",|' -i lib/portage/package/ebuild/_config/special_env_vars.py || die
-
-	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} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; 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 ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		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() {
-	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
-
-	# 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/portage/portage-3.0.13.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
index 2ca4d26888a0..489969e0c4a6 100644
--- a/sys-apps/portage/portage-3.0.13.ebuild
+++ b/sys-apps/portage/portage-3.0.13.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-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"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/portage/portage-3.0.17-r2.ebuild b/sys-apps/portage/portage-3.0.17-r2.ebuild
index f75ba73cc86b..c15b19433d3d 100644
--- a/sys-apps/portage/portage-3.0.17-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.17-r2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-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"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/portage/portage-3.0.12.ebuild b/sys-apps/portage/portage-3.0.18.ebuild
index 2ca4d26888a0..dd17cd2869e5 100644
--- a/sys-apps/portage/portage-3.0.12.ebuild
+++ b/sys-apps/portage/portage-3.0.18.ebuild
@@ -14,12 +14,14 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-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"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( dev-vcs/git )"
+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
@@ -83,8 +85,8 @@ prefix_src_archives() {
 }
 
 TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.xz
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.xz)"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -138,13 +140,17 @@ python_prepare_all() {
 			-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
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
+				echo "${REPLY}" >> "${T}/shebangs" || die
 			fi
-		done < <(find . -type f ! -name etc-update -print0)
+		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
@@ -248,6 +254,10 @@ pkg_preinst() {
 		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
+
 	# 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.
diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest
index d3dbc936fe1b..4aac1db5d7c0 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -2,5 +2,5 @@ AUX Makefile.am 70 BLAKE2B 9c2735d35e8a0c707d5fefd6721c5a8678266b64e0fa157e3ebac
 AUX configure.ac 200 BLAKE2B 3ec747f56bb304484671171dd61c72cac8b264563955b7759b0c5f42f1ec03c490f400df0bc381c87c006316cb00a1687dd4dd5d83471c0699266cf23a727788 SHA512 ae8a75d3a37cb33fa8958f2de48549b99fc0b6f5c15fab8d7b9478e38e0dbd6d31e4bbdc876a50d52598d8b7964a544c0eb2e4677b3b32e7034acab98d8d6fd7
 AUX prctl-1.6-no-implicits.patch 381 BLAKE2B 4374744647de591232e9da6398465a5b9f31f75027f57ce7da5d2294321c6ee17d6bb3c4a108131602bdab7f6643aff2778313c764d659e15093a6cee1081fad SHA512 b01e17872a6c098ddbd4720cf62cd83d485fd1095a9da47c2f79cc09b50648a02bde2aeb38b8dec03d5be794223c898f2c753f576068540252071209e1701812
 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
-EBUILD prctl-1.6-r1.ebuild 545 BLAKE2B d948fc8ac27ed240266ab6eeb805bc65a7ccb07c0a8008e9acd719649cc2380f4ca61dfb658cb40a099bc67a22ee98734d03cecc6c70d9485d2ac0d8353fc304 SHA512 64419216ed7f999f12fd0fe37005cfac90db415b3952abf7a5787e56d2a6ff88d7209280487dd94fc7a37236d11f70c3a4f6700f1bea416d575b2039dfc7f96b
+EBUILD prctl-1.6-r1.ebuild 499 BLAKE2B 33fa444df6679fb2f43b47bd1cb495fb3ea5ff1592c2323c8d772e0e8adf31ecff263ad3c6a170282a83734957295cb8e1813eb348671b4a742cb646aeda2d40 SHA512 9c613de230c09e8ea956fa83b25b0f38fdcdd44f4ab8118ec84b3870681d3f04d46913679eabb9edd49f2457411b7e0182ecb7ad63a9a2683002a8204cecc05a
 MISC metadata.xml 326 BLAKE2B 0133c9224a3685844700784a04d8fd4a9bc5ff6f98213e84bc2d3e12efb8d68dbbc9cbb250c058fed38a903b75bbe908459db58dee9b6725479b8289277aa450 SHA512 bc575ce8fb40e554f52ed9a0154b9d5952538d6703d45a2b7bed559c452458e2bd57cd057771c8db351665f9737dbd1de95471e4cd2884505241514938bb5ffe
diff --git a/sys-apps/prctl/prctl-1.6-r1.ebuild b/sys-apps/prctl/prctl-1.6-r1.ebuild
index 419cae89d00f..26335f994e69 100644
--- a/sys-apps/prctl/prctl-1.6-r1.ebuild
+++ b/sys-apps/prctl/prctl-1.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools toolchain-funcs
+inherit autotools
 
 DESCRIPTION="Tool to query and modify process behavior"
 HOMEPAGE="https://sourceforge.net/projects/prctl/"
@@ -12,10 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${P}-no-implicits.patch
diff --git a/sys-apps/proot/Manifest b/sys-apps/proot/Manifest
index 93766e2b0a9b..cd95af431c12 100644
--- a/sys-apps/proot/Manifest
+++ b/sys-apps/proot/Manifest
@@ -2,5 +2,5 @@ AUX proot-2.3.1-lib-paths-fix.patch 704 BLAKE2B 2ec5d90122914299dd892001a2b100b7
 AUX proot-5.1.0-loader.patch 8308 BLAKE2B 097a5a3dbf46160a940acf194004443529b720fd8d323bb39057263cb294905e729f0d441a80bc52427e1108a9c1c4fe7dea7e84d39064258d98a3e832522ae0 SHA512 6c3018a4b44149260f2d9f9b8f892f972c0f85482fdc6b7d2858ab6ad16fdc68a9ea619dbcb80c1cb7b4a6d0af2b90329b4560f44baaf3fae29f3c624966ef12
 AUX proot-5.1.0-makefile.patch 779 BLAKE2B a70e16c8f61501253adcd4cb40f69e315548d4394828af537c646fd46878ec75a5f3d24270458a1dfcb9bc70c2468efbcc6e629f848172a678fea27e9f4a5e2c SHA512 3ee5566e2209e0c3cc12ba9dbbbbc93d0080e66039aacbdc3c30974acf5380d4f855bee81a49976ea9c0a67f904456104a2d18777e5c0c10f530debae6e42df7
 DIST proot-5.1.0.tar.gz 253251 BLAKE2B 8dc147d6c6ee303baf0c86f2fa4a8c17a58e76d9da9432635fc70ee06a65aa748ad617735012a1a18a520775fbe38c2264dcccefb681e8e829a5e7e1ddb05cca SHA512 26be26d405a8bcbe94377c3e9c18a571e4b61e3074f0716b0db3517d147d9d4a07c80f7312171cf9580ac7748e72e688efaf1b8e4a0ca3bfc31c802aa351346f
-EBUILD proot-5.1.0-r2.ebuild 1830 BLAKE2B 7c2cf6ede5965c7ae5e65d84112d57a8dff6519f89141eb029a4d0b74a185b1d66247a85d7c12bef81edc1a29fa3330469ec97c9dac56f7a7179bf8a040ee547 SHA512 dcec91f326ab7be2c11b2ccc2555c5983034b9c440eacfd219d4d72775722f7c18f7aab046180553bfc6f858e9772de9e943711866f04845070b2856dd1d5c27
+EBUILD proot-5.1.0-r2.ebuild 1823 BLAKE2B c2a1aa663ac505372e94045ba0481deb7a27254dbd4a89aacec8b4bb8fcfa0b242434c597afac3e826c6547258c3d53e55beee6c133604000e461b962f895fa6 SHA512 aaae8eb80442125c72e09181eb0e8ed5b5e205d9140367c6874a4e6cbb29400edb282187c091eeeb3236b78afc12dc154edf2628659357a06beba5f3d2b82f2b
 MISC metadata.xml 1021 BLAKE2B ee51ffc5905ac216dc1be7388ce514b84a25ab74f4593db590391927353dd4270f70bdff4cbadf645c66fc2c7519d36e4c84863b3d094a187d949f5c54f15ec9 SHA512 e8e8c014074365a50de8693c904eaa22340f426e985d661fd90ca5ca5f09514d366b5d32404a16edaddd817ef029c871f316409d5a10fff23c6c8b934584dca3
diff --git a/sys-apps/proot/proot-5.1.0-r2.ebuild b/sys-apps/proot/proot-5.1.0-r2.ebuild
index 0b43af65d9a5..cca458ee3e86 100644
--- a/sys-apps/proot/proot-5.1.0-r2.ebuild
+++ b/sys-apps/proot/proot-5.1.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 MY_PN="PRoot"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 453b5133881e..16bcc5e07b21 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,3 +1,5 @@
+DIST qdirstat-1.7.1.tar.gz 8532003 BLAKE2B 4e3eec17dbfedf602580eb94a8264af40e77e2d5f67d4f0b9bf4a073bcd951ec48b9c3cac50463d0c0a2512a31c69adf10c1f77d6df317c617d4260c7fd845cf SHA512 e272cb603262966f6f24ef0dda268b4c9819783ec43e4f09181f7c6c7c9dac576403b8fc0c3a5b90b85bdc381f491ef3fd0db79ed88993f2bed3157529651ce0
 DIST qdirstat-1.7.tar.gz 8057173 BLAKE2B 7de2d74933dcce190240569ca043faf76925592576016090498ae21d2074a79aa9b1313fa491c270d5a841238cb35007a85ca3de9c343a353b3de9235f9e5032 SHA512 9af03c110663eab0df48f69f7d949421feebfdca1299205d25a216587cf2c9e472cbe99ad98f3cd6c783be2b02e0308cdbc2f5549bf662b3061ff5e059317b01
+EBUILD qdirstat-1.7.1.ebuild 983 BLAKE2B f8f4e993b7fbaba3da9a2265c74cb72b4e776aa5fc0ed53ce857a91d67a695ccb542f00c677ddee6249a15232055fea81f3273423879a22278d81467c2bd6f68 SHA512 9c0407b7d39282d205494d511ffae91331aa27112cb9b161e9ee317e26a70f54050652e7101cf702d19e6eb6da112437bda848520962052b395a6d6d4ad067e3
 EBUILD qdirstat-1.7.ebuild 888 BLAKE2B da8431858fe360acbe63f7718543318e69e1baaf6db4f245b3bf702aa4c875739f95b1138fbb20d3a11e45eca732d77ccfad8ee15b5de5a34f32140819191f1c SHA512 dd7f0e026558f3a30cc01c076bb4651d019fe62bc31a5ffd1e98a53df4f3c823ead8328c6a2cc346eb5a0ecc3e201d5684587ef6489f4da3aebc257f15fe17a3
 MISC metadata.xml 882 BLAKE2B 9ed3f6470fd94b9376ea810069b63aefae3a0347a7f46be4f1c7c17425082b4b464fc2a5e4b4246d0e6a7a0d0e88f74173593b94ef01721b85990ea59f9ad145 SHA512 606dbdffa7732dbafde3151554b62d7879de5861c0647d21876d6ce4198d63c9413256af2c380ca517e6b148f9e0ecee0c092aa6e3bb47bc972124043508edbf
diff --git a/sys-apps/qdirstat/qdirstat-1.7.1.ebuild b/sys-apps/qdirstat/qdirstat-1.7.1.ebuild
new file mode 100644
index 000000000000..a62fe9d3b636
--- /dev/null
+++ b/sys-apps/qdirstat/qdirstat-1.7.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Qt-based directory statistics"
+HOMEPAGE="https://github.com/shundhammer/qdirstat"
+SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+	dev-perl/URI
+"
+
+src_prepare() {
+	default
+
+	# Fix QA warning about incorrect use of doc path
+	sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die
+
+	# Don't install compressed man pages
+	sed -e '/gzip/d' -e 's/.gz//g' -i man/man.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index d7312d311c74..120909ade475 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -5,5 +5,5 @@ AUX qingy_at.service 391 BLAKE2B 2dd7ea5a1c18502fb77a5bfa4beafe10e96877199c45c9c
 DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9cd18e7ee8c76d880eb2d0f0d379d56dc3693fac24ab7fd70db6208579c4302f3be390399503a8b9a7bb0978b6dfcc8f7efe7b SHA512 563a146acf92d7a4757abd8f537ca912882501d4ef407a3f0ce44f2b334da2872edafe8b489acfc6e4fdafefb60992f8ca13c322047311e5ff16eed091827d64
 DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54
 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd
-EBUILD qingy-1.0.0-r5.ebuild 3840 BLAKE2B b70bacb93653e1e1e9aa7bdb4417850286954af7af26402e6ba8a15ff7c722b700d5652b15f09d5aa1ce38661650e3e6aaf9146920dc9030cdedbd72740b7c36 SHA512 dae7dde84dc7d20a1c21b13a2ac19bc1bc65f4916b72c2f678a3d24520b609e228c18573d93dbf6f30ad13574596f4489e3e937ee20d65eecef0ad7ecc942875
+EBUILD qingy-1.0.0-r5.ebuild 3840 BLAKE2B f9b9bd27a1d9d35c4518303d6655861b41d5dfb15c8f204d44ad213faf602863631124279b77a5567a6b4d417d37616e547ac70e7c81ba1ffd2bef7b0c4e7784 SHA512 a0f252c1f57861b8ea280e544486865619d5590ecc2b0aa1756cb136eada97ec01bffda765084a67881b44baa96d761c51a8d7eba9c73d39ec6a712fa6f7cc52
 MISC metadata.xml 455 BLAKE2B 1f5c9e9578a79b34f81001fe4123f9027bd1c08f669359992ec7f046ecbdefc0da541d0c72091c2ae51c1ff4e920f7d7f2c32bc6d7d9feef1c7d587fb3f18e20 SHA512 4f6eed8a90fb3b6dd96a3e7036aeead5b9bb550b92f5b3d519461775a6d1c710e0a3434b31b9e371392c2219e952419a38c1b90edb1f4ddc450281b165a0934b
diff --git a/sys-apps/qingy/qingy-1.0.0-r5.ebuild b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
index c842ba0889ca..d69f2be4d3c7 100644
--- a/sys-apps/qingy/qingy-1.0.0-r5.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools elisp-common eutils flag-o-matic pam systemd
+inherit autotools elisp-common epatch flag-o-matic pam systemd
 
 GENTOO_THEME_VERSION="2.1"
 
diff --git a/sys-apps/radeontool/Manifest b/sys-apps/radeontool/Manifest
index ca8618e572d5..1b639904740c 100644
--- a/sys-apps/radeontool/Manifest
+++ b/sys-apps/radeontool/Manifest
@@ -1,5 +1,3 @@
-DIST radeontool-1.6.3.tar.bz2 367487 BLAKE2B 0af4f7ce5f638b1ebfa191439f048bd3687ecec0085621b931890f07154fd40349c7d5eab57cb58fb75a6b0c9ebb687728332e3b72826f9b57b2272f67691eca SHA512 937ddf3e2b7dc35b9bc872d770b184303ac9e8199c0de6c17d187acfc5c398abc0cec2071c1af5ad16b0df2976418e06db8b1f90775fe59a8a80bdb3f8e2dca6
 DIST radeontool-1.6.3_p20181127.tar.gz 145939 BLAKE2B ba445095a45d0754c3d20fb45cb75754618d88c9ed23c988926323e9194ef3a8c6ea37c13880d6878750587e6de283a82789c98a6225e303edf7579a327261c2 SHA512 48779a1d7d4ceb79acaef4ba93074ee06b4ee0a02db42fbf1faa7cdc462e21e6c7450dd71c435788e54b99595e61f255154a672bfb8d76acb2d30f560ee6eca4
-EBUILD radeontool-1.6.3.ebuild 559 BLAKE2B 93c5569717865bf9dbf494161d5582297b35ac8be67353f5e34a7e77922b26439e8d70da543b9ce7a6cc6d6979a40dba55efe6a2617ee413a422a79f634146f6 SHA512 5a3e1d3c3f299032d8df4214cdce746e9e06e212322f44f8368877069c18b005cc88cbd434e1e1414aec967df2339966245b62efe15f95b269560dca2d918e44
-EBUILD radeontool-1.6.3_p20181127.ebuild 622 BLAKE2B 01b4ecc282f5e0a2683625faf4bf9e51423beec3a3d1df831dfb35f53a928213715df51dbbe94eabff2dd2e1573d81f761d9ce8f66c3b8ec09743013ead877af SHA512 4045d006d5b26397b40c80659fc92ad53936f3baae77b4ddf1df448593568806db79de43a8b411f5b9f541a4d6416133e59c7c937f84d53947427f7039a3602e
+EBUILD radeontool-1.6.3_p20181127.ebuild 618 BLAKE2B 3a21a13dedc1d9128b5f5a380ea06bb08de26f9626990888fa279b26c3b35e75ae5bc159995312fa178d5a443d0ca8d10ff8e09c624de1946836fa5e032f2723 SHA512 e744bb098dea83a4726dbc9d867a323bcce67d2962c3edd9b9c4e8b2b609f7288ee9e56a80e2cf815449d37be3b86c834f41025f0cb701987e5c29c01fa088fd
 MISC metadata.xml 495 BLAKE2B 17be5127a4b426e976b5634908bc5b05ce304f9f63c42f19be4492bce20ca315030531d8919277204869c0555ae4c24e74b207ff34e002886060f9811b377eff SHA512 adc8f558f969d79313893e30a90a838f99fdda22b9b47dd8dff992367b2a0383e4d49d75318dc9cd79ddbc3a2005d72c2c67ac4d16344299b348481df22773a9
diff --git a/sys-apps/radeontool/radeontool-1.6.3.ebuild b/sys-apps/radeontool/radeontool-1.6.3.ebuild
deleted file mode 100644
index edd777f7ac49..000000000000
--- a/sys-apps/radeontool/radeontool-1.6.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Manage the backlight, external video output and registers of ATI Radeon cards"
-
-HOMEPAGE="https://cgit.freedesktop.org/~airlied/radeontool/"
-SRC_URI="https://people.freedesktop.org/~airlied/${PN}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-
-RDEPEND=">=x11-libs/libpciaccess-0.12.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	emake install DESTDIR="${D}"
-}
diff --git a/sys-apps/radeontool/radeontool-1.6.3_p20181127.ebuild b/sys-apps/radeontool/radeontool-1.6.3_p20181127.ebuild
index 945498dc3d08..1fd63bdf2fbf 100644
--- a/sys-apps/radeontool/radeontool-1.6.3_p20181127.ebuild
+++ b/sys-apps/radeontool/radeontool-1.6.3_p20181127.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="x11-libs/libpciaccess"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index 4a47064410bc..8af3f2ab0d30 100644
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ b/sys-apps/rescan-scsi-bus/Manifest
@@ -1,3 +1,3 @@
 DIST rescan-scsi-bus.sh-1.57 22575 BLAKE2B 71737a9b2df22d8aecc756bb690cc401343c7951f0e809804eee43e01566e9f5377d5fd2c1d3628602ed64536402a71770dfe8e6514ab2d36851c7f0827f0c7c SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733
-EBUILD rescan-scsi-bus-1.57-r2.ebuild 855 BLAKE2B c6607ca02e05d2cf847047c9643f536c42380b8ad21c9100817d5614199efe96b814de031d1a0f02e7b8e8d97557dd612d410cab9ccf6addcc913c2f263333b1 SHA512 34c6a3f33737f7cdfcbf5574fdb60f2c3ea65da33ca33a724d2192a1fdaab6c1c7cfe02687688af9a38f51c0a1637d8651437ff7daefccc4af58aa67198a95a9
+EBUILD rescan-scsi-bus-1.57-r2.ebuild 856 BLAKE2B 9b87e53b45a9192d9fb0b1e9ce893874d0682d628834ae0d486325a017317a1ce91746db0e0ed39edf12677f01611b90aa25607f48ab32328ea8d85df14c122e SHA512 f188a989e4b4e86f43a86b23652fa62c942bca2f359e36e1afdee028e0789d2a5ba53cb567408f67d9562466dda826370e725243776c2c70b8983297dd93467e
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
index 13405ae87e68..569d87f745e5 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=">=sys-apps/sg3_utils-1.24
 	<sys-apps/sg3_utils-1.44
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 9a190dd8d240..019f9a2ffdd8 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,5 +1,7 @@
 AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f082c9c9c9ef458ef87c48bf2e6cacc8c2603a51d9c639938056cffb49a0b089eb4b2a088a11af8eec0c SHA512 dd68ba095d67ccc6f698a8ab2d86942458763619d97a68f421eff0a48d72e66021df40121440107b9402a30a4e4351526d0878dca29a7eb57d68399052b1e2a6
 DIST restorecond-3.1.tar.gz 18939 BLAKE2B 3a3fcde057dad3ed05692d679ba27e0b24f191d92ed5114fa38cb5f846c4cc00d85bb09b5d4e560ed2b914444e0c2d1c407f6c03900610624d5626d05f2991bc SHA512 cdcf299f48b89a7c641ded9507b9b966bf648497394f8e988a9cb1ceb3224c86369706027f3416a4f9750836f7a8f4580a4b3df76673e03f897b383d7ed0e2c8
+DIST restorecond-3.2.tar.gz 18965 BLAKE2B 6cbd32c7c33fcc9f3fff78cc1faaa354c7ee918bfde8e12dfa73ce99632a8bc1e00d2f3b7cdd9c72179dbb51af1847e8dadd41cdc3ca20e9fb45e61871325029 SHA512 b1437a5d4dffef3463a0f2994f07c98585e9cfbc354db2dc07483fd9b964b079090697a277d2f4fd6bcd8df62f7505962fdca22d700721f6ba71490ace0167a9
 EBUILD restorecond-3.1.ebuild 1170 BLAKE2B 98e3caa2596762f7a123252aebff2b9d2fd774e070fcbbd5bfcf13445b1ee1afe9e6850fcf37491cc6da6d382c0a6af360902180dc17905384eb78840dae1055 SHA512 68d65a4b44f6d1b5cd20226a25e8813af4cee19bb2d197ad188c79fa4cf3f152307c2cfd0ef4198f9684ada8efddcb243db97ec13b9dc5843d4fb4859938c91c
-EBUILD restorecond-9999.ebuild 1172 BLAKE2B 3141fefbeb5f95ce31c8a6272609ee292a4496bc39b52121513981333643058019c735dd56c480de47e3f14c2442299aeaaa352550ab7cd27d35b86cf7e12ca9 SHA512 8e2317555f188e3a3c3e4af895add0b1140276ebef6f3c75fe5cacce9c98d3f193438b29a78ecf60a8437b7e78fe41ef992b421a6aec1488f78ca02cc4a807d7
+EBUILD restorecond-3.2.ebuild 1086 BLAKE2B 5e96801f2054d6b2a825f9ab4d63f39f91597488a31dc76ce1111de3b1e3e357897dda4b6ff9ad09fa82dd180bd64770397c06a938bd5999896b38266389fd3d SHA512 a0108d23bfb7dc4990eb4d25e7ab53136454d9250e4849814602d394e31329fe7f7c6c94e07af3793bc689a4655d2c0442f1f70295750643c6948eaa4a8c5118
+EBUILD restorecond-9999.ebuild 1086 BLAKE2B 5e96801f2054d6b2a825f9ab4d63f39f91597488a31dc76ce1111de3b1e3e357897dda4b6ff9ad09fa82dd180bd64770397c06a938bd5999896b38266389fd3d SHA512 a0108d23bfb7dc4990eb4d25e7ab53136454d9250e4849814602d394e31329fe7f7c6c94e07af3793bc689a4655d2c0442f1f70295750643c6948eaa4a8c5118
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/restorecond/restorecond-3.2.ebuild b/sys-apps/restorecond/restorecond-3.2.ebuild
new file mode 100644
index 000000000000..f3e66897e8c1
--- /dev/null
+++ b/sys-apps/restorecond/restorecond-3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd toolchain-funcs
+
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="dev-libs/glib:2
+	>=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
+		SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \
+		emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/restorecond.init" restorecond
+}
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index 9d1e9b1ad76a..f3e66897e8c1 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -5,19 +5,15 @@ EAPI="7"
 
 inherit systemd toolchain-funcs
 
-MY_RELEASEDATE="20200710"
-
-MY_P="${P//_/-}"
 IUSE=""
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
+	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 3bd2c00c49eb..b1b63b0c5d89 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -5,6 +5,6 @@ AUX rngd-initd-6.7-r1 1683 BLAKE2B 34bea128a94f2fc8479ebd8e8a398a01bb96dcbe8dd74
 AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2
 DIST rng-tools-6.10.tar.gz 56806 BLAKE2B 6cce0579a47f638cd90b51ba5216712fe39bf92dd59b288691a5e9783d520212cfb62e875a7e8f85de7a932568fdf0287cbea6f4869c9616a4c9325a111b0243 SHA512 b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389
 DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
-EBUILD rng-tools-6.10-r1.ebuild 1859 BLAKE2B dbed15bdab91852dc931b593aa9c5a625aa77b7721827d9edbbf5005beaad20d88aa086b6deebbc3dbccd59179c36a0c24e8758fb50d6527ed3a405759d9f9a8 SHA512 5125b29f1a842e590e94e3808617378a0a05908a584c52f1ad52ae60880c163c6cdda72b2b78269a47f912482163d5807b9b282b50418bcb45c8b763f67a0399
-EBUILD rng-tools-6.11-r1.ebuild 1857 BLAKE2B 89421ba2239d8f83a4ab41e8bea6100efac735b0ad1689fa818625d3e04b99697365b776da572d634348846d3aaaad12ac275a742a1a768c9c606eda47d655cf SHA512 c0a11820afb9d429254b930706b8d887f3b3ec01884373d51d13e06442ac72558723d931ba2494af7293c24a70dae8333f650f791a861a1b56ae94cb70500c53
+EBUILD rng-tools-6.10-r1.ebuild 1861 BLAKE2B 95f605d3732ea1360c235734b7062e3205a8c9797c741c0206160558634972d11d2b43ac7c936deb30b3bb33ff7d6dc3c197c35e68ea6a8cae430c8c99f38a02 SHA512 c9af7757433b193a388c64ee3b4e960d308366104aa162307dc550d75a6aef2004b605db34aa419417a41e33ccf9686e1abafee4bddf3d375d7fc3ba37935fd2
+EBUILD rng-tools-6.11-r1.ebuild 1859 BLAKE2B 1635014e03c89473ef4d703283345c14e8157fdee7a9f9ca2ae18faa43b7b5065db52a793e6421fbf44e09bf8cd349fe6e39444dd985ed5490f2f028b828b753 SHA512 95f7b6867cab270b483a8371366d3e8a0330564d1c895a155f266bba4fa0141ba038f29e404a4841dd0a66570dc73e6acbe8237f58ff1c57f2fd831cb4cfad82
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
index 76de150c11ce..1d3092b3fdfb 100644
--- a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -72,7 +72,7 @@ src_install() {
 		local DOC_CONTENTS="
 The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
 to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EROOT}/etc/conf.d/rngd'
+	'${EPREFIX}/etc/conf.d/rngd'
 reflects the correct PKCS11 engine path to be used by rngd.
 "
 		readme.gentoo_create_doc
diff --git a/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
index 7b183b63ef91..d691af46947e 100644
--- a/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
@@ -72,7 +72,7 @@ src_install() {
 		local DOC_CONTENTS="
 The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
 to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EROOT}/etc/conf.d/rngd'
+	'${EPREFIX}/etc/conf.d/rngd'
 reflects the correct PKCS11 engine path to be used by rngd.
 "
 		readme.gentoo_create_doc
diff --git a/sys-apps/rootlesskit/Manifest b/sys-apps/rootlesskit/Manifest
new file mode 100644
index 000000000000..99fcb2302417
--- /dev/null
+++ b/sys-apps/rootlesskit/Manifest
@@ -0,0 +1,107 @@
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Ffanliao%2Fgo-promise%2F@v%2Fv0.0.0-20141029170127-1890db352a72.mod 37 BLAKE2B 2192038adcc0bd5fc5be522624f1e2953140a74612a2abbba7c93a24d9ff65b62d73764e4650ab8057927bca2a2bb06a7bdbc68cf1fc9774fd1906016c1f56d9 SHA512 ded2e5dd23c0af5d7c973c97ab390ac9de104f0043bc5cb7ef38a2d5cea715b66b895325cc4b9766da86c87a5b04c702e579a80e9e2e61cb2835e63c27549423
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.zip 14639 BLAKE2B e8d9db907be590e1fe4017afc762898fc83eab3df6e56ac5b0aed018c2275c312a58d9140bee3d0eed21a290851460fbefc41713f26d99bf87d635181cf8e0a7 SHA512 e6dc067a4977622a374656709552a15baed25ce3f3714682ba041fc80c96d64b3f74ac7862dc00e616c85b7ce53a221391c1eafab1bbeb81485bc5bee05d35c9
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip 21941 BLAKE2B 94e8f4d50c0651e1bb47daf76c642871e1e3c53b725910aa101991a7a9b83b8042f76f20be54323b66b5dda1900a7fa5c3708ba0ef02fa2a72c2012efcfa1644 SHA512 eef3b3444dce760fb6cbca5e22f3fcb33fd418e2b54509e80a2150cc644f41a05a59f0acfb7fee386c994dca06d96f4cd023fa192aab368be08ef20eac4a626b
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod 39 BLAKE2B ce025298653101cca2bccaa3f6797881c47f92443d0835d57c2900c62bb34a82d1399884826c863a7a51fbf731c1a8f836674f4416ec2364a20c690d788eaf14 SHA512 3398e8e140093ee9f7c27ce680fc141df5bbeacffb365a98b64898fb6b28cca8eadcbed1d593b90a101a1aede53a5602eb3455e4ec364ea4b76aa3ca043f68f8
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip 57100 BLAKE2B 002b1bb18bc81e6a124d511aaa6270763eef5c9af2117cec54f4dae6be22f0bd0de2594158484ae32933f24f1107f4bd490dec99f119a1c7d2cb2f722a9160c8 SHA512 d4bab61fba7c23094263e73459f6b4bd15bdbe02ef6349619cf89e1064a7d44c20534d6267034a0af4f2aa1a7aff0f02c35f424d25e6dc7c4d5e911e6e9fed32
+DIST github.com%2Fhugelgupf%2Fsocketpair%2F@v%2Fv0.0.0-20190730060125-05d35a94e714.mod 39 BLAKE2B a912dcc347224514c81826763aa9ad2e6fcfdeb8b97ea12b1d46bf738ed2d6894f63253f8df923f4ceb8b306f724998cf06ed4f67494b45039c7adffee02347c SHA512 f4f7373afd8b364bdb8817d6dc5131113a7540a49b28a306faa42f031905632ce39adff49098236be024966e5f7ba7bbe96eb815bd65bf1d7e7d5b0be28c29f5
+DIST github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20210120172423-cc9239ac6294.mod 663 BLAKE2B 24e5c678742cebe0227616262ce67ef3d3ad91cba4b64da045121ddc88557b271a1fe869815d4f6158599877eb8672bdb81d21232121cbcf49ab09ac7434c232 SHA512 20aae78d98ad5b7b363e7f1a21050caaf4a399662ce7a97022cf9b7d174478b6ffc11a38945ad638769237018d6b86ce3527862bbdbc4d237a0fd1601dd0d107
+DIST github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20210120172423-cc9239ac6294.zip 241947 BLAKE2B 62978502e560be131ce97b350d2284ba27ff5fba39697cf15faef837afabab7fd62b0a3138446d4e42710f488288dbef634c19a1ab4a9bf5c2e85950f6dc2354 SHA512 defc922d5c29e44620f79fb84bf01e1697bfa2d3fbf27b67e50e776cf68c4744340b5795170a847482b93fb66daeca9dd8875639c1d5fb5e1b36ec89c8597ac3
+DIST github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.mod 34 BLAKE2B dc250d3c19b11a58deed3e35ece7cef11c91af1da148471c1803e9eb4dc63f6e519993aba3245317577e37644c7a43bdda5c7f69687638a08f0330b82b218e95 SHA512 edd717821dfe4d73ec9ee7e1864284d39fc5ec282c5ebaa3f20b409f86fccf24b8c243ed2671387860dd5e1ecb7b780e896d3798ee4af62e2029b078a9cd360e
+DIST github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.zip 6227 BLAKE2B 295e3d0a3b7c730efaf25470060bcf01ada1b4b4e4f0c212d6477a5ed528f557d86edbca78736cd97ee898f1914c0c9ca772846c4dbcb446dc0f6da4be0ef8b4 SHA512 71cf1725e14a1054c3cc79de141a2e6c96a3a537dbee93b2873844574b8376a1db9046a13487b2ce56b8aea67f4132c1c7d167330717753cf9965492dcea65fa
+DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod 178 BLAKE2B 305d9f2431b92866a80f6d956d8c0e0825857da7177e9c628d2cfb88b6995a49696d9274d7e0a8ae5e3ec8a1e490f3e5ac74f8f1decf6730ce70bfc9d3681ec3 SHA512 9dae3380dc38404b99d1a7119e3607aae1cd1132f8d7a808733cc22ed21fbc4edc2d1320d008cb63439812151f44a69938abcff05a6c8727d1bc58b2c973dcc4
+DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod 215 BLAKE2B 290912a223a80b17cda3da4e72cb5a149e6c3e2fa8d79bf221d6529eb74c1e88c602bffe1234f16657433128f0ef3c9091b723689be39a6193e421b44bee1715 SHA512 549d0522fff36f194065fb864e65e0d11fb5aa45f4720d38c74049af138d75a1f7680489d5e7c4adca47abaf902dfdb202d05e8b040f119c1fcec2c22f412d0a
+DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod 183 BLAKE2B e9f24802c355e638823352a65cb9211b7ef90951890fe600791236d0877731924c34624c483ca14b5c97378ceedd35abd8b5f2e2397985039b0096057bd6c0e6 SHA512 c64bfec29d68ac738bfa3ec5263eba71ce749c89b5296e8e16205a286fe715536da5b66856065986e94172665dedbda96531f6c8b7f6803f2a1c4213d9f5f138
+DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201110080708-d2c240429e6c.mod 183 BLAKE2B cc512f6cf373325a09f20eb9dd33809c33d89d93d67ab1b57e95ccbd558e3ca7790ce8a2cbf77a8998bd8f4c7dae7acfed12d338991d036ba7613be8c6b71bdc SHA512 f019e3325b1eed1b46bc937b9aa1639fc611da42952c4095bf830afe8b8e0f237b5a9cda6663860e8bb31af07ec845753790f803f6ab8e7acdb368ef124b0746
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fmdlayher%2Fethernet%2F@v%2Fv0.0.0-20190606142754-0394541c37b7.mod 293 BLAKE2B 5f61954d8488ea7636d31c7f139e604d78774546bf5668f4b7466c250bc6397b36db8d0ead8c0ca9eebb6b8b548a6e967c18a5235f1066ec6a6c7d237a4a6d2c SHA512 cdca21047fb14be4646478109afc34ac6bbcff4387ae7342cd9422d0ab3025318d2b9977cc3739584adc781a01fc99dca4364ca294bb48fe7198d57497eb235f
+DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod 196 BLAKE2B 69661cd95029a767e20e49762a593633d3acd11e44b489bedc3f52c0a997826b5a07e9706b74edfebcf3aa94706836ee6362edcd32a9a7b6ff33dbb01ab0c1df SHA512 edb2c00f2879dfedf8116e6f21f8358ad89750e1b26ab25db625c55fcfbeface38b523c72e376bd7a5eee333d33e883cbf7ed26d07b4b3a567a162283d9aa006
+DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod 264 BLAKE2B afcb7c0ee7467a383178aed08ff780382ee1efbda1101cd944cba4dd653974153654b3ff38943fb7d6ecece515997384e8eb6f9be2aaceaa4b09bec6fbfddfe7 SHA512 e59cba812a94c451a95be9347f148f0341d0803f32f5f387f6b9dafc96bd4072b035e6fc504235554585338ef448304fcefbc50b1b345d80b27f1cc1b2b571b2
+DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod 264 BLAKE2B ac83365044a3a4cf949e88ebfa21128e7af58e00b1681d94165dccbd57c8cbc45079b84d0da814312f60baeb0bc8209a66f5edbc6c9b376ed2068ae167f35eff SHA512 18c6cda418f62c68b1f39b3d40ae8f6a81442f577bf8eb3180df408c0ed9e05e4f43b57d0bc54f4d51b1c13d8fbb436f01895c3a3c70ce08d7d47ebca1e46726
+DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod 264 BLAKE2B 50eabb5a490f67a346b49011bd13385645b7c56000e78e73b05b5dbcdd98929d9167e74f2d08c548cc66a59beb2a11bd93dda533f6d01ae21b2a16a5aa0dc47b SHA512 7b2445ae9f2ad7c1f5ce769bb84721838136a325dd5dae17eb8cbf34e582a1296cfbfd260a2598fd80f3418945560e16814203f39dd1e61dfa605ddbe379107d
+DIST github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20190606142536-fef19f00fc18.mod 192 BLAKE2B 375c888a49b9c59d4040e03c543290675cec5876cd6bc94cc39072b79ed7a7123e67d4d6e6770d0418d77965d6651b353469e260d5db090e50fd5c75750f5a46 SHA512 f322192b679b9e1bd03201b14d85c077be14ab94500b6b337f392558a680b3da4cffbb68caa890ffaa779ebae72c346a6f72175832b28bf64cf5a442a421e87d
+DIST github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20191009151244-50f2db8cc065.mod 192 BLAKE2B 375c888a49b9c59d4040e03c543290675cec5876cd6bc94cc39072b79ed7a7123e67d4d6e6770d0418d77965d6651b353469e260d5db090e50fd5c75750f5a46 SHA512 f322192b679b9e1bd03201b14d85c077be14ab94500b6b337f392558a680b3da4cffbb68caa890ffaa779ebae72c346a6f72175832b28bf64cf5a442a421e87d
+DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod 107 BLAKE2B ab66968ee9263d9c9d1e1a85444ca0da86a5b0f263cdc51a4d4ae9d6398445b529ea4042e3d93560cade1321d0115c153950611f34a8075194ffaf19a7acc472 SHA512 55dc5a9ed85f4b355e9de88d26d76fe6d87aaf45f95574960d42af9d2c9e97c9685d5397faad9409e3384bb0a205b6546e40c303f127302cf9bea040466665e3
+DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip 36737 BLAKE2B 3edd53bcc466182fde46b860033e34cbd5bebff97fa22fcdab0ac5808e796cf9947f921ee267fe0fa3befacd032d655ed771cea4b80f633a321044d08dfc78f4 SHA512 0926b976e8ea08cefa68658519450675ec50e9dbad8716c8e211812bc36830746a75a1a8dea5a8365fdd8d383cda115b066c7cc93abf613f14203ad398d66813
+DIST github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.5.0.mod 30 BLAKE2B e9d34b8d09999397940ff0ccb1ca0925c3e3f0cdf55364314dc535920732ca8181828715240283d2eda8846183d018582988bb93b6d9fe5e128ef5f46c079e7c SHA512 946d58070f83448aa79ee6f594e8bc1bb013d4d92953b8c0079eec0ded5a0adefe95ed852d4d98ab46d2637faece15a7dfd7d48f2fa429b2586993d9f9078e9d
+DIST github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.5.0.zip 737146 BLAKE2B 0bb07891976994953ca3cc215ff5dfd3e23cc8d53c24952ff1edb2e9bbc46c59d011175e49019248d11d97e50fc75605521ebf965cd1147751fc2544c93e3794 SHA512 2a0c678d40dceec17a8a220cab9851c7772a6ace2922615c4240a9842de5de546f1d0f42a61ec29fc81ccb9fa5c9c89d5e3c0377ea913b7c71456294be4bd066
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip 122358 BLAKE2B 8f906d748eda31f9e673fd8eb0978eb9ff17484d38cfef9f5cb7dd623005bb971d131dce52a6089f5a41deded4c4dbb956aa9a56da91b5a5b5eba9e3a9100f59 SHA512 11e29cdd7a8baee7995009755582c26eb819efd715e9dfa1442b5743c7bf5752188f0fa8f5ddb3452f05f371a280324406410b683609f6a510277d3e03b30ca0
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod 242 BLAKE2B 68986e3744d3ae593a16a24b6ce79876723d93cdf96c978c185b14e4fb8d73d379d4ba05e138b412973b465a76a98a458c6606137b0affdd085dbcf20851471e SHA512 ba06d3386a03812f2ce65f0597b932beb62b70b4da92974c5f5ed81c150fb71ce0285a2d9779ec8a40916870b0e4da5c2c8c5591c3687f3b8e829652a01ec1f6
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip 66301 BLAKE2B cc9a5f24d1cecda3c1cb51b34d441527c40d16a4c088b888b2e43bb08b0a4f41301ba78fa2503b54546b568a49544ddc516451ac1aff4fc7f92300677e802f5e SHA512 50aa92ee488371c7242664cacc6772fcf3b54068d834089d7b62675f9e17a84d234295f266419919ca197f3ddb6d358bab6d5e4583883d4504d6ff90054f5827
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
+DIST github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.mod 32 BLAKE2B a7ad78e4f0640ac2e2a89707740847482b2c20c3156d929b27af98a496f720d3ee6579da516043c8f0a4849b3eae6ab3b42b6a6fec1d5dd320f94b21b8efbc97 SHA512 03919957e4a589b3576e8b9aed9e8d4a0858060f92c8e75756a7fbfcdf10326836cf3b03bfd1bd4405a1281fa01a92dcfc876301b5cb17c0a44105a2eb714368
+DIST github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.zip 4068836 BLAKE2B 73ed69ad3628e38c4d3b7d9481a12330c0a8bdc58e4f9eac9a3c442f87b7ec2adfd1fd1ec306342a9b010dbce6e6431100d71b1b7e76d91525301e286ee1e98f SHA512 85d333b8baec16fbd572f52aba626b32858bc9e99357c19c5179e6d9407bc74f056595c597017b8f0dec0a9c14942beac1c425c2cdf28cf1d314b9d40cde5b89
+DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod 183 BLAKE2B 664e1cdbf471bca9566e20f34f214a9abd2ce826067d232b177056fecba72e8d87bb9eb9b56dff47f5ab7a8c5aeb5ac6bccc7069738f4b195cef81851b0ccffd SHA512 081cf55720b5ee8f81340d7d9ff9da92ef1be9d7a139d58516b01db8a2d8e020d097f79305dcba18ed2975b49b2ee23bd697e3c0a466adbf8a8e75328e943401
+DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip 3454701 BLAKE2B 5f43a7730268c3bd6d4fcc6b6e27ac23075de3421239c00604b3dbd05f0a65a163a41dce00ec919e2704327419117dfa1f21285b74e44945a615b698b397d465 SHA512 b08d6aa4db1930e6864be6a09bbae416bff657cb25c10350f0a5c7bf92d893240216b6fa243e9d58ac68e684512c1818a70e33e11665b467f6dff6a3433a7e29
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190419010253-1f3472d942ba.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.zip 1583673 BLAKE2B 07f4349a74096ed2d757fef00892d30c428082663d5cf998dae21f6bc0aa62897e25bcb628872ef0f100088ae9c5b01eb0915db28980e1a0d9651655fb287e25 SHA512 2a79fdae6c57df7762827d29d9e31e916a2dd33ce9d1dd07fa9e0c2b194015018949078d791336eaa5aa3c5ae831702aacdc48fbce5a779120d0eb8754fa4024
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190418153312-f0ce4c0180be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606122018-79a91cf218c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.zip 1546031 BLAKE2B b8b07e0d05b0bd1b77ef90145d6684a30225e5c38ebc21039e94524792937ef49d60ef2705fe226f62a03712553c685c5eff6c4ddaa6a1fad0327151769125b2 SHA512 f4a3d3f6af5020f70eb69f539c4ee8452028aad40bda05bcd5de74e725db1ffc487a3ff2bf31e4c26ef530b74fa090332f608bec5a2ee233ddfd82c1209e77b4
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
+DIST rootlesskit-0.14.2.tar.gz 68527 BLAKE2B ceb08c4a1d12916dcf1f54f38de800a0d9ee0a67caaea7bb326c40e05bfeeb9bb1e1c79152d1ebbc648dd0df72251c24897f2d2efbe1e44ef9f22957eb417ebb SHA512 2b8deab3116ac85062020e395d0343b2984da26593d16629119ad0dcb6a4d9177dcc43b50cc839707159c87972530f2fd0e830c6bd54bb8be24a3e7aabf401fd
+EBUILD rootlesskit-0.14.2.ebuild 6183 BLAKE2B 5c67c967bc28a769b907b940c9c61272d8f49270cc2e7c87bf538010ad08f73d48c12ee53f13df7c1cd57cd36468d8cad38c52f35fe7d60f5e065baee10d7bf4 SHA512 5ea9a8def1cdade55283c6be3b5b98a8c2a855fb8f8caf4a3239de03067340a06ea45f94a00c63a4eabbe54168717cba0b694b003d440caceae49489a9f968d4
+MISC metadata.xml 340 BLAKE2B 971b992aaf5ac26fa5f0961e6d01efe72ebff68a7b713e8a1274de952e89f7860d6d25a164025ef9d57a37d0ef56e2b8929d69ddf814a8b8deb1c119f564e762 SHA512 db012a63ec176cfbb27374984ce9b7a7cf0965492cdbdcafa60a7823863796f1c4518d7661bf6f91fca73043ac058f8b129bfe5bf86933999b8dc6431ffa813a
diff --git a/sys-apps/rootlesskit/metadata.xml b/sys-apps/rootlesskit/metadata.xml
new file mode 100644
index 000000000000..aca92c3c5826
--- /dev/null
+++ b/sys-apps/rootlesskit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rootless-containers/rootlesskit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild b/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild
new file mode 100644
index 000000000000..6a101ab526a5
--- /dev/null
+++ b/sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Linux-native \"fake root\" for implementing rootless containers"
+HOMEPAGE="https://github.com/rootless-containers/rootlesskit"
+
+EGO_SUM=(
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod"
+"github.com/gofrs/flock v0.8.0"
+"github.com/gofrs/flock v0.8.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/uuid v1.2.0"
+"github.com/google/uuid v1.2.0/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gorilla/mux v1.8.0"
+"github.com/gorilla/mux v1.8.0/go.mod"
+"github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod"
+"github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294"
+"github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294/go.mod"
+"github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c"
+"github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod"
+"github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod"
+"github.com/mdlayher/netlink v1.0.0/go.mod"
+"github.com/mdlayher/netlink v1.1.0/go.mod"
+"github.com/mdlayher/netlink v1.1.1/go.mod"
+"github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod"
+"github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod"
+"github.com/moby/sys/mountinfo v0.4.1"
+"github.com/moby/sys/mountinfo v0.4.1/go.mod"
+"github.com/moby/vpnkit v0.5.0"
+"github.com/moby/vpnkit v0.5.0/go.mod"
+"github.com/pkg/errors v0.9.1"
+"github.com/pkg/errors v0.9.1/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/russross/blackfriday/v2 v2.1.0"
+"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.8.1"
+"github.com/sirupsen/logrus v1.8.1/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/stretchr/testify v1.7.0"
+"github.com/stretchr/testify v1.7.0/go.mod"
+"github.com/u-root/u-root v7.0.0+incompatible"
+"github.com/u-root/u-root v7.0.0+incompatible/go.mod"
+"github.com/urfave/cli/v2 v2.3.0"
+"github.com/urfave/cli/v2 v2.3.0/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+"golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod"
+"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+"golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+"golang.org/x/net v0.0.0-20210119194325-5f4716e94777"
+"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod"
+"golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod"
+"golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod"
+"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4"
+"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/yaml.v2 v2.2.3/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/rootless-containers/rootlesskit/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE=""
+
+src_prepare() {
+	sed -e 's:/usr/local/bin:/usr/bin:' -i Makefile || die
+	default
+}
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index cc90880c9533..1be7d7c2bab3 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 1559 BLAKE2B 1f0ef83fd6c614989354de59667d2a67647e4cb9636251c8215ace86d483326af6e9729378bf8a387531899f711ee17404553183a654af1260d616d0b9ae686f SHA512 06123db6df9af4aa99877232ad1aef677da64582ded476d777a596c123a82dc9a9d4505dc19a49fd5170e549b40bdbd7c3536ca257cd36ca99a51025e10e98ec
-EBUILD s390-tools-2.9.0.ebuild 1557 BLAKE2B 3e3c95cf3a5ecfdd23c20a3582b1d80a9efc57c4c6e91ba5a634723b8f304eb473c21fc9d925f7337f9e18f0363905ca61864a65c766b2cbad6f211441b9fcb0 SHA512 0873ae6bbaf6fee6e9882f673522b8445a6461364ee69b20bffcfe2e461849504f5ceae810f21a212399b4266ab30454bc4f46dae32f5ca321eb93fa5132c3de
+EBUILD s390-tools-2.12.0.ebuild 1560 BLAKE2B a386b182efb8fac0045a5ad5deb3b70f39d5d6fccc91a92edab87210ea096c7067e6ea24a5cecbf6526739f262667a6cd8cd1072129d94dc53c3aab7df8a6415 SHA512 f63cb8d370b47e927a813a6c02541dfa6601f279f06063115df4b2e9c626ee471600bde05fc170d848ca280135fea4b2a27008ec11e28818b3f1b33ff7039b91
+EBUILD s390-tools-2.9.0.ebuild 1558 BLAKE2B 3cb867c60c43f8c1c9aa13d2e04bfbe1f0d992e76f69ec98cb4e67e1995e1cdad71bca54f5d400f1a9aebeebf8f362b8941323766e212295a1db928c75b23f6b SHA512 570f5c924efc1a69927ef8c3aa105fd6213bbb5827c15796b79fdfbed124d6f2b3efd7e2026dc73c5c1a8716c0800a5b05871d2b4ae83cf5e0b0da135b2885c8
 MISC metadata.xml 731 BLAKE2B 394fcebd142b7302d84787d4c56e927b1619f5959e77d3f3daafbd6cc13d25698cc16703f21eada5a7d644f913d89fddfa679987a8a4531022706a2f97911e0e SHA512 e41893227ebb14df77594fb0f7f262fcbf7cc84513a80d21be5d201d8e0d78edb4b24317878770b6a3895a1b34d8cf38cbb566e030d59a5791ee867139bec473
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 06c2fdd5d481..4c890c3a9d1a 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibm-${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* s390"
+KEYWORDS="-* ~s390"
 IUSE="cryptsetup fuse ncurses openssl pfm snmp zlib"
 
 RDEPEND="fuse? ( sys-fs/fuse:0= )
diff --git a/sys-apps/s390-tools/s390-tools-2.9.0.ebuild b/sys-apps/s390-tools/s390-tools-2.9.0.ebuild
index a6710b34ad7e..d62f83652230 100644
--- a/sys-apps/s390-tools/s390-tools-2.9.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibm-${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* s390"
+KEYWORDS="-* ~s390"
 IUSE="cryptsetup fuse ncurses openssl pfm snmp zlib"
 
 RDEPEND="fuse? ( sys-fs/fuse:0= )
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 816d158d2ac3..22c09013d613 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -3,8 +3,8 @@ DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa
 DIST s6-linux-init-1.0.2.0.tar.gz 47666 BLAKE2B 95b092d624db23c0a31a3af8d381e471221f7e7608cad4b49e07ef1e12f6526532e912bd75ef9dd739e14dc1ca99f4aa80e8923ac31beee42828cdcc9c71030d SHA512 1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843
 DIST s6-linux-init-1.0.3.1.tar.gz 48888 BLAKE2B 0633b66840396029686c32e13223527436db118a59abab5800d59c0baad8788c0dd4ff5e97704f680fce2182a64212394dc6a8e7dab6ae8028dbd8cfbf72dd4d SHA512 71b380ff0eaa1d297bf6af5a1c979efdf34d10ec1e440fd1ee3fcab8ddf2c5d7c903d151986ecb5f01a9e0135bedc8021e5fbf82a3fd66abfebcb5e3cbf19242
 DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53
-EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89
-EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0fcde3d8523d74c77867811231e1126e26a042bffc3aa7b6a98e1d39fbf3d37f4a39f604e02e397d085a43e85a795ad58f SHA512 2cdfdb084ab008bd5ae29b63eaca26be3e8d6e40520e2d6c266f4072cf98709872ef0d79bf39d22a62a144c50c413e95eea6016ec3999286b7db75ea1d50a0a9
+EBUILD s6-linux-init-0.3.1.1.ebuild 1469 BLAKE2B 282b8558bd05147da619ed33e946cf65ada8e71dc8e2f7796d8e769c42b674b770f423198d51a8f73b0f14792d6dc5057ff747eb6ea4ced02727952e818ee501 SHA512 01077c8c6e2ae648ffa2447d4d4fb8d60ed98473194620517434b3755f91e7a6a25a79f80c729ba90d74fd76dd5b9a1e46522192076b821a2d34fe29d860146e
+EBUILD s6-linux-init-0.4.0.0.ebuild 1469 BLAKE2B c487b424ba9ff48c8b1f93de50793e803b406a6a64581cb47c0fd6172f20df4572ff2292af29be03cb4b19e9d8485cd51a6629e37a9a77e108c89c00ae117080 SHA512 48436969300b301de32133f9dd2f16fd5ea5be56f405c2eb3db7ebe4d7be7002385014a6ab10fe85ddc88c79235dd90355a2a0d5be863c67de653a1d5de858e6
 EBUILD s6-linux-init-1.0.2.0.ebuild 1670 BLAKE2B 8232e58ef6708936d98b6b3ed12ca25155174c7307cf7dd5cdd245625a89d74f2361ee2cbba1f5811f509c1fe2591343f6625bf51b3b481ade8fb9f86fd777d9 SHA512 ffef1f4e994d727ec80bb23fe2f2fb42b2950010753d83ba459071984c8880f5085bb083c623f39289a93604231014d9d8a02cf0faeae923477915e0f5fe513c
 EBUILD s6-linux-init-1.0.3.1.ebuild 1675 BLAKE2B b2ba090a18a25b3469153fb2f480d81529baf33ae7e002e595a89f3f303b532ed68cf3d7371c501f0d98cb871e8adf7ac6d6f0aa838f0bde4f6f1c1d97bca64c SHA512 ff438cdc3b7393689f8e1088a10323eb372813adbe5f5f1b3317139cf42b10d7ef7b688a214aa63438dd179bcea043694cb966b2b989a1e0314697131318f49b
 EBUILD s6-linux-init-1.0.4.2.ebuild 1684 BLAKE2B 87a4f9184c55aff9b1390c22bc72abbcf71b38451fda08c503c479800d89eabb8c5afc9663bf931800f1c92cdd3cc0e61ae0f0f9abce6114b2723a5c8cda79f1 SHA512 ab6701ff5a1f1f53d48f93c300aaf7f449149e53a0966afd77921ead2f58a3d2b3359f25ccb3b4d86d504afff518e60b5f069fd2f0a70045a6e421401914c465
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
index d94588ab510a..fe8fbf9cdc59 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,8 +55,7 @@ src_configure() {
 		$(use_enable static static-libc)
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	einfo "The generated init script requires additional packages."
 	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
 }
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
index f1878d4e465b..769ec2dd047d 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,8 +55,7 @@ src_configure() {
 		$(use_enable static static-libc)
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	einfo "The generated init script requires additional packages."
 	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
 }
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index ed92ba81fb62..eb1d2021064f 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -6,7 +6,7 @@ DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba98
 DIST s6-2.8.0.1.tar.gz 208122 BLAKE2B f24981b1f29566ae23b8a41a20a119918798ba96fad7e4e62be7d03096dfcbc44de9ea6832c166f541aa8c36bca92819dbe2acd4c46e83866130817237056aa2 SHA512 03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f
 DIST s6-2.9.0.1.tar.gz 201404 BLAKE2B 206bef034446753b32b19eca96b1399209e0480b785f43bb8ccfb0eb9db5d1305155de74405d851cbaccbf5ef07ef1c4d2358e0e47f33928397201417b6f3b92 SHA512 5beb6170e4a457a0a307cbace67369cc35f6fd79d13ece2e82a3ebbdb4b032304eba8124be3e45b4db921863eaa02f51472c1365b0da000eef0868c11514dfff
 DIST s6-2.9.2.0.tar.gz 205009 BLAKE2B a3b3299d7d8695b4c3555a9603763e51c7c8d84d05ea229c787e46af8f5dca3efc09d16eb3380fbbd8e9ff1d300eddb5f632082ffa8dfbe08d45b5799f705131 SHA512 ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee
-EBUILD s6-2.1.3.0.ebuild 1284 BLAKE2B 805f6f16a33b6a150ef75c2c3775c715598694b13d68dfb930a438df946ed1d0ea3c668024ed963997f2667883765dbe0814ade890b80c8c2ccd35ac2bb5e7c4 SHA512 f5f2e6a032852380cd2991cd09c09f4c55d498c42b33af819893f3f81335db221827e5400633d99f18502d0fb9e8965728d7ce32129f1736aee049c498bcf193
+EBUILD s6-2.1.3.0.ebuild 1279 BLAKE2B e5488623ae0bfc682d5e68cbf684181fb85d5af4ef1516ca920f8182a231f53bacfdbc6b3ea5ccc97aff848df3505fa8b35ff9349676290a94342d0a0bc6b5f0 SHA512 ba638e82d48d2032e1adcbd40877baf3e283daa96642ef5f9270fe6603e186baafd8e696bfb28c1d4c2a689cc2ac2f25e68257a3386fb19cde81c45443cba3a7
 EBUILD s6-2.6.1.1.ebuild 1508 BLAKE2B fbfa323712511650c38cfce93faf3c4408791ca887ba7a77e4c9b4022b36cd42ee719b8691bfe8976db608ff4a7822753fabd78d51f107b77ee84d117fc55d10 SHA512 194af6e8227a1f63e5285af765dcb43ae3c06e07daa33c83718e73077d3a3848e1edddef3acd49e48618e2ac10c240bb60313338248a1fc6395b326064cf6a6b
 EBUILD s6-2.7.0.0.ebuild 1508 BLAKE2B e04f58311a19ea1ed6088b46f7919296a234efd09d07bd77207f1d9432183c57081072974b4c720a40f57af0dfb8ebbd447f47ca862c89e8f612b825a43bfe25 SHA512 ad05a4ed4e5c0f98c52cf9a3b37c33de5025cfa04b3d240f7a8487b86637f4317ae6cd10d835f18734326bd3e47d1777d91c860dc2020f16e5d9f888172323b3
 EBUILD s6-2.7.1.1.ebuild 1508 BLAKE2B bd4df2ccff6fbe2e72e4643c33a1a37e6d008ada08f5f0806faa8c14905cda8e0e7e00b3d52da57dab5ba58428ded71d4b188b2b714a37ef015b424433ab8cea SHA512 fa2e5517bc36bbd43a56e35a960aacf13ca0d39bfeec82feb17dc0479c8bdc24b636f38a54d302149a816dc18e8f3fa1250e526bd8b8c890db01bf473fa3e5e2
diff --git a/sys-apps/s6/s6-2.1.3.0.ebuild b/sys-apps/s6/s6-2.1.3.0.ebuild
index e06f05e36281..125f5749978d 100644
--- a/sys-apps/s6/s6-2.1.3.0.ebuild
+++ b/sys-apps/s6/s6-2.1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,22 +23,20 @@ DEPEND=">=sys-devel/make-4.0
 		>=dev-lang/execline-2.1.1.0
 		>=dev-libs/skalibs-2.3.2.0
 	)
-	"
+"
 RDEPEND="
 	!static? (
 		>=dev-lang/execline-2.1.1.0
 		>=dev-libs/skalibs-2.3.2.0
 	)
-	"
+"
 
-src_prepare()
-{
+src_prepare() {
 	# Remove QA warning about LDFLAGS addition
 	sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
 }
 
-src_configure()
-{
+src_configure() {
 	econf \
 		$(use_enable !static shared) \
 		$(use_enable static allstatic) \
@@ -53,13 +51,11 @@ src_configure()
 		--with-sysdeps=/usr/$(get_libdir)/skalibs
 }
 
-src_compile()
-{
+src_compile() {
 	emake DESTDIR="${D}"
 }
 
-src_install()
-{
+src_install() {
 	default
 	dodoc -r examples
 	dohtml -r doc/*
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 1a223882db1f..9597458fbf60 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,6 +1,8 @@
 AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a
-DIST sandbox-2.20.tar.xz 428400 BLAKE2B 11761631ce8e2e495adb41508f308bce875d416ec978e3eb3cb491d3d3a464d7653b8b81d4dcc7e5cd31e8a55069aafa263b85008651ee1d7318f32407fa4615 SHA512 06db36fc85bacf9a3a094c434b73277d8cdde986f2fad7676c42e8f84b3b8b653a1f4b1ec4af9fa1ff5484177419e18f5621275f56a8fbf3973ece524dd6d208
 DIST sandbox-2.21.tar.xz 434540 BLAKE2B c9af3b44e65d96d20b98996a4b9e35cccf6b62020d49522b9fcf50b097d4ffe3719bb334405226c5ee650943bced365547a5d8b0f707ed26ef5f12a4d15dadba SHA512 42b85e230bc89d0e02f22a7ee81b4efbb2c37ff9db24982b4b39487664a095d384101b16a4689863bd32ea91349347980b1c7f8eecb09225bc65619829c6a5b2
-EBUILD sandbox-2.20.ebuild 1883 BLAKE2B eeb4c37d3397fca51ef4f89c3f4d89443291f6385e4ace9cda138dcadeb2ea019dda8d255aa05ffdd20f5f6e535009d6caa78f7fc78cd5b1bca2f2de2cc9f57b SHA512 0524497f51519aa3404f5426f2d77dba1beb1714455d31514ac0c07bf99541ed0ea0664466683a4b65bc82615fa5c1656ec21fbc7f0742c780957622d6e45642
-EBUILD sandbox-2.21.ebuild 1892 BLAKE2B 908d3c4e1f87c2dbd01b2c5a745756fbca721be5764957016049241f9e57be4b89ab5375570fec98b71862c21c6fdfe7e97f3d281497d656df884e9e0ebc93fa SHA512 6e102f8b0e1c84d88f660ae2365077ebb0ade4ec38dc176ade00ccb10a1c18abfd1d62ad351f83acca8e42851c2e51f20c9e441bee1635eab45adf5010ef74e3
+DIST sandbox-2.22.tar.xz 437872 BLAKE2B 248920733ffcb56422bf02711f1ae69e81a176ffb59a1a45266bb81779e2916841eee0d237be4010062693604603893973f1fb295276c25a59654dc56a2593b4 SHA512 9c83e7748aad99e14d43ad81e6f3a8d818b821467023bbb3059ce8cee248090583d31500c1278705110f1b62cad5e5bf7f23390c6548095df709521c7d842eba
+DIST sandbox-2.23.tar.xz 437980 BLAKE2B fd417ea88512e7716a7f075442f684dc67b6c7d991e4375b47de4411353abd52764e5b85709aef06d175ba492b73edf5162c03e66e456cedb8586add18c8b5ea SHA512 d25b27bfeb5f5b9a331029a453be93947f32870b84d0e11efc5bb82044de6005111959a4efef87f1055e7065f76deccce6338d44bb7ab32e3a5ec053a429dbd5
+EBUILD sandbox-2.21.ebuild 1884 BLAKE2B 7fbf74c7bb4ed328c301f1f415b085f45b1e39992d730019fc598e8fe4864ca4b0ff570902b2ae970333c3e2af3e00f2d1d3258cd5372b0e3bf89a2a67f0f9ee SHA512 bb53ced577f1c449b84bf39fde7e2472a02df90d18ef1a2fef070dbc26d9cef995544c4289b2a9e0d49f876c2c0f970212a02e9e397ec22d45c4f790b939434d
+EBUILD sandbox-2.22.ebuild 1438 BLAKE2B 28d7dabc32b6b2f63312b7c2e27fe950c2b780f28abe322d3afade5f6a12a23a48ff17df7ea33aa8b38e804d9e1fb5ba72b7faea343beb0deca2b018086dc932 SHA512 68c2e44d7e1592f6acf21b1c624d470ca843cb79cc777c50c0459137f4baa7841fa7c67bede57217820ac4b0edaca08e4a99581a50837fa7f9ca986372de96ed
+EBUILD sandbox-2.23.ebuild 1438 BLAKE2B 28d7dabc32b6b2f63312b7c2e27fe950c2b780f28abe322d3afade5f6a12a23a48ff17df7ea33aa8b38e804d9e1fb5ba72b7faea343beb0deca2b018086dc932 SHA512 68c2e44d7e1592f6acf21b1c624d470ca843cb79cc777c50c0459137f4baa7841fa7c67bede57217820ac4b0edaca08e4a99581a50837fa7f9ca986372de96ed
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.21.ebuild b/sys-apps/sandbox/sandbox-2.21.ebuild
index 0caadf280c6f..a49b3d6f0a4e 100644
--- a/sys-apps/sandbox/sandbox-2.21.ebuild
+++ b/sys-apps/sandbox/sandbox-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.20.ebuild b/sys-apps/sandbox/sandbox-2.22.ebuild
index 30e031ff6d97..844b1e1fe4cc 100644
--- a/sys-apps/sandbox/sandbox-2.20.ebuild
+++ b/sys-apps/sandbox/sandbox-2.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,11 +7,11 @@ inherit flag-o-matic multilib-minimal multiprocessing
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
@@ -33,6 +33,8 @@ multilib_src_configure() {
 
 multilib_src_test() {
 	# Default sandbox build will run with --jobs set to # cpus.
+	# -j1 to prevent test faiures caused by file descriptor
+	# injection GNU make does.
 	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
 }
 
@@ -46,29 +48,7 @@ multilib_src_install_all() {
 	dodoc AUTHORS ChangeLog* NEWS README
 }
 
-pkg_preinst() {
-	chown root:portage "${ED}"/var/log/sandbox
-	chmod 0770 "${ED}"/var/log/sandbox
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		# 1.x was removed from ::gentoo in 2016
-		if [[ ${v} == 1.* ]] ; then
-			local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
-			if [[ -n ${old} ]] ; then
-				elog "Removing old sandbox libraries for you:"
-				find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete
-			fi
-		fi
-	done
-}
-
 pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		# 1.x was removed from ::gentoo in 2016
-		if [[ ${v} == 1.* ]] ; then
-			chmod 0755 "${EROOT}"/etc/sandbox.d #265376
-		fi
-	done
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
 }
diff --git a/sys-apps/sandbox/sandbox-2.23.ebuild b/sys-apps/sandbox/sandbox-2.23.ebuild
new file mode 100644
index 000000000000..844b1e1fe4cc
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.23.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	# -j1 to prevent test faiures caused by file descriptor
+	# injection GNU make does.
+	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_postinst() {
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index cf127ef4b08a..b0d85aa7b003 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,5 +1,5 @@
-DIST sdparm-1.10.tgz 361464 BLAKE2B e2e7f09936fcdbdd50b7f397c62023592b494d5b1f8a998d32a4777134ec2edc39b11433ed00f5518ba6a8d04f7dee36e6a070221901b9c31a1a0d25da8439e5 SHA512 1cfa95ced443d190ee9e4a899c9cfc6b98367ba39a9cc201c0db2f8c92dd4e74368182be3b8bfe28e51761b1ededf914ee669ef8ff6023d1ec1f05d69889a35f
 DIST sdparm-1.11.tgz 473501 BLAKE2B 7c8b8a1c14b72de3c36cd701c6d870e0b671df2f17d17a63eb00cce41a80f3cbfbe9e3f2afca08f1a1a9be5a08fbb98a9ddb1ccdc117bceef508790407513754 SHA512 cb5d1dd351464fcc05005429bb8f452b05e6673b1dd8b699f762d005ab3e612b3b7d6ea400ffbd5e98e33e3e78da735d01705353b8a9b9567aac55a3f6b6d813
-EBUILD sdparm-1.10.ebuild 1010 BLAKE2B 6e8d101a71b4f258390cc419dc208725f78af18f7ebd3b73df49dda9c7e4aa019fe97e39a2254736e8737a3403e26a3aa24332956c9104a31c0ad6f739bc4971 SHA512 503e7dfdc75b47e099038abceb3288edd3a42ed7e2e9475a98c73bc1944cd67f409675c5a1d32f99baffdf0ac8d276b8ff0c1477ca71c00f432a5cc722ab3b13
-EBUILD sdparm-1.11.ebuild 1016 BLAKE2B d612e67d7de185fa06ef544ea7a89bb388a7a0413a4a62c1ffd031f9f32de8995ea2c4ef6002a9e5e0ecda03c4ffada92100f16a90d70d061da423e5ab585cf9 SHA512 0ff795ab9b9a9b127d81ea0b14dc56d243c18967b82df622e936b395ef0a10d75e5bfc141d4f3036848be059a607092638caf070193f12ad9a043ea44e50b0db
+DIST sdparm-1.12.tgz 486592 BLAKE2B 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6 SHA512 00e2775c290c6db3a02780dd3eefa58ac40e1df79a7f19f80a9d497c019a9a4a9a16fb2726f48e7083d0104a8e74326e683c3f5f44c7d1f591a0f607e10493b1
+EBUILD sdparm-1.11-r1.ebuild 1013 BLAKE2B b6ad08363dc6b2bcb1313ec286a8c8f89d0d00a606413f5df8021cfe5523143050bc30a5be3d774de29c84adbbce3449e0dcbfbc0ee2c505a2e2e698ccba1d0e SHA512 09908f1ed86909834dc4e42d310b4e411d446a28dd8d1da74b65a1d6246121443cec3ee55be72e507b12ac723794c9b09b8a0f810da77c7ebd27661d71d975aa
+EBUILD sdparm-1.12.ebuild 1019 BLAKE2B f260399daf449a20f2585ea61d6e8bb9f57ca5366b0c170e58d9b656a498ddc69af7e040379628cdb67f2eac3f0d84ef806196c7184ab4fdf35afb6ebe3a12b6 SHA512 01bb2a18c387fe7c8f1079ac3c937acc5101da5f943fec37926bd915d510182feffbc461321a16614fc94637ea3d993da7761d37a3c6cb75c4811c7a87c7568b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sdparm/sdparm-1.10.ebuild b/sys-apps/sdparm/sdparm-1.11-r1.ebuild
index dd271d3dc33d..3a51faebd89d 100644
--- a/sys-apps/sdparm/sdparm-1.10.ebuild
+++ b/sys-apps/sdparm/sdparm-1.11-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Utility to output and modify parameters on a SCSI device, like hdparm"
 HOMEPAGE="http://sg.danny.cz/sg/sdparm.html"
@@ -13,7 +13,7 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-li
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
-RDEPEND=">=sys-apps/sg3_utils-1.42"
+RDEPEND=">=sys-apps/sg3_utils-1.45:0="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog CREDITS README notes.txt )
diff --git a/sys-apps/sdparm/sdparm-1.11.ebuild b/sys-apps/sdparm/sdparm-1.12.ebuild
index a2e3e27e0ba8..451f17f9b145 100644
--- a/sys-apps/sdparm/sdparm-1.11.ebuild
+++ b/sys-apps/sdparm/sdparm-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~am
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
-RDEPEND=">=sys-apps/sg3_utils-1.45"
+RDEPEND=">=sys-apps/sg3_utils-1.45:0="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog CREDITS README notes.txt )
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 198589172ff9..b81f5ea3930d 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,4 +1,6 @@
 DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2be628479f517412ca876fa225ba0dd63ef3200ed15ff693cd5f4cb4ff537d81666fef3a008ba4b3a7577e0c SHA512 79e3e4910178af49ea164d620aa997adb21dd18581c054a4023dd9116ec9dd203bd12989ef308aa1d253b47fcd251ee2b99c26e143d1db3de22a7f374ff38e0b
+DIST secilc-3.2.tar.gz 179384 BLAKE2B 89a02ceeaeb221eb5e819f6c6f09cd7e4675971d1870850867f0e258e3cf089c048a2976016c8200cffcb7904aae01d7e9d6a0c086a2a33fb08020df10b92059 SHA512 ef60aaaba3a9b4d8da496ae80203a8c9595dc2f97f767432f6b3323395fda65293540ed9574e8d7d3f40854c3ad38a95a7b96939b6c689f02a3d04834b81ca45
 EBUILD secilc-3.1.ebuild 872 BLAKE2B 755350212203ab5e1ad5a96c22c275f304bcccf96a7b2cbbff4eaf41ef35eddc4cb80cf72a781844a3ca19c3bdcf003216f834a1241ffef199cf65fd5d40b6b9 SHA512 d5fdd15eb659992be37725aa1434550b3ba5cdd775462f081c7785865083c7b40642b789076597a7c81db465e08d80bf3b708666c735b9eb4a198a93ec02fe3f
-EBUILD secilc-9999.ebuild 874 BLAKE2B a1b094750de07eaea9f6893c30e5cd844c41349c8ec88a1143fe4eacd91f5f39270f0b1ec5de0824cd77d94db613c803481282aaef7e6847af20cb2d1c640b78 SHA512 5630546e79ad0eaafe6b00571747185df1d5c842e649ddb154430cc68d24f23ca2e5e4dd1a49b1c1e4c01ea38fe77d01bac71492822790b27dd165d235cea82e
+EBUILD secilc-3.2.ebuild 762 BLAKE2B 4c616414c63c7514009a67e4e1dc5446eb24c946ff6ad123b8bd3e8c24f272fb151a5d167c45b2a87755379bd2af8d98b6d7adff6b27bd0d4c2a85371411ce8c SHA512 72a52bac0f49f41519f8e0c195cce6ca9983da8b9d4394e3e52e22a907fcfdd37d95f30060a07dcca4baf83940e49777dfec597fe7fb457014cf54f695d47590
+EBUILD secilc-9999.ebuild 762 BLAKE2B 4c616414c63c7514009a67e4e1dc5446eb24c946ff6ad123b8bd3e8c24f272fb151a5d167c45b2a87755379bd2af8d98b6d7adff6b27bd0d4c2a85371411ce8c SHA512 72a52bac0f49f41519f8e0c195cce6ca9983da8b9d4394e3e52e22a907fcfdd37d95f30060a07dcca4baf83940e49777dfec597fe7fb457014cf54f695d47590
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-3.2.ebuild b/sys-apps/secilc/secilc-3.2.ebuild
new file mode 100644
index 000000000000..c7694587c83e
--- /dev/null
+++ b/sys-apps/secilc/secilc-3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs
+
+DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/xmlto"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index 0642e837b999..c7694587c83e 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -4,28 +4,22 @@
 EAPI="7"
 inherit toolchain-funcs
 
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20200710"
-
-SEPOL_VER="${PV}"
-
 DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
+	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=sys-libs/libsepol-${SEPOL_VER}"
+DEPEND=">=sys-libs/libsepol-${PV}"
 RDEPEND="${DEPEND}"
 BDEPEND="app-text/xmlto"
 
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 6ae3412bfc9e..484c016de769 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,5 +1,5 @@
 DIST sed-4.7.tar.xz 1298316 BLAKE2B 752bc2e942b6f041710c6811518147c5fa4b143b33ae842ec1f142ec914bfaf4d7e8a94a2b1a5b345789944e5426f7946997f2ccbc43ee5034351a95ce3a677e SHA512 e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb
 DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
-EBUILD sed-4.7.ebuild 1111 BLAKE2B 369db9f158dc01fe1e6405b174ceed1ca8adb068a42002bdc84bfe1db64cc00a7758747b0ede85a67cd44e169745e542667d7029f459deb2ef084c896da760d2 SHA512 45f5f6f4d095a007b4c5685f6af3659bd0194f1ecc595059c33866cc07f9dfbd5ed7fdb1b1928e01bba217b0898eb1f1935b0121e0f25467d386c406bcce4717
-EBUILD sed-4.8.ebuild 1019 BLAKE2B 3c64243b18b5a4e5014b651d419491a8ecf47a2eccf61125c8b9462b59cf025b868659c6cfd8176029851c88c4cbc2c02fc1be6ae4e8350c993d0b0975fdff05 SHA512 be3637c91b2e561517c0855f7d9cbb8ab8f7f959a5e2bda9196bd545f1282c407e161b2834a75f3c67c0583fbd706f8ff4de3e31984563b96ddd11267a31f5a0
+EBUILD sed-4.7.ebuild 1096 BLAKE2B 843c959088cf24e4eca4547ce948e843c382f340b05180a2fe7295955e9604007fa78e4f8cdc8be09865a32f08c3abd82692194e3d25c5a1382558e7e09f0258 SHA512 e4e4bff1a5c2771505c20cfa3cc11b32ff47f3d3f64fc6b2402f1a6d508a191f95f87f5f2cc6a8e2bc98bdb4722cf04ff56ecd5c0ba565bba2a583d7934a073d
+EBUILD sed-4.8.ebuild 1004 BLAKE2B b8d496063405fd7b7cdb70092477fbe0ad13a1d8ae39700eac52df1c300a4750501080e1260eb4f53c6e36bcf02aae78cd9e8032019ce11437a669e947f0df07 SHA512 1fc00a09010dec7e021071897f648e26dba688dac2135e0475b5ebc713b76c12e5a4e45cc85a64a2cfcc759b354a95937503c5ac986df79554cc9a721e14c93d
 MISC metadata.xml 373 BLAKE2B 3aab40c661d76a8005ae92bdfcf6a3b20732c052b95183a64008a88ed47fc9cc7f663cb1e778eb3b61c6561d854cf805ee17d91fe2657da7cb295fc5a2b2073c SHA512 383c7459fd3f9d0d3e14d819091d1100fd87723bc17ad7492ef6df06b9b878116a628a7cedf38f167a1ff969dbba02b834aec45e4f04e87cb5cff3484553052b
diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild
index 28c5f7cfc63d..c319f8bf409a 100644
--- a/sys-apps/sed/sed-4.7.ebuild
+++ b/sys-apps/sed/sed-4.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic
 
 DESCRIPTION="Super-useful stream editor"
 HOMEPAGE="http://sed.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl nls selinux static"
 
 RDEPEND="
diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
index 35656086a9aa..a8aaee8972f8 100644
--- a/sys-apps/sed/sed-4.8.ebuild
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic
 
 DESCRIPTION="Super-useful stream editor"
 HOMEPAGE="http://sed.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl nls selinux static"
 
 RDEPEND="
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index d0f21e752384..1902f3d3d190 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,4 +1,6 @@
 DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
+DIST selinux-python-3.2.tar.gz 2101106 BLAKE2B b4b185a7468de68eb2146011a9bc82ffb7db9878517833c1e8dfa23279aec3dfbf46a27b70b17c1e317a2c939bcf6d1748638fd4a078325b853de34ae3c51a6f SHA512 2c3483e27c4ad6942e23e39897e0eccf61b95d685ace62315678cb49739d300d4ca4a7a51fa7a9aacaa98737446a70923855d15827eb6275ffd6999be0b2a755
 EBUILD selinux-python-3.1-r2.ebuild 2543 BLAKE2B fd5cf8e64f172da259a7ff0f6be5d9d3f4824584b2d4e816689b5ac2c00c516b3692e748debd0dab51db4ef2faf07b10510b6b39147c0238969a6ca9cce25c45 SHA512 ae2066a82dd516c983aae8f00b1a7c14d25f61120904ce3cfcaf5958866d659386860598b76137a6ed311e7c6ad550f710f4b6daf099db4c125501c6768c1c72
-EBUILD selinux-python-9999.ebuild 2545 BLAKE2B 7f5b9c6db2d0e88516e4e53512432b95e8c546fefce46b02efa481cc06aea80e0aafe7ad04aeb9e9bff328ab260b5c19f889bd3e17a87c9beaab91d2c51f0e6e SHA512 449604db5ba1d8331416e0d51bc6c5613d074ebcc3d309706a81392b745a6069dd1e041176c53c24a9632c318c21d65ffb4cb43947c41e728e9c5288b8a6dc07
+EBUILD selinux-python-3.2.ebuild 2383 BLAKE2B fcc4d47cd407f0004f2522e7341a424479310352c7452e30a6d5e09716e4b36c6bd4dc3887d4c6754a1fea99eb86ed165de097f8a5c5bbeae85529791f2ebd04 SHA512 9ac89baabe3bbfe17e87cabaaad5358a5d16aea252db7a407c58fb751fbf8306277c7df88ba54403251fdd843ece1dd2bef96155e870a71888f3cceccb86bbb5
+EBUILD selinux-python-9999.ebuild 2383 BLAKE2B fcc4d47cd407f0004f2522e7341a424479310352c7452e30a6d5e09716e4b36c6bd4dc3887d4c6754a1fea99eb86ed165de097f8a5c5bbeae85529791f2ebd04 SHA512 9ac89baabe3bbfe17e87cabaaad5358a5d16aea252db7a407c58fb751fbf8306277c7df88ba54403251fdd843ece1dd2bef96155e870a71888f3cceccb86bbb5
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-3.2.ebuild b/sys-apps/selinux-python/selinux-python-3.2.ebuild
new file mode 100644
index 000000000000..def193bf03db
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-3.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 toolchain-funcs
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN#selinux-}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libselinux-${PV}:=[python]
+	>=sys-libs/libsemanage-${PV}:=[python(+)]
+	>=sys-libs/libsepol-${PV}:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	python_foreach_impl building
+}
+
+src_install() {
+	installation() {
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+		python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage; do
+		python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 59dad86d9671..def193bf03db 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -7,13 +7,6 @@ PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
 
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20200710"
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-SEMNG_VER="${PV}"
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DESCRIPTION="SELinux core utilities"
@@ -22,19 +15,18 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
+	S="${WORKDIR}/${P}/${PN#selinux-}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
-	>=sys-libs/libsemanage-${SEMNG_VER}:=[python(+)]
-	>=sys-libs/libsepol-${SEPOL_VER}:=
+DEPEND=">=sys-libs/libselinux-${PV}:=[python]
+	>=sys-libs/libsemanage-${PV}:=[python(+)]
+	>=sys-libs/libsepol-${PV}:=
 	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
 	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}"
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 21a87f5c72e9..7730d2bb660f 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,4 +1,6 @@
 DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157
+DIST semodule-utils-3.2.tar.gz 14260 BLAKE2B 35c071c96071028d4a912a89b88d02672f1fb8c2d8d23c3cb472b607dad55acdf351ef870b4d52bb2bed7b816a199c18947afcd16e77b66268822288feb4af2a SHA512 f937647cc22f7ed719908bad64415d706fd97cf1dce484dbca2484b05b3295de40e31bec643b6caaf4e8be742b1f911428d393c5e2d1d0ae39a2a37fd3be9bc1
 EBUILD semodule-utils-3.1.ebuild 937 BLAKE2B 2a17b566209258d0f47adf56d8c38f7c920f6ceb053e07bfaf7dd51139e39a42cc60a4e1986ccb19b50c4bc89b1c97b3a133c02a38431127dfd17200e361e535 SHA512 e36fad3f19c5f81791e57a02ff677a42d02e8037b4cad66d24d7bf37fa50863954c8fe58c18d1416212d24537febed8b91bdfa6fa3ce9c79efb5c80675b3d476
-EBUILD semodule-utils-9999.ebuild 939 BLAKE2B bf2a3ee661d25124602ddefce76746570ebc974e6b8d7b28c78e0ba2b5144de528c7db7ad15afdcf6704ed86916535a6476aeca13d03aba498c3343b9df1e941 SHA512 20ae6289b23580918bac2b032357db24b847c771d290ada9391d66e5fc648fb57bd604b19d890edb7b6867cf840d3cb6ae34b7698d8dddf97b953c5a93df154e
+EBUILD semodule-utils-3.2.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
+EBUILD semodule-utils-9999.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
 MISC metadata.xml 400 BLAKE2B 688a9292eb5fc938ae1aef1e62cb46f7cfb119f8d8e784e03c7d3f0d13d48b5120037195d1aac27080b6768a28fa51c209a6928ad0b84aa3802bda55d66f94be SHA512 737d2e097f9b98132e1a75d42c95aaf8ec51be2c4da9898f33b7b07ef519bb846bfc36836c33fc3ddfc716fac06c610475149b5923a684a249f4edf6cc13a147
diff --git a/sys-apps/semodule-utils/semodule-utils-3.2.ebuild b/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
new file mode 100644
index 000000000000..13fc0d86279e
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DESCRIPTION="SELinux policy module utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
index db1d166cceb3..13fc0d86279e 100644
--- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
@@ -1,25 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20200710"
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-
-MY_P="${P//_/-}"
 IUSE=""
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
+	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="SELinux policy module utilities"
@@ -28,7 +22,7 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:="
+DEPEND=">=sys-libs/libsepol-${PV}:="
 
 RDEPEND="${DEPEND}"
 
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index 48a558270cf2..da0dfb8cff64 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -6,5 +6,5 @@ AUX setserial-2.17-headers.patch 236 BLAKE2B 06ba0f4ad6ecc3788115b02fa4f5762b272
 AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2adcb7adc8e04f6d20594395cc01e821364d04aeb02608644c88e511453599af451d00dda8c8ab54bdd1710030cbdc7833c32286f SHA512 6041894014b3d139a8c2d59460003310c17aee407dab2fa3713f98ea2c29fd347906f68f3d988f052cbee45de43fa00afadc4359b562bfd34fd4931b48505cf8
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
-EBUILD setserial-2.17-r5.ebuild 952 BLAKE2B 86d219f7ce0a53bbad51b8e88cbf64441b8121e2549e9ea5448941b1ea1ebb985448797b169412b3a02647e1a43e8ab37a5bc4a15b4d885be2859a2a1a2c52a1 SHA512 de69148580d3868c8ae42cd2133dbc23ddbc49e50c202f1007bf071d3b139e99f88a8f577b7e60f902e1b7a2bc54b01853dc23bd5fa5ed5739e740a7da428d9a
+EBUILD setserial-2.17-r5.ebuild 953 BLAKE2B 3ae641afca71105475e26a752416b40b08310fbefcd979d268dadbb604c63967171ab2b76879fd58671a7913a727e04cd29ff01f6dcb90a1e8831127f05a4b71 SHA512 f479bf152514f73bd5d9fa8dc7b77cca458fae12fffe11cd22b380f54df0b9d2dbb9913263731f17d202fb8eec7f2b0bcd59f77dafb9470fad5ee08229299f3e
 MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index 47b3a4a2421b..62ff18bf70b7 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 582209e126e9..4022a164d219 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -3,7 +3,9 @@ AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e8
 DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
 DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d
 DIST sg3_utils-1.45.tar.xz 989864 BLAKE2B 2d0a9e0edf514c8c7a566798f8087fc27d15d31cc8df39073dd97cff569da396b24236e0c231781625379b2ecefe7c99716d5d9c7dc104b15e150cb4e3c43e75 SHA512 fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868
-EBUILD sg3_utils-1.42.ebuild 1034 BLAKE2B 4b138764ce395ecedfbb105036df6e12746399b029bc282fd6729443c68db2947617b405317a55975e98bfeaafa29884e89dfc01c5bcc17938f82582b27119ac SHA512 80c918d5922b523180f72e806b75164b697deb9995271d3f425c9501c409f2aa54b4c7bf76aa4cc9a4492bf97a86c439f7341a77597687f47ac9b28841f0137c
+DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
+EBUILD sg3_utils-1.42.ebuild 1034 BLAKE2B 10745a9e5cb59557406583f5eba0333f75f6357cd84fc68130fd98a486938905f48c609114403bb47c918f0439169df73bf478d120d625a86e04d2c789593c27 SHA512 bad6f00df0944a54bdb692ec7e16fb213eb35c93066c9dc23123ad6b683544ec037a9703cb229bb902396b9a962f7188212207121998c1ba7a6eda9a185ca1ca
 EBUILD sg3_utils-1.44.ebuild 1045 BLAKE2B df0ea79d1386fba7d4b9903b61d3d6c2cf743bfe7d7786a5570ce0202488c1c0c4a23f2b5d96a98e2da43c0e589b12bb96fc7e1eebb737863ab003cabb0adcf0 SHA512 2fd1d84c219567c7f49daefd02007f9a6b55b4bc6e2e07fb7cfac628f9c324fc97f4bc0d88d5c0f8348ab68d8881144b0bbdb5729239d9e2d7e115d125e9d839
-EBUILD sg3_utils-1.45-r1.ebuild 1067 BLAKE2B 22eefc8e13dca6c86abdc10c160b833c16c53cbd423e95597becd131a05aa24897d1c1185482a3c4cf47b96f707d3ca412c10df4750647b8230f380eb3d852c5 SHA512 1c7391ab95673a97bf8c24f13dfe27de724fbecb4208cc5c9bd6121114811a35d51a19124d78dfcaab11cb30a3d485de9c6d31f85a55fe05997b2d567a39f916
+EBUILD sg3_utils-1.45-r2.ebuild 1066 BLAKE2B 4871a822cc621c43c04838380cc6d4afc1360ecc851414106141c3e676d29fb236b0a7e386af7c629386beeeb8e2dbd15d083fda0deb8464901c0d3ba1e1325c SHA512 fc2717f60f31087fed00be923c0fa7e04a66928093f1a93524de9629a48f1292bcaa4a43599473ac8eb0da86ac6195f7ff5619643f30042a61598f61bf3deeaf
+EBUILD sg3_utils-1.46-r1.ebuild 1073 BLAKE2B c4f3e2e58768cb5782d1dcde03e988b1ecb7e62034b314bbfa20bdd3ee9d31baeae4ae0bb1071b2d8e05991e245b097e2ea319ef60c3a9186a0a71600cbd4c16 SHA512 c08a1f22c938da966500a9988c22e4b90acc2297fff526b828ec225b82dd40bd7ffbb1c644f416a09ad85417b52532c068912ffcdd6bd610a056e6984e98f384
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
index 56b30e539729..7509872c7d20 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils multilib ltprune
+inherit epatch multilib ltprune
 
 DESCRIPTION="Apps for querying the sg SCSI interface"
 HOMEPAGE="http://sg.danny.cz/sg/"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild b/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild
new file mode 100644
index 000000000000..9a35e645d320
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="Apps for querying the sg SCSI interface"
+HOMEPAGE="http://sg.danny.cz/sg/"
+#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND="!sys-apps/rescan-scsi-bus"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26-stdint.patch #580236
+)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dodoc COVERAGE doc/README examples/*.txt
+	newdoc scripts/README README.scripts
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	# Better fix for bug 231089; some packages look for sgutils2
+	local path lib
+	path="/usr/$(get_libdir)"
+	for lib in "${ED}/"${path}/libsgutils2{,-${PV}}.*; do
+		lib=${lib##*/}
+		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+	done
+}
diff --git a/sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
index f5f7118c4eff..b2dfd0bf2217 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="http://sg.danny.cz/sg/"
 SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs"
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 80179a30a322..96a112fd74c5 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -7,6 +7,6 @@ AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d6
 AUX shadow-4.8-revert-bin-merge.patch 305 BLAKE2B 2fb6407ed60251b3367931c2c7eb9b2bdaaff565ff5338fb6ffddc9b618963e7835925c07fea0cbaeeee90a03b7e0c571f0e1b9e1844fe9397f4e74672edb080 SHA512 bd821f6af288ac4a3cf9b0de30753626db90d187ece7d53ee7e0d6b7c61dbfecda84bd9ae60958120cc8ddce48055878c9daaa668dd88392bb70b73c7ad4fb01
 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
 DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c93fc6dd610876263ac22e61fbc2821649d347c28055ae84f64cd5ab5c2435450c55339c80b4ae5062ccc44f SHA512 1c607aec541400fc179d6cbbac7511289c618ab2ce6ee9d7c18a8bfda00421c62d4b9e58aff52b5f82d485468e7db955c186ea0faad9a08003ffc01bdf2ccece
-EBUILD shadow-4.8-r5.ebuild 5944 BLAKE2B 8d9a693741a2ef27ff6f0d0e5e953a0d79ee53a700955437513189cc245c668ee6f9e899e843792261c303b5723b5267cac9fb64e58797f27badfe8af21b2910 SHA512 4a730bbd30f5c279ec264ea17ea251ddf21afb2e8389b891d9df69eea39de32ee1698569744b553b24320ac0f67fc57ea7f67700859f170b59f0975a71addc93
-EBUILD shadow-4.8.1-r3.ebuild 5930 BLAKE2B d276959cc82554d053f44de668d2f8b940ae6b75fdc8ba6a067dd96f3d7f0b4150b802c07d11d4fa3bc4de5c3c2fc49a11fc8400dff62923f16a2576336045ad SHA512 328a6fcc140248693f7e5ff2051618442da79572bab18b4a6b2a086c560ce48ab173cdac8300544f89a0450488a7c22577f22de1bc5892b5201ace2d6404676f
+EBUILD shadow-4.8-r5.ebuild 5941 BLAKE2B c6feffe96b66027a0f3cf02653d4b5154a668d186acc3531fca2c0fd22de2cf70c58928fe5f1c374fdaaff989794bb07d297912d8a2dd4e9a7b725315251c6c4 SHA512 b54436e75d7cb8ad3d3898a3310e81ed3a320c1529ade8f946aa9f8904177b73a5753246811ab3d79fdae09cfabeee0f00a242182b3ecd600bde8917c6c04c50
+EBUILD shadow-4.8.1-r3.ebuild 5926 BLAKE2B b0dbd0eb675947391ce1e0ede2ad0557845989d4427ee69936032e19096e966406721b7559867261fb58fa787c9f22852d28d6bc267d47c88d2c413bd0ec3216 SHA512 b9f6d2361361e0764a0d0f997bdc07326a663c10738442f338342b5e03bbbde64ac5f92394eb90b8519e4e0343fcaedc68074c47bb3ec5af75c23a56ce379d65
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/shadow-4.8-r5.ebuild b/sys-apps/shadow/shadow-4.8-r5.ebuild
index b04fd057bc5e..da23f02aa7f5 100644
--- a/sys-apps/shadow/shadow-4.8-r5.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools libtool pam
+inherit autotools pam
 
 DESCRIPTION="Utilities to deal with user accounts"
 HOMEPAGE="https://github.com/shadow-maint/shadow"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD 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 ~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 )
@@ -88,7 +88,7 @@ src_configure() {
 }
 
 set_login_opt() {
-	local comment="" opt=$1 val=$2
+	local comment="" opt=${1} val=${2}
 	if [[ -z ${val} ]]; then
 		comment="#"
 		sed -i \
diff --git a/sys-apps/shadow/shadow-4.8.1-r3.ebuild b/sys-apps/shadow/shadow-4.8.1-r3.ebuild
index 019710fb27cd..2bb0fd2b726e 100644
--- a/sys-apps/shadow/shadow-4.8.1-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools libtool pam
+inherit autotools pam
 
 DESCRIPTION="Utilities to deal with user accounts"
 HOMEPAGE="https://github.com/shadow-maint/shadow"
@@ -88,7 +88,7 @@ src_configure() {
 }
 
 set_login_opt() {
-	local comment="" opt=$1 val=$2
+	local comment="" opt=${1} val=${2}
 	if [[ -z ${val} ]]; then
 		comment="#"
 		sed -i \
diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index d143e8f28073..67633d764205 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -2,5 +2,5 @@ AUX elftoaout-2.3-64bit_fixes-1.patch 6806 BLAKE2B 49b9ce39d215496a858785c77c951
 AUX sparc-utils-1.9-no-implicit.patch 584 BLAKE2B 153440b685bfd044c24f3da85598895724873b536628ec205c24028baf908e84008c0e629381a6f703f42baa7d6bef3534e77bb03af6dd3b23d9a9017a43ebda SHA512 302c29f1a33ea6b92184bd272fc974b1886168e7aa3d0f0cdcc117024475cf6b27eed9336f8b7edd84b40862144f58c3337fcc47cf3c1a744e5f4a71f8ee4f7f
 DIST sparc-utils_1.9-4.diff.gz 9083 BLAKE2B e4b16c26fe67be73d0fd3ad8e1e80b19356d5961abac344f28650e4d355cac9c557999591947391c41be88d819ebb703ae1ff177b4fbe0d9bea7a411a791821f SHA512 ef79dc480471117da3a778450b3a122eaf64fdee69d35ff30b301f2360ff5d76c6343ce37c25cc188891c1619809daa0595d01c6e85781ddd7ddf1713c8378b7
 DIST sparc-utils_1.9.orig.tar.gz 110080 BLAKE2B 52f47c130fb8e24b0340589c846292fb2e4e9b211a10cddf52a7a63edd70673e2b7d05c2415e558c5f2d1235f33f4ae65b777d3f8b2cf2c50a601d1f0a7a941a SHA512 bde05f1a98211aaf502be6dfd757ddfb21c136cedbb46ca84a4539706c71901815c9d8bedfebc3800c7340634b32276197c75f92f9cc829e4f50c37d203e9358
-EBUILD sparc-utils-1.9-r6.ebuild 1592 BLAKE2B be7e5119af2f376fab807c37983ca73f1b3d39ac25ccde43119792553ad47f11fcbf048717162ab154fa5057307a12ce81a3dd94eff2774d62f747b38ca9c06b SHA512 3bb8bdc39cbc21b9dd763d8a630c3d96f18d1aace0ae27671e1c7161705f03d180ea17e006a72ae2c8f957fa1fcf18de1539ff956898fade6fccc74074700487
+EBUILD sparc-utils-1.9-r6.ebuild 1585 BLAKE2B b91d32f573e973dd9fcfa68f28652da3d3a7ed29a786f40222fa865a65d887ab923e4d16be613d61190d3358af87f7975f49881bba375c09a47d229efd9d1c39 SHA512 79cb400fb36e2aab458eba75f9580ead604451986bee29b275570b5c1b91143fcbf0ccf5b657a383feeefb243c411cf13c239ba0ec23197c53fd94560c759703
 MISC metadata.xml 416 BLAKE2B 3d0e052bc957750b869856cabb6e94d86dc1655e63da29ac3753c16d8437e7a9a97c89e225f03b6267bb32bdbe6215c25717f088684e493b5785a6d334854dd1 SHA512 c057eea9ea65b87cb366e802dd8962901024335a85b3ec53caa6c342c9e1a23e656dcadc2a70692e5e7ab55a0ac82637ef052699844f50061461a645613b688d
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild
index 0eb8c5ee13a5..adeaa08ea36c 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
 HOMEPAGE="https://packages.debian.org/sparc-utils"
diff --git a/sys-apps/spu-tools/Manifest b/sys-apps/spu-tools/Manifest
index fbd181d7cfbd..ce41117510b4 100644
--- a/sys-apps/spu-tools/Manifest
+++ b/sys-apps/spu-tools/Manifest
@@ -1,5 +1,5 @@
 AUX spu-tools-2.3.0.136-buildsystem.patch 983 BLAKE2B 1f3feec2ebcc4b6e6d991461ee20411048dc23030c2f013470c0d9f37fab167f2d91546274be83e654810214b238c49f09f3c8f5d328e3c436fcd4c3f1e18a59 SHA512 093f9c881a8b60d027d24ceb1b120d7f2d475a688dff82df3418b115b613218555e885067cc67e8bd1ebd3b66024d1b6ff6b51d8d2ea73f3244dc2339a5e805f
 AUX spu-tools-2.3.0.136-format-security.patch 431 BLAKE2B faa46ac8e2e9c9ccf9f5bd1735c3860db179a836338b4725a1021e15b1df1125022217c0a963110bbd5a54da5b19cc7b48ba7e99c46fb8b57fbed48190043e58 SHA512 33ea0520587668e10876e3ce62f14cc0b751e69b1f4816456a0cdd4cfdfd542f9b3896ae80f6ba095eccb087253c10a924fac18cdc66a5f7cb88bb83bffdf488
 DIST spu-tools-2.3.0.136.tar.gz 21981 BLAKE2B 24aed86e43179e547c871b804a39b2c49215757b2c5c7afdce2ae798367350725f18974bb67ede5fe24f9178ea2003ed7b1b2f5c09c157b90757d4dc789629d5 SHA512 d25ef8fda067ee98eb698859c21f497ae1a09a6d791c0c2063957beb022b2f2946f9df7e78907b4d3b2f71021fa3c2f76012db7154faaee5be3285a0224c7612
-EBUILD spu-tools-2.3.0.136.ebuild 744 BLAKE2B a4bde106bf99a1b62c11d72d180155c3fbe24b1d6e275b416086b2d083e2ea44bd2317467d4dcd1b488a979578f0a3822822839128c0ccceb36a0102bddb871e SHA512 ca89359550b69857cc32cdada73d34a821ab8c6cd1ee5edb874acaa7102ff935fd3d5a38ed02fd0542ff9d144fbc5319665445ff2bbc0352bd32bdd85c55ab2e
+EBUILD spu-tools-2.3.0.136.ebuild 760 BLAKE2B 8b6137c6c588e88ec82560ae349c248f64b9ab238f117dd8b795c07cd3ba6a111504bc73ef8f03159389037760276e2862a773f0d84dfd5f9e41284fc961fc82 SHA512 82291f6c914e4cf3e69f124ee0bc7df16749eea86ebe0434552bcaf3b7226b602b91cb53955ccb12289974099bda1af47986a9292a8fff11dd563f7015805517
 MISC metadata.xml 294 BLAKE2B 62efa659609c1bf952b3da3036c59d504cd165fe3f844507c688b5477a20da23231e01f1d92a78732e1be10f716f4d9ef354347710869d6ced2cbe2335f8f60b SHA512 f27b273f7396a60b20a0a8ddbec4a93b8b87730b00a190913a561f3f767248bb0dd0956c24f93ecb6f6423cc9fd3413f20ebe47f6b3cf2b94a900605482ca62e
diff --git a/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
index 63f188280172..e64a12c86a55 100644
--- a/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
+++ b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit epatch flag-o-matic toolchain-funcs
 
 MY_P=${P/_p/-}
 
@@ -21,6 +21,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	sys-apps/help2man
+	virtual/pkgconfig
 "
 
 S="${WORKDIR}/${PN}/src"
diff --git a/sys-apps/superdiag/Manifest b/sys-apps/superdiag/Manifest
index c5e13cc29446..589a7be11393 100644
--- a/sys-apps/superdiag/Manifest
+++ b/sys-apps/superdiag/Manifest
@@ -1,3 +1,3 @@
 DIST SuperDiag_1.4.0_20201120.zip 5537813 BLAKE2B 014a3770944fdf9f9396e894320cfa65acebc63cfc1f396b4170a351813b72cca5902a27df21f62bf04a25ab5f9db306795ab108d8669045a205f990b1ef73a1 SHA512 d1e33f0fcb22c0b3794dd3677efa6d1041c81cdf09b92e297035a907e4110482daf896c109437380750ad2905008651b017718e97b1ca1e9f8ceee8c24ee0943
-EBUILD superdiag-1.4.0.20201120.ebuild 1522 BLAKE2B 27ccc547b0c671e35f36cb7ac8f2821f662077c65540aa7945c0a244e59bc96531cc7fa9480fa4c4aa095a573dc743d78fb25b69eb118e38b4e438c40dd5b9f1 SHA512 821092f25b1ca5dc5f706c6f5dfea5350572fb9b4e411b6b183cae8b0189239694d0afc296c8cbfd27e020d5aea2834384518158a01356861e5a27988f0c28eb
+EBUILD superdiag-1.4.0.20201120.ebuild 1523 BLAKE2B 60955320e47a5a0e5083b13c1ab6e2a69ac9d4e381bcbc844a851432d46318595ec0bff3f8dac3b5b8bbb81f630972932a8e57d84d6766830f14ac98b022eb66 SHA512 bfeee1d19b0e3a26cefa5b4de489637b0f4d83b69c2d3f8c0731d1a2b3522b2652d7105261099d42ab061a59e11637f4cba51149f523bf18e5e0158469406c5c
 MISC metadata.xml 910 BLAKE2B 59eaa7f51cc6c2c733b62b5f5bdebac5737b3af580fb8afe91f6f5b96e5cb49e66635b182d204a6536141aad275307d0e580ca272ba8d5020635c9c96f9e106b SHA512 e066b98f13d3669a2dd97a38b454c20ec59f5e40ad95fcad43e29bb6baf6958091517f95d94380c2ea2edd41b057f284b687267422bf01da62628f07ca255e0d
diff --git a/sys-apps/superdiag/superdiag-1.4.0.20201120.ebuild b/sys-apps/superdiag/superdiag-1.4.0.20201120.ebuild
index 2203a544278f..cea0aa94f07e 100644
--- a/sys-apps/superdiag/superdiag-1.4.0.20201120.ebuild
+++ b/sys-apps/superdiag/superdiag-1.4.0.20201120.ebuild
@@ -16,7 +16,7 @@ LICENSE="supermicro"
 SLOT="0"
 IUSE="iso usb"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 RESTRICT="bindist fetch mirror"
 
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index cde2a9b118d0..2ad3c58c60ef 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -4,5 +4,5 @@ AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f5477
 AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
-EBUILD systemd-tmpfiles-246.ebuild 4690 BLAKE2B f0234c3b84dfe8023613503a4acd813ccb93912d177d11bd7c98a5b162e424c3121440c22d732ca49f5e79ef6455718a75344157245ae3a734da977c8cfd3a1e SHA512 08ecdca206a0af1eda980183ebf98dbe3380366174268600f3fa3844e335691bba09e1489aeda5cb9ec4af12e2a1c468baa392e4951cbd55b1a00da392fea4b7
+EBUILD systemd-tmpfiles-246.ebuild 4706 BLAKE2B 9cdf5cea7dc7e3984c81f2b706b078e5b3a0354d70e387b7df5df413ebf1c5fd6b60ba56b3cf202ca07b4c2e62733e522cfcfe23012216c0c092be5e1c6e7707 SHA512 6fd016811da2db42a7c7a418cc5c5807c84ac1b5b8a8f538c3810d1225d4a9de03a3c435b5f3b9dba7a7730a147b7efba8ca25a0d6e83818de877254e20eedea
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index d243c5691c3b..7bce5591c7b9 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -36,6 +36,7 @@ BDEPEND="
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt:0
+	dev-util/gperf
 	>=dev-util/meson-0.46
 	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 3171caee9ef1..818b444bc717 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,5 @@
 AUX 247-cgroup-test.patch 1859 BLAKE2B e97d638c96e0f9c783736227031ac8774dfa5c2040bfb828abbbc14faa1edde312187ff2314d9f762081bc93dd5ecec077229e30aeb46ade43410c961feed965 SHA512 1c08ce1e7a8e56b68966666d8af5764f903e2d851a288e3e1bc78ad58f7223d7a52486ed4b1c1a4afef0ba24e4b90eecea56df9f2139c771a935e050bf436aff
+AUX 248-rfkill.patch 2060 BLAKE2B 498bbd4eb1a38e10583ac00f4474aa331cf7a6fb9a4b826b9c59d7e91e6b26e23eef41cc631c8534a8266b0de6e4cb15c1d92785a2f12ee9d37ed864b8d05215 SHA512 9988bc85ea0c4a49d59b4b669bb7c757cefe3cd0ed12bbc31238ad90c43f14494d6ccbf907a47d2aeeb08ae9c374dac64e5b602346aff7234b96c90f3758a83d
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b4bdcdf4a8a9dd87031abce6bec2a6ed1578520f61a014de2c0127a5f96e8feec11b120e7e91b09c89 SHA512 69e50d1cec1e2d927365a97aebffe1024f600a8e5779e214fdc6fa35499786382375edb645d4c8c7c1745b96cd1e5cf83b4b9fc4daffdc1977bf7c7a50891db0
@@ -6,10 +7,12 @@ AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed8
 AUX gentoo-systemctl-disable-sysv-sync.patch 784 BLAKE2B b2a1a931e1fa0c41d5610dba624e3f168a7bd7a54f83eb2e208b9d596645819e4e4d977876d032c5b98d392c846736b7be3e758aa53cf7b724eeda8d02c19ce5 SHA512 043a7bba0fac81a4a5eb1217cdfdd90cbdc7b2f01327d96b6f2cc12f3e8be4976e55e40a1dfbcc94d8ec35230c7e02a10e85e593a6faa355e675e202073991b3
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
+DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af SHA512 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
 EBUILD systemd-246-r2.ebuild 15296 BLAKE2B 91f3b46502254f87a3238c58b44e8d9b3452e785ac7c03e27aed967aa1c5722d667df46fdba74becd72a94b69dffa4c929e19e01733e17146897a611e8944cec SHA512 6942d33e12f48006c7d2b11c491d30b60f69fcf2f847fa3e02a4d58506f4b9f3e76ec80c8eabe6635bcc92df03bc3df192471ff9d74dcba9f5d35fc0a65abd20
 EBUILD systemd-246.6.ebuild 15393 BLAKE2B 9e107dc2e511b55e338faa6706e1e5959a598afd44886a51ed9ee0be001944a5541fafe02dd818fbce0b679ffa47af58d0d2444c9757eb9aa4ce835a3a649ebe SHA512 17d667ce4ea662d94206c3b04d206f0b0f14d94ae9c19d969c9b235f3f32dc63b10ba5116c3e96dc59b873c495c3a2c4039e0de3a2bc64c7375c088979e1c592
-EBUILD systemd-247.2-r4.ebuild 15766 BLAKE2B 51833eca4fe5b60b72fd8b7a4f23726da3dc88946737426a6bb513ae18cb96c81fd373b0c21fd844a6a12184b800b5363acb2b2f8f6c35e77d0dfceac3724d7c SHA512 20064f79166a8faa1b6da1a4ec0849d1bfb7416b8a958e129df72aa76dfbbc63b1fce9ead8b67300377f98083a5be4ceef4d4d4afc149299194aeb0a0d6ec1ab
-EBUILD systemd-9999.ebuild 15731 BLAKE2B e1021ad90a8f0b60829f2da18947c0c21d9fe590bd4e0e591030964c57ef6774d7b1c39189d0e7291c3e590b68a32a932edba10dfe16810fd9154306e721bcaa SHA512 2d7f30712144e5071a6463c0117b8d476b5e771d6fa0213d89b8b5e3aaadd8ee09defef207cb0d7149c76a644c3d5ff60f95c7cf9529f9f4ac84d00a94ba26ee
-MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
+EBUILD systemd-247.2-r4.ebuild 15762 BLAKE2B 41d0aed008171bc05738adab0028dacf4a45b43345b534043a949392611b080e572673fbda0a0d0326ded33e03f12873a675ddd0a3c687f7bbdf7f068bde8348 SHA512 e2ffeae0abb0cbc363134f4d0184bb73e96200172cb82858e4ab775fedb256f5e6ec1e848d82e6f82b90634efc9ff9d0bdcd94088951c8a6a329bd8dac561759
+EBUILD systemd-248.ebuild 15858 BLAKE2B 53e11d0215eabdea015fb2e652d9889d247caa2dae3ebc905f9b92769002a57a95106b986ac96fdb8078ce11d62df54884a1b7fea28804794485565fb237f623 SHA512 3130c20e6ce32ba1e132fa245d4880d391ffc46b9de6d9f968621fb992802180f910043eec79185f404930ca117d1eb821bdea83dffe16ec3d79e63fb0cb6352
+EBUILD systemd-9999.ebuild 15359 BLAKE2B 1335bde6d963c17e6f59c8ed290eea05bd568f582d443fc7d115730b1c6b2004a19b8dc142a94a490642de19895ac81b997431c4608841fa198e567eeaf0297a SHA512 29fc15694ae9686f98820116263d15b3972a7ffe591d304307284d95d5f50a4b6b603ad0c4950df80c6a5b793c19875da71638536965a966328d36d73ea741f3
+MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/files/248-rfkill.patch b/sys-apps/systemd/files/248-rfkill.patch
new file mode 100644
index 000000000000..122508704355
--- /dev/null
+++ b/sys-apps/systemd/files/248-rfkill.patch
@@ -0,0 +1,35 @@
+From ab1aa6368a883bce88e3162fee2bea14aacedf23 Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <luca.boccassi@microsoft.com>
+Date: Tue, 13 Apr 2021 13:17:53 +0100
+Subject: [PATCH] rfkill: add some casts to silence -Werror=sign-compare
+
+---
+ src/rfkill/rfkill.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
+index e2d1a1be5fa..bff1a2886be 100644
+--- a/src/rfkill/rfkill.c
++++ b/src/rfkill/rfkill.c
+@@ -177,7 +177,7 @@ static int load_state(Context *c, const struct rfkill_event *event) {
+         ssize_t l = write(c->rfkill_fd, &we, sizeof we);
+         if (l < 0)
+                 return log_error_errno(errno, "Failed to restore rfkill state for %i: %m", event->idx);
+-        if (l < RFKILL_EVENT_SIZE_V1)
++        if ((size_t)l < RFKILL_EVENT_SIZE_V1) /* l cannot be < 0 here. Cast to fix -Werror=sign-compare */
+                 return log_error_errno(SYNTHETIC_ERRNO(EIO),
+                                        "Couldn't write rfkill event structure, too short (wrote %zd of %zu bytes).",
+                                        l, sizeof we);
+@@ -335,9 +335,9 @@ static int run(int argc, char *argv[]) {
+                         break;
+                 }
+ 
+-                if (l < RFKILL_EVENT_SIZE_V1)
+-                        return log_error_errno(SYNTHETIC_ERRNO(EIO), "Short read of struct rfkill_event: (%zd < %d)",
+-                                               l, RFKILL_EVENT_SIZE_V1);
++                if ((size_t)l < RFKILL_EVENT_SIZE_V1) /* l cannot be < 0 here. Cast to fix -Werror=sign-compare */
++                        return log_error_errno(SYNTHETIC_ERRNO(EIO), "Short read of struct rfkill_event: (%zd < %zu)",
++                                               l, (size_t) RFKILL_EVENT_SIZE_V1); /* Casting necessary to make compiling with different kernel versions happy */
+                 log_debug("Reading struct rfkill_event: got %zd bytes.", l);
+ 
+                 /* The event structure has more fields. We only care about the first few, so it's OK if we
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 74125276442a..cb86e5b1d243 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -31,6 +31,7 @@
 		<flag name="qrcode">Enable qrcode output support in journal</flag>
 		<flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
+		<flag name="tpm">Enable TPM support</flag>
 		<flag name="vanilla">Disable Gentoo-specific behavior and compatibility quirks</flag>
 		<flag name="xkb">Depend on <pkg>x11-libs/libxkbcommon</pkg> to allow logind to control the X11 keymap</flag>
 	</use>
diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild
index 4853d82c9c9c..22888e851a55 100644
--- a/sys-apps/systemd/systemd-247.2-r4.ebuild
+++ b/sys-apps/systemd/systemd-247.2-r4.ebuild
@@ -16,7 +16,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 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{7..9} )
diff --git a/sys-apps/systemd/systemd-248.ebuild b/sys-apps/systemd/systemd-248.ebuild
new file mode 100644
index 000000000000..3f21eb068539
--- /dev/null
+++ b/sys-apps/systemd/systemd-248.ebuild
@@ -0,0 +1,549 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils 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 +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
+
+REQUIRED_USE="
+	homed? ( cryptsetup pam )
+	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${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= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	homed? ( ${OPENSSL_DEP} )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	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= )
+	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= )
+	repart? ( ${OPENSSL_DEP} )
+	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-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]
+	hwdb? ( >=sys-apps/hwids-20150417[udev] )
+	>=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
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig
+	test? ( 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/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+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="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~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 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}/248-rfkill.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"
+			"${FILESDIR}/gentoo-pam.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
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+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
+		-Dsplit-usr=$(usex split-usr true false)
+		-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
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-ld="$(tc-getLD)"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dhomed=$(meson_multilib_native_use homed)
+		-Dhwdb=$(meson_multilib_native_use hwdb)
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		-Didn=$(meson_multilib_native_use idn)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dzstd=$(meson_use zstd)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dp11kit=$(meson_multilib_native_use pkcs11)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dpwquality=$(meson_multilib_native_use pwquality)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Drepart=$(meson_multilib_native_use repart)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Dtpm2=$(meson_multilib_native_use tpm)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		-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
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+
+		# static-libs
+		-Dstatic-libsystemd=$(usex static-libs true false)
+		-Dstatic-libudev=$(usex static-libs true false)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+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
+
+	if use hwdb; then
+		keepdir /etc/udev/hwdb.d
+	fi
+
+	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 ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	if use hwdb; then
+		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+	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
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+	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. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	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 [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	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 dc14b4f1a7f1..1899e9f7640f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -28,7 +28,7 @@ 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 +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
 
 REQUIRED_USE="
 	homed? ( cryptsetup pam )
@@ -73,6 +73,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	repart? ( ${OPENSSL_DEP} )
 	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}] )
 "
@@ -98,6 +99,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=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
@@ -235,11 +237,11 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
-meson_use() {
+sd_use() {
 	usex "$1" true false
 }
 
-meson_multilib() {
+sd_native() {
 	if multilib_is_native_abi; then
 		echo true
 	else
@@ -247,7 +249,7 @@ meson_multilib() {
 	fi
 }
 
-meson_multilib_native_use() {
+sd_native_use() {
 	if multilib_is_native_abi && use "$1"; then
 		echo true
 	else
@@ -273,66 +275,67 @@ multilib_src_configure() {
 		-Dima=true
 		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
 		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Dacl=$(sd_native_use acl)
+		-Dapparmor=$(sd_native_use apparmor)
+		-Daudit=$(sd_native_use audit)
+		-Dlibcryptsetup=$(sd_native_use cryptsetup)
+		-Dlibcurl=$(sd_native_use curl)
+		-Ddns-over-tls=$(sd_native_use dns-over-tls)
+		-Delfutils=$(sd_native_use elfutils)
+		-Dgcrypt=$(sd_use gcrypt)
+		-Dgnu-efi=$(sd_native_use gnuefi)
 		-Defi-includedir="${ESYSROOT}/usr/include/efi"
 		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dhomed=$(meson_multilib_native_use homed)
-		-Dhwdb=$(meson_multilib_native_use hwdb)
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Didn=$(meson_multilib_native_use idn)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dzstd=$(meson_use zstd)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dp11kit=$(meson_multilib_native_use pkcs11)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dpwquality=$(meson_multilib_native_use pwquality)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Drepart=$(meson_multilib_native_use repart)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		-Dhomed=$(sd_native_use homed)
+		-Dhwdb=$(sd_native_use hwdb)
+		-Dmicrohttpd=$(sd_native_use http)
+		-Didn=$(sd_native_use idn)
+		-Dimportd=$(sd_native_use importd)
+		-Dbzip2=$(sd_native_use importd)
+		-Dzlib=$(sd_native_use importd)
+		-Dkmod=$(sd_native_use kmod)
+		-Dlz4=$(sd_use lz4)
+		-Dxz=$(sd_use lzma)
+		-Dzstd=$(sd_use zstd)
+		-Dlibiptc=$(sd_native_use nat)
+		-Dpam=$(sd_use pam)
+		-Dp11kit=$(sd_native_use pkcs11)
+		-Dpcre2=$(sd_native_use pcre)
+		-Dpolkit=$(sd_native_use policykit)
+		-Dpwquality=$(sd_native_use pwquality)
+		-Dqrencode=$(sd_native_use qrcode)
+		-Drepart=$(sd_native_use repart)
+		-Dseccomp=$(sd_native_use seccomp)
+		-Dselinux=$(sd_native_use selinux)
+		-Dtpm2=$(sd_native_use tpm)
+		-Ddbus=$(sd_native_use test)
+		-Dxkbcommon=$(sd_native_use xkb)
 		-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
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
+		-Dbacklight=$(sd_native)
+		-Dbinfmt=$(sd_native)
+		-Dcoredump=$(sd_native)
+		-Denvironment-d=$(sd_native)
+		-Dfirstboot=$(sd_native)
+		-Dhibernate=$(sd_native)
+		-Dhostnamed=$(sd_native)
+		-Dldconfig=$(sd_native)
+		-Dlocaled=$(sd_native)
+		-Dman=$(sd_native)
+		-Dnetworkd=$(sd_native)
+		-Dquotacheck=$(sd_native)
+		-Drandomseed=$(sd_native)
+		-Drfkill=$(sd_native)
+		-Dsysusers=$(sd_native)
+		-Dtimedated=$(sd_native)
+		-Dtimesyncd=$(sd_native)
+		-Dtmpfiles=$(sd_native)
+		-Dvconsole=$(sd_native)
 
 		# static-libs
 		-Dstatic-libsystemd=$(usex static-libs true false)
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 3e7011cee710..495a8eb8d02a 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -9,7 +9,7 @@ AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa
 DIST sysvinit-2.97.tar.xz 126848 BLAKE2B dd2612de531a89f1fdbfaeb8b5975aeba9541a6b570587a881bdb11406991c1a9b254d1802725298eb13362d625d3859b520ee964782a0fe43d3f038a28b49e6 SHA512 89950080a120b62bdd297f3a59898dd11e10c7438cf18774bad16c65ce5fb2e190726e601c6f263def32cff59867c0984edcd99d527eb80297901085afbb2e90
 DIST sysvinit-2.98.tar.xz 127028 BLAKE2B 302219cd0753dee20772d78ad073e279f430ededab93feaecd166d9be9f91f0f5e97fcfe3e5893d9db963ba638e66e1f6670a94f6e2328fbfdb92325563a129c SHA512 37bc3279b58ce3d808abb78eb6aa8c18a55f991343cc66316ad5b8c2fbb8dce95b83dd995cdab1df8c82a5ab155d0ad65bc3cee3860e4ba4ba4f8c2ac865c3f7
 DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
-EBUILD sysvinit-2.97.ebuild 3955 BLAKE2B e8c55bd2b99b1bd32dd298911a4e6a83e36c5589e1af29f7c55314428dce9fbd335dcc2919f6401cc4e55adefbe12e02f5fc7d7d4db39247844e86f307271761 SHA512 045dfb3b3f01db57781b87fe2ba6561fd78a713e7b9636dfdbf9193b1eae5a1414158ade0969b426737e2c8d45c4c9ea8921c5bf4f60b756191be4eea895cf29
-EBUILD sysvinit-2.98-r1.ebuild 3970 BLAKE2B ae65585a49a850902c9b96c237b0ec53e450a28bc587d49f6faf6ff76a9ccc93f542afa16632969e3fe6b3fcc4dd7ef2896a34727c3c7f3584c00af1401badd5 SHA512 b3e1e541557830dcf2cc2f55e1be9639b010bc7d0e843e5c2bc6a67f73dbd5279589f17d3062dfeb8746dbd89647f49af0d3207c2ac70be4e14ea2e7f8e69202
+EBUILD sysvinit-2.97.ebuild 3956 BLAKE2B 063ff416ecd75142e9f4700983768b1b242cc47cdb471c0fb754d0b752b1d8bb851c96f369998acfff042d9273f3cc9eda247565219db9201f937c88a3606fbe SHA512 ae8d9e453ee5fd0305e27a9ad47331044ce97d48e0ed061b811eb0db469a0e0e4b23c48d9d0177f4d804dba36068f88379af2cffe8e2de77f1e91dbf30928fe3
+EBUILD sysvinit-2.98-r1.ebuild 3964 BLAKE2B b9aba3c6723cdd18119eff7a6e4fe926070340d2f4f6d4513a549632f8d9e17513e6eabae101dfd399843f489884f4370c406836148baab931f93dd9277a5f0c SHA512 de496ac43e87209fa3a2163f7a4588cc61831a542bad9382f303048d3e3d922fd8cedaea4fb16ac37f1bc8ea83fa33ec0c79d16a3acf45af75e4aacb2c810b97
 EBUILD sysvinit-2.99.ebuild 3967 BLAKE2B 48967c9bb6525586026d78474fae39c0d2aa0f1fbb6161ff1f580f35974641b494ea3510c3c503b96876e6f30c2d7219449ab0b7ff40dc624e414f006752e626 SHA512 fc41e9ef6e2d5f19d74513a0285206acf9f477b8951b1e4da6daa78fa64cb6bc78f4d1fc084dbec986b79142f2a67e91c7b74592cdd92a5abffe711535f9611d
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.97.ebuild b/sys-apps/sysvinit/sysvinit-2.97.ebuild
index 9a08cbac04aa..6476fe8b57e6 100644
--- a/sys-apps/sysvinit/sysvinit-2.97.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.97.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild
index 3d7822e542af..72ee3268859b 100644
--- a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.98-r1.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 kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index f1aea2e24947..c2cabc4fbc20 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -3,5 +3,5 @@ AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae
 AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.28.ebuild 2470 BLAKE2B ed4c4f993b0ec36c105c2871e480fe7e8d499283058e38e8c07ac3affce524fc73c4f0e76d691ce311b3210513ea609dc3f3e393b8f4aadb105b019baa297723 SHA512 4da0ea67fc429ba58061b4d2cb59b4db325fea902c794f1b73c4d27c4b63462001f4328c3e08e3ac3c8a9f97f95194a25f6ec823060c894fa25d8a81f668a6e0
+EBUILD tcp-wrappers-7.6.28.ebuild 2457 BLAKE2B b53e506539facbd75c6ef6c3b8e3c4e1dd7b6339961fb3f0766e853e7b93f320619a09a3f135b80bc2b4d5da3324834f5cc71352d35f1a8ee3a1b4dfa82c89d2 SHA512 d8890c2cd982810ce7e00e2c20037c9cc37af072d6340c5e0db38c725601818e4604e6781835b02a75070a9ea99ca80844041f19b02c7287fcf37520e8dc5aa2
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
index e99386b4d958..23e5f2a73fb1 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit toolchain-funcs flag-o-matic multilib-minimal usr-ldscript
+inherit toolchain-funcs multilib-minimal usr-ldscript
 
 MY_PV=$(ver_cut 1-2)
 DEB_PV=$(ver_cut 3)
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index bef0db78d253..02aea82bd84a 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,5 +1,5 @@
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2
-EBUILD texinfo-6.6-r1.ebuild 1342 BLAKE2B 665c2bf8e3397da1649684e45d82462007182a008b083f658088504c08f48a527dce41379c6bf02d2a41c3fe83d963cd5269c0c656832fac9410b8208c259a3a SHA512 b31b40fcc21303a30b143ad99da020b1abc7e10afa40ec7e837198fd2523e85da469ecee57485c72f5d4a8f8ad0f120012ac591709783b0abf8bd5586c4b8055
-EBUILD texinfo-6.7.ebuild 1940 BLAKE2B e68ff2e3cc5b53a7b23783be28950b01689cc2608063a36b1eba6b9c89898d9144de15060ef5ab970658092e16bf5cf1cb97aae9bcbb2583b03fc57f5aad3afb SHA512 2df9622d5cb9bc18bb4f062878f3fdc1722086f64365fa47e051c3dd4babad3f09f48b98a431353cd4738011bae90b6b335f0a8f4cfb227f0cdc1d2e2b9c0db1
+EBUILD texinfo-6.6-r1.ebuild 1343 BLAKE2B 4174e58d56ad4020954a3af7a6366d3bb51f2d28b2a9e8c9a604dbda878bbb6f13bb9017169a8d2222a5559fcdbdc4501a22607b97fcf6b83e9966e57a2b9ea1 SHA512 824e89af5382b0cf25aa115eca341014c8d399d2715fccf75e1219bc7cb5bb12559ff1b5798aa8e603145f89a2d3e3b351a7509deb5268b97e42b33e21f98d52
+EBUILD texinfo-6.7.ebuild 1941 BLAKE2B 26caf30f52c31e1de0718ae11eee9043910d6d80b81c70797102c3a026c6e767ff68a9f6f055fb67c88019c56af8ed678fed14c5d4ac290d76c2a42fb9adfc38 SHA512 c1e18457082628d892e5b58a3f514a1058b0b53a681da0863f72da6a6120d98dee47104155e84618fbab2e794f6571cc3803c32577b9602ac670ecffe98efa69
 MISC metadata.xml 539 BLAKE2B 5445a2b07c6bbecb3c33c64e80227f57ff80b17b0b440a3d0220a88ed1bb930deb1b0274eff8db1a64fe82c64e7f34b1183c533b1a1ca7b41694668e2c5b682b SHA512 4d0b0b223f04e6ebc4e7a7546dbf6b731fc0676657c8d3c3cd38a54c327f4eebda927f1793ead3f8f255bc82d7884b5acd6df8431674db48c2ebbbd1098cb032
diff --git a/sys-apps/texinfo/texinfo-6.6-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
index 4814e56f518c..efa2711dee61 100644
--- a/sys-apps/texinfo/texinfo-6.6-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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
@@ -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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild
index 9050516349a3..caa8be913bbc 100644
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ b/sys-apps/texinfo/texinfo-6.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${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 ~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/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index 20280ba6f535..d3e3729d6fbd 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,9 +1,7 @@
 AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052
 AUX the_silver_searcher-fno-common.patch 3785 BLAKE2B 860a2ee021e29e3c1729363a574eab5e58d02922634cf778729f70631396e4dbae0ba968d8d7828fefca7dbd618138dab3ad7094727a851ba254a460f216cf13 SHA512 14352a4e44a7a07d832a2192be2f22aa7446984d90dafc8d637610b9a13f79adb91e1489a4439a25ec453b29b18d696e41797bee77f4465e2fe9a864a8f12459
-DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 1955772c6f71cf7839270cdcaf73f917a69966afa69e781a81ff1926946d9e61a7229e5eb4981b21879b6d2ad46232563285b083de77b8fbf42d3070792b26bd SHA512 2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
-DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944 SHA512 9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
 DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814 SHA512 b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e
-EBUILD the_silver_searcher-2.0.0.ebuild 988 BLAKE2B ad8291bda658214118139b25e298b994f308d93a99d5aead2a3937f34533bba0ea382f1ecd00817670171cfd97f94d768680fcbb7e1b73a3b332b83f06eb8ca8 SHA512 ff4ef60e0e27173d65fd50579a66b21a93cebe98417dbc86e7db898d5059a89f5a717ea799a27ec7469895cb9e0c604a2999db742d63f90f1739a1e448430d5e
-EBUILD the_silver_searcher-2.1.0.ebuild 1049 BLAKE2B 6764ac8a4a66826a6db93de31fc60cb7e5fe5719b662c25e5d2e3888bf460cf2177d7a24fc1ff5bbe71f88c8043ccfaf958c10e5c6dadd9c94a1ba71f38ef2e1 SHA512 e5b2d03888ae5a07dbc2b708a828a48f8237922af123b108db0816e01db9c252e49b436e6e7de4dd840bc4c2bfc5c54dd87ef9804ff1b0e8a07ed6a604c64d8f
-EBUILD the_silver_searcher-2.2.0.ebuild 1049 BLAKE2B 6764ac8a4a66826a6db93de31fc60cb7e5fe5719b662c25e5d2e3888bf460cf2177d7a24fc1ff5bbe71f88c8043ccfaf958c10e5c6dadd9c94a1ba71f38ef2e1 SHA512 e5b2d03888ae5a07dbc2b708a828a48f8237922af123b108db0816e01db9c252e49b436e6e7de4dd840bc4c2bfc5c54dd87ef9804ff1b0e8a07ed6a604c64d8f
+DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa SHA512 96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126
+EBUILD the_silver_searcher-2.2.0.ebuild 1047 BLAKE2B 546d64df5130376827e3556a4c1ab8487d1c580f21682c4d0e954cff92d186f154d0f156cec508f65e7d77170230ce7cda7ca8128a4c62c8f59c3594d09b9950 SHA512 d0c7ccc383ea8ca8da7a81071106d6d9b2948292b65e3685406b1502fb16d6fec04527fb0887e6d9b97dc824e86358353173dbd06f03ed384794250f18ee89fa
+EBUILD the_silver_searcher-2.2.0_p20201217.ebuild 1079 BLAKE2B 84c10dac5ae7de65605d90b82cc92d3dedfbf04769e27fbdbf7f142123be061c3accb02cd1570cdc899808ed88981990a4f43ec70d5f242a7e521284513ae1d8 SHA512 c85b10b692e2887191d0bdd52d454cf9fff62c948af1f78b663d146528f6d775c0146863f584d1ad49665beb35bb3f1c7a9c3008ef4f2e0248c9fe25a8fb360a
 MISC metadata.xml 343 BLAKE2B 21afa71f55c3a250d73910c6f8a96fcb5164b921758c8969b8fad8ac95e45f86d114742738d6f6f192a33be057b28440390b52719ee71755c3ba04a4f1a0cc0d SHA512 a2dd33c75fde978e49227132e7579e8c3d3b77989228f34f43e5611fafb6999320991f4bdb683426a30595771d2afebc5487487b890a9f399df086fe3946a39b
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
deleted file mode 100644
index 6e62890da072..000000000000
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A code-searching tool similar to ack, but faster"
-HOMEPAGE="https://github.com/ggreer/the_silver_searcher"
-SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86"
-IUSE="lzma test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libpcre
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		dev-util/cram
-		dev-vcs/git
-	)"
-
-DOCS="README.md"
-
-PATCHES=( "${FILESDIR}"/${PN}-fno-common.patch )
-
-src_prepare() {
-	sed '/^dist_bashcomp/d' -i Makefile.am || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable lzma) \
-		$(use_enable zlib)
-}
-
-src_test() {
-	cram -v tests/*.t || die "tests failed"
-}
-
-src_install() {
-	default
-	newbashcomp ag.bashcomp.sh ag
-}
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
index 9643faccd4af..5b4b3e89acdc 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
index 9643faccd4af..1094502e22e0 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools bash-completion-r1
+inherit autotools bash-completion-r1 vcs-snapshot
+
+COMMIT="a61f1780b64266587e7bc30f0f5f71c6cca97c0f"
 
 DESCRIPTION="A code-searching tool similar to ack, but faster"
 HOMEPAGE="https://github.com/ggreer/the_silver_searcher"
-SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -28,7 +30,6 @@ DOCS="README.md"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-lzma.patch
-	"${FILESDIR}"/${PN}-fno-common.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/timer_entropyd/Manifest b/sys-apps/timer_entropyd/Manifest
index bc8c9638be06..2fe87084221b 100644
--- a/sys-apps/timer_entropyd/Manifest
+++ b/sys-apps/timer_entropyd/Manifest
@@ -1,5 +1,5 @@
 AUX timer_entropyd-0.1-syslog.patch 833 BLAKE2B f7b3aec1bd30185e8f5e8c5efded4c30a39fa7208ee6396a69b1e93053f3c5efc1904c4006b6e1989976b213edad29974e037650552b5c219ec119c7ae746946 SHA512 93eefcd75c2c61515d8304f13d196022d76a8244c9b74764247d330e518a2c06fd93e6c9859cde7d6be2ae7e50c05f9e45d5a0c68bf2aa057821b52f588187c7
 AUX timer_entropyd.initd.1 236 BLAKE2B 281b56e70175419ffe5bec4609ce75a48982103353ca88f866e5bd11b0a59cd771fd0ccc9d80466d105de93d467afa0c7ea37c0b9cab90a3d5e89888af73b451 SHA512 78f0ef265ec514a781e9c53d4938a56fd83196c4e923882aaa368c40545f59196cd74aa63be08d500db083603ab871434365583b23932e284fffcf7a4f897f1d
 DIST timer_entropyd-0.3.tgz 8329 BLAKE2B 96af82883eeb5a136e1f059afb067b6df46e5940fe0da5b4c161047c0e4e40a9885454e3faa926b864c2db64cb6b481d5dfed7d8ba4f28d5c8691959e41d26d2 SHA512 bdfedb594ee32daf7fb961a703842ca3479de158fc19bd75664b183e44bcf2ef3e74645cc6097f340834933db6f9133710df7d433ac062b2375494de5c052dcc
-EBUILD timer_entropyd-0.3.ebuild 963 BLAKE2B cc42719a877744205c872a2bad1907f1f4bb03989e15187752a36edd383bd27e819eb1137c5d1de71acf550f54724402823b0818e57a388473ed6a8b6bb35199 SHA512 b5fc76e7357e03d2a510f4d1ed9e8f44075507005a0942503f03d512be33b4c8c4ebc4c6f580dcf9aef59c4ee01da977045a957a1b6c4b98bd42794fcbd4f713
+EBUILD timer_entropyd-0.3.ebuild 963 BLAKE2B c902fcdfb5de30429d0711d99f0e4487bee0086ee86d13923fb7d09ef375690e504d51d1b25aec3dbe041e2eeffbe907012a0578040aff84998fbfc323c34fb1 SHA512 fa2892994f9ef2128682e59c66dad6a19ff9c9c1fa9b18a1d5e7624fdc4c8dd92ef7ed8c2da7c02f9ecda5618092e942236b1e450e2cff9ed7e3faff0ec28832
 MISC metadata.xml 359 BLAKE2B 1e5b2d1f60ba4e6380b3411f9ef4b0bbd0dcdf4a078bd4624a6359aec49304691b3c03d2c214f5661f75af82d02460ead441e117fac1dedfa8890977ec2411b1 SHA512 7f1472a20512fa60f4d81005efc7ef659176109e7b19c17db63ee4dead3e4c5a03c8e8b1ad1bca2124cf94776e6a41fccfbc4c15e42b6ad42591a9210602624e
diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
index 041a72467d56..8fe1dd37e068 100644
--- a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
+++ b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit epatch flag-o-matic toolchain-funcs
 
 DESCRIPTION="A timer-based entropy generator"
 HOMEPAGE="http://www.vanheusden.com/te/"
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index 63c883c26c3a..ce11ba762043 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -1,4 +1,4 @@
 AUX tomoyo-tools-2.5.0_p20130214-warnings.patch 814 BLAKE2B 10a9966f726a47058388773500bc06bc6cebbdcf90eaaca5ecf8b2c1159618843645e55663892a5897c6741794b49cacf823a1fcee5e0e67e9a5c7e27ec3b892 SHA512 947caa5ce7f2c80e7e0b40042b09568c4fed731b530cf70c1fa24fa0f1a382dd41443f3db82a6aa6444c0ebcd25fd7de657c0f1990d69579e4645f3efa561e10
 DIST tomoyo-tools-2.5.0-20130214.tar.gz 210892 BLAKE2B fc9435c5b4c97a58d6e3b00cfa5b82e08732c0f6804a819e99872fbcf64e3e831f33766c23e0ab7d8767e0c806d8e2f7c18280ebedb198684c386e8c7c8bb637 SHA512 1ba6f6b3a3d4e644e6ee742beb64b09c6d527f130b1fe6d09a2e19760ced26f540ac8cc1e6f83fddacc3ef8844c3c23425191e4e0098c8b72b5ba3086adc9dc4
-EBUILD tomoyo-tools-2.5.0_p20130214.ebuild 1422 BLAKE2B 86254dbc931dbc0f1a69d71d3fd106e35e0fb09286e6fd097b3d98057b4d8a38f0a3a32dceb04f49fa2b042c64fe162af13c051da3d91c03da4eed7773a76fdf SHA512 7ca85cb6d9b9bc5108364d18e3d131e47c1e02e0e4248ff1c197c1570ed2e7ef9be5825628b5640158b7f4b371e3fb4a6d229bfe9e735582abcdf140be450bf2
+EBUILD tomoyo-tools-2.5.0_p20130214.ebuild 1419 BLAKE2B 204adcc2d145149ddddf1fb09a500db270040224ae42f2157ff4063649e46efa5075d9497970cff2310c3b285f53579b18f8eea1fc38a59a5f5c5834f8756b3c SHA512 9136926024ad7823bbe5162f5849fcf3de98882ae62caed20b0448ea31d0e3e3bed8d12efa3116691eb58ac880351d9b5866fefff2d0df78ee73cc27a9ba0460
 MISC metadata.xml 295 BLAKE2B 457d2e30395637e99931ce1dcf07a60d3c255b8e56ae338f0aae4489d6314ab4d147af16fb7c5976fbc3329625f0cd82d281918c6dc7f05db71b3b19ae5539ea SHA512 bcad45a60a3abfcb3054f0c82a733ccf5e0562f796cdafe414d2fb6e95301371591b1032404d83365d4a39a60bb1f3b2dd81d6a85592f72cced041cf36393ff1
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild
index 998598543f43..fe6c6041421c 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils multilib toolchain-funcs
+inherit epatch multilib toolchain-funcs
 
 MY_P="${P/_p/-}"
 DESCRIPTION="TOMOYO Linux tools"
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index 8e4bd6048634..08b3cabaa80a 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,10 +1,4 @@
-DIST toybox-0.8.0.tar.gz 975002 BLAKE2B e137c3616d2affaf8b6f234cab49190b98540fe8f954244172f9ca80c749069f85ff8addd94e1018d3680f1a307df54671ee9b01726c5279f340f8fee3669609 SHA512 aeb15a02782cc0b3b46a892e2d82834e5172a7da04e2498eaefec58221305dd24a86aada5ce05978bd4694895ffeb94ae980fd767f4ee00c499b3dd518fd3e20
-DIST toybox-0.8.1.tar.gz 1015363 BLAKE2B a765a133910b7c8d903a1fa95338b8dee1267c3b7430267d47c4157d966256d16c615500acc38428296b9612649fafdaa111a149df7415ac580c01cfdd361025 SHA512 22f91046c75f986e44927ec89feab6c6afa1f614e5b0eae73e43f6ccd5c4328991ad283858fb1a5cb4d697806f38b8ab81782c160860a2c34ecbef3885636d5e
-DIST toybox-0.8.3.tar.gz 1098057 BLAKE2B d962c4fd1c79229ace5a0836b6170e3ce8a5435df660b5306f5dd0aab32f4509b5c3cf5cc87eea597d336c7cdd51ca4895cadd420febeb9ef9270e85909f8dec SHA512 e2c5a22547cbd85bfee84c4aed3016895e4e0eba9b6f3dfc6cdfa0a0d59dfd74203a35389dcd0b2c557dd04eebbb051f9a458762af3abb32b473bd8924ed7b74
 DIST toybox-0.8.4.tar.gz 1133770 BLAKE2B adc695c2ddd592b9de7137db623621410afaa4cdf2dfde647f24f25d38de99ad38907b5e5aa2ded0d6b2eceafc71763a25e04abc33e8f057934fceed6df22e69 SHA512 507604f96ee89094ca7b4b218985659a8de41578d1a4f267c7282baf11306419e94bb4bfcb06835dff3e46f974a0bb49f89e4c427c69c590738a4a37b62969b8
-EBUILD toybox-0.8.0.ebuild 1150 BLAKE2B 60afaa318851dcdf112b5e46a5963f539e095444f53f4ab9d9645a1ebac53b4cc78ff0eafa54b6dc413590c7e2ea21dbebbb8dd373c4d0d560b60d00e8869075 SHA512 0d0402203c6f292dbc1ea35fbde8a3bb37f3b5ea217c93d33a6865332be020bd4b1dbe376638a2531ef6b1bc65d9c83fcf57a35fb7518242d6b31c8ea82ec9ba
-EBUILD toybox-0.8.1.ebuild 1152 BLAKE2B 5085537d8d99a88301e9a1d4cb835d88207fb584a23ca38abdb3c00c459ba37a669f83c98c838fafbcdc73695c7060abfc08bca49a0c56959a2c070a88d4a310 SHA512 b52bd51a23f1e413abbb8f4e07e4d116f024e7113f0fa78c53788896322d448820f80de74db5fbd267204c4d6e1ee0c3e96b07db568ccddf9b969a0851d36c18
-EBUILD toybox-0.8.3.ebuild 1152 BLAKE2B 69e582a35a852a026721e245e63e4cd48b3ceea36d2c3e412aac8bc31b3372b439668b3eb2343a8eac1eeaa5c526aa8f486ff4459cc68eee7c9edd5cb5abd338 SHA512 2f4f3619467b6b1fed69666d63dc43824fbab1e25e0fd2ffb179deb7d366852674a4ec84de5f40c7f2812d3afd0b5e78142de7baf6b3ae6bff0b08833b302df7
-EBUILD toybox-0.8.4.ebuild 1154 BLAKE2B 1eeb73e01ab5428395dbfd2e78c943c02e994a27e3be0342c1620f8f5a60ff7a3142a8e5e42a9df7a06044dd51e1b42d22193d1d0026e371332805d2260f77c7 SHA512 8a3b37c51d1c27c1e63f1b5f45afdd91f711772bcc07134a05c6ee61c0fe6c200a4f4dd0c25aabd586bd5fee60ab7f078cd279fc328cb44ac3654d850ca6bd05
-EBUILD toybox-9999.ebuild 1154 BLAKE2B 1eeb73e01ab5428395dbfd2e78c943c02e994a27e3be0342c1620f8f5a60ff7a3142a8e5e42a9df7a06044dd51e1b42d22193d1d0026e371332805d2260f77c7 SHA512 8a3b37c51d1c27c1e63f1b5f45afdd91f711772bcc07134a05c6ee61c0fe6c200a4f4dd0c25aabd586bd5fee60ab7f078cd279fc328cb44ac3654d850ca6bd05
+EBUILD toybox-0.8.4.ebuild 1058 BLAKE2B 661aa389f23fd9378b257f02fa2005dc0153c762446e2024930a0a031bdfe06469e0332459813eaf20fcfbda07a182adbc610e0a4fba106bdb133da814f5584b SHA512 6da970c6be012eea604e420f244ca913a068db6b03b7be30e8c1a1858287abf2fded6ab341c325aa204b6b14a5d17cb4c23aee3073cca229adb309e712570f2b
+EBUILD toybox-9999.ebuild 1058 BLAKE2B 661aa389f23fd9378b257f02fa2005dc0153c762446e2024930a0a031bdfe06469e0332459813eaf20fcfbda07a182adbc610e0a4fba106bdb133da814f5584b SHA512 6da970c6be012eea604e420f244ca913a068db6b03b7be30e8c1a1858287abf2fded6ab341c325aa204b6b14a5d17cb4c23aee3073cca229adb309e712570f2b
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/sys-apps/toybox/toybox-0.8.0.ebuild b/sys-apps/toybox/toybox-0.8.0.ebuild
deleted file mode 100644
index 564d2c54b23c..000000000000
--- a/sys-apps/toybox/toybox-0.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/landley/toybox.git"
-else
-	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="https://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	default
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake -j1 defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}
diff --git a/sys-apps/toybox/toybox-0.8.1.ebuild b/sys-apps/toybox/toybox-0.8.1.ebuild
deleted file mode 100644
index d334e3570448..000000000000
--- a/sys-apps/toybox/toybox-0.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/landley/toybox.git"
-else
-	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="https://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	default
-	restore_config .config
-}
-
-src_configure() {
-	tc-export CC STRIP
-	export HOSTCC="$(tc-getBUILD_CC)"
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake -j1 defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}
diff --git a/sys-apps/toybox/toybox-0.8.3.ebuild b/sys-apps/toybox/toybox-0.8.3.ebuild
deleted file mode 100644
index 616f3fbf49a8..000000000000
--- a/sys-apps/toybox/toybox-0.8.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/landley/toybox.git"
-else
-	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="https://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	default
-	restore_config .config
-}
-
-src_configure() {
-	tc-export CC STRIP
-	export HOSTCC="$(tc-getBUILD_CC)"
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake -j1 defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}
diff --git a/sys-apps/toybox/toybox-0.8.4.ebuild b/sys-apps/toybox/toybox-0.8.4.ebuild
index 5b1788940a17..ca78edf8b366 100644
--- a/sys-apps/toybox/toybox-0.8.4.ebuild
+++ b/sys-apps/toybox/toybox-0.8.4.ebuild
@@ -16,8 +16,7 @@ fi
 DESCRIPTION="Common linux commands in a multicall binary"
 HOMEPAGE="https://landley.net/code/toybox/"
 
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
+LICENSE="0BSD"
 SLOT="0"
 
 src_prepare() {
diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-9999.ebuild
index 5b1788940a17..ca78edf8b366 100644
--- a/sys-apps/toybox/toybox-9999.ebuild
+++ b/sys-apps/toybox/toybox-9999.ebuild
@@ -16,8 +16,7 @@ fi
 DESCRIPTION="Common linux commands in a multicall binary"
 HOMEPAGE="https://landley.net/code/toybox/"
 
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
+LICENSE="0BSD"
 SLOT="0"
 
 src_prepare() {
diff --git a/sys-apps/ucspi-proxy/Manifest b/sys-apps/ucspi-proxy/Manifest
index bd9070abedc7..866bc569a4d6 100644
--- a/sys-apps/ucspi-proxy/Manifest
+++ b/sys-apps/ucspi-proxy/Manifest
@@ -1,5 +1,3 @@
-DIST ucspi-proxy-0.99.tar.gz 35537 BLAKE2B 0b3f809b027dae6d83a39aa7b83d0747e2046409b97ba2de678d49a3611ea08f82ea9f30f13a3cd67dbc06de881551d282b14aba67addcf294e64156d2d6d5bc SHA512 5bed82bd0db2501c3de8b38e23a07c39bf9937b9ce95166cf1822a6bd5551aec945dc01d6ba716d7ce35f4aa7f2a126d860d31f7df2d807f1f4eb5e355e93164
 DIST ucspi-proxy-1.1.tar.gz 38351 BLAKE2B 395dc3d154665c8c65c2d35f6e666543f5f919497fed441aca7223dee4983fe165911e8bf1571aa11fa10ba6adb480b4da853773b5a2be556ae59ad6d1708328 SHA512 c9e6f98a73bf6868341b0d5c1653d0b9107aa92c21e8fe96c47a9ca0ae41b247aa10bccd819d84bdcf4e8d5902c1955bfbe9e4e3256d5303578cd3337220139c
-EBUILD ucspi-proxy-0.99.ebuild 795 BLAKE2B 1fe311503f626e092ca81fd2a0d9e76bf460df87181112d3ef5c15804a85627d7ea974bdafa2c487b5611bcbc998fd82bdb456f303876426686bc96b055b2d94 SHA512 390de9c8aa461015cd08f9354aebee5bb7579ed17f33ea5b6b4d35cea4d9fd377c897bd4f0e142542a2047f610144e240a33da3ab05b935634f4d43474522eff
-EBUILD ucspi-proxy-1.1.ebuild 656 BLAKE2B b6cd7cc455d37c2064a1870c116c8ccf12ecd291a052a376d8624550fb8109fa2965ce18d81feb76d98f9a2b8c5a7e878032d3d4480336aad080bec6a18e6533 SHA512 e1d5b236a95c1eb8f3a2f0a3c7a8c253cc18a5031412cc3315b51c1cdc8104d40b70861c2aaeadd5a7685a4eea9a2b4faba4005c389329b2ed2b7d225507df41
-MISC metadata.xml 439 BLAKE2B 0765793e54cdc093b3d94ffb0c3f938bb12d53e99a21f091ad05e1f23ee599c77d0b6af04e1f33a92ea5916131718e97e7ad7a48921e3622682ead4eb35992b7 SHA512 86623b17b403875797df6844dd2fe579cd1eddfd0c859e785a9140ebee91c9e35ad3ee9de001ee5b9887f46d4a08e6bf459fdbe1984c4666993c9c4ccbbb3a40
+EBUILD ucspi-proxy-1.1.ebuild 726 BLAKE2B 6b6504ec29272ce53e53fcf012615d4937064b04c9fcc5bb51e0f1cd3dca001a980c28766f8d12bdea89f47e4381b50d6fa1190e8a7f75de8276076f0b7a52b1 SHA512 f510845a3a27c62dca7886687592ac7632f1cd87131f0dd4fd8a2af887f793e7ca63838379d582cd3e00bad58094ae8ec190aef56d88b4fb225a2b4184359c89
+MISC metadata.xml 352 BLAKE2B b6c8303ce6c72145e17ef26029c18d1774538cfb7bab0029a10cc45db08faa6ec142e8d33f07162ce6c3e2b9ba6aad1c1b67d03d993b49c449355ab577163f14 SHA512 fcbbeee2708fcb372f0ab0b58d6854f9f60ecd226e597b93d0651c28d991ab65ccf3cc439484ca931d22ecb99ef203353550a15d764b07fa75a626cf915c27b8
diff --git a/sys-apps/ucspi-proxy/metadata.xml b/sys-apps/ucspi-proxy/metadata.xml
index 118cf69936e1..4d3c5494713f 100644
--- a/sys-apps/ucspi-proxy/metadata.xml
+++ b/sys-apps/ucspi-proxy/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 This package contains a proxy program that passes data back and forth
 between two connections set up by a UCSPI server and a UCSPI client.
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
deleted file mode 100644
index 28b9fea119e4..000000000000
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="proxy program for two connections set up by a UCSPI server and a UCSPI client"
-HOMEPAGE="http://untroubled.org/ucspi-proxy/"
-SRC_URI="http://untroubled.org/ucspi-proxy/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/bglibs-1.106"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e '/^>bin$/ac:::755::ucspi-proxy' INSTHIER
-}
-
-src_configure() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/share/man" > conf-man
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
-}
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
index efbc87c02090..05bc1325eda0 100644
--- a/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-	echo "${ED}/usr/bin" > conf-bin || die
-	echo "${ED}/usr/share/man" > conf-man || die
+	echo "${EPREFIX}/usr/bin" > conf-bin || die
+	echo "${EPREFIX}/usr/share/man" > conf-man || die
+}
+
+src_install() {
+	local -x install_prefix="${D}"
+	default
 }
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index e2a1ae18aa61..09ad0a82067a 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -1,4 +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.ebuild 1603 BLAKE2B 46584930009cc07be6aa8459c8a8475d1029f935321a2436782d60df8ffa3bc0a806c85d4da4e5ad11026c351eb291f280fb13c56052c580e7a8d98704639e83 SHA512 e8834e91cf83360cfcd4ccff01623d9b2a1d4a9e1866557f16db04958a9047c1266aad22f389cace5369ead082cb689065b50173d1bfd29d672610943858124d
+EBUILD ucspi-ssl-0.99e.ebuild 1604 BLAKE2B fed894417661ad17f66419a88b5b8310e09ab5b22817e35caa01d14b6926b0e66ab92ce54f47f60fe8d6c245a5b340f57a2dcb19274e98195f866a233594a782 SHA512 9cb24b0d7a9bd878811040dfb12504e8c8c614180b3069ddc00b6c946f57a3aa38fd71e555238719bcb2d20da6f77b7bfac0caf4f70405d6db04c92576cc178a
 MISC metadata.xml 550 BLAKE2B da79281578d7c1fcb0646eb789b7b12e431ae96f645e9fbd944b1c1089a9321c65a66570a0c9a32ff6502a06794422bcb1129a3edba5016ca3d7f14821058a05 SHA512 e4f99e1cb7f634dfe7252a62fca125bcdc1f7f1e868c8b9786bd4e4d7b857fb983f2567a2022fea697bb4694911807fc0099d0641cb3025558f7bf22c235d2d6
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
index 03a26b48ecbf..8b033c331a30 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
 IUSE="bindist perl libressl"
 
 DEPEND="
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 023f5db9ea46..3c2e4763be98 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 2099 BLAKE2B 9489bcb0552f2f87e12c88b58af7e0f2ef7e028ebe572b0e4ed30e5c2542ca6eda15f271faed5dad9c9a19425810ec2122b07cc3501aa27e96f962bffb364080 SHA512 d89d464d244fca5f03c75129390f475e4a82a9523d5680b91b4cbe7e27e2a8ad5085efa404472b3fb9bd5c1f6f4f629f88ac7455583f1ae9cdb62e90bc02d39d
+EBUILD ucspi-tcp-0.88-r18.ebuild 2100 BLAKE2B 90fd62cae5fd2118e238476b77d20a64659a55152986771cc86a434b0765ec498dbfb50e00144db392b194e7ad8591002ff4814eea1e50c1426bb1c782342ac2 SHA512 d65d879f22d849f7ccc31c7199fa0c5b900c72cd53a2ae6a100a8aaee93433dc3f06a9399f7836df8a6617380d2e2939297b070f11464c90328a9168d30dc70c
 MISC metadata.xml 600 BLAKE2B eee72034e2adba51553bf32dd54e0ec2026a97fd709cc828f28e22525dc66cbff4bdc8801f7c5b4fa655fdbd682ceeb71639f22094b96150cca02f7db538554a SHA512 8cc6d3b8383d604b971b5cfd48060d5190269beacd1060ca279cb5eb0defc54e36fd1972ccecdff5f3fa912ca0a80e177433226876ba72158e93a5a6c1cadffa
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 d12f321d1d5c..2089ae8eda88 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-2020 Gentoo Authors
+# Copyright 1999-2021 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index a07f035dfd63..4cc7dbb4c1e8 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -1,8 +1,5 @@
 AUX usb_modeswitch.sh-tmpdir.patch 596 BLAKE2B 6198685654131161989e03ac28ec4f4db5a2d8ba57c4f3c4b5c1fe96086c36bf450b4854995d098610faf12f89eaf55a5bcd95f1a68f0f2d2c3956ee92870947 SHA512 45e3a3f78a9404293a8b7e864f22db94a617be1d34d2c91fdaddc9b6a183dee1e3e2b5f4376e417d2c56b13b772a70e5e5cb53d0a08adf4cdbe60f1378abfa1c
-DIST usb-modeswitch-2.5.2.tar.bz2 259820 BLAKE2B 263d0b8c4ec79eebb1f79cfd171973f0d6cab96bd361b54c5fed8908745eb4643af935edff788b0913f8ba5ba1edcb683c75aeff6c426437c8436c74f875982b SHA512 ad2a7e5134379664fca83b85803e52ec8e3fe3c2d6c633eb5af3c291c43b15ca4a67198612864de01d146a029ee5c475c8c7dc71d16e3a475b532837c5dd34ea
 DIST usb-modeswitch-2.6.0.tar.bz2 44971 BLAKE2B c1b7484e2c9df9eb0097b3d560adedafe169bf797cc6d8702a83bf47ebadcb9601f32112b14fb65fe164455c536a0d5f66319d5927d81e59298b7820c9fe9b11 SHA512 43e6d885380602ddaaf771af73a302a7de30f7ae6ea58b2b572a9ad9ec77a453789020595de33a8b04ec209414fe08face2bbf84c67271d7b6b90700face09ef
-DIST usb-modeswitch-data-20170806.tar.bz2 32700 BLAKE2B 954aa513a74774cdabb2e3820fa56f1244de74cbfc0adda5309e4dc3bd79c2b6dd2023a5180f8d39f8b496485e1991de2a7fabbb59f6995fc7e0c0bb0b782243 SHA512 818bc9f3d9b75df245bb25f959075041667607e7681bdbca7006ec036613130a0fa5e41da9e939ca510e524a78a7a76aef82ecfbbe19611887b3735987b951cc
 DIST usb-modeswitch-data-20191128.tar.bz2 34069 BLAKE2B f6bf0c54ea51cda361ef9476875e0311f2c0e839c9e5f0a9ca2a0e5444fa16be65a436d98291e97d338d0416a7367c6abcae1a9877470246ed9f84d25dbe3e06 SHA512 4b5954ad83f7281e42321c16f5cc5b956923cc0e2db5f238cc64b3ea37a419768f01f2e26310f2b4fe9a9a5b1d901517933effd6e6edd23bc9b8d0c039ed0ba2
-EBUILD usb_modeswitch-2.5.2.ebuild 1671 BLAKE2B 304ccc0dee0fccac9beaf220e7ef1e6c07c549f197180bae7c6d3ae3ea8d9e64300f4b39387b0d7739e572f5575f3f3826929277c7ee6799f2f3b23bd1cbe343 SHA512 06bc65bb27d68ddb41d994feceb97de8dcaad790fecccfd247993d2bc2d54aeb9a97ba150b7875fd1a78a4f998ec88a3dd61efdeade725c2839b6081d27ec33c
-EBUILD usb_modeswitch-2.6.0.ebuild 1603 BLAKE2B 6db61ac8c5447b0a02f8c0c7ce1a29c443319086743a1cfe61e0375ccd5424b3b470658bbb798be7934d483f352714cecd33c98d988179fe4639dd3a6e686bf0 SHA512 5d0c78dc40d668f8b989e50c3851844c786047440a8aa28a88cd5f8ca1d9c239f5d93b0a82e9eaac965768234ae365ed684b1f95b0bb242040c55fd3ee338bcf
-MISC metadata.xml 419 BLAKE2B b10eae75d3eacc64acd82b38254b85362f2301c6a5c2447f5113dae4d7769a260cf8b7d82c478d0589f05791ffab9651727f24a7709bff3f89d8d8dd0b8bd805 SHA512 6032951cd03029286f34a452c911d977a92cd3eb56c3c588c27d091bb506e1f3f963e87fb262270bc1108aeefeeb4f49b18ab8aaaa38383e35cddb8c5f43b06d
+EBUILD usb_modeswitch-2.6.0.ebuild 1600 BLAKE2B 71de1cffe48eb806663a702c21a16556e1158db2465d6740b8577a677d7982a27b238d12c548c015f4b6d2310e201b96fa84b6173ae76c1a4207342bb9e966eb SHA512 2aa20d35a72b4d2a81181d83811aaa52b91c989b9065289d1c7e10513673e42a6b7132470201a411014b55a76f0e7d176fca148a63a944a1c0b8b851f21d9979
+MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/sys-apps/usb_modeswitch/metadata.xml b/sys-apps/usb_modeswitch/metadata.xml
index 1b2d98603b73..f843557871de 100644
--- a/sys-apps/usb_modeswitch/metadata.xml
+++ b/sys-apps/usb_modeswitch/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <use>
-    <flag name="jimtcl">Use <pkg>dev-lang/jimtcl</pkg> instead of <pkg>dev-lang/tcl</pkg> for smaller memory footprint</flag>
-  </use>
-  <maintainer type="project">
-    <email>freedesktop-bugs@gentoo.org</email>
-    <name>Gentoo Freedesktop Project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>freedesktop-bugs@gentoo.org</email>
+		<name>Gentoo Freedesktop Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
deleted file mode 100644
index d7a1279b2769..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev systemd
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV/_p*}
-#DATA_VER=${PV/*_p}
-DATA_VER="20170806"
-
-DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="jimtcl"
-
-COMMON_DEPEND="
-	virtual/udev
-	virtual/libusb:1
-"
-RDEPEND="${COMMON_DEPEND}
-	jimtcl? ( dev-lang/jimtcl )
-	!jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~USB_SERIAL"
-
-src_prepare() {
-	sed -i -e '/install.*BIN/s:-s::' Makefile || die
-	epatch "${FILESDIR}/usb_modeswitch.sh-tmpdir.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		SYSDIR="${D}/$(systemd_get_unitdir)" \
-		UDEVDIR="${D}/$(get_udevdir)" \
-		$(usex jimtcl install-shared install)
-
-	# Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
-	# which is why we need to force the .service file to be installed:
-	systemd_dounit ${PN}@.service
-
-	dodoc ChangeLog README
-
-	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
-	emake \
-		DESTDIR="${D}" \
-		RULESDIR="${D}/$(get_udevdir)/rules.d" \
-		files-install db-install
-	docinto data
-	dodoc ChangeLog README
-	popd >/dev/null
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.6.0.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.6.0.ebuild
index d82fdae1115c..77ada0145c06 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.6.0.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/usbmon/Manifest b/sys-apps/usbmon/Manifest
index 2e975d373c90..bfe232bdc8db 100644
--- a/sys-apps/usbmon/Manifest
+++ b/sys-apps/usbmon/Manifest
@@ -1,6 +1,6 @@
 AUX usbmon-6-sysmacros.patch 1103 BLAKE2B e4ea9107680a108dcc15e9b53eff87dc3905b4f799335ec560d4905ecb3c848d3b8a5aab361f6602c4545d5549303d14423d75402ac4bb959737e8f7c44c7aa3 SHA512 e3a1b55effd247ac8911c07220c187bc099db011269608d09a8b6698670b5e3d1c34a8cd60acdbfd69ae3bae24ab4cdcb69927b4c9b8c573bfc7045c5e3d1a0f
 DIST usbmon-6.1.tar.gz 16358 BLAKE2B 94e7793c6ce2ef6a8616f04871efbf22c388c569834c34869d51bbf3138c4c0ce89adaaaba19fc70a2371e244a99c7fe365f360530b9366a339be3cbf291f6cf SHA512 580aa1edd6336ac86e562081a79698a98e6c7aa3dd8605a4c12201dd0e3ab1dc58b3d69f670742e007aeb76fb6ebfff9b5d10114df93814763e0c393b6473b54
 DIST usbmon-6.tar.gz 16796 BLAKE2B 14faca99b44a1d9aa33217f75633251a7932d57732780ba6d871d2dee1b48202071186704959b623f8afc276e9e7da5e4d11204b40f567057cfa731d851cc413 SHA512 4ee41379196b86697a5156d4411860ba31540b98e50165c65f873e22eee1c3caadbc73a2c61903531f968797eca8e7f95490255a0820dc0778fba82c7eb260f5
-EBUILD usbmon-6-r1.ebuild 656 BLAKE2B 3bf8359b80661a705df8fdac42be508ced4f3fbb57639339ea2ee8ab61d97b001b0c0702e605ca97636b741e3b124a6cfa307063a9f7bd38f80fa89e91bd0ec0 SHA512 485a80e44616a61c24a810e4af3e97d157deabf5fcdf9da3b9b66457647ee767ce5d6d017c309fb5481c7249fa789de47d587164b18245533773171763277877
+EBUILD usbmon-6-r1.ebuild 656 BLAKE2B f9a7f8de8e36f160fc452f682d6b270427a75bf4109ea3af1741824d1c9930fd36eadb9d42c64b4e8213efb44e30af17208228e93434200a2f861d6636bf77eb SHA512 a00661e774332a263d0ace466b90551f7fb430815e7e16776bd5ebdf8315e7f1556fec798cf11f4bc15884f9ac21577c6690acd7f8a4c0c04e14b5a9fa847734
 EBUILD usbmon-6.1.ebuild 528 BLAKE2B 5adde7cbaa47e3f02dfb819778952c2259983900128a60266a372b0d47d566e274a7acce8696526e63cb692776aa2cfbacc04875ed5c4cc5da979da84a882391 SHA512 4cb63c0d3d76ae4aa892993c4044086daa54e740af0f4e8b27830128b013bed4bd3bb53f771caa891c4c2df2c8ad7473ca363acaaa6352379d94b6fe508af4af
 MISC metadata.xml 222 BLAKE2B 5000e095f9389a9ea81b6ae970f1f1587ce12f13fb4ce95ca82be803b45d9553af4c13f5ceb47eaefc780dd6be374c8b905d12aa84179ad7b58aea44c5bf1927 SHA512 05134582b0d0287f20fd3702d042ca556dc42f3ca4568bfa73f6d9886ed8027057936af758ffbb252a5677e1af876c46e8d044f5fc691148922c5fa0c5cddc03
diff --git a/sys-apps/usbmon/usbmon-6-r1.ebuild b/sys-apps/usbmon/usbmon-6-r1.ebuild
index b3fda313d587..887cedcf62d5 100644
--- a/sys-apps/usbmon/usbmon-6-r1.ebuild
+++ b/sys-apps/usbmon/usbmon-6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs epatch
 
 DESCRIPTION="Userland for USB monitoring framework"
 HOMEPAGE="https://people.redhat.com/zaitcev/linux/"
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index 14b8cdc36a0d..325ac41370f3 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -1,9 +1,6 @@
-DIST usbredir-0.7.1.tar.bz2 329895 BLAKE2B 7017b1441c2265c9e58532bcc8718844e6f64c7272ad599a8cf5f6e21f694524e05da2d8672c4892faa7b744be46bdfff521dbcb4944715d45b24d5925972ac4 SHA512 f8d26d59d5a530aa413fabe2402fbbd9662760453c2b4e83d34f2e5287c188114ea870f15ae1bc910297649986315be965f0d23d0a2b7b0cec2f207fc65d7598
-DIST usbredir-0.7.1_p20170503-patches.tar.xz 8120 BLAKE2B 21c7a853b3d5329fcca45169e22135bce615c9422f314f680f1087014d64179bf26f07bdb377bcff48155f28a37dec82b0bee8bce4d868e41614b128fe61b95a SHA512 b281d7a1ee191746e5fbe655b21c0cd9b2cf9cd69d5f28d91ab41de2d62a7f3c5c2a42f3f9c40c73d61a57d89423d996f4a779ebdff8f9d088030c2a4c2a24a7
-DIST usbredir-0.7.1_p20180211-patches.tar.xz 12508 BLAKE2B 57479444752070147583a0cc2f6651a32c8a618756638ae04928dda7082214d501fb5122a0f5d02aca994be0a386a8e493628faa240f61987dbd02d2fcfa679a SHA512 993c7ad5faf66f249546e1a631a10cd842439486de029ed2fff049b70967cb0a6ad45fb773a1c97fd6811e246f4cc4c7482522393dcc74b26ba2646a83ac70c8
 DIST usbredir-0.8.0.tar.bz2 331349 BLAKE2B 0190b4ab35cd554c13b65d30756b7b018e7ce82c72e7dddbaf05b8a704bd8a25724c4ac4759e1b86dfadb64ad7ade75c05365ab9ae3152f8fa60e909bc5e183b SHA512 976274adf08f8691b0961f5238021e988a4347873d0c67576038f44cbdaf25c2bb325d8cede0a507933b719f9715b1508ccd1d8f52fccd36f13a7640553dc108
-EBUILD usbredir-0.7.1_p20170503.ebuild 1003 BLAKE2B bb0837a9d6c069743bea46321fa5381cec6e0ecdab4d3cfa0a4a745a7ef0b388f399e6d4cfebc1d1a50a72e888360ef05edd7692d7ada755375973a3e60d75c5 SHA512 b8ec95d79b4761d79bde59f077057a33747c050df4388bcd94f8101afa288220be67ddb0d242cdadc897fb3e686685cba04e8a1c7b4c6f6d245a84d625a0c2ba
-EBUILD usbredir-0.7.1_p20180211.ebuild 1015 BLAKE2B 414cbca6d217eff50399838c4ecf2347cf21d9dd1e0db647f3226e29ef310acb23cebbf0cb070c04b576d24bc1319fdcb8287ad5d4dd844a966e37a41bbbf31f SHA512 9c0677daf7aad198167007d60b271af0a94f9d92315b2f3b9f0d1b2fa20c0a2960db10d6d4b10a07c73e3a9efc8d5843b06eed05d6a8a89d65882f2ae8f41d98
-EBUILD usbredir-0.8.0.ebuild 920 BLAKE2B 311afcb7250e8710026222309b4e5bfbe8cf2fa0e2d26f57c63ef882ae8b05137cbdab4594cb3afd5649d805ae302f8cb4cb17e3ffe4a1011da67c04759fc7fe SHA512 427f8d66cd133c2532512f3d1213cc2719214b0b6eea829ab3406996a4d87e84d29e5939601b20c5e93eac59098e40882907feec910a308fca9b3277df9a9555
-EBUILD usbredir-9999.ebuild 852 BLAKE2B e6a96cc5978957733801a69c92d4b47f39ddf81415bea571f88eb2c18e8b8f6a90af63f2cdc21c8d16112eecd941a997b8b5c70ade8fc17ab41cf5b94335ac9b SHA512 34ea35e062d41cce07d9985b3ffa6a0e666d1794f9cf964ed962eb809c9ae7da013d4e93bae501f3eabbe2e44c302e35e7c6ff0fb20309060caac6c9a1e7a54b
+DIST usbredir-0.9.0.tar.bz2 72498 BLAKE2B 857b83795ac082d412b2872a4ca06b1602d556698f3217379698e8b1f54edd09b012600069045ff0f7583703253853998b900f34d861a538047783510b3fb2e9 SHA512 5df62fb6e49161be974776c86f026a58322ccf1c1964447958707408492c02175100ead9dc4a7e77bb7a9112a33b91461d64761425e7aee7d44c71ff6913588a
+EBUILD usbredir-0.8.0.ebuild 923 BLAKE2B 580602ef4cf7f46fe0ab508c1c3a53262e0f2eeb7bb9e72dcfa53e48756daff7775c19f7e402bc6f536f8cf05ca75995b954c1f0f5d6b0423e4320fbf57e3cac SHA512 718d4916a441bf6a2a2d83988666e5217a1c310069444096011a02f63c3e0bd596045bcad908f216d2ae2471d4991d0f8122a608a9119c548584677c441d437a
+EBUILD usbredir-0.9.0.ebuild 997 BLAKE2B c33a126d7aa4bffe010730c63f63385aa1859ac3098e5219641cee9681556354fcad1b19a5ebaa055d2a4f1bd08bda847ef3502998a211c4985abff8eb2394af SHA512 11c1373bf9ebf3df076688b65026552dfe9e0c4596b39b5aec0ae0a7b718628768c82eb8fed6b8cfecb16b88f74682e808d45d7ff301aba6756ebd37e7b81a42
+EBUILD usbredir-9999.ebuild 850 BLAKE2B b01f925aea22d8f2e288a5e4fd8a093409f7370d2b6399add5df799de1af24694dde48dc971579c108917860773bf715e419a806e7e3e5db7684d694182e4f06 SHA512 47a51143cd9587b0aa280792375fd8329b547d434245ee4cde3187f06750521c1d1e9cd2d2e3e56c3c1229fc9ee9a4ef15f45720b55f668332c04f3691eab25d
 MISC metadata.xml 381 BLAKE2B 63160ad268e74a23031e19d54e171504f751e2337e6dc059215942052518e09e945796ec6522828eee63fc872be396f9f47f85a8b1ad970904f764e7e5a222a7 SHA512 a4363c96453be6c53dff19c47739440d00f03b7994a2c993f9be0608f2a1b7a4ac8e9178a4784a74dd51b97cd0de37cf0aad209041f2b03c65864b2798f9684a
diff --git a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
deleted file mode 100644
index 5b382fb4c5c0..000000000000
--- a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic ltprune
-
-MY_PV=${PV/_p*/}
-
-DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
-HOMEPAGE="https://www.spice-space.org/usbredir.html"
-SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${S}_p20170503-patches"
-)
-
-DOCS="ChangeLog README* TODO *.txt"
-
-src_configure() {
-	# https://bugs.freedesktop.org/show_bug.cgi?id=54643
-	append-cflags -Wno-error
-
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	# noinst_PROGRAMS
-	dobin usbredirtestclient/usbredirtestclient
-}
diff --git a/sys-apps/usbredir/usbredir-0.8.0.ebuild b/sys-apps/usbredir/usbredir-0.8.0.ebuild
index a62437dc2019..66e49f807dfa 100644
--- a/sys-apps/usbredir/usbredir-0.8.0.ebuild
+++ b/sys-apps/usbredir/usbredir-0.8.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic
+
+inherit flag-o-matic
 
 MY_PV=${PV/_p*/}
 
@@ -16,8 +17,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild b/sys-apps/usbredir/usbredir-0.9.0.ebuild
index c939b6bf7ee3..73cd0c9866b9 100644
--- a/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild
+++ b/sys-apps/usbredir/usbredir-0.9.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic ltprune
+EAPI=7
+
+inherit autotools flag-o-matic
 
 MY_PV=${PV/_p*/}
 
 DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
 HOMEPAGE="https://www.spice-space.org/usbredir.html"
-SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches.tar.xz"
+SRC_URI="https://gitlab.freedesktop.org/spice/${PN}/-/archive/${P}/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -17,16 +17,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 
-PATCHES=(
-	"${S}_p20180211-patches"
-)
+DOCS="README* TODO *.txt"
 
-DOCS="ChangeLog README* TODO *.txt"
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	# https://bugs.freedesktop.org/show_bug.cgi?id=54643
@@ -37,7 +38,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 
 	# noinst_PROGRAMS
 	dobin usbredirtestclient/.libs/usbredirtestclient
diff --git a/sys-apps/usbredir/usbredir-9999.ebuild b/sys-apps/usbredir/usbredir-9999.ebuild
index 86a0a057b70d..c673028d9e2d 100644
--- a/sys-apps/usbredir/usbredir-9999.ebuild
+++ b/sys-apps/usbredir/usbredir-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic autotools git-r3 ltprune
+inherit autotools flag-o-matic git-r3
 
 DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
 HOMEPAGE="https://www.spice-space.org/usbredir.html"
@@ -11,14 +11,13 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/usbredir.git"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS="ChangeLog README* TODO *.txt"
+DOCS="README* TODO *.txt"
 
 src_prepare() {
 	default
@@ -34,8 +33,8 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 
 	# noinst_PROGRAMS
-	dobin usbredirtestclient/usbredirtestclient
+	dobin usbredirtestclient/.libs/usbredirtestclient
 }
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index bd3ff4f2abe9..ed54b954cabb 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,6 +1,6 @@
 DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
 DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54
-EBUILD usbutils-012.ebuild 1197 BLAKE2B db4ab5535c21255039c00894039f1c411b9c1d80f7bcaa1132cb63e966374b49c7b630cb8bc64474b524badb046059c438a532a5c725194daa68eb163c0f2d2f SHA512 89689c8252d574bf996b5ee09fe20db3b90675df437fe7e66779c6d025fde370f384f0d985f1a533e95df3e2d97e560a601f67aff220e6e5c76716fe6072adc3
+EBUILD usbutils-012.ebuild 1198 BLAKE2B abc18554c8bbc212899f754a773fdf340664e81d5b123bd39c417683bd3b0fe577f4f99f03502ac35fdb942487d1575152c3bbe66add18fa13a764ba41e53942 SHA512 cdbe4025facc03ba57503aa5538f3e08dbda84fecef938950e474fc8cfe495ccb3d3222a4462b4f0179bd546db5a126cfe266b55d35cfb5bd6ea10512472934e
 EBUILD usbutils-013-r1.ebuild 1273 BLAKE2B 9e3dca2dbd592cb04de860c9b1d27dcc6b7142687c0add196ac7c8002c6c4764f7f7883c52965350188c88e0069a2a5d2f8d40a6b7eb37c4e4c345e86a5eca89 SHA512 ac89837fee8a114eecb448bd63d698de7ce277d8a935d4326e43f2f08d2df752302a63c6db86088d334e2b2dab41b7ebd484ba8bdaa6b1ed22e1cc361ad7f549
-EBUILD usbutils-013.ebuild 1199 BLAKE2B c66c69667bd4d2a0a86bf0ed321e03f8925ee2ee9bf254c9793aaae6c79dc970426e855dad052e25dce70000d184116ad8d9ffefee189eed6bbbf3d45e17b312 SHA512 0fa82598dc936f07851a5e2d70d9b7b0bc45fc3584a035a6f113636ae0c1d4bf789809bf6f835d96a5b042dd1ec49660c3d017afc37df80ea037de20fc4886b7
+EBUILD usbutils-013.ebuild 1200 BLAKE2B 409776c56eb61d8eb175c05bf3bee47644ad616bd7bcc407c45c956a9da955687e05df87e9c5db53ae0df33b14307817d6616c614c405e7d997102118d452bfa SHA512 126041a5f1f37dee41d144a1010da635550ca15a9797f15fb2270774aefbfff4a58cc2e048528402de76586686ee522e54c8c76dd67b2237d2f3a0407069c686
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-012.ebuild b/sys-apps/usbutils/usbutils-012.ebuild
index 2913e5b5d45b..31a5985fb585 100644
--- a/sys-apps/usbutils/usbutils-012.ebuild
+++ b/sys-apps/usbutils/usbutils-012.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-013.ebuild b/sys-apps/usbutils/usbutils-013.ebuild
index f47c0e63e898..4b99cf62766f 100644
--- a/sys-apps/usbutils/usbutils-013.ebuild
+++ b/sys-apps/usbutils/usbutils-013.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index ad8627ee781f..12dd496dbc43 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -1,5 +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.ebuild 1175 BLAKE2B fee4d1a93bb95a26176100456b66ca7925acb36abec54870cc92b75e041d1d3dfcb5f2509c24b39522494fa34f8a497685a4f01e77a9e95b4e7ecc266d890c94 SHA512 1335cfca2773596098857a26a67713e6aad2360553e383e6dd34adbced65eee680869a70c4f0680000387b523c1357b1a5ab19dac770d5016c55efeb04f45028
+EBUILD utempter-0.5.5.6.ebuild 1176 BLAKE2B f69291ee2133e60d389d9ee368920042f1dba52ec13c37eabd59925a7243a2eb0b6bc3ae2881406b9a9982287bc895400859002c65c83190370fc2f0053deb6c SHA512 9f03b9180d919d9f4f0782fa852f9398f38e307dff7edf0f865d37992ecbd2166c1c1262871e062d196cd127f01dfadb5b4ef186b632c3a66b714e0a0658bd12
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/utempter/utempter-0.5.5.6.ebuild b/sys-apps/utempter/utempter-0.5.5.6.ebuild
index 5017f8c69337..6d31a543cdcb 100644
--- a/sys-apps/utempter/utempter-0.5.5.6.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a0b7ab3db6b3..884b62da4f2d 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,18 +1,12 @@
 AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
-AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
 AUX util-linux-2.35.1-cleanup-pidfd-include.patch 1117 BLAKE2B a207824f36b2167f721b4420b5de47462cdc3f12187316ee0ba37bebd1561aee0c591a522cb9cf7f24986322e1954f1fab1e6fe1751dfebc116aec12f70cc81e SHA512 315b5aabad68d3363f1a06034c22347d755ead4b974fd7879ce41b29953b41be510705a4806577710bb8e9d32a8034002f6868fea287a214640c80324754ea00
-AUX util-linux-2.36.1-libmount_dont_use_symfollow.patch 1576 BLAKE2B 9248b3a7646881c6cf3b4d53f1e28cf19d4f1444a881310c6569fb87063b5458063b53083872fe316318cd2ad4fd2164792fdfdc506e7371bb8b424f62b79f56 SHA512 fd310fdb8547b86dafd84564b3fb68167c02f25defc9cea1a5b2afc9af9e82f0b108a900b5073dd7394815d4c5bc894ebebe989b2c9a30ebecea7afc4083669f
-AUX util-linux-2.36.1-riscv32.patch 870 BLAKE2B 2e1c23ff3ed47bb3cffef4c3fe049e84d35dc63c6be56bc56f21e14fa9801652cd1b2dde65379251fc265f4da5a4a55eb0ef29548fa4f7543bb5034327c0abbd SHA512 0f7924e98fab102172bedd76cf3a7d7afae1c22a3a9605fd78a4a8d05fb78409cb67592f092f4b720738f1e511a7e0d303eeec0137942be6de7196565a09c677
-DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
-DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
-DIST util-linux-2.36.1.tar.xz 5231880 BLAKE2B 52d867aa0b722a84828c37958d80b0bdcc1ceaae4e46fa6550ad0f2f152c52e4aaf2c8bc5fdf4f27b522037a870ff2554382abac0eaa50a6791d8b8016e3d74c SHA512 9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a
 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
-EBUILD util-linux-2.33.2.ebuild 8413 BLAKE2B 91cf11ece3866ee440ab658a0b11891b558fe3cd2c896ab294ecca69d6697ee587d64d16749ca383698ecc422cede27f5474535377e191d777cfa813ccaa0409 SHA512 cc5c0ebddc2e496211ccbd22fd7ff3bc88451de55fc4c0884b700107260fa2867eb17a43a29560f46ce79f12e8c740b041d1806733250804eb2c41b34de40795
-EBUILD util-linux-2.34-r3.ebuild 8446 BLAKE2B a52fb003aaf00e7c9bd49014955c7faffef9f46b1b720a1dc74617699f6717ab2f5d33e9b3f55cad0382704b31ad09a8453723fefe9cc3fa0bbd80448c620db0 SHA512 10344c02f3e30fe2c4441de2ccfd5702cb6395cefff850c3a4fc9625ce06f68ce5ead7834cd6c9994fc2f3000d9c15fa63761216aa61b853fc2ce6efddfc996c
-EBUILD util-linux-2.35.2.ebuild 8890 BLAKE2B 1e8607c649882ed1c9d93f1e15c1bbc54d190f61703a084e97208bc887bc6fc31a0718a324c4e7b33dcdb53fe459ec9632509525084a9fcd2373077880c60151 SHA512 065e3989eabc4d56b6345c38a707cd3af787e5ab92924b96d917f3db8a5a249628725820c733dc86b1ec19cc8fae1a657599e7df0c6189014c81b25578a89d0b
-EBUILD util-linux-2.36.1-r1.ebuild 8936 BLAKE2B b2437c366ed36a232aacf10b6ad5e5a84f0e067f88db4840cd89df78e176410927e0f0aa8e624e6f8e8e76a8bcfbccb928ce41d308b7c4a5644016cbcbbe2402 SHA512 d6145c9114c806f57654dc2a5886cc99223713a3fc7299fb742f7d749196ca757ef389856dac89a9afde0949297a1871d0a52aec98800a474190fb07cce7226a
-EBUILD util-linux-2.36.2.ebuild 8827 BLAKE2B 7224a61ddb2ba83e3b127be0d48c1a26c9588ceebb2610e8ac8a34bd1a7fe945bd6afefd111e9755dcfe1d9b6174c869fc679c13b6c4bb204a6e763d8cfe3bcc SHA512 d32e9ac794a46fe4dcc3e37f405596bb2b4e46a8529396ea926162d4f26d2cef584ffbeb45754465803417dd9d3983644e15ae74d843d5645b9f903273cce8c7
-EBUILD util-linux-9999.ebuild 8762 BLAKE2B 6a64f715d5dbd5b9f57186d2790cd11a78fb2269d89cb65d17db522d09af3e5395c6a5af728287589858018d98564c78ebb44cc14efd8581ab4d8eb5adaf1a70 SHA512 6cf6b4993db8dda2d80c32185ce4b40be86d227a53c78062058e3e0449c0f8ae67ae36fcd21b5861a0c43bf8a169b2ea3f8c9f4897a4bd8b0ec99b3e34b28744
+DIST util-linux-2.37-rc1-manpages.tar.xz 160524 BLAKE2B 3d301478b772f944c7d4cd713130fe9800cc32fb14ac46967c6a64fdca6e561d91f642f839c77cded6f4af8b4487cf3f36ac3f6a72aea50a75c020a1c9862ee0 SHA512 44f45356c2a97f482dc4b0a762e4c2e04fbce0d2268cd765fcff87c40554d0ef3016ff5e1c1165ba93c05ff8390d76ea14fd30f419ce4c86fc5678858cede54b
+DIST util-linux-2.37-rc1.tar.xz 5269776 BLAKE2B cc964e8f1bb50f704d7f207bd166b41d6b70d138b52e140687fe58f77626097d6151ae3f3efdb655b8495a67ad33cdf7fcdb0cf71839ba34963b0f14aace98a5 SHA512 5c3125a0ac42e17c8837f398cc3d59a538f18e823fab4feb9d7756a4c7523dd70fe7a5c94baab2a329d1ce99d85bdb19a14dd5d32d72d479a398f7dbc3003c1a
+EBUILD util-linux-2.35.2.ebuild 9014 BLAKE2B 549633172e6d1dfc1f1c993c2d095ddcae525a40964705263c0694ba4ce91ba1817b9b99d1a34d9bc2f08b3cc8075cd45a5eaea5db2ac3f7f9846e9585399f6b SHA512 19c24c1d5f60a3948614fc588df718de8208e08bd386a6d780921355ce906d41e32b62cf5bc669e032557958bd02357c75491a03abb8d0b0aa4c9c828d284d53
+EBUILD util-linux-2.36.2.ebuild 8942 BLAKE2B e26af16681c038a8d2818bfef7565b106711639e0fee55868a056496180648c6ae390e66595af22c1ac4c444052355ccd1a46ef359624b56ee1f8b3205ac2584 SHA512 4f9165ea6a2397b0b9df2971a8547d03005a3e1333673245b4d9397f2b78632cbab23bc12ccd4392ad6b90f1971fca764240730fd315eb22bfcb495937e5dc44
+EBUILD util-linux-2.37_rc1.ebuild 9754 BLAKE2B 3a0bd9c913eb52b123ab4e4cae17d5003948758a08615448f8450c0833844b0d2aa867f6c040850fa1f31dc91b6ba39f6ba87c47df1eab2f882380cb7be28ff3 SHA512 445c8b441aa14763ca3296c73ae6ad6896df54a4e6ffe6feeb754fb22574dc18ec3f7af1df66ec61612f38b501dcf7f7411e6a0a75a7afba8c1170152dc8498f
+EBUILD util-linux-9999.ebuild 9754 BLAKE2B 3a0bd9c913eb52b123ab4e4cae17d5003948758a08615448f8450c0833844b0d2aa867f6c040850fa1f31dc91b6ba39f6ba87c47df1eab2f882380cb7be28ff3 SHA512 445c8b441aa14763ca3296c73ae6ad6896df54a4e6ffe6feeb754fb22574dc18ec3f7af1df66ec61612f38b501dcf7f7411e6a0a75a7afba8c1170152dc8498f
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch b/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch
deleted file mode 100644
index df52af45049b..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 963413a1adf6767ab17712097e288e1a346f63a7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 4 Jan 2019 22:38:25 -0800
-Subject: [PATCH] ldattach: Check for value of _HAVE_STRUCT_TERMIOS_C_ISPEED
-
-in glibc 2.29+ checking for just existence of _HAVE_STRUCT_TERMIOS_C_ISPEED
-won't be enough, the value has to be checked
-
-see
-https://sourceware.org/git/?p=glibc.git;a=commit;h=e5a50db36eaa6e8c6427b3a971563240b633ca85
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- sys-utils/ldattach.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
-index d33d68535..fb50711eb 100644
---- a/sys-utils/ldattach.c
-+++ b/sys-utils/ldattach.c
-@@ -242,7 +242,7 @@ static int my_cfsetspeed(struct termios *ts, int speed)
- 	 * -- we have to bypass glibc and set the speed manually (because glibc
- 	 *    checks for speed and supports Bxxx bit rates only)...
- 	 */
--#ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED
-+#if _HAVE_STRUCT_TERMIOS_C_ISPEED
- # define BOTHER 0010000		/* non standard rate */
- 	dbg("using non-standard speeds");
- 	ts->c_ospeed = ts->c_ispeed = speed;
-
diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch b/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch
deleted file mode 100644
index 7c0b73f49d78..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 19 Nov 2020 09:49:16 +0100
-Subject: [PATCH] libmount: don't use "symfollow" for helpers on user mounts
-
-Addresses: https://github.com/karelzak/util-linux/issues/1193
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/context_mount.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
-index 8c394c1ff..dd1786176 100644
---- a/libmount/src/context_mount.c
-+++ b/libmount/src/context_mount.c
-@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
- 		 * string, because there is nothing like MS_EXEC (we only have
- 		 * MS_NOEXEC in mount flags and we don't care about the original
- 		 * mount string in libmount for VFS options).
-+		 *
-+		 * This use-case makes sense for MS_SECURE flags only (see
-+		 * mnt_optstr_get_flags() and mnt_context_merge_mflags()).
- 		 */
- 		if (!(cxt->mountflags & MS_NOEXEC))
- 			mnt_optstr_append_option(optstr, "exec", NULL);
-@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
- 			mnt_optstr_append_option(optstr, "suid", NULL);
- 		if (!(cxt->mountflags & MS_NODEV))
- 			mnt_optstr_append_option(optstr, "dev", NULL);
--		if (!(cxt->mountflags & MS_NOSYMFOLLOW))
--			mnt_optstr_append_option(optstr, "symfollow", NULL);
- 	}
- 
--
- 	if (cxt->flags & MNT_FL_SAVED_USER)
- 		rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user);
- 	if (rc)
--- 
-2.29.2
-
diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch b/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch
deleted file mode 100644
index b18a01906ebf..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino@tiscali.it>
-Date: Tue, 17 Nov 2020 11:32:45 +0100
-Subject: [PATCH] hwclock: do not assume __NR_settimeofday_time32
-
-Check that __NR_settimeofday_time32 exists before trying to use it as
-syscall number.
-
-Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
----
- sys-utils/hwclock.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
-index 1f7ef3317..db448687d 100644
---- a/sys-utils/hwclock.c
-+++ b/sys-utils/hwclock.c
-@@ -678,7 +678,7 @@ display_time(struct timeval hwctime)
- #ifndef SYS_settimeofday
- # ifdef __NR_settimeofday
- #  define SYS_settimeofday	__NR_settimeofday
--# else
-+# elif defined(__NR_settimeofday_time32)
- #  define SYS_settimeofday	__NR_settimeofday_time32
- # endif
- #endif
--- 
-2.26.2
-
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
deleted file mode 100644
index 84549290f15f..000000000000
--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-
-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 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-RDEPEND+="
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	!net-wireless/rfkill
-	!<app-shells/bash-completion-2.7-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# In glibc-2.29+, a lot of changes were made to arch-specific
-	# handling of `struct termios', which breaks atleast MIPS.
-	# The below patch from upstream fixes this, and should be
-	# in the next release.
-	# See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
-	"${FILESDIR}/${PN}-2.33.1-fix-struct_termios-check.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 ! use userland_GNU; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
-	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=(
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-	)
-	if use userland_GNU; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
-	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
-
-	local myeconfargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--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 unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with selinux)
-		$(use_with ncurses tinfo)
-	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-nologin
-			--disable-pylibmount
-			--disable-su
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-raw
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_enable kill)
-		)
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-		)
-		if use userland_GNU; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
-	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
-
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use userland_GNU; 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 userland_GNU; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED%/}"/usr/share/man/man3/uuid* || die
-	fi
-
-	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.34-r3.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
deleted file mode 100644
index 16c378134edc..000000000000
--- a/sys-apps/util-linux/util-linux-2.34-r3.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-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 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	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
-	!<app-shells/bash-completion-2.7-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-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 ! use userland_GNU; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
-	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
-	)
-	if use userland_GNU; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
-	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
-
-	# 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 unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(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)
-	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-nologin
-			--disable-pylibmount
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-raw
-			--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 su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-		)
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-		)
-		if use userland_GNU; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
-	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 && use userland_GNU; 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 userland_GNU; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
-	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.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index ba8b1c61789e..1df44660f8fa 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	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"
+	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
 
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 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 ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -36,7 +36,10 @@ RDEPEND="
 	cramfs? ( sys-libs/zlib:= )
 	cryptsetup? ( sys-fs/cryptsetup )
 	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2-r2:0=[unicode?]
+		magic? ( sys-apps/file:0= )
+	)
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
 	ppc? ( sys-libs/librtas )
@@ -164,6 +167,7 @@ multilib_src_configure() {
 		$(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)
diff --git a/sys-apps/util-linux/util-linux-2.36.2.ebuild b/sys-apps/util-linux/util-linux-2.36.2.ebuild
index daf96cb33aa0..dc8d4da2b30a 100644
--- a/sys-apps/util-linux/util-linux-2.36.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.36.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	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"
+	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
 
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 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 ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -36,7 +36,10 @@ RDEPEND="
 	cramfs? ( sys-libs/zlib:= )
 	cryptsetup? ( sys-fs/cryptsetup )
 	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2-r2:0=[unicode?]
+		magic? ( sys-apps/file:0= )
+	)
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
 	ppc? ( sys-libs/librtas )
@@ -160,6 +163,7 @@ multilib_src_configure() {
 		$(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)
diff --git a/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.37_rc1.ebuild
index 0e3e92d94d7f..66a36a6cd0cb 100644
--- a/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37_rc1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -17,7 +17,8 @@ if [[ ${PV} == 9999 ]] ; then
 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"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
 fi
 
 DESCRIPTION="Various useful Linux utilities"
@@ -25,7 +26,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 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 ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -36,7 +37,10 @@ RDEPEND="
 	cramfs? ( sys-libs/zlib:= )
 	cryptsetup? ( sys-fs/cryptsetup )
 	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2-r2:0=[unicode?]
+		magic? ( sys-apps/file:0= )
+	)
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
 	ppc? ( sys-libs/librtas )
@@ -68,7 +72,15 @@ RDEPEND+="
 		!>=sys-apps/shadow-4.7-r2[su]
 	)
 	!net-wireless/rfkill
-	!<app-shells/bash-completion-2.7-r1"
+	!<app-shells/bash-completion-2.7-r1
+"
+
+# Required for man-page generation
+if [[ "${PV}" == 9999 ]] ; then
+	BDEPEND+="
+		dev-ruby/asciidoctor
+	"
+fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -76,10 +88,17 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-libmount_dont_use_symfollow.patch" #755878
-	"${FILESDIR}/${P}-riscv32.patch"
 )
 
+rm_man() {
+	[[ -n $1 ]] || die
+	local el
+	for el in $1 ; do
+		find "${WORKDIR}/man" -type f -name "${el}.?" -delete \
+			|| die
+	done
+}
+
 src_prepare() {
 	default
 
@@ -88,7 +107,7 @@ src_prepare() {
 		-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 ! use userland_GNU; then
+	if ! use userland_GNU ; then
 		# test runner is using GNU-specific xargs call
 		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
 		# test requires util-linux uuidgen (which we don't build)
@@ -98,6 +117,14 @@ src_prepare() {
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
+	else
+		# Conditionally remove some man-pages
+		use hardlink 	|| rm_man "hardlink"
+		use kill 	|| rm_man "kill"
+		use logger 	|| rm_man "logger"
+		use ncurses 	|| rm_man "pg"
+		use su 		|| rm_man "su"
+		use tty-helpers	|| rm_man "mesg wall write"
 	fi
 
 	elibtoolize
@@ -124,7 +151,7 @@ python_configure() {
 		--without-systemdsystemunitdir
 		--with-python
 	)
-	if use userland_GNU; then
+	if use userland_GNU ; then
 		myeconfargs+=(
 			--enable-libblkid
 			--enable-libmount
@@ -165,6 +192,7 @@ multilib_src_configure() {
 		$(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)
@@ -176,12 +204,14 @@ multilib_src_configure() {
 		$(use_with selinux)
 	)
 	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU; then
+	if multilib_is_native_abi && use userland_GNU ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
 			--disable-login
+			--disable-newgrp
 			--disable-nologin
 			--disable-pylibmount
+			--disable-vipw
 			--enable-agetty
 			--enable-bash-completion
 			--enable-line
@@ -204,9 +234,16 @@ multilib_src_configure() {
 			$(use_enable tty-helpers write)
 			$(use_with cryptsetup)
 		)
+		if [[ ${PV} == *9999 ]] ; then
+			myeconfargs+=( --enable-asciidoc )
+		else
+			# We ship pre-generated man-pages for releases
+			myeconfargs+=( --disable-asciidoc )
+		fi
 	else
 		myeconfargs+=(
 			--disable-all-programs
+			--disable-asciidoc
 			--disable-bash-completion
 			--without-systemdsystemunitdir
 			# build libraries
@@ -215,7 +252,7 @@ multilib_src_configure() {
 			--enable-libsmartcols
 			--enable-libfdisk
 		)
-		if use userland_GNU; then
+		if use userland_GNU ; then
 			# those libraries don't work on *BSD
 			myeconfargs+=(
 				--enable-libmount
@@ -224,7 +261,7 @@ multilib_src_configure() {
 	fi
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
-	if multilib_is_native_abi && use python; then
+	if multilib_is_native_abi && use python ; then
 		python_foreach_impl python_configure
 	fi
 }
@@ -238,7 +275,7 @@ python_compile() {
 multilib_src_compile() {
 	emake all
 
-	if multilib_is_native_abi && use python; then
+	if multilib_is_native_abi && use python ; then
 		python_foreach_impl python_compile
 	fi
 }
@@ -251,7 +288,7 @@ python_test() {
 
 multilib_src_test() {
 	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python; then
+	if multilib_is_native_abi && use python ; then
 		python_foreach_impl python_test
 	fi
 }
@@ -264,14 +301,14 @@ python_install() {
 }
 
 multilib_src_install() {
-	if multilib_is_native_abi && use python; then
+	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 && use userland_GNU; then
+	if multilib_is_native_abi && use userland_GNU ; then
 		# need the libs in /
 		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
 	fi
@@ -279,18 +316,21 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-	chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die
 
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
 
-	if ! use userland_GNU; then
+	if [[ ${PV} != 9999 ]] ; then
+		doman "${WORKDIR}"/man/man*/*
+	fi
+
+	if ! use userland_GNU ; then
 		# manpage collisions
 		# TODO: figure out a good way to keep them
 		rm "${ED}"/usr/share/man/man3/uuid* || die
 	fi
 
-	if use pam; then
+	if use pam ; then
 		newpamd "${FILESDIR}/runuser.pamd" runuser
 		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
 	fi
@@ -305,11 +345,11 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	if ! use tty-helpers; then
+	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
+	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-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 1a657d941caf..66a36a6cd0cb 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -17,7 +17,8 @@ if [[ ${PV} == 9999 ]] ; then
 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"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
 fi
 
 DESCRIPTION="Various useful Linux utilities"
@@ -25,7 +26,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 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 ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -36,7 +37,10 @@ RDEPEND="
 	cramfs? ( sys-libs/zlib:= )
 	cryptsetup? ( sys-fs/cryptsetup )
 	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	ncurses? (
+		>=sys-libs/ncurses-5.2-r2:0=[unicode?]
+		magic? ( sys-apps/file:0= )
+	)
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
 	ppc? ( sys-libs/librtas )
@@ -68,7 +72,15 @@ RDEPEND+="
 		!>=sys-apps/shadow-4.7-r2[su]
 	)
 	!net-wireless/rfkill
-	!<app-shells/bash-completion-2.7-r1"
+	!<app-shells/bash-completion-2.7-r1
+"
+
+# Required for man-page generation
+if [[ "${PV}" == 9999 ]] ; then
+	BDEPEND+="
+		dev-ruby/asciidoctor
+	"
+fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -78,6 +90,15 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 )
 
+rm_man() {
+	[[ -n $1 ]] || die
+	local el
+	for el in $1 ; do
+		find "${WORKDIR}/man" -type f -name "${el}.?" -delete \
+			|| die
+	done
+}
+
 src_prepare() {
 	default
 
@@ -86,7 +107,7 @@ src_prepare() {
 		-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 ! use userland_GNU; then
+	if ! use userland_GNU ; then
 		# test runner is using GNU-specific xargs call
 		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
 		# test requires util-linux uuidgen (which we don't build)
@@ -96,6 +117,14 @@ src_prepare() {
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
+	else
+		# Conditionally remove some man-pages
+		use hardlink 	|| rm_man "hardlink"
+		use kill 	|| rm_man "kill"
+		use logger 	|| rm_man "logger"
+		use ncurses 	|| rm_man "pg"
+		use su 		|| rm_man "su"
+		use tty-helpers	|| rm_man "mesg wall write"
 	fi
 
 	elibtoolize
@@ -122,7 +151,7 @@ python_configure() {
 		--without-systemdsystemunitdir
 		--with-python
 	)
-	if use userland_GNU; then
+	if use userland_GNU ; then
 		myeconfargs+=(
 			--enable-libblkid
 			--enable-libmount
@@ -163,6 +192,7 @@ multilib_src_configure() {
 		$(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)
@@ -174,12 +204,14 @@ multilib_src_configure() {
 		$(use_with selinux)
 	)
 	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU; then
+	if multilib_is_native_abi && use userland_GNU ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
 			--disable-login
+			--disable-newgrp
 			--disable-nologin
 			--disable-pylibmount
+			--disable-vipw
 			--enable-agetty
 			--enable-bash-completion
 			--enable-line
@@ -202,9 +234,16 @@ multilib_src_configure() {
 			$(use_enable tty-helpers write)
 			$(use_with cryptsetup)
 		)
+		if [[ ${PV} == *9999 ]] ; then
+			myeconfargs+=( --enable-asciidoc )
+		else
+			# We ship pre-generated man-pages for releases
+			myeconfargs+=( --disable-asciidoc )
+		fi
 	else
 		myeconfargs+=(
 			--disable-all-programs
+			--disable-asciidoc
 			--disable-bash-completion
 			--without-systemdsystemunitdir
 			# build libraries
@@ -213,7 +252,7 @@ multilib_src_configure() {
 			--enable-libsmartcols
 			--enable-libfdisk
 		)
-		if use userland_GNU; then
+		if use userland_GNU ; then
 			# those libraries don't work on *BSD
 			myeconfargs+=(
 				--enable-libmount
@@ -222,7 +261,7 @@ multilib_src_configure() {
 	fi
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
-	if multilib_is_native_abi && use python; then
+	if multilib_is_native_abi && use python ; then
 		python_foreach_impl python_configure
 	fi
 }
@@ -236,7 +275,7 @@ python_compile() {
 multilib_src_compile() {
 	emake all
 
-	if multilib_is_native_abi && use python; then
+	if multilib_is_native_abi && use python ; then
 		python_foreach_impl python_compile
 	fi
 }
@@ -249,7 +288,7 @@ python_test() {
 
 multilib_src_test() {
 	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python; then
+	if multilib_is_native_abi && use python ; then
 		python_foreach_impl python_test
 	fi
 }
@@ -262,14 +301,14 @@ python_install() {
 }
 
 multilib_src_install() {
-	if multilib_is_native_abi && use python; then
+	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 && use userland_GNU; then
+	if multilib_is_native_abi && use userland_GNU ; then
 		# need the libs in /
 		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
 	fi
@@ -281,13 +320,17 @@ multilib_src_install_all() {
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
 
-	if ! use userland_GNU; then
+	if [[ ${PV} != 9999 ]] ; then
+		doman "${WORKDIR}"/man/man*/*
+	fi
+
+	if ! use userland_GNU ; then
 		# manpage collisions
 		# TODO: figure out a good way to keep them
 		rm "${ED}"/usr/share/man/man3/uuid* || die
 	fi
 
-	if use pam; then
+	if use pam ; then
 		newpamd "${FILESDIR}/runuser.pamd" runuser
 		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
 	fi
@@ -302,11 +345,11 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	if ! use tty-helpers; then
+	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
+	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/which/Manifest b/sys-apps/which/Manifest
index 152527b1069e..33a779ece076 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 627 BLAKE2B c066b5e0a67d0a5d77fd68fd94152db51ce0715c79d6462482712d508b5fbf385f5b7ccf052ed9cca79a4d0161955ae37bb09d93e80f0e1bb933eb3948c125c5 SHA512 9b6a061004068cafb0e8d753e734b8838d22fd0a336b30259cc745765c2a20bf62e1708ed723ca0651d926b2ef85604b452d41f0ff17cc7681f848bb3164fad4
+EBUILD which-2.21.ebuild 628 BLAKE2B 41009e94012370df27bc7b7ca2954fadae5d7f932f61f962e9be28d25ede1d5df403d27655e0a6efa46323d4e208cff48bfe6422ce2c0a62801f5bb1cf152445 SHA512 72df4b11a31454bbc91f60490d1096743ef1f81b92c08aef26c5e6c9315cc5106e02e83a0fc57f231d3174b22c4cd7147a13fc8e24620cb847334ebaf6716711
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index 831688cf7c05..a0a57a10d289 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.ebuild
@@ -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 ~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-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index 9601c14065a3..4ca10725fa52 100644
--- a/sys-apps/xdg-desktop-portal-gtk/Manifest
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-desktop-portal-gtk-1.8.0.tar.xz 370196 BLAKE2B d15a054e8fbc74718db7ad2d0f7b53c86b392e729fb4d5b8bdd87b16c0ebbf4feb11b29bc27da12990b351f520faa23bde694721819589513b6cfd1e4ea2f092 SHA512 832b3c4cb9ea738f2ab7641fbd7e14beaa5f6a1ae88f012cd44b12f4bc51588f61868b5982301e3dfd67965d6a69fd8669a9832b6ec7017168d611c87d76689b
-EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 986 BLAKE2B b21a169dd7b4cca4e739e1e018b814c6f0d1144bebbc84586d23c3219e4f2956abe228be29360ee98dff2ea862379783bb4bd5e8fc051c0ae8a29a77d8eafa75 SHA512 5a6442c7c2150f8f4f262af2b4f0b142ca5c1ebaf99344a6ce23a23503805705ee36f82f639d48b02d015b61fd61061c39b730f5239e2b1c6649fc119224af27
+EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 976 BLAKE2B eda583623e17a090c59186deac0e4800a09bb374edb16ed209184dba2e4ee63bfd33f78eec4ef4032f3d42d5c535022e0be600889310b74e63c5771498189504 SHA512 bd9fd5813cc033e901c799c8c4e552100729ca7d075041528066860d20e5525ad5293a3d561cdd7b1526c3d1b9810fe4c365b6cea6efd5cd2486ff9d1ce052e1
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
index 9d097a11e0a5..e3dcc6c26696 100644
--- a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
+++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools systemd
+inherit systemd
 
 MY_PV="${PV//_pre*}"
 MY_P="${PN}-${MY_PV}"
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 4a05f3586a26..9bb1da6e7749 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,6 +1,6 @@
 AUX xdg-desktop-portal-1.8.0-fix-doc-portal.patch 4954 BLAKE2B 3ba7ad250eaabc707d5a139196d7ad428dc6356f7a35da6e8636214d8600f47b700eecbf5bca2194fd6b3e44d2fc60e38e0c664e6cd777a3400d608503445126 SHA512 350b0ae907c7927a08632f370f080296dcdfc054df5e9ca9e74fed3ec0b6e2d21af3f07d7ae072e372b5774ec578830f7187eb14e5baf3a5f516ff2faf0d97b1
 DIST xdg-desktop-portal-1.8.0.tar.xz 470692 BLAKE2B f21da5ad11dc2b1611983fdac87335b3c7e9c13222bbe3b90b276d75726a6f16d950a9ba62606aa31d52f57b8d076393ec0d48014b1623ab03dee23c524ed0ef SHA512 6d9760b41447af711d5937279b0031bcc88947e11204351accfcd9e6e19e498e9021675753185f92f7bd40336decc1895968796b1b71508c7caf5f6fc32a51a4
 DIST xdg-desktop-portal-1.8.1.tar.xz 473052 BLAKE2B a7d0aa2aa1e8220ced3e4abff8a8284c521b983ce807cd3e0d7b5d22f98f6428b6de9a193ae3aced9c13473617f453d13d0af83c677e3d077906b6cf8a138d45 SHA512 447d287d6627a1086d97dc5ebda20dfb1d0ca8643cbe54a7af5f6205a122a7be9d1643fded592f922c015561b7e2f4c6b6df555db3e0d3c02aad5bbe944077b6
-EBUILD xdg-desktop-portal-1.8.0-r1.ebuild 1070 BLAKE2B d5ce95c1f12bce06b725aa818873f6e28a1576506b44997f36acee3dbd2244ada7066eb2513e5f1592a8a5083aab4e791faf7f37b18a5ad9170dd86ef1557912 SHA512 be5aeecb5e5627dfef5d9d830df4cf4755f40c0ca40e0ae52eb6cc50213955cee6535a2960be0eddb1d09f6dfa89c57317a759b1ca5daa004ba40c035dd06412
-EBUILD xdg-desktop-portal-1.8.1.ebuild 993 BLAKE2B b147725e6dba398e470a880b78c0d2a2172d8bf2867ddf57b9a6b9e906d3ec727341f4ebaa71a5f154352bf40081fe392fd5f9937498aa8e566a89373869cf73 SHA512 92de3b828e497befd2a8de410cb65816de624978c23317e102b97d98ade6bccd88ee0bd4829500d2ad64e7bdd3d1002ecfbc22d63113c3a233a3e159c4091093
+EBUILD xdg-desktop-portal-1.8.0-r1.ebuild 1060 BLAKE2B 81e3fc6eed93b4eedd09c2e126059e5d060ed113b4648389025c49e11b433ca9ff11d143ccf3b933e7113d3db06f5e9781c07aeaf7f6db199dab8ec71fe34f63 SHA512 37f53a187e24dd1cde5a2c8762b68ca8af3599ce4972b27caf99a4cd3cf5c7bdb0d1d133115ad29a97e632353e08c89bdb67ff328f032ced1f2477c282e634fe
+EBUILD xdg-desktop-portal-1.8.1.ebuild 983 BLAKE2B 1027688c72ec9652d55f8d89cea31b92ee13fd29709c8ec4016c842ac28b01e111efb6a87b23468101a9968f87368caf344eef1d66716b5a274e5d8e1ced26b5 SHA512 341501925233635295bbf77c4b7943db330e865d424fed3527bdd3b0ce7bb2c4f26f1d444aa9d4067395e8de61f950fd1011964368295a95178cf5235d604f0a
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
index 04f1c8146551..eee5858119f1 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools systemd
+inherit systemd
 
 DESCRIPTION="Desktop integration portal"
 HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
index a976a7e8f8db..4131ed399282 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools systemd
+inherit systemd
 
 DESCRIPTION="Desktop integration portal"
 HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 13a85cab5bb2..d7b4dc89fad9 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -10,8 +10,8 @@ AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b2
 DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195fc043a2fe8b1b61a1d9e597a5a10feda8d6692e665af1f1690870e619098a9a2367df3a73f7821a91777532f1fa SHA512 3a744d5ce66da46743eec28d5b95a44709b1828187078984e59d7220ac325abce1198927e9156f343a4e16a9dc63e8846f1dcb0facbf05ea44c73aecbe7e504f
 DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d SHA512 1d9bbf5f60b299746adf3e57a669bf1a554b50066563b65cdb7584f00dcab2d3d331df705eefb56b51c52a16b5ed6b109cd832c27df87c7f262bb304e17ddc0e
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
-EBUILD xinetd-2.3.15-r3.ebuild 1557 BLAKE2B fc610a9dfb3d199297718edeaf61498bb5aff861048e52683ede841e7385384161e323f1007dd5fb2690dbaa4f21a506219ca4b609e53dad571e95638af72514 SHA512 b180d02cc79803fdf636d25cc8b956ecf1a4678620c64f00300f8427f65bc2b0f1f93edce73b55ac0c775189a6ba3ab3b69fcd2214e320671ee2bf5f39465c51
+EBUILD xinetd-2.3.15-r3.ebuild 1557 BLAKE2B e5befba5bea664705ccade9f99cf44ffd4c1efdc5ac3bc6a1fce6a8e55a8e8972ebe585b509c7a493882773087e3a278b1c6416c809b1aae875cee684047f60f SHA512 91d64d436c5c48e3fe2c0fa692211f7720ebf630d9443bddc1b9f68b74a310f5a3b4a8fd225c8bb5c3c475ba7e747a6fa3d6780914b1f92ebb8cae5f633d361b
 EBUILD xinetd-2.3.15.3-r2.ebuild 1374 BLAKE2B 3ff01d397797dbb3e3db0ccfe78eb74951c68ba9d597ed57d6175f780343e7e16ed79799a89bb8f45dda7a758ac44ad116ac45ba0b3b2b7c8513d1a9a127b1dd SHA512 97c3358a713966208b9e862216434b459c8725fd9d471b64b5de14c69e7481a26187ecfd9721333d2cab43c33286a10a0d2dbea202bdc260df14f84839701f48
-EBUILD xinetd-2.3.15.3.ebuild 1063 BLAKE2B ac2f410056b5da2aafa4fa5ef30ed80ee70735cf57cd30ed2227ca9165e40159e7308dc3179977131b0077d6df88e3f153fe8cd1a3fe53344cb863b850e5d549 SHA512 386396c14d246f92813f3f47ef719e956de6adefd5007ea8c2293e73eaed4c26822ed1072012a7359e8f229d8f025099ed94a34aad1008e7f37f98a059569857
+EBUILD xinetd-2.3.15.3.ebuild 1064 BLAKE2B 1fcdf000aa09791d386141985248e9ce25908eaaec4f40ca05f0ddac6c7288d462f7e49b14cbb67f1432d36982d71d076795ceefca354be15bfe8cbf189b95c8 SHA512 cb722070e1aa372ccb001934e1fccdd6bc66e3a926b1ffeb30811b222d3ec9965d0249f2dff7d89062e04e43b02b7dd2091d36dbf0eb223a5cbe7c7c364a40e1
 EBUILD xinetd-2.3.15.4.ebuild 1272 BLAKE2B 5b4dcb90820d53586246ee4cefbebd6e29a9ed6c3728fb03f6ede34751bdf7e85863068b31a3d9c0bebf6aa47b1bd198638d801d81b9916e92c6ea2c82b37405 SHA512 4af494a22e0168fda89c358f4e60e9bd2bb583812a5100f2c70a985b28d3e859517243d39798700f1cb4d65400c190ea994d02079b2c369b192c96eacb249afa
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
index fc91c97a8ad8..4dad4fcdcb20 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils flag-o-matic systemd toolchain-funcs
+inherit epatch flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="powerful replacement for inetd"
 HOMEPAGE="http://www.xinetd.org/ https://github.com/xinetd-org/xinetd"
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index 2f5b894f0bb9..7a903b612a35 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="perl selinux tcpd"
 
 DEPEND="
diff --git a/sys-apps/zorroutils/Manifest b/sys-apps/zorroutils/Manifest
index 7911b6ac55c2..474e0a5661cd 100644
--- a/sys-apps/zorroutils/Manifest
+++ b/sys-apps/zorroutils/Manifest
@@ -5,5 +5,5 @@ AUX zorroutils-gentoo.diff 149 BLAKE2B 362923537fe56671c793bebbd82962362af13a97c
 DIST zorroutils-0.04.tar.gz 12205 BLAKE2B b5818073551b39d715c8e8fbaaba2b827a7a4f4442bac76876037721d1202cf5893779cd22fba0451d2a0e7eb15266b08af242a1fa1c6be3eff2e65949523803 SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f
 DIST zorroutils-0.05.tar.gz 15428 BLAKE2B e9baa6de4da3cbc6754c52d9e0c1fe34ce735b4d5377772c1765bdd30ae988f92125a5f254fcaab797eed33d65dad59e2a385fba3fc4610a9cfb6c34c6b45e7e SHA512 5260cfc7ccf77d0a0fe012c32ab492824903cb0f1397a82cf4c52aa12df5845b9e3d53aa1f619cc3a0637dfb42e9b75f80d715e4e912c5b8f42e0588f9053421
 EBUILD zorroutils-0.04.ebuild 689 BLAKE2B 8a7bd4d720e3ed693777d8fe6cf929d1cd9ce207dfd79f396bf552bc8070ddb50585e4766c59809310d9ed0abeca0459b16678b75e0956aa951c95303a0ab313 SHA512 118207c7b40c0014c555b8c7d9e2327040b28370424cc9c1cefde33216fd4f27b7ed6f17317b3d80062a7ffe2d5f1cce9823021826390ebe542530d5ca35382c
-EBUILD zorroutils-0.05.ebuild 690 BLAKE2B f93d54e87e5311751b73865df6475a70797074f66bdee36cb6124cc8ea288ef9ac687ec4013cf8cb38d6ba04de813df03b9fdab30aa82e97442e5fb0f45624c0 SHA512 271b061ba8b2015a7fc97dba703e8d2baa510d27d0da48ac8d5aa4ae0d9e537c95b077dd0295f72fe72a7be97047f4ffa2a20b9bd1100c593c1af2e99f047927
+EBUILD zorroutils-0.05.ebuild 677 BLAKE2B 5caebaecb796b0f89cfac1872e1ab6641c118fdfb985248dbc1316fe5fb178bedc71e3e511d2fb0bab4c502df6c0cac249ccc81a60d88f0341d4583b020e7ceb SHA512 a8ed06aa511345d67489372b1f1ff862319a1ac703d53ac436beb639dc93695f457f7c503b07982495f503e7ec49a723b3f409b74556e5723f26b37a61a09b60
 MISC metadata.xml 460 BLAKE2B a96bd20cc3d8c469b21e4eb2ff121416e65c54d3bfcf596437bb4f0874f1d9ca50a388a1d24cf63770fe4667f584c75e73a669229b65ebcc5e5a088e3ff74b23 SHA512 91c6187ff9ff3202b1a63e60e0a62722a00b2c3899602998cb1d26b72baa5dcc6412f8b95b1a9f70b5e4c7532726be27f13a7d19664795026b144e2a842c73e4
diff --git a/sys-apps/zorroutils/zorroutils-0.05.ebuild b/sys-apps/zorroutils/zorroutils-0.05.ebuild
index f5e28bc3f6ca..c5c317af0be4 100644
--- a/sys-apps/zorroutils/zorroutils-0.05.ebuild
+++ b/sys-apps/zorroutils/zorroutils-0.05.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Zorro bus utility for Amigas running 2.1 and later kernels"
 HOMEPAGE="http://users.telenet.be/geertu/Download/#zorro"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-apps
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)