gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /sys-apps
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
137 files changed, 1580 insertions, 995 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6dd621ef9858..04567a359aad 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 9d2ed479ab43..54da25079eb6 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -4,8 +4,8 @@ DIST ack-v3.0.0.tar.gz 238646 BLAKE2B 679cf84c7dffd6f1ec3881de465cbdbebf9ec8958a
 DIST ack-v3.2.0.tar.gz 246140 BLAKE2B ac729ba6b1c7f0b720ddd076498452660f7f50ba7f866f908717d19c2ef985858d63dad96a2acd5c93d0a991a1870bec895da3dc64b974bc11c5f74b9245332a SHA512 3604a8ad6a79c63fdd65721fc790db09f345f66b81e5272fa073cb53b7964b576ba3638e1f358d8e0c28c38acd0d9a0362f2666ece9abe374cf6355b752a0f69
 DIST ack-v3.3.1.tar.gz 250024 BLAKE2B 3cf4882929afb05ea592a7e964a06745bef58303d5bc1c66e65ca3eb7d21fccc7fe285b142fe9518cfd9eb5c37bc32dfbec113df775b84de4f55b12864a4ba9e SHA512 7f0a5cc55b331f69877d186699e2fab64a196b0ea0fd148699b7be5f9a7bb2850ecf9e45dc026325af8407a37f719faf3f3e314c43e48d575b3685087461addd
 DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 192d1e851ef5bd3547e21fe49cf276180eb278af783209046c02e4a1ae1471c7b24aaf6825223aad96dedea9fd266576a2021dcb808b0e229312e8237e2f7afd SHA512 cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5
-EBUILD ack-3.0.0.ebuild 810 BLAKE2B 2617de5e26ff8f9ecf601ee5a4f5c2104ec9acfc2e42fcc1fe56742dbe64c729bfbd58f780374bdd1bc6563bac29e05284e99e73ec5f5310cef0fa10cef239b6 SHA512 574ee3043cc235a1914d2002ac9a3184890f2ae6f23037823a699bca22b04b44d15c2617d4bd910e4e00123106d2c5a47d36e8289d75b1583e758f4b6cefd51e
-EBUILD ack-3.2.0.ebuild 812 BLAKE2B 916da318cdcc7aeb9b98f65f156365f103e59248c1087615c293da0a73d4fc1ad3f535e2f6f5a422406a26a522cebcb12f97d9e05c3d80aecf64e2e445020898 SHA512 b4272f60a2ffd169b490b07f2ac28db6c069ed5543451202d1b49b34f2deea2dc05098a0a304bc4a8b5cfde86419f2ab486a8a9b5dd88951d8994d2c4946a2eb
-EBUILD ack-3.3.1.ebuild 812 BLAKE2B aef52558bf7791b754afdfdce9fb497c26b44a3aeebe8a1b2bc587bcbce6d5477340194c33d551f7aedb4b2f5fe9fd71fce8aa6e382fffa686dffc0ea2a7fc87 SHA512 93c5e79e1800400bd40405993f5a8e05e43a446c308b26f3e6c9f670df36c354e2cf6f0396b5ad9fe636a1f6031d8a5e4a655b8b32e2e5abc1af4158983972f2
-EBUILD ack-3.4.0.ebuild 828 BLAKE2B 50b9213ec87c984ac9d78ecb5283ff29878e20c72c733f40d1d9b38c0acd5b1213c23175ca6ac679657b0e4dd67296c301bafd3aa57c9f665d949b42bb7d4588 SHA512 cbcc0291eddd9f6abcaae5e9183c5d8b5e7b44cbe2c1f949e9a66761867f4f23810fdda3ad9c0fdc061c769ac3ca66e84b03f018ed2efb6471ab117d9d3a8133
+EBUILD ack-3.0.0.ebuild 799 BLAKE2B e7e834930c8486c65253d08383544d41ad662fcff5b8617452b4736ad66935c2ea0545338382b267fd33f806c440e75ac260c439278d6fe2b06754cc495ee7ed SHA512 d1b580c7218c6ab3d8fffd6c486286bec34512f2cecef10ef073528a4d6f5f9a4e57c1e56a8b76d5acc8b70d6f107e501d2f32d441661f9d36e952da2dbc285b
+EBUILD ack-3.2.0.ebuild 801 BLAKE2B 2e8cfb420259f4738032d84d9b02021c9ea27ef7a57679ced10f9457c611935a1a7724dedd1fdc97ea71f62a4c453470a91a0998ecd686d1623b902f70a187d8 SHA512 21117f19bb5fe3da21042542d5f26e1959c22aea59fea2f44137da6a9398043a64934ee3ac4d5de1287a057952ef40dfd409ffdfdb5f2866e30160b53d157c7a
+EBUILD ack-3.3.1.ebuild 801 BLAKE2B 1ba6f048ecd103d8bed6aba66158336d3a6926376e51f5e0142396bd0ae8ccfc10ad2c45e8ee767c473c348ac0c7d8d77d2b4c2a3dad8b53db464943c90a1cf9 SHA512 bc0dfb7d5b4de1a61b59bee9654370ee6a6a121f09370af64b63e1b7717861122c15095fb9277936dfc2d01dcdf387644f5214e3367c14d41c3bf163d96e1c0a
+EBUILD ack-3.4.0.ebuild 817 BLAKE2B 8c6ea1cbe26c32e24e89bc28da057ea62b8cfb39af9b2d47abd91b6468c42c2389e0cc81b4ba3e905128b3dd3fd5046f07639f5870385e01dff2ad23801d083d SHA512 c2b0cf0c6147bea5bf242e0041ce7156aa87ec6c4b3c82ae07694d6167b99570123da0aa581bd40369c4ff267fe0117556635f7462c5252b3e099e0e992eeb5a
 MISC metadata.xml 1749 BLAKE2B c8803cd3161065885162a0a3c21a426e36914ff7796b3f99eb57f1e1db40be7cb789df331dde048e112f6ab691a30607100a521091ece034d2edabffc22751ee SHA512 91bee1d028fac56e397138f7db10742721a509c3ba1f7de21aebe5d9c334b2bc56736cbedf47df90f3dec5bc6193feacccceb45ad247e54fefdae5a06df65dac
diff --git a/sys-apps/ack/ack-3.0.0.ebuild b/sys-apps/ack/ack-3.0.0.ebuild
index c3870edf5b2f..01badc0b6234 100644
--- a/sys-apps/ack/ack-3.0.0.ebuild
+++ b/sys-apps/ack/ack-3.0.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=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/ack/ack-3.2.0.ebuild b/sys-apps/ack/ack-3.2.0.ebuild
index 43cde812a941..4ae50c324a70 100644
--- a/sys-apps/ack/ack-3.2.0.ebuild
+++ b/sys-apps/ack/ack-3.2.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 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/ack/ack-3.3.1.ebuild b/sys-apps/ack/ack-3.3.1.ebuild
index 0df2c490211b..cb79809565e6 100644
--- a/sys-apps/ack/ack-3.3.1.ebuild
+++ b/sys-apps/ack/ack-3.3.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 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/ack/ack-3.4.0.ebuild b/sys-apps/ack/ack-3.4.0.ebuild
index 90f7405ca35e..054e17840055 100644
--- a/sys-apps/ack/ack-3.4.0.ebuild
+++ b/sys-apps/ack/ack-3.4.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 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/baselayout-java/Manifest b/sys-apps/baselayout-java/Manifest
index f1beb40ef52e..cd33d3693896 100644
--- a/sys-apps/baselayout-java/Manifest
+++ b/sys-apps/baselayout-java/Manifest
@@ -1,3 +1,3 @@
 DIST baselayout-java-0.1.0.tar.gz 72571 BLAKE2B 3a41752b1bdc3980fe8690e499738e19ba9c390164fba04d16eba8f85a73557c7f9c15e311fcd738c250ed1226cc143bc933eef14edad0546b27eb5b41cf3bd3 SHA512 6f5b6ff1ed07406711e15a768f5abdf9f7edef1b31e094760f265863aa8991bf60ff71c8b10003265d8ec1aa7c94a611bede96980d25c819908b705b4d2d1062
-EBUILD baselayout-java-0.1.0-r1.ebuild 1399 BLAKE2B 8bc14f9e8ad297310e63d250ccd0aac45fab087982ebde056fae9a642d7390ce11552b1bb58eaca3a409cccb9868c0e755f6df0c2c3b73b00f0dddab3c7050ca SHA512 49608bdaa36f8d34b725805c4e39f97c21f4170c6bc8571bccd1ad7ec05bbe4618d9b77fec96020cd1f8855ddcfe2ad8648d409988b6a12d9c15d9ab75d578ea
+EBUILD baselayout-java-0.1.0-r1.ebuild 1388 BLAKE2B 02fa9ef849828d1db96c70479febcd108667639e9bbd07a9c82e754725750fe20baa628412e1334b0766586472a4f37de81450672c7c29df6020884e1f24d274 SHA512 a3c561646acb355884b824260b4f80d11dc9ae6bdb894edc71c6073f4203569e7bacf9780d4c94c9dd09c5dd62b1c0093bcceaf9ddd76139bc97cf7ebcbcfa83
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
index 803fe0c5eac9..22c2420159bb 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 96d0ffb2ee90..58a269593c5e 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -7,7 +7,7 @@ DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE
 DIST baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch 1168 BLAKE2B 241d3dd665a7373563fb413ea9613a0597deb5b1b5213567ed0abf1edb00c495acec9570f5c3b2365c00683cbc32fb9e518666928c73640bebe99d3345fcd764 SHA512 96c4d63b5782e388882760cefd57157927543570a920f66c88cf3c58335c7e05918805510dc6e07f07f06564756482d055987c99b0cca7c31b432936558cadc6
 DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
 DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51
-EBUILD baselayout-prefix-2.2-r5.ebuild 2885 BLAKE2B 36f2d752fa9d74e7f9a434056869ad6b30ca4c74790602354a7b8b38a558c9802aae2be2cbd48bb8272a9a775f31f99483b55bfface668d15fff008004866611 SHA512 c88b3fa4b469431ac76c535a2dd10d42bfb72818c60b042453d5cdc115b789d31e5222427623cd663cee95acd80f9b616508141569a6d500ab955f3042ca26ec
-EBUILD baselayout-prefix-2.6-r1.ebuild 10999 BLAKE2B 1bdab9f30d2c27d3bc09998bfc23378cdc182528f8dc5cc9e9726f4ebc03ea38d3c253586e480488090d09afef1f7acdcc56dbe2c8f16754f075ea7212e6749d SHA512 0b291ff1bb1d07f89d08f359b74bf7cf032f0b3597fca7b687b7e294e49712e3b4c5c54d21b0af759049fa792b79b66906f9e6c1334518fd3e45d010b8a2a8fa
-EBUILD baselayout-prefix-2.6-r2.ebuild 11100 BLAKE2B cb94032184d1071d6964cd5cf40e8e42bd09c91a8563797039074a2fd1b3a4ecbea1e485ee75abe449b36cdc9846e2aae322f3d4fab3c49da07f8d5caaba3c4e SHA512 929009de24f1a8bb50110588741344b104879c4c4ae81a5aa21ccf49075d73fbe592d69b809ad5b8c837f08196873178fb9983deb88960abc0b0104294babec0
+EBUILD baselayout-prefix-2.2-r5.ebuild 2874 BLAKE2B 5f5cd3610bdd77da24715acfad1f862f21af3538f4ee10fb3b45ed54d353508aa284a5a32ec45813fef97b9bb3acf04256a0405385c0ea51fce77f9c4a0a5cc7 SHA512 3fac056af962a325c494e01c1cfe88ba209f1ee60a4c2a906a62a9e6d7fd77e061a4413d380da081b433b7c01f4a40d9090fb5d7b19048eab9d733be1170bf38
+EBUILD baselayout-prefix-2.6-r1.ebuild 10988 BLAKE2B 80936e19891b8271bdacd53eefcf59f185d25365bde1f0c408d6751bac87863c9aa97f2b04d3e50f84ee3aa56e54f3ceb5a9a8e27e597eeb70933a6f379aba98 SHA512 c164e27911fc38c698fde0b78ec67ed2a4c86ec71935fdd25bb0ed4967417584b5ee38caad9c467a8d84af281f03b8d47af8b7ef1a417602bfcfdbc3f053d990
+EBUILD baselayout-prefix-2.6-r2.ebuild 11089 BLAKE2B d0160e71164c386d2c5d14f239a1bfcb3b464cc5fa2d206def92afa3e6f2321c018e5053f2156db1492bae8735c54f6db10cc2006a911cd4cd1184e655414207 SHA512 11b19a4ccda61fa358d039ddaf5dcc47055f25401d1cdbd8b3db70406de04ae7a164ca3b5f3e82305c27f66ceaf9588dacf4cadbf01238c77c6ead082e5636d9
 MISC metadata.xml 317 BLAKE2B 023b00acfd1afc0255ae1356c8a9627a2d3d81e762b8a7bbd155c2e5e626c4a7663ced36ac04590a127e3a845122a17e07f7c0614dec091919e958883e71ced2 SHA512 3893a08cbe1db5c7888ba808a3cf04c20c8ba5988078791a707978f91e56bf2049244e30096617bf5906e3ff4257538407a02645ceb1a49a61ffef57980bcb27
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index 789cb0acceab..775cc96e9530 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-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="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="sys-apps/gentoo-functions"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
index 1163e18077ca..902bfdcf5755 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.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=7
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index 5ed070e67db8..a2a404b6929a 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-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
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~ppc64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~arm ~arm64 ~ppc64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 656d46d030d7..25f46fbe1aba 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,7 +16,11 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
 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.31.1-r3.ebuild 9530 BLAKE2B 80e81e1c4c2c372171b40265549bf56afe1ff0953699de74332c396cda4b18df8e2fb880d7030352c295dd2a2530752dc234ab21308b8c92e4be94188896f00f SHA512 066b9baae3e80b8b1ae95be670f99d7900a0c501e8d95e4f750901c30674ac7951440efe727b8a2423afb7a85145e0c33190d3a15c1eac8a97ea4ef289edace4
-EBUILD busybox-1.32.0-r1.ebuild 9493 BLAKE2B aa5309a1dbb2e863bdc820207c28f07ee0ec33b433508745d5df18e04623b08605564f22b347d908cffac38c832992482d4984e598c0a919e80e851a2754c9c8 SHA512 67025c4610d71461c775107f6fc391e574e1e9efc8298c7c198a89476b32e42e5c26a59c693a14cde7a6b0e630b0b5d1de2b0f4ec5f28fe8a77163e138e70a0b
+EBUILD busybox-1.32.0-r1.ebuild 9488 BLAKE2B a10d4f1881df9ff82fb3ee8ec6b251f0878ffa5034345416f532d3a31d009f757dd8acddd366c5c7dbdffe5f73d6e13bdb4cd7a25b6a506c4b6bbe4c3cdfb60d SHA512 1a41b906a3185d9daa6e709554253d243935171d4225a27b37a2efed773252969df4edb7f577d33fd55a0c0472d8fbcfab7111091ec47da35791e77327227dd7
+EBUILD busybox-1.32.1.ebuild 9493 BLAKE2B 54b44ae3a230bf7fd6f03b76b293e0e42b351049a3b2200928c2a6dfff459a62115e48bc279b280151a73cfbc660f8403a5f9673e88d4e1e30445029fe9c4cc0 SHA512 54af8a0e8f4c1d6c4bf28f85f2c205487c6d0449baab0f7872b9cb11121d7ddf7f142dd902a2abed3a770080d70e7b2d0b39f4f7d775d83dd3b22013c05d1aa9
+EBUILD busybox-1.33.0.ebuild 9493 BLAKE2B 54b44ae3a230bf7fd6f03b76b293e0e42b351049a3b2200928c2a6dfff459a62115e48bc279b280151a73cfbc660f8403a5f9673e88d4e1e30445029fe9c4cc0 SHA512 54af8a0e8f4c1d6c4bf28f85f2c205487c6d0449baab0f7872b9cb11121d7ddf7f142dd902a2abed3a770080d70e7b2d0b39f4f7d775d83dd3b22013c05d1aa9
 EBUILD busybox-9999.ebuild 9438 BLAKE2B ff3b404b01449191451c5126eab5368eb97c4a3ddada5f988b5ee106e483808ea008b7106bce99f357642fae4d600097ff0977df1f28c1338ac8e4270cdf1eb1 SHA512 45f808c10761fdbdc7571714590530fe5ed2de13ce70be1351e7b871bf8d34bcdc0e72837461459cd1a3ca2acc8f2af6177f9a85bcbad0e5d218a685c4fbd54d
 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
index 6d7a58111698..a325c2012322 100644
--- a/sys-apps/busybox/busybox-1.32.0-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.32.0-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
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -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
diff --git a/sys-apps/busybox/busybox-1.32.1.ebuild b/sys-apps/busybox/busybox-1.32.1.ebuild
new file mode 100644
index 000000000000..7dd2ce8e7480
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.32.1.ebuild
@@ -0,0 +1,337 @@
+# 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.33.0.ebuild b/sys-apps/busybox/busybox-1.33.0.ebuild
new file mode 100644
index 000000000000..7dd2ce8e7480
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.33.0.ebuild
@@ -0,0 +1,337 @@
+# 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/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index d079d9d1a1b7..f260a44499a5 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,4 +1,4 @@
 DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168
-EBUILD checkpolicy-3.1.ebuild 1205 BLAKE2B ae6dcf8e32b169d8f2b4389106d3131284f2af359056c42c03fafd1dc443df4bda0277b16af1fe59bf490ffb3ba604292e357eae90fa4bdcc2e1dfd9129c4020 SHA512 ee2d92c22559eea88f13b68f97b026992c7d4f16d8487c126d3b62ef10fcfb6917652bbdd03558306c4b978a4179c8981c090d7af4140ad0c441b6a9dcd10fc8
-EBUILD checkpolicy-9999.ebuild 1207 BLAKE2B 4ab6d0a6ed8f2080f89536b87676af9c8fcc4227047b7e35f96c163f76ade44fbd53b399ccde482c05181da82f64c419cb74416d3be57cdfce0dfe3968b71858 SHA512 e37923a568790a7155be174ee451616e78b8b2ce994ee6e96525fb6a7e4a2bdc5465f352f2be94f753c5b079088a5f689f347a3520321e73a6682e9592743a27
+EBUILD checkpolicy-3.1.ebuild 1149 BLAKE2B beac3751ebcfc7969e662a3cc1b25a266b144db2155a8f469170781d1e6aa515a759d40adecec768e066f6424291e6fd7ed5c3e87f56eb39a309e0e56de45676 SHA512 68682e8384cd6ff456343fdfa611be2bce2e15edb732dc377e8839cd3b1fcf510d914d02c8b2433d34ee6e53fe5cfba46ad0712cdb25f91bff3532b5cf80c035
+EBUILD checkpolicy-9999.ebuild 1151 BLAKE2B 68c17c638f651a64d4e40925f64ac0524c5dd042e679b1023510703f2e970f0c6d8eb5202e5a85beebf74aeccbb7802057768aaec08e47383e4ac365ddec8356 SHA512 0af0987ecca8693ff221aeaf358017a58f89a51c37f7e6ff0308a33e61e509835e905f8555b9e52b4957cd79b1697674493376312db679d86ff970a876b8e0f5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sys-apps/checkpolicy/checkpolicy-3.1.ebuild b/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
index 070a1f1418cc..1b8381709ac8 100644
--- a/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.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"
@@ -28,12 +28,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug"
 
-DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
-	>=sys-libs/libsemanage-${SEMNG_VER}
-	sys-devel/flex
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}"
+BDEPEND="sys-devel/flex
 	sys-devel/bison"
 
-RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}"
 
 src_compile() {
 	emake \
@@ -43,8 +42,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		install
+	default
 
 	if use debug; then
 		dobin "${S}/test/dismod"
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index fe88e2f1c073..90907ec9a0d2 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-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
 
 EAPI="7"
@@ -28,12 +28,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug"
 
-DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
-	>=sys-libs/libsemanage-${SEMNG_VER}
-	sys-devel/flex
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}"
+BDEPEND="sys-devel/flex
 	sys-devel/bison"
 
-RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}"
 
 src_compile() {
 	emake \
@@ -43,8 +42,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		install
+	default
 
 	if use debug; then
 		dobin "${S}/test/dismod"
diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index a5007e3e9777..316d39308657 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 4802 BLAKE2B c98b816e57a3376b955b2090f73659ec6bae7cb0e7545f1bc318905e1d87e7658d9e7a8257eb99cce4c8bedd7ce08d886f5cd488f0dba016b3089e6f49c95a73 SHA512 ee5c9e4938ae770bfb0610b2d5a31ee8d5c0cc3d5bf2f967bdd0ed8579baa0b12d0c99e5ac543ac23b07a7e5364b7eaac03a2b16984a9add99c15b72cf3c7175
-EBUILD darwin-miscutils-11.ebuild 4730 BLAKE2B a4f3910539a26c88bcb655cbefaac196ef331f4d3fa37d754c9c1f9c8c033a413ceee9ea40eb3f3809612e7ca50f1c975ed471e67b7ac805772abd9519871744 SHA512 c9e04da6422c370b04c8054ac2dcef573630a05d5ba21b39cab100f6dd30a43540fd03c9a3aff0e9aaac53fd1307b8130217925b8160c48527277c83e63e08ee
-EBUILD darwin-miscutils-12.ebuild 4329 BLAKE2B ff27b03f3e817f53e2c5bdadfa3b4c4442d1f62905df0938156e5403d0de1dc265597e4a20932caf58b2c872020fa58eff3b8aaae219b7a23e663780d751de59 SHA512 ff43d14c815f3a84a0ffe95ae2ca0b88d3df7bbeadceed151fe77047a44afab1fd835ebaeb4809ff6141eb9f87a8f15f1d783fc50e0600c9d85497677fa7869c
-EBUILD darwin-miscutils-6-r1.ebuild 4255 BLAKE2B d82c786adae41051e547df3cb8a3b0079a51fa07618b0c61b696e696ce4e6f5ec348f52cdc99538e392f33aebed0b88449c073459f7804bea2fbcfdc4dd94538 SHA512 5bec5032b942963bd5652283c5914e2a6f5e4655951ac90ec680a042cc37576b3a47df969f54d4b5276bc799e1c516298e8a605d64e83e485703305384f75151
-EBUILD darwin-miscutils-8.ebuild 4095 BLAKE2B 5fa06daf4a5d44c3b0dee694360bedfd87027d634c683396c4ed0b6d129f401bbc15369269d88c89a8d4a53797d17c240373d2f8aec834f51e28e92ad96f10cf SHA512 748ca7f62e8f4cfca2ff19668a590b63268628cbbd6299e490b220356c0c854987fcca0ceb3b65b2c1fbc545b07bc275c448ab87a1fb15c2cd591baf6f9d17f7
-EBUILD darwin-miscutils-9.ebuild 3955 BLAKE2B 9cc4d2b2279e02d08476b827e3fab4b55cfeaf1e505c43fe151b147c7b933228389255942b6d8eaeb5212aac90b51ee3a9c40b2adb6370af04da36690cf2c4a1 SHA512 de3a869b5880c39d82bfbcaf8b61591324ca10efd0be1e884933ba75b19d61a8670e23c5163389406a1a9c3b6db9b8ee0550a63394dd6c35c5c658295211c60c
+EBUILD darwin-miscutils-10.ebuild 4788 BLAKE2B 794ad767bc69c790f1f1fff3eeb2a6f206af27177dbf7cd3ec5a5e584bf72fb94eee7a1e4c019f1c726924b81703fe05832f7db402787e009ff2e6caf882d75f SHA512 2adfc46e3e2931962bab5b622aaafb6f1bb05fe1c5b67187ece650771dc74069ffed9270cc226c9cb2feb11648cea8d0d543fce4b85e079f0dd1994faaee62ea
+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
 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 67fe14641673..6b1240b93ac0 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-10.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"
@@ -23,7 +23,7 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-$
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild
index 82bea18938fe..30b006932108 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-11.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-11.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"
@@ -23,7 +23,7 @@ SRC_URI="https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
index 96a868b3409d..9c9cef2f0efb 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,7 +24,7 @@ SRC_URI="https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE=""
 
 # for ncal
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
index b0b7099617b7..ac663fb5ffc7 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.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"
@@ -17,7 +17,7 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-$
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
index adbde8fb92e2..44d350ee68c1 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-8.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"
@@ -17,7 +17,7 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-$
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
index d0467ed79845..c7af5ec16977 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-9.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"
@@ -17,7 +17,7 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-$
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 8b9017bb4745..5bb9598292db 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,5 +3,5 @@ AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a03
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
-EBUILD dbus-1.12.20-r1.ebuild 7321 BLAKE2B 1f02525af06075ac2ea9466da2567988d6abc609e10c5335903988933ff07e1f1614fa82da7ce34ecc7ddeb481b87a768902dbdf4b507ec4f8289ee7a1fc3ae5 SHA512 3bb91d64d52c2b1eb9699e2bc6c91e1a9b1a86063794ede6f9b188aae4c81f6cc81d37de4dc38e3d1f43a88fdc6be1d6769265d4b5d71c21be72c23cba0f6661
+EBUILD dbus-1.12.20-r1.ebuild 7310 BLAKE2B c85d6347becf2f6d5aa293db198a9e584248544900e02c7bc8e196d5125df346f7a83a0e68d126c3fe26eb75e380b3c4b83d6d93e7ac272a0294cbc164e6eed5 SHA512 6bb7888b82fa5afbdebf9495c808ffb6c208e04ad99267847ab2d974418e210395fec6254516e32058788288066845195f065471e2d7a6c10bce321a3bb2e164
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.20-r1.ebuild b/sys-apps/dbus/dbus-1.12.20-r1.ebuild
index 17f89e9ff272..7c8d31932081 100644
--- a/sys-apps/dbus/dbus-1.12.20-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.12.20-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,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 3c3e0c74d02e..959cabcc3cef 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -2,5 +2,5 @@ AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3
 DIST debianutils_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 940 BLAKE2B 21977548806665c1edcaa8427ae0a310b29540d63aa407ec4f931283c8e476d692627efbfe472d8405d14d794f00256a1108d5a0ce137439363a1099a47e3994 SHA512 322439c27a6edb9d6395c23f9243724326b89c7de2e8c4f7cc4c1cf1a0911fa8547259dcec3eb35f1330c6389b8395bfd45b1eaa389bbda751d808b0aad51098
+EBUILD debianutils-4.11.2.ebuild 934 BLAKE2B 48f99a9d5c1ad125ef6cb120f39f2a3ea97f0a4238b4e153ba906436786280cb6c9a3e0bc28d9a1ecbb5594b741897d4e49097ac84ab011f0c209a1450875eae SHA512 6c286ff2e91e212e2aae39a389608f27c18074f4a8edde2127e7aca181aeed85e858fa65501b362c6a7702804abe672fb0e0736b3f0c3d3358896286069a5b82
 MISC metadata.xml 445 BLAKE2B e074fb05a82e69de19cfca5e102bd6577060cd6bbd3b5b6b7e4c8f24d8715b50abe3e7444eb04827d41f73777ab2588807b708636287271c39e14b2bcd7c90ef SHA512 b07bcaaba5700fa08a6dbd84c514ff720efd155fe442cc35a7c62b5c0b64802ca286c991f20f0d6d56b15bb6ecc097804bcee83b0d924b868e8c9106effa1db0
diff --git a/sys-apps/debianutils/debianutils-4.11.2.ebuild b/sys-apps/debianutils/debianutils-4.11.2.ebuild
index 81009055a049..574dc9bc8357 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 71bb511b41fa..74521306c071 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 1182 BLAKE2B e37c711bb7a7acb57164a1991fee9b4abfa9c16545927cb80c13246cb368ecaa592c32ccbcf48a011fa19501cdff9a4eb251287820ce67e3830afa1f730f7358 SHA512 7f333946a56cd49c068e57c786e8ece323c526f3e3970ab6a2ec40a9eb1ee4ff1ba4a5b4b119744f76eb553ac108f1f069bfbe13654ee85b8b7aea3a88b1136c
+EBUILD diffutils-3.7-r1.ebuild 1171 BLAKE2B c42cca73af228b8d347c5ac5d0eec096624fd1a9b137faf87b3a28dfa3cb8b79b71f368441a2d7892c1f12bbec010bb2c068accfbe046e74eeacdcf00bf16471 SHA512 89e2bb0af464bf31d0f2288e86deaa6d68a359e78d381486873e81ce15bdbbb6e9b87c7406fce6e94ee9ffbcd82b34ebc2bec9e54c6e40cf60c6f366abc2472a
 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 25aef108f0bb..79eb1d1d0f51 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-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,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 ~x86-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/ed/Manifest b/sys-apps/ed/Manifest
index 231bd3206a90..fb9bb20d4dba 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
 DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
 DIST ed-1.16.tar.xz 68432 BLAKE2B 222ab30f72fb466372cd7ced75807e9324a916ca5962c6829d562476ae1d9ae9c01235a130e58f952bd6029b931f6362d2a695b35963ca32bb3cfa539dceab0d SHA512 45b29fb86c7e7d8569c02c8177a9c7f7e691e08e913bc07b301b34210b6dc27377858ce60dd695feb950ef436c86d7059ade90396364c95aefa3c1e7a9d3a2a4
-EBUILD ed-1.15-r1.ebuild 920 BLAKE2B ffdf311b76f473ce985174455fa322f57e46153ba3823403b60e0ede90b3812d502676b2acb60255916401bde740e330e678829b881b6468e9f009324ea88e26 SHA512 3b280432c58cea963d23797dd070cf15b5f04d8e11e925c3fed7df0d054d57e4fc3a8960b112764ea26649e90c77fcfab6bd7701c232bfae5bfa9ae57311dfd4
-EBUILD ed-1.16.ebuild 999 BLAKE2B ee5e8a6d89700f401018d4f3be7ae1792e99ca190632ccc0998dcee4bd89ceef073cc1e7c0af5a88a3d705485e2529071d070e8c187283746add65c15408b25d SHA512 e05fbb977ae5cfe5f2c96dd7e116dc32b5f2c7a43a0c39aee5e5e99bc4ac5ddc52fde344173cef4f50d55c180c6fbdc3cb00792ab74c3de42ea7ea9a00021466
+EBUILD ed-1.15-r1.ebuild 909 BLAKE2B 126921a2b52a84baf2888d7fbe936b966c471cf635e7cf6b432ca7ad2b2dd1bdd9b05f79f1ec1aeb20ccdf3fa5975c973a57fd9742b23d9aa9b60f3ff70f32dd SHA512 1e8096e4cb312aed67ad0d81a4bcfeb422a169fc29330b09021239760f99600b52d7f3d1d84e2072e536307a5f00b85adc3f732586001a7a11de59b29aa35f6e
+EBUILD ed-1.16.ebuild 988 BLAKE2B e5b78961d557678be89e600f5c25939ac0337d88ce89e7474b5ce2db94281e4f27055839a1f29986ca1be4c7d79f6a49b4afad74a8b1e3890cebfcedbca1c1f4 SHA512 d017d4aecaa044458ca946c935dab5dabb46fd8d1b68c8076c14afac80a400a9c22a98c698e8a7e8ac840f036a45d52c0c3cb2ce8b622bae227b04fec22ac0a2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.15-r1.ebuild b/sys-apps/ed/ed-1.15-r1.ebuild
index 4aab70584654..5fb157bb1917 100644
--- a/sys-apps/ed/ed-1.15-r1.ebuild
+++ b/sys-apps/ed/ed-1.15-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"
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${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 ~x86-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/ed/ed-1.16.ebuild b/sys-apps/ed/ed-1.16.ebuild
index dcc0ac9a51a9..573eddf03f08 100644
--- a/sys-apps/ed/ed-1.16.ebuild
+++ b/sys-apps/ed/ed-1.16.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="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 ~x86-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/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index 99fe26f36673..cbecd2ad3dc4 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,4 +1,6 @@
 DIST edid-decode-0_pre20200720.tar.gz 102525 BLAKE2B 57b296987ef890c9d4dd46d432730ffab5adfb758be4e1bcc7b6b5e34fc3fae42901da98c302c4a1742d39274b295b8b639012e4b848ed48ab0ee69cbc45b98a SHA512 4545c3a2263587eaf98cab0a3ec109659b50478b17e2ee51605ae53b1475761aee16f4c6e1549889016359cfce3de03cd907c3e801f12021e7459f25cebfdccb
+DIST edid-decode-0_pre20201230.tar.gz 110090 BLAKE2B ffd43a26060bcfdd35cc174a7a1a4d6e21e8206f5ca16fd4bd0237f3e6887597fa95fe2f70e9168ae73db68350348cff0a65d81d311e417b841defe882fd3ef4 SHA512 f459c7e37fd2890fbaab4180b85ccb48c6d8443841e627cadabddd09ca486cb8b2c8645510b91c9ffdbc4ac5ae3d482834a32eea7c7f306120823e610280d421
 EBUILD edid-decode-0_pre20200720.ebuild 688 BLAKE2B b11228f8ae070655c7efd7542a9774b9e07a26c586b93124426524b6fb5ac955c3a31616b9e4fe8906a1bb8897d7914208b03049fad980b97d615aea13aa1c78 SHA512 8a64aca8fa837937dc44d47648d5747067feb7cc4070cd2ddd49f4bf6bce217d932641f98b1888bd97387d8fd70507962ed460a3724066fa971236bf4e93ed08
+EBUILD edid-decode-0_pre20201230.ebuild 672 BLAKE2B 27be7e3c034c1977686c4847b11f153c6d463604028f7fb6641f2475a1f31478be3cd79bf8708c589e9eaa52f92fde703c45d8c617de7fd4e7aa30ed9b8cb818 SHA512 d157d4db9a8c852ec5a5c15e19f57e3f16d98509064a1509e54edbd7167c694ed1a77759c563e116dd9e8badffbdd134ef0953a3f85b68e6b677e2b8be82045c
 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 6e79eb700ebfe891bcd2f5451ecb80a27bcbb29af23d0126f5105f984372986c23527e7781b5f5db1737fd1c6c3efe8688e2de6c84e1515f7ad6cbaf7b783739 SHA512 c913ea25760f4ef10d56c1467f3de2a9c79bac6f0f25768989207aab8354dc0fa8903d100773fb81cfdc0118d8ae6762ab9436db11c0cfba7e270fbd17bc3d76
 MISC metadata.xml 646 BLAKE2B 37a3db350195905c7a4b420d0d2d2d4741cca1b3954d42620a9a411696a734702e145bde400c4d68997aedd0de45d418faacb1d132ab385f8454f7f5c0039260 SHA512 95293d61feeeca16b0341a5c5fad464db4fca0d2dcfc9b7f51cb3d2984f3ff4530d2938d80ecdf658fc2c784368166bc5fbd220787de6564938ee2171f1816e2
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20201230.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20201230.ebuild
new file mode 100644
index 000000000000..fc373b025e2c
--- /dev/null
+++ b/sys-apps/edid-decode/edid-decode-0_pre20201230.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+EGIT_COMMIT="95d81c95f89424bc5ff541d941eeea4addeeda1c"
+MY_P="${PN}-${EGIT_COMMIT}"
+
+DESCRIPTION="Decode EDID data in a human-readable format"
+HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	tc-export CXX
+	default
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/edid-decode/examples
+		doins data/*
+	fi
+}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 21bdef7a185c..06bbd120d769 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -8,8 +8,8 @@ AUX file-5.39-seccomp-musl.patch 1021 BLAKE2B ffb395d7ebf1a96a7f74c8c8462e561f31
 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 3166 BLAKE2B 7b668c34c770fc050c48d2753c81604505da990b4febd8ab73f3e5899070ed36895e23b6c2e10aa54a6773ee0a2908c8701b0fffdbd601ca026be0763fb9f7d9 SHA512 641e83e9f08fd49e95ae8c2127cce496c81f922eb31402485651cc5d58d1ed7f18424780aabe228368c0761af540618540c5ac6737e36cdb4aecf189ba247d57
-EBUILD file-5.38-r1.ebuild 3377 BLAKE2B e05f6b8aa573445d033dc1a811a70d514d1ae083f7083ab0b48448affb2411cf0037c63f01a44a2d34e2ddf95e738c69e11bb1703097bc821c357d39f766cbb6 SHA512 c51d863ac63ee5f68063abd3e07df79ec8ef46edc7d79b0af7add4a24e62eec7a44b57c4fdce00d31d71b6a0fbbb36d8a1e3c358d39e22e098f3a6d620f0f6b5
-EBUILD file-5.39-r3.ebuild 3401 BLAKE2B 37c11a7d89b6ebd934526063c1d5162c2ce53757e2eac0b7ad170a0240b0f70fdf55c112b2d1c4fca6e5d386f3291e1ae0a1ad781a32fa8a81938d5d3f9be4c8 SHA512 d4ed2ea6785a3b7f9090e0e115d70a7a6fbdb634624349a85fd901313953cde7631114ceb5ee4e156ec857185ac750cdc2b308cfddef80214cc0e79c87a1f55f
-EBUILD file-9999.ebuild 3307 BLAKE2B bbec566f1f9a3291e6e03fe1220df01532cfef45b50b797711340732638cdaac41dd40fb6275bd9618cf182178c7fbc4fe3ca59394057609169e2926f4bd07e3 SHA512 fb30b25f2b312c84758461e4903c170bdd72bb62abfc0eab933f29430a305a0b62e309d894da508093fc585952d9b6106cd4ce1ca83d7388df2b9b26568ac0de
+EBUILD file-5.37-r1.ebuild 3155 BLAKE2B 2ce2b5ef1520aee46e2e6dd2763067b46f9fcc33a683cb8d4add1420405e90020557317aa6d9288334c7b1576fc32a14bc7189433f07b0d5965aa93da9d455b0 SHA512 70fb65031da79a79f1e29bf7605b961f420184d8be965a459cac5ecfdd3dbb16afe77598905afc8509a55fe9c666021c5df65b0e38b7ddfdeeaf4056a595c1bd
+EBUILD file-5.38-r1.ebuild 3366 BLAKE2B 359ce003300e6bda251e3b971383a7426d8e65b3c22ab83e1fb941e6beb43f1aaefcdfac85c4b376e2e9a8b4d6e8e343f621ee048cac2b9ccf8bdae1b6c6d9b4 SHA512 356be3c4611d4a660ef8bb1297c448c523712d7fd598d95b3cc799b7e2851a9d6af9a117e6b27a5450dfd1c7e1cc4c2b3ff22ff7cdec96ac421f7cea9a2dce76
+EBUILD file-5.39-r3.ebuild 3390 BLAKE2B ead6c242f61b30621c1f1719f4d7be36449dbc329c8e6c0fa24e4f9fd615af4a82680dc2c99d09a319f4dc3a30be50ada17d62556ad5116d80d867e744c2dc02 SHA512 a34b605e608d67ef45b724227c40bc13f2cf8492a3b935eb64819da8d85c5fab823f2382b983c3224fc2b4154b25696db2ff3cd691a27e8dd3031b9fd1f1de0a
+EBUILD file-9999.ebuild 3296 BLAKE2B 28306a6c25a490189f82c52b81171f907453ea14692f4f0a8622776a15b173336deec9d68b8f7c385762d8ede9a937a16037ab9cb2ff16343a98c3dfd10b0c9c SHA512 9b1dc9197d9cd618a626d0238914bd556251597c7b3cc7aefd28a685e73575c8a58bf21b52a6a9eab4f2e12583b0d28ce1015313d347add264c7ecc464b5fd88
 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
index 32d1bb6737d8..e3a046598285 100644
--- a/sys-apps/file/file-5.37-r1.ebuild
+++ b/sys-apps/file/file-5.37-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
@@ -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 ~x86-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"
diff --git a/sys-apps/file/file-5.38-r1.ebuild b/sys-apps/file/file-5.38-r1.ebuild
index c64fc4a06203..7342b5b226b3 100644
--- a/sys-apps/file/file-5.38-r1.ebuild
+++ b/sys-apps/file/file-5.38-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
@@ -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 ~x86-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"
diff --git a/sys-apps/file/file-5.39-r3.ebuild b/sys-apps/file/file-5.39-r3.ebuild
index 6077cee935d9..bfdc70fe3daa 100644
--- a/sys-apps/file/file-5.39-r3.ebuild
+++ b/sys-apps/file/file-5.39-r3.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 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 ~x86-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"
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 99b7a792e848..bbd23a1287d9 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-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
 
 EAPI=7
@@ -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 ~x86-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"
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 8115aecf9540..2cb58b8c035e 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,3 +1,3 @@
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
-EBUILD findutils-4.7.0.ebuild 1660 BLAKE2B 2b68d8a19faaccc46fee026e6e38f685d3221577654f536f826c16685efdb0e5728b443dfff247af3c9b2e9705d861b29521f5636aefa924f6374fa9ee6e6e6c SHA512 b40d181aff1a5b764db019f6810e02ddbb051d4a316a2aa8a0e31b74ec5707747ce876a8af233652e29233594954b9d6763c7b9c3aec79ef8672075293e17e6b
+EBUILD findutils-4.7.0.ebuild 1649 BLAKE2B f51592d9eaf3b9f55e145aea9a650f4b3ed23d4a53e1666c83cce76002f436af8c297e8f9a9727aa5400821282634668741b94ad33ad1beca88d84fccfd3ebcf SHA512 e4734c5d46017cf34863096957746c9da1121d3d2f7bb100088526dd06d76a0fb2ffd92e03cf142afc10ae6e8f433c4d20c60c81247927ab9c3cb5582ffd8378
 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 df5efa18b975..da8cd77f2cbc 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.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
@@ -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 ~x86-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/flatpak/Manifest b/sys-apps/flatpak/Manifest
index c33ab3c343e1..32e0038602d7 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,5 +1,5 @@
 DIST flatpak-1.8.2.tar.xz 1424468 BLAKE2B 4ade582176cd4ed494d0afc2a75b81168dc2263183d4ec2ef731b2d3ccbd96a7cc0fdb012f07966b4429529ab69c79b32abbcc4c1a8640b030d3ba2edfbce36d SHA512 f27c05b2621328dce31e4c31ae097765864bac84f6c1fada23f48c0235c6b85f447948a07861653f7bed4e17e43f8ff3d2c60263e23426c765c787b5f447a4e2
 DIST flatpak-1.9.2.tar.xz 1490540 BLAKE2B 23e5c4cefaadebb1e9fd599ba8e372ddef9e7e241b186032a142f60bc07b243926d3fb514cc62e90437d2e8ddb17098476b4d73913c2ad656b2719268705057a SHA512 ab4feb6c10161a1bd92e428623772c4217ce3700db412c6280de3415247ffd39eb800dc917937529a82328d778e089f45bd0a8b48fdd7e0c8bf34c494dcb085b
 EBUILD flatpak-1.8.2.ebuild 2341 BLAKE2B f27ddca127f893a74a0450e81178dafa9e01d2e824dee11e1a59f6fc584aef88c30735df457f5d5a34cf20236c69fa48251b1fd54c8167b9c89d404725437c2e SHA512 97afcccc5806149b2939ae93a725f83dd2899bfb37e66c27b6b44bdb83001b114a875ab8fa1b3a007269f9ec4be0eae8989fd549aac98aae48ab6721694c8c13
-EBUILD flatpak-1.9.2.ebuild 2341 BLAKE2B b1bd2925dba55a570bff569cf0072791688b876ee7350088c6d7ff06d6ef2f77adb3f4bb6c65d219bf1646459d75abeb330d0de3fd1071b61f55aac049d76458 SHA512 ef74cb57a6b9e4da6fec7df1b200588ea2e7891769909e94970be7a242666d9a85f378b21d7822782eea05c8c3664c8487275d12f4620b1d86861a2968ced84b
+EBUILD flatpak-1.9.2.ebuild 2344 BLAKE2B de6e186e4b9ef761378907e3a2c1deb0c8811218ece8e33586b711ba76880855f48884e4d020015d700a1ea555e76f060348a00c6b62a43489819b83f4b39498 SHA512 f4932cabb3c5031104243e214115c5b4e4696ce1b74da8a0f56afcb87c438fb7a9d802cdbce7dbf6ce5cc1f099275c86dfa62ac65c576482f8211bf846b20af4
 MISC metadata.xml 324 BLAKE2B edeb76b1ab3c052555564fdca397116a0ca48a7b2eafddf8958e080a7c8ccab9a04613fe67504c4c1d51d75eccc8cd25cc0d4223958f21e37f8ae056b3fd4686 SHA512 667951ea59e4871daf2508bdb4e56a68638d37bbf6fce0a56923cf3c0632a28d2eae3aedbc38e8db04e80c03fe06918569b1697e890bf20055add72ab0c7c15d
diff --git a/sys-apps/flatpak/flatpak-1.9.2.ebuild b/sys-apps/flatpak/flatpak-1.9.2.ebuild
index c9f3f0c85a4c..be7b57cfebd3 100644
--- a/sys-apps/flatpak/flatpak-1.9.2.ebuild
+++ b/sys-apps/flatpak/flatpak-1.9.2.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc gtk kde introspection policykit seccomp systemd"
 RESTRICT+=" test"
 
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index c382e2602c53..9169fa77665a 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 2144 BLAKE2B 6cf3baa45fef8b33574dbbb22285ff2e787778e3460bc103ffce3bcf6c1d1a78a1ef9757b132519bef514f36f0b3a0ff5b624193d089d1a149115eef141463b8 SHA512 8962fb055d618831015f7262dabd3536d1a922301cf77b0b34b0a1a41f1575032ec70ea4eef3ee5bcbd6cf668471481000fcc907320fc13509e279fa1aae4c89
-EBUILD gawk-5.0.1.ebuild 2202 BLAKE2B 29ee3a62c362643857db9dbfa5762130b5bd02665e8208cf7a18267690ace425f1253fd35ed06f29c6ff0637302a5ecee6b4339f5bce3c64d4ad42811f864861 SHA512 b698d40a0d7358aaf548877bd5e9e9b5419646bb0177eeb7983cb65ba34f02795552e62caedf0c01e1bad15bc8b6ad5a7e9a2eda9352ff8c8ecddc3783dc099c
-EBUILD gawk-5.1.0.ebuild 2251 BLAKE2B 7cd5266c8a1f0ce900f5500158a1e8073a9e67ff41ea3388c3e75ae306725f5eb54e6477d44f8d72881d79acb956ef18634b72442b5ca63715c67ce79b33da87 SHA512 36f50ced8eef7574ac293dcd612c50a29d9a60e2422ff3366709847853d4c628954d9e50050e7740fcc4b57858689de7fab2bdd68cf1a4d3d26d3f3f6e6a7e33
+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
 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 718d9915b630..62e8aecbcd67 100644
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ b/sys-apps/gawk/gawk-4.2.1-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="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 ~x86-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 3518112e852a..f253f21675ac 100644
--- a/sys-apps/gawk/gawk-5.0.1.ebuild
+++ b/sys-apps/gawk/gawk-5.0.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://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 ~x86-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 e47b0daca045..6850a412e15b 100644
--- a/sys-apps/gawk/gawk-5.1.0.ebuild
+++ b/sys-apps/gawk/gawk-5.1.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="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 ~x86-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 0a83c8c09241..cc930639a8eb 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 866 BLAKE2B b3db68c2e523a0e0bb4556143dcc2b0400cead0fef36cb070a2a701b960ac82dd92c1cdac314f7bc36bd329b4cf6c41bf789542a609aade8c00a1811151cce11 SHA512 71f7920ae93c8e373c207deea7c31281a7ece76cea7ad7a6f9f5b5b2069403b3cf3e0d54fdda653eb6121d1d009695a9e4c4fbb3501d3c196766972a4199e0be
-EBUILD gentoo-functions-0.14.ebuild 875 BLAKE2B 5616d73c808cde08fe691d8ddae21cafc31b1cf029af8bf3443563521d7e1692ae76e8d0ebd1ca2d4de7b31be6b64b4e3f7fb9db79af9e965b29aad3a54e0ac6 SHA512 4c3b01c8da0db726b49f38ff14f42e548cc026c837681918432e9501c4e240417e6d29981ea83a1c526f1e07d1e0a1293771b5de53caaf12ea342393697268f6
-EBUILD gentoo-functions-9999.ebuild 875 BLAKE2B 5616d73c808cde08fe691d8ddae21cafc31b1cf029af8bf3443563521d7e1692ae76e8d0ebd1ca2d4de7b31be6b64b4e3f7fb9db79af9e965b29aad3a54e0ac6 SHA512 4c3b01c8da0db726b49f38ff14f42e548cc026c837681918432e9501c4e240417e6d29981ea83a1c526f1e07d1e0a1293771b5de53caaf12ea342393697268f6
+EBUILD gentoo-functions-0.13.ebuild 855 BLAKE2B d70ec2f0f5dd09d5031b6117b9764ef6e2276a7a424eb64a22309b0c598f54939b16cb80fbada96cab4b92b0778838e0be294696d65dc14e30ded1a218b46ed3 SHA512 8bc116b065b7a25bbd8db1b87a061a075092baf5637f0d67e8124c076f5d45ee9f81edfb3d7e03d2b3630187135674022423852aee57b6d35796e6f3e553745d
+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 cdeb2f06e03e..7ccbb3427ae7 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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/gentoo-functions/gentoo-functions-0.14.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
index 90e792cad73b..6ab30b8f6eb4 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index 90e792cad73b..6ab30b8f6eb4 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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/grep/Manifest b/sys-apps/grep/Manifest
index 814b232d9192..6cc8dda53963 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 1494 BLAKE2B 0bbf5bd0e80c5d110361e2d5bf55b852ca5da8254238a1187858f1a6e93c4d487ca328285d9b4ceec0aa4a47442078f7c12fd9af6f626e7ec0874d14bf1aa436 SHA512 32e0cde4fc11437e44f95c58990974bff29c36ac91d5dbaf3b19af2a1640707cd039fb6ed13146b73a1b34f1922814df3c5b91df222f30e1daa60fcba3924aed
-EBUILD grep-3.5.ebuild 1496 BLAKE2B 1d9d711fbd5fd8eeb7f561d7a7193658f1209b4dee16840757ba466fc8e627fe5b72060e7dcf8f2bbb7e37f70b9b7657efd990715a911e2938ed60a807207fc0 SHA512 455b7d5a8f04cac4a96787017e056fdc5095aec0f5e6ca091c1bf3bbf337c1b1e2fc34203ab5719dd48d0463200d1e832a72e40cf05e6f9a3255302045021d65
-EBUILD grep-3.6.ebuild 1474 BLAKE2B 75adad63705582761db734d97e3fae4cea92a9c1ead65d20f82b33242b8803eb2e4ba46c71b81b8f09faa02cfa70ba19157da6bb909ee0f9c42910179e260e50 SHA512 454268f6e5ec93cf43fe825cab3e6bcee0a7c61e066e70defcc57c946ea837d266b5d23c74847c6755fea5c27e00023e229f38283806c8a883d3b7e0167379f7
+EBUILD grep-3.4.ebuild 1483 BLAKE2B 10a274f820dc338f8058adf3c9ad76fa23faca41b695ce6749b16e0460e3bb97c071075662f5e4335030755c150f1420f96fb44383d475ac6ace57e5681ea75c SHA512 9c090efff4b3e1c81ab5867f04c20f66bf3b4d6a0bb1a7e2fc6be9623ba6fb5728e955218144ea18b06cd7ac3315bd3bd89b8a99b32b17fcd1eba0a59ba37b28
+EBUILD grep-3.5.ebuild 1485 BLAKE2B 00235fd67f3f37ad0def3d57378e2ef802c9eafa45ae442b088b7447f010f6832b7c0c4a433d88ea69d4bb04972bacce7cc116cdfef31c8c603be90d1b4a1b0d SHA512 93d066fd92d75de0829ac686424914a662e902b4ddd5a9c17b30be5209ff357edce19976df95086f571ab8f5e2eddccb235bda2588df24983005f3bcfe96b855
+EBUILD grep-3.6.ebuild 1463 BLAKE2B a6076ab22306df9fe8dbc3fe7410c6ebe4b058de8b2385c6dac4a80975c9dce16894f899bcf71d299188b083056a822660aa37a38c53dde80b5ec3e2fe876df8 SHA512 43c891dd21e1a1cd4f5e3786c0aace2591c84f2e34a86091034bc4ba4940bdc07ff0fdaef9ce310bf8e29897ad2208c38e3012c640e3f2470963645092ea92b9
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index a1e1595331a2..89e057e1a1c1 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.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
@@ -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 ~x86-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/grep/grep-3.5.ebuild b/sys-apps/grep/grep-3.5.ebuild
index eb193c0da2e6..1ddad9147b1f 100644
--- a/sys-apps/grep/grep-3.5.ebuild
+++ b/sys-apps/grep/grep-3.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=7
@@ -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 ~x86-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/grep/grep-3.6.ebuild b/sys-apps/grep/grep-3.6.ebuild
index 4e1f76ac4e03..549cc796ef0d 100644
--- a/sys-apps/grep/grep-3.6.ebuild
+++ b/sys-apps/grep/grep-3.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=7
@@ -11,7 +11,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 ~x86-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 fe7651fa20a9..0b4e7f4483bd 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 2534 BLAKE2B d7bd7690c078703062a829f287b245930cb16e1730c181ff9c4f875b0d1a7b82175056e28f90d839aaf1dfc39cc00efd77454a3709eaeb4017c49eb406c5a669 SHA512 04b36067ca6d0a6004bdcefec02af2c01e654aa731be679a0747fd2610a8858fccff66645b6623d3ce116c0d9714105c22b26e10ec8dd48b3782c275fdff09fe
+EBUILD groff-1.22.4.ebuild 2523 BLAKE2B b8881820bbc9497b4dfe62672d75a910af7168cbc3a64aa9c3bf96b53c5adb7980fc1f3d4cf9565ab4b3f69450c6e06fa8afd52ffb560544621f8816459911c5 SHA512 0e3ea9668f975f8b95c0970affe43becf054e3b3530ecebcf904d20a5bde1f0e36c3fc154787941be8b8719ae2bf0bd230872392c17432a7e3b5cdd8bf788858
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index feb7f9ee7d84..8ddffb888635 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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="examples X"
 
 RDEPEND="
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index cfe2c0c0fb2a..9e7fba8937f2 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -4,9 +4,11 @@ AUX haveged-init.d.3 322 BLAKE2B 7484eee6c17a5c6ecf20fa656b8c3976c732ba40f370d92
 AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b4055a89ac14c0e3cbc2e370d344debe8fb69f9ceacae6882c17d2620e0daea171d349073672d4 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
 DIST haveged-1.9.13.tar.gz 495737 BLAKE2B 5a8c154d27ca7dc71e7d34051a5e24ec2bd49be7a68175c351293958261083f2cfb0b318daaf005cc95f6a9b76664df63d4c41d28d4276f6906081d21097475a SHA512 dff0f4273643ed6b2fea26f1ba5c17be3d655d27ab0b96091bcd23e1cb984fc440cc81e694cc7bcc84a9a667d96f3c04a73675f79ecae525ee56390940cce576
+DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
 EBUILD haveged-1.9.13.ebuild 951 BLAKE2B 8cb8eacf9227fd0d68cab0f612145c806eddbd02dac0420bb20355a2aa685b0180a518a83faff6768e0026405e5979a62cf820217ada046ca863ed6137593686 SHA512 b0427a8e45ba0dea92e0395dd1de5c9cc6a6a14f97fd0456891080401b6bcdc76024f9dba965b672ce9cde979c35a998c33698b3e427b202ae81be28f0510a41
+EBUILD haveged-1.9.14.ebuild 951 BLAKE2B 12ef8d388695bf07df766b355ae25d2e5c1d17fd485a013aa75bb1ad2ea81bed6b7e76830a5aaffc05a3db2be57e8f5a2e81a068b5715fbeda921fe3ab3f994b SHA512 b48393a5c4ce57b27ca0f6f39bc3fe0cba16f2c5047d3b9e3ecd27c50542d2c71392f60e5ff2ff4f9e59d3762eee64ceec312298e5dbcba01bf2aa539ff538dc
 EBUILD haveged-1.9.2-r1.ebuild 963 BLAKE2B bf2f2452d79d16443399910a5e21867b76ee3ba1199018b866419bf33b75b7b02dcca985b26cc062a8871160382a83d24aa151188e0eba03c2fec80df127aefa SHA512 3322e6668948ce18dc1857fb8f72521ce348f0590fd81e6fc945e37724653b8e4e856ad403e7bc4f6dfca17ac69221a57dd29227d123987caa91c857625fd52b
 EBUILD haveged-1.9.8c.ebuild 1013 BLAKE2B c6bd3c7abed9f3689ae5963510e90e2e8d313e9de6df1e1923685b5ed149997251982af5f4180c0003644d9eb37759e7e1d680403d6fea2f43ec3042b60d34d5 SHA512 e497acb97c2086916b9c9876926493805cc5873ba253ec9a2549383db3696a51301633b2d73ff86d24b0b134cf24c2519c42b1fdcd9142cae3cdb16324310404
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.14.ebuild b/sys-apps/haveged/haveged-1.9.14.ebuild
new file mode 100644
index 000000000000..92c901487af4
--- /dev/null
+++ b/sys-apps/haveged/haveged-1.9.14.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd
+
+DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
+HOMEPAGE="http://www.issihosts.com/haveged/"
+SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="selinux static-libs threads"
+
+RDEPEND="
+	!<sys-apps/openrc-0.11.8
+	selinux? ( sec-policy/selinux-entropyd )
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		--bindir=/usr/sbin
+		--enable-nistest
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install gentoo ones instead
+	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
+	newconfd "${FILESDIR}"/haveged-conf.d haveged
+
+	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
+	insinto /etc
+	doins "${FILESDIR}"/haveged.conf
+}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 3c7b807ba6e7..12f834395ab4 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,4 +1,4 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
-EBUILD help2man-1.47.16.ebuild 1045 BLAKE2B 392c258f83b735c7fb5c36f11bd8eeb9d5ef681fc69abde740b87680b4067a88c05c70b0c09e6e031a8f9717cf1bccf667245ba00ac2afda1a9419416c4aa7f2 SHA512 ecfe53a1c16d1f06117e6de45a195f0af606c6b56438b22b3e757f8b6ab9b16ea4ef5814ccbac274e138e2ba4cfdab37a339c301356769852cb7f1b139c6306d
+EBUILD help2man-1.47.16.ebuild 1034 BLAKE2B dc7c42555d1efd3896ba09d0602017ad721ab5aa94cc2dad5b9cc4f127f191a64fffc19f47f838ed81d2f4918d5262189ff369c220e9afd4f02d6a2dc6f11bb9 SHA512 e6dac61eb7d535c184cc15ea54c70bda3e0745a21cb8d47acaf6186780fb836e90f92d1869c9335433f857a44b9d6be24cc21ffe25986320cd33b8bd4e2054bc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.16.ebuild b/sys-apps/help2man/help2man-1.47.16.ebuild
index aa6b480c0308..8832b330c3db 100644
--- a/sys-apps/help2man/help2man-1.47.16.ebuild
+++ b/sys-apps/help2man/help2man-1.47.16.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
@@ -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 ~x86-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/iproute2/Manifest b/sys-apps/iproute2/Manifest
index f2c263803482..b7acf6e92b62 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,12 +4,8 @@ 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.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.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
 DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634
-DIST iproute2-5.9.0.tar.xz 786524 BLAKE2B 9d82cfb1b1353d2cc6c441269af234b05e1ccd190a58c67f890d74fb42b4266be91ce64277bd2b75a0b711977c0f9edc61d8655bf262d05aaebd8d73caecc0c7 SHA512 bce59b0e8d876f10f94926be7f2a7cda0de15db04fabedfe938649d486ca6d6d222523d1661b8b36ea50e35369a4730938d6ebeb80577ac0522a3432037bcd50
 EBUILD iproute2-5.10.0.ebuild 4714 BLAKE2B 396c4c256f6dfaac4cedcd152cdfc217ed9ccbb1c53ab80a306a0a4bddfa8de77eaa976b1a189e74a354de2b51afad969d4ec1c9745cb050f31535e7bd9a5591 SHA512 70eb51d70e8a3c66171a0c385618a1d39b21cd2b4cb3896da7ad9f8562967642714b25d3f38770ae2b1215823a499ca34516f5b6977904a1eb81e11b1f4e8b82
-EBUILD iproute2-5.4.0.ebuild 4424 BLAKE2B e2d894990ddf5a875c9c388e8526f2efd63b8c22337ba91675df91c855e44818011667a674b70f3dcf0d49792941922cef37e79f231b661ef976411043197607 SHA512 81f10259afec234731f29736052b6eed107dca060f45d146cb210fb3d8f4b2a75fe8fc96c8d4f5036b9f58fba4543d4986e5c9a5fe4d5609337545fd34e2a56e
 EBUILD iproute2-5.7.0.ebuild 4487 BLAKE2B 2eef7dccd0a2cb4ec5aa8a6163204457650a09800fb61a4d62f580e0ec96b93c199251544c663734e039f3736c44712156f7cfdf079cdf020be1fa7b4ed7cea9 SHA512 7eb534a873a76ae2842aa5e6041ba2c80f74b9379c473cbcddab78989b6a52c12208dc4d64167572ee1a6e9a071b462705af6b871790fd0d79fcaa391fed10d9
-EBUILD iproute2-5.9.0.ebuild 4714 BLAKE2B 396c4c256f6dfaac4cedcd152cdfc217ed9ccbb1c53ab80a306a0a4bddfa8de77eaa976b1a189e74a354de2b51afad969d4ec1c9745cb050f31535e7bd9a5591 SHA512 70eb51d70e8a3c66171a0c385618a1d39b21cd2b4cb3896da7ad9f8562967642714b25d3f38770ae2b1215823a499ca34516f5b6977904a1eb81e11b1f4e8b82
 EBUILD iproute2-9999.ebuild 4441 BLAKE2B a5ad7bbdd8f462eaa1cd5fb8d49ea8941743db34652609c36b5add05c383d2cd6584970df34047b074309414c5c52ca687b23cc8ea432514e0435ee1caa71513 SHA512 eb7fe8565a30aa2864364fdc556dbcd3e20d613992921cff2b46772e17c96ec8aede27017fa992b59c1cd122b267acc6ef222706cd1f62aca88c64a04b982ae6
 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/iproute2-5.4.0.ebuild b/sys-apps/iproute2/iproute2-5.4.0.ebuild
deleted file mode 100644
index d79f9a329ba0..000000000000
--- a/sys-apps/iproute2/iproute2-5.4.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	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"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	dev-libs/libbsd
-	!minimal? ( net-libs/libmnl )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-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
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	# echo -n is not POSIX compliant
-	sed 's@echo -n@printf@' -i configure || die
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	if use minimal ; then
-		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
-	fi
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	# run "configure" script first which will create "config.mk"...
-	econf
-
-	# ...now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_CAP      := $(usex caps y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	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)
-	EOF
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		ARPDDIR="${EPREFIX}"/var/lib/arpd \
-		install
-
-	dodir /bin
-	mv "${ED}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		keepdir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	fi
-}
diff --git a/sys-apps/iproute2/iproute2-5.9.0.ebuild b/sys-apps/iproute2/iproute2-5.9.0.ebuild
deleted file mode 100644
index 6bccbe4b7ea6..000000000000
--- a/sys-apps/iproute2/iproute2-5.9.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	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"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	dev-libs/libbsd
-	!minimal? ( net-libs/libmnl )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-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.7.0-mix-signal.h-include.patch
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	# Fix version if necessary
-	local versionfile="include/version.h"
-	if ! grep -Fq "${PV}" ${versionfile} ; then
-		elog "Fixing version string"
-		sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
-			-i ${versionfile} || die
-	fi
-
-	# echo -n is not POSIX compliant
-	sed 's@echo -n@printf@' -i configure || die
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# build against system headers
-	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	if use minimal ; then
-		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
-	fi
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	# run "configure" script first which will create "config.mk"...
-	econf
-
-	# ...now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_CAP      := $(usex caps y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	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)
-	EOF
-}
-
-src_compile() {
-	emake V=1 NETNS_RUN_DIR=/run/netns
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		ARPDDIR="${EPREFIX}"/var/lib/arpd \
-		install
-
-	dodir /bin
-	mv "${ED}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		keepdir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	elif [[ -d "${ED}"/var/lib/arpd ]]; then
-		rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
-	fi
-}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 0bf3d7de7a89..3530122fef86 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD less-563-r1.ebuild 1375 BLAKE2B d23b42e1132806a8e77099c068f069699c5039162fa0440e0a2b02c6d27060b1b7a52bb03f852d1b922db7d38be4315237c9ebd0ef6773107638be367c470af4 SHA512 0bb3d7d92a4c185a9afa1892582c6b4c4971c353f77a76b7dfe204909c3f965e045a77bf07d77da206b31afe97330de52ff5ce391df6b960ec931fab81d26f09
+EBUILD less-563-r1.ebuild 1364 BLAKE2B 3ec233e47b0061ca470790d05ac51c37230ce367458263e3b583d7bfee362be31a7a31ea73f61adf8e7da040ac02542ab712ef499f60a9009f5e8cbbccd226e6 SHA512 06c13fc26c49bbad4e78d02ec0e6f193b1cc02f7b19d83371e2671c7a714d6b68569a0e19cf9ce3b090470dbdc3fa1a45040527b9d37498ca2e937561185ef9d
 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 fc42f4c7dd62..3b0f698785b3 100644
--- a/sys-apps/less/less-563-r1.ebuild
+++ b/sys-apps/less/less-563-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
@@ -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 ~x86-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/man-pages-posix/Manifest b/sys-apps/man-pages-posix/Manifest
index 3ffdff9bfd16..60190e7234fd 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 770 BLAKE2B fd5869a95bd863317b8a814fd9ae2f4505e0040b6ce7a8a4f6b8f0a3b8b47f5737fcce1341bcdca91fbc2cafaaede95d9994631289a0d730543935c788b68fd6 SHA512 12a86ed005441958436723e7324efc0e3d0542cac9c9298428932dd6dde06116c2116f6513d347b11a4f251b3bdccdf87385c759b8f61dfecdf409c563ee5b34
-EBUILD man-pages-posix-2017a.ebuild 751 BLAKE2B d9ddb51234ddbafd274307426d5f9143c5c41218500fb59cf66305109f4baa95c4e181ffd77212d03358c39950c5925ca5ef9934fa3aad58f4cddd5d26cc7801 SHA512 0d3a4e260969c8a3abdecd83ce5dbb60fb3fce83e99f935c749ad2d7d9239b7c7944244cbd8b076fb140df6ab2f11abfd6480ff6de72b748f52e73fd936fd9ab
+EBUILD man-pages-posix-2013a.ebuild 759 BLAKE2B e391bd771a0a017e3836bab1dbab874846a37e3e062dded952398f63e09847e0d9a0bdadfdfa30b65e71c1dfd482186d9c34722b32d4ab5f22be8355b191409e SHA512 59f50c9a6d476fde645a697eab073515ea5d19c8e082e28defc339e45a869d35d7c10fd446f98fe0021b755b406ce827e4fcbd45e0d0318f1267031df68fbb56
+EBUILD man-pages-posix-2017a.ebuild 740 BLAKE2B 1de9bdd73fb3f4a7ad68c95410f11898bc3bce82f722a2513ded670f168985c3d37c1cd10cf2badc69de621f13cbda5f6f4ca42ee7d70d9fb799f5f85a697865 SHA512 59d58c35ceef05fde0b4b8f6dc955e9755d5ec89bcbe8488bd3dffa9e05642a05a2d9ab4331082831f0b2ed5063f13019cd0cc445be22100383b1e596c8673a7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
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 c8265a263428..eecfc34e6335 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2013a.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
@@ -12,7 +12,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 ~x86-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 71be95f7a7ba..5dbafbb699f0 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-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://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 ~x86-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/mawk/Manifest b/sys-apps/mawk/Manifest
index a7f81e18f4c3..e31c9beedcc9 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,7 +1,7 @@
 DIST mawk-1.3.4-20161120.tgz 461464 BLAKE2B 7481345b391198cc9ec47f6ad84f0f07e31c931a40d59bde401d00ea7bc74b728c8149f80187e5d73923496e2eef1ec70bc097aedf0b68630f73264d45d96ebd SHA512 c5edcbff4ab1e40eb9b178a045fcd426a5f3c93a3ab5bc1ca1fa85a0977b8c9060967fcbda4e4a6e9e68628f50a2814e22939676008dced529377d2cf9bda5b2
 DIST mawk-1.3.4-20190203.tgz 466481 BLAKE2B f647c52872ff510f02ab44f13f6c51497abdecf3d6ab40faa2e419f726a15ebdb531607465bcaf2f53d032284251f9fd25e73734a72fc31c014a0a9f200613ed SHA512 64d5b1838d34d30e32966f46cb7457c865caccfe9fe1049d2645ba301b1ddb4efc18588115dbcf96234a2a0b791211a7f82264a3c81899459dc3029e65837646
 DIST mawk-1.3.4-20200106.tgz 468031 BLAKE2B b125eecf780f0658d3a1c06875fdac221ffe5999e38646d71b15159c50271a7bbfb594fb6347442239c3eab6703f9c782739bd2a5a055e1ff8cd44a0e8a6545d SHA512 f6f65f3b73965f520a6f9bb7e2b6ad2a3c532c0768461744e6cfb2e72e2c718dacd1c5eea995dfa267facfc4e0ee71d337809cd45d5c75cfbc65294b45280ff9
-EBUILD mawk-1.3.4_p20161120.ebuild 858 BLAKE2B 538082458c682fa329e576527df38d8bac43a73a7d680c59b0e2e73d343df61b91ec557dde525c263b3ac25c0bca52ba26819041010b095bb7b1377f79f07774 SHA512 988366417da4caefbfa19f5f77ec4b0bfc9824e31a140d459d92cb4a60ffde3afed56988d617a041596e00e366e128a6e6b87752eb424b8a7aefeff569fc0aca
-EBUILD mawk-1.3.4_p20190203-r1.ebuild 870 BLAKE2B 6807ee81efefa0b20bf167339f9d41666deea695335f1aa0aa4c027fb72c1c0cb24e100a5da8744d166397063c106beda877c018f89a2d6adfff59f0d1798c0a SHA512 e243b88614393657de85748fd449fbbd08d7bd2541fa00a3297566b8934b882026b3a4d0153405f36844632ef2a5ce76a63e351d6cb8eb73f8c674d271a5152f
-EBUILD mawk-1.3.4_p20200106-r1.ebuild 874 BLAKE2B df44970b25357b4ed16555d958991488fe3e512fb5b0fbe090e508855799d906bd37da3a6be5fef88ea9701c98a83c7c2958e95d8cf03bbf197d8b6489a2af65 SHA512 d4676e6ae145631798ee7b7915a7975855f8e7694be4ccef8f84e91812faa9c507f336f25b0c21887ba1bcfe1817e9df2284ca9e45a5eb673b218a1b9c96f5ee
+EBUILD mawk-1.3.4_p20161120.ebuild 847 BLAKE2B a0e38937ec0d0f5b2af29e04515b0b9d9b7fb39bba872994b53192e17953a271a815d1ab89bffcb7ac1a44883d99c33d639af6890879005d18d70a25ac9d6b7b SHA512 7cd40f54379231e2700d3b5d77a0a79fd7de74d17fa97c70af243dc9829ad097632958af06e1d403494a69d052032b1d12ece0bdc170c7999987509da78ad816
+EBUILD mawk-1.3.4_p20190203-r1.ebuild 859 BLAKE2B fd568717a6de060e9f47d101d1ae2b785eb427e59d0b309ffbead13071c2ba41d8b5a41de9d3fdd6f9857563e03c39bd3bdf9c616596fd5f020eac09a89b3994 SHA512 c340f2cb9134a883afb54609d4e41d401d31249050f2fd50842525f880b9eab3414027e634dc39a56572ad34fc9fa40e324d1a76cb23d9660c1289be9c2fc6fa
+EBUILD mawk-1.3.4_p20200106-r1.ebuild 863 BLAKE2B cc738e91b0d37e69e952c6ee68a94d2a7dd27de84066c090e3a7150dc3f8d65a4cb484b917c10e9ce38cf8e26a1d3037a8c611f12da84f07a2740ee4c11dfeb2 SHA512 770bce3376c7e8fa4e4997071722dbfd1311f4e2beddb4dfcbc03ae3a3558cd7948282a323ba6eb27478cdb108a947c75e0d24767599f88e34849d2527efc74d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
index 93e24c1e895e..961d5c0228d5 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20161120.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 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild
index c65ac1f64223..ca4b31615f33 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20190203-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,7 +12,7 @@ SRC_URI="ftp://ftp.invisible-island.net/mawk/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
index 9df26d1d6857..e069f55819d6 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20200106-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,7 +12,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index a20a35ae0af8..55ec898c869f 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,3 +1,5 @@
+DIST miller-5.10.0.tar.gz 6793426 BLAKE2B 25ec96e29ee8d913feffd6e9a54cd2d494c9050e180556ed462a6d94a6adaaea88dbdbc09b4753f8888673bdc33a1f0aa43f9dac37bdc3c25191b2a565fe8847 SHA512 a7cbaee9ad4075d27e74ab3a60297164c535ea2bc1e38128174f4f226ad061850d37108e7d7547821b7e6667cb9a024639795d7678b1897fedf6ee15d6064538
 DIST miller-5.3.0.tar.gz 4940072 BLAKE2B 2e34ae010d409877040a60b08dd615f32e6945ca3bf97c078c89b9d2811067fa4bca2403f8ad239f8245e050acb10305d351b1db4177541a4fa9ed9a4bc1396c SHA512 4c557d97eb1cda2e52093fa097677602491895dea3093776a03af56114022b8c0917df9fbf26071d4d1a3c1360f520c82e33b32635c7b4207fa62869ab564712
+EBUILD miller-5.10.0.ebuild 1047 BLAKE2B bdd7d5d896950ce6c0ce71921839a51d6adb56b96224f9a811a1b5bc52a52e1d7074b4f60e4a7ff4211d9cac34560df3e0e15d8f5ad608cce763e5657c0ba4b2 SHA512 d7bcbbff6133465f6bf31a8ff783f22c60cd738a191ed1ebdbb7217c0dfe66b541ffbdfa467503d59749234c16fd3ec8760ab4d29cc00ee2bccad31268833486
 EBUILD miller-5.3.0.ebuild 1043 BLAKE2B bd9aba828d1e446d70ef561f9930eecf7ffb02030c03d03c779122d7e0d6362f8ddb7bde63a609b253aa5be45fd384c81ad272279e5835cb2ed573422b83faba SHA512 28594f3915eaa1e7bf01405db64a14551d476eae0ece718bf5c7c1ec36a78cddc037c04ceb500a599ab69a6bb4b2ab109e9720e6a1e31a7a216637a823764be2
 MISC metadata.xml 245 BLAKE2B 183034a40812aee01ddfd5d59eac1d2d1d42d281575fd5a3c900bd96af21cad81f9262b41f81c39f34dc60078ffa3db70149f8d50ecb09cb6003ed8602ab3ecd SHA512 b7b2cb8f6f35a36afa6a90e1d66747c2bc3e26a202483ec1d5c32346e75a738ee59be158af291a18c55140486d519c159492d12e3d25134ec20cc03fd7627cad
diff --git a/sys-apps/miller/miller-5.10.0.ebuild b/sys-apps/miller/miller-5.10.0.ebuild
new file mode 100644
index 000000000000..e0e1b73a7b1a
--- /dev/null
+++ b/sys-apps/miller/miller-5.10.0.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=( $(usev doc) )
+
+	default
+
+	doman 'docs/mlr.1'
+}
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index 480d7ea512f0..a34443ed4e23 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,4 +1,4 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
-EBUILD miscfiles-1.5-r3.ebuild 1704 BLAKE2B 3fae7b4480663af99d9301adcd74c9f89b12fca97c51543034924729313b4384308e45051aee4d0a29a3ea860a133487424afbeb73790a20ecc491493af8f3a8 SHA512 7d34adecea95554baa154659c907d3f2f13f62621637f41ebf112c6f4ba350a52c0d81bad6ff6bb9c7297a5326c65bb3a7515872aa5b384811c88a1a8a3b994b
+EBUILD miscfiles-1.5-r3.ebuild 1693 BLAKE2B ce211686d5717abc6ba3e56f54f5dfaba24549c7f86cf5ca4c51ab14dddf46225b43039cfa605ae231b9d525da6bdeb3f094680597883147c98a4af33c7fc1a2 SHA512 5b57ad621bbeb599936b84b5402eb1dfffe4b032f69cd828c4551eac106cf7a6a51413de3ffb49cde2cdd55efbad5f7b0f58ff6fbaac77bce61ff1b4f6155ea0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index 10ba7363c4f8..6f2413f075aa 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.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 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="minimal"
 
 src_prepare() {
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 16e0e9598d57..dbf88e1ea14b 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,4 +1,6 @@
 AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee92def3df7cc5bb74b476ae8172924421676bec09f6c74a59d7b07b82382e57b502088d75e5c365a5747ee7d38e8ba3c227 SHA512 db1ff22fb8a6284bea95488b71c456353379d4f9b4142f62ad7371e2546ff82fae6e7e2fb4be2e5b018d475ef5d19c677059cdb171d882e9c7a3641ed0ce4647
 DIST moreutils-0.64.tar.gz 92741 BLAKE2B 3e014a18a3b7615bcd83fd9b0a1e3010a059aae154395c2c1158f57634fe83c27503dc3aff1e116743cf80fc73ee2063ea60b03d4bece4119b962669095c71dc SHA512 94f131b9b02a8c1139dfe34abacab022687f51413c529288f57fa876676c028e200324ed855b910a7dbfb4290eb8b38b3dc182eda49988f521a550162b0a0eec
+DIST moreutils-0.65.tar.gz 93180 BLAKE2B 2105cc281b9f4c9598bb0cdd5a4b9b8042e77eb14de323ba889c182c956b00d7b8a899c4112542e0a3d513fd961ee0ed6c82dd2dbefffe50e1d4fd326919ef4f SHA512 dcad2a3b6d9621da6d2f860f39acb04c80d42cc2123e12a6ec84524f6a1fc7f5ae4bd5d00e698fe14d4c5e7d491d790970ce4370c9abd1f63318d1c512f596b9
 EBUILD moreutils-0.64.ebuild 1693 BLAKE2B c79acfacc2ac668ac1fcb78b0769198848faa2164db1ceaac5b9a1e0d2eac3f75ebfb530e5f472af68671a0695717760f7da29ea1e284817a3dc8c4df1332594 SHA512 02f522ca1dd8e61d1bf1eb538e7464469b431c05dcf6e8db7ef6c362aac81134ddbc2affc4021de68c6a08c875d8546a4cb830da8d904507f5c98aa821ec50f5
+EBUILD moreutils-0.65.ebuild 1699 BLAKE2B d0dfcfa7a412c1ad3f209c9459acf8b667df2263298a40586c185958d914663dca8420f10e1489b38ff537b8c650a7684527f4937cb97a40fa211461636df355 SHA512 7c7db86a47faff852b8e0b79bc39c925b1e170716ae2766a9a32d33a3c0919a66d8c40964a8dfd6616ad26905e70eadd7ae0511191f2cc62df2bc808feff51b8
 MISC metadata.xml 313 BLAKE2B d0cd446eb7516dec44ac4eb8a73d268652317a7dd1b3531f9e69341ae5a768a2dbc554fb577d499d139a684d190c400c08b5a14023c1a0db03cc599321c651e5 SHA512 07345c6cea216cf9e7043eab1a33cdc9bd9bf52adb5a4019afa401faddfbf0129f2297d01e2a9595cf9963e55ba53c4496b7ab79a9c33be85fac18ca60220a3f
diff --git a/sys-apps/moreutils/moreutils-0.65.ebuild b/sys-apps/moreutils/moreutils-0.65.ebuild
new file mode 100644
index 000000000000..2a5608311949
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.65.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A collection of tools that nobody thought to write when Unix was young"
+HOMEPAGE="https://joeyh.name/code/moreutils/ https://git.joeyh.name/index.cgi/moreutils.git/"
+# Not available at time of release
+#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
+SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux ~x64-macos"
+IUSE="+doc +perl"
+
+RDEPEND="
+	app-admin/eselect
+	perl? (
+		dev-lang/perl
+		dev-perl/IPC-Run
+		dev-perl/Time-Duration
+		dev-perl/TimeDate
+	)
+"
+DEPEND="
+	doc? (
+		>=app-text/docbook2X-0.8.8-r2
+		app-text/docbook-xml-dtd:4.4
+		dev-lang/perl
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.64-respect-env.patch"
+)
+
+src_prepare() {
+	# don't build manpages
+	if ! use doc ; then
+		sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
+	fi
+
+	# don't install perl scripts
+	if ! use perl ; then
+		sed -i -e '/PERLSCRIPTS/d' Makefile || die
+	fi
+
+	default
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" DOCBOOKXSL="${EPREFIX}"/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
+
+	# sys-process is more advanced than parallel from moreutils, rename it
+	if use doc; then
+		mv "${ED}"/usr/share/man/man1/{,${PN}_}parallel.1 || die
+	fi
+
+	mv "${ED}"/usr/bin/{,${PN}_}parallel || die
+}
+
+pkg_postinst() {
+	# Try to make sure $EDITOR is valid for vipe (bug #604630)
+	eselect editor update
+}
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index ec9ab6d4e2b8..c78233c11d38 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -2,6 +2,6 @@ AUX most-5.0.0a-donot-hardcode-path.patch 969 BLAKE2B 1089149fc01a3081760f422b73
 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 890 BLAKE2B bff9ceb77aeaf91b835d80a11b9eb44e7f5daa561143794fa3947f0c14013d9377d5cb8998c1c7fd21315c63540e052ffd189fdab75a228a71a2e6f9861e5e37 SHA512 de68399f163b044e7c9a70689d4620dd429c3fa6dba19ea6996bf8f2904493abd9615012385ffe10515205129da8193cfe9ca6451349ada07a387b5a184c75ce
-EBUILD most-5.1.0.ebuild 881 BLAKE2B f1cc3d00ead0b30f1765100ead62f823a67b2a546055425af20d38aff56eed993033a5b78498c995ef75162b6baf03790cdfd417811eb96db98ceb5cb50e3ff1 SHA512 56a166e010304276ad56c68b790810f5df3eb2d8cf0a666b7d64cfbac84c876079fed216e195dd33c3abbcf4c65b97f804638aa43cc2d9ade106eecacedd8b0f
+EBUILD most-5.0.0a-r1.ebuild 879 BLAKE2B 4fe01614ceddbdbe1ab9ef427ade3817621c64e48a9b39e8ba6269e8512e9dbb58287a5f645ae468135a106bc609a03f0e483e6fbfaea0744cc7150421fb9846 SHA512 b504994a06d07fed46481f631bd6e6a81d6fc38d9157a426b8df0845abe04047e097af6416c85769bf5c4751593f0aa0a8056748277f02447c3496b7283c084a
+EBUILD most-5.1.0.ebuild 870 BLAKE2B 74c3ded940f1e5ae127d87bffdf1520d091ec6f7575284f5e2dac2702b75e0bb97e3e933d8ba4d4cfed9a64270881fa9ac0434927ba667b4f86ad6bacc322602 SHA512 4030f523b09d9e45a37a4b1e57572a68260c10e6a40b95f38e77bbe389019f85f4146334bb239510a4ab0040c3f14e87bfc629e4ee2e3cf99c35343583520378
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/sys-apps/most/most-5.0.0a-r1.ebuild b/sys-apps/most/most-5.0.0a-r1.ebuild
index 4a7c1bfcaa53..f57fbba42dd5 100644
--- a/sys-apps/most/most-5.0.0a-r1.ebuild
+++ b/sys-apps/most/most-5.0.0a-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=5
@@ -11,7 +11,7 @@ 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 ~x86-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/most/most-5.1.0.ebuild b/sys-apps/most/most-5.1.0.ebuild
index bcd6abb617c0..9268240d6aeb 100644
--- a/sys-apps/most/most-5.1.0.ebuild
+++ b/sys-apps/most/most-5.1.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
@@ -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 ~x86-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/nawk/Manifest b/sys-apps/nawk/Manifest
index 36f58d3f95b5..075d54da2ffb 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -2,6 +2,6 @@ AUX nawk-20121220-parallel-build.patch 1653 BLAKE2B be278714502f7bf267f57e0e5002
 AUX nawk-20180827-parallel-build.patch 913 BLAKE2B bc0df39ad9d8b0b723c0f66520ddbb8318ccae67c07b5cd5a5743ea1d6154d52da20d2f50eeb00ec45a9cb4bbb52b7244715c868daff77d1e93f89dead130c4c SHA512 aab5431373d7733c9ce8088cc1474f70e4fda352494092850625d34e288682d2d0cc9223d834241c9aecc2ce4411103945c87195336ea91cd4be7fd7b21fcdce
 DIST nawk-20121220.tar.gz 88970 BLAKE2B e00b9e55bb3b9139c00b8cc0be3f6cea2acc1162ee4326103c054c7270ef4a29b97cdddc9a692cad0773a72a17c399d2da5453939681a5d2456f0b740b6bc2ee SHA512 1dd62e1aa4c8cfad7ce599b10d88e9b450ecae3217cf8327cc0f3ce77d0d0dcb731101b8f211066462d46dc4ef23e20ccd7f70d799d7d48940026abe8fa79d4f
 DIST nawk-20180827.tar.gz 1824076 BLAKE2B 4cfd000842d75d9a713fe73a85eefab33c17f9ecaca4f7f663d1157da411fd9fcf2badbf5180b4a90910445332095fe457e7acf0643621ac8a68da1a246b5e5f SHA512 cd6561149be71e6311aaa69c86b90ee4b29a057e5c2595470ccc8a41c40c653ec31b4bd46d7f58896d012f5fb5952103a76aa463a69e5128cba43d80eedf0b9b
-EBUILD nawk-20121220-r3.ebuild 1045 BLAKE2B bbe7b5e1dd5567cab602ad9d0126f029a2808c71e1dcd0462925a518c3942ca8530331ce5e4943457a800e1174ed313f7e6e62807ea34f68e7d6582fb7b4bf75 SHA512 f2d9770f4e3068014459500ee9a53122423513e11c8e8515487e6f16e11752250f36ac85b4f87cd17154cc6c9c643a00c75d085a3a549df7a5d518217d01b75b
-EBUILD nawk-20180827.ebuild 1045 BLAKE2B 8ec38b27c886357fe46c263da3be2949d7a385f8f4b6d77084e41e39b13cf7f6fe44d74e28128b715b55ed0eb576a6959c8a3c56867fe369365a7d71ab8b7ca7 SHA512 c3addc4f060536b606e798be5791008d3ded90bfac15ea6f61811c29a0889ee7cd2b529b74b1e24e5ac1e2719423a0bf08eb7f390b5aedcb8cfa367a3adf501c
+EBUILD nawk-20121220-r3.ebuild 1034 BLAKE2B 092f1dd5c1e4c0812da677adae7f104493af5ea331b67440dcbf3d4ecbe5a9e13d22918512afeb0d82cb56a2f015da8c469ebb09148c4ab58088bc74131dab5d SHA512 1c4b220d7677113c3081d789930674986876a08ebe7b8f01e03be2efdfa90c050bd436dab8419dd0f48e1a83593da0e01abc4362485a8165c8fa5f82d6d744ad
+EBUILD nawk-20180827.ebuild 1034 BLAKE2B 8c7e4267c1b2bcb598092cdd59c2ca4f4e3fcb7192f811343786f94e31ee01f6eeaab52ecb81a2a4cb820b6766f58e7858d126cc3d346cbfa17d67b745376517 SHA512 df7f0a9887e234e8e9ad1d12b610a1e67fb869fbd8ac296a2dadfebb320fba83c5764607ac35fa78d574d472047d00fb8c95f92d9554420ac61a8fd4b1b1431b
 MISC metadata.xml 330 BLAKE2B 0f7e580c6988620e9e3cf452696c66e7ed5f383e878c898b0f90adf96dd847e6063a09bcccf85bf957c86d329617554e72413b4b7536319e37d8993287de3c5e SHA512 621c5fa8dc89857de39705622efcee6f0487e404de19424d0aaeec5b393a01176585139f98c2587d9169564c73585a339c86af21a41c2ab5ec084adee47d1ff3
diff --git a/sys-apps/nawk/nawk-20121220-r3.ebuild b/sys-apps/nawk/nawk-20121220-r3.ebuild
index 6528c601d6bc..975fa8613209 100644
--- a/sys-apps/nawk/nawk-20121220-r3.ebuild
+++ b/sys-apps/nawk/nawk-20121220-r3.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="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 RDEPEND="
 	app-eselect/eselect-awk"
diff --git a/sys-apps/nawk/nawk-20180827.ebuild b/sys-apps/nawk/nawk-20180827.ebuild
index 77b72967a326..d3ddf5c3f048 100644
--- a/sys-apps/nawk/nawk-20180827.ebuild
+++ b/sys-apps/nawk/nawk-20180827.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://github.com/onetrueawk/awk/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 RDEPEND="
 	app-eselect/eselect-awk"
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index b7ce7e44183a..dac3313b7040 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,7 +1,7 @@
 AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 968 BLAKE2B 4104f8238ac3758e756b37dd281f1ca66f3f6d6dff9966713ffb108c539fbd19b9bffff94c929b829254c755cd0e1fc4530c74c5b8d6ef85889d7b8f9f54b5f9 SHA512 e732e809a4a17e3535c9ef009519808d5d1a6a792c1249e5cbaedc2aebc0245a16f4cdbc351c6ceaca676e942d909de548b036b8c59a62a68c277093aaa09445
-DIST net-tools-1.60_p20161110235919.tar.xz 227552 BLAKE2B 0dba75b7b7345be047bd8618811c6ea43f96f0d7c8a2c67cd03138b8f31dc47a641c7ff1e93fb1ad295423f9b82e3d222178c7c97233d4e3698355fed729f723 SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01
 DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb
-EBUILD net-tools-1.60_p20161110235919.ebuild 2545 BLAKE2B 14cedeec32fb214a5b27a51f99241d4f54686bf7df550ad7a9582bbe67418516058a1303eb2f3c9159e81f338acd73ebc837de690727a8a7ce117263bf521416 SHA512 c5d7e0b32edf23ae687e16be8357f8f4d48bac7b82f4c735f362e69b1550a011c7dd892b762da999ad5861091390b4d3b00de81d6741a967c58c376107f6b555
-EBUILD net-tools-1.60_p20180626073013.ebuild 2477 BLAKE2B f48bf52d678801b5632282ad44569c7eb2739e3723d01f30216ba5c0f4e6dbc8e1f084792913a3169296ede6cb7f68bdf2b8e2ca0cfe8d67f3c336242dad58ce SHA512 546baea120075e22422cb4ff6914178afc87ef2ea9e8cc7f1c7d1aafce91c2edc3f0a0699f4840d3e9e7782c9444cdb4d9897f9e54b65860eb337b3540638c8a
-EBUILD net-tools-9999.ebuild 2485 BLAKE2B c7f7c12a1d9d46d4afd4d86bd7bfc50dc7f59f0b215d123f4d3a5689425a95dea2d4791be2fcac8b3bff0ca4496c1a15ead3ac19590190ffbaa85aa693dfb4a9 SHA512 9c4b5f1ae7010f035ebc427a5ec3b33707fa913b8377e5168960eb0af2247592c92656b2fd14243e8784560f2aa46825bc3fc8961cb58435929516581ba177d8
+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-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 97bc2e7a04e1..b6f687b457f3 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.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
@@ -29,8 +29,7 @@ if [[ ${PV} == "9999" ]]; then
 	DEPEND+=" nls? ( sys-devel/gettext )"
 fi
 RDEPEND+="
-	hostname? ( !sys-apps/coreutils[hostname] )
-	!<sys-apps/openrc-0.9.9.3"
+	hostname? ( !sys-apps/coreutils[hostname] )"
 
 maint_pkg_create() {
 	cd /usr/local/src/net-tools
diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-2.10.ebuild
index 56b1c2da8654..96f533d8a695 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-2.10.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"
 
 inherit flag-o-matic toolchain-funcs
 
@@ -9,8 +9,8 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/net-tools/code"
 	inherit git-r3
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
@@ -21,34 +21,16 @@ SLOT="0"
 IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static"
 REQUIRED_USE="nis? ( hostname )"
 
-RDEPEND="selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+	hostname? ( !sys-apps/coreutils[hostname] )"
+BDEPEND="
 	selinux? ( virtual/pkgconfig )
-	app-arch/xz-utils"
+	app-arch/xz-utils
+"
 if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" nls? ( sys-devel/gettext )"
+	BDEPEND+=" nls? ( sys-devel/gettext )"
 fi
-RDEPEND+="
-	hostname? ( !sys-apps/coreutils[hostname] )
-	!<sys-apps/openrc-0.9.9.3"
-
-maint_pkg_create() {
-	cd /usr/local/src/net-tools
-	#git-update
-	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
-	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
-	local p="${PN}-${pv}"
-	git archive --prefix="${p}/" master | tar xf - -C "${T}"
-	pushd "${T}" >/dev/null
-	emake -C "${p}/po" dist
-	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar cf - ${p}/ | xz > ${p}.tar.xz
-	popd >/dev/null
-
-	du -b "${T}"/*.tar.xz
-}
-
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
 
 set_opt() {
 	local opt=$1 ans
@@ -60,10 +42,6 @@ set_opt() {
 		config.in || die
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-building-w-older-linux-headers.patch"
-}
-
 src_configure() {
 	# Clear out env vars from the user. #599602
 	unset BASEDIR BINDIR SBINDIR
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index 1fd92a62a67f..96f533d8a695 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.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=6
+EAPI="7"
 
 inherit flag-o-matic toolchain-funcs
 
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/net-tools/code"
 	inherit git-r3
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -21,34 +21,16 @@ SLOT="0"
 IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static"
 REQUIRED_USE="nis? ( hostname )"
 
-RDEPEND="selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+	hostname? ( !sys-apps/coreutils[hostname] )"
+BDEPEND="
 	selinux? ( virtual/pkgconfig )
-	app-arch/xz-utils"
+	app-arch/xz-utils
+"
 if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" nls? ( sys-devel/gettext )"
+	BDEPEND+=" nls? ( sys-devel/gettext )"
 fi
-RDEPEND+="
-	hostname? ( !sys-apps/coreutils[hostname] )
-	!<sys-apps/openrc-0.9.9.3"
-
-maint_pkg_create() {
-	cd /usr/local/src/net-tools
-	#git-update
-	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
-	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
-	local p="${PN}-${pv}"
-	git archive --prefix="${p}/" master | tar xf - -C "${T}"
-	pushd "${T}" >/dev/null
-	emake -C "${p}/po" dist
-	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar --exclude-vcs cf - ${p}/ | xz > ${p}.tar.xz
-	popd >/dev/null
-
-	du -b "${T}"/*.tar.xz
-}
-
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
 
 set_opt() {
 	local opt=$1 ans
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index fb40a42b9332..f71b4761ecb8 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,9 +1,7 @@
 AUX openrc-0.42.1-gcc-10.patch 1679 BLAKE2B 464fa390a6626538dad9d68d9e1c81195ee5918cc503d1fe750b29fe5a87bfa7b99d2246069173c1fe23a4dbd9c13507bddd2e5d2951a38edb5c4d746830ecff SHA512 24c665098475c8a1dca75677b48864dc554930f8039900785d8f73c4ebab857255607297fdcbce6249f18f2b97bd7804a35a782721d4658a1c7a7b7b985418ff
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
-DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
-EBUILD openrc-0.41.2.ebuild 5251 BLAKE2B caddba8654402dff27269c1460233758824effa7185f323d6b65da9811432246093c16b72b00bfc37e923ba7ef6b92ba96ba99d6446a6ad54305db239617dd77 SHA512 a3688714d603639ef95748a1b5688a7cd2158387260ddd63f0e92c945b0ae75df844a03bb3a2cebc05b5ccf0615ecd6da7082cc9945721dbaadb52c95c417780
 EBUILD openrc-0.42.1.ebuild 5404 BLAKE2B c8e1bb298988e4249d3b3bc8143b3dc0cc08514278ca50663f2d87d1c0f4501921545413736b91978495e09f5456ccae6253780f15fdfc0398cefb0313e960b1 SHA512 6e7c07b0575c098339c71234d061d605b50cf5255407addc4c0414b8b80229b0f1ee909a3f396a32e8a6cf3070e263e9a50f2755c3fcbf35ab4926f6c37725a2
 EBUILD openrc-9999.ebuild 5025 BLAKE2B 9f19179f99c2ce4885917e4d5bffc82caa10deda853ee84160ec7617a91062fe169220b4a8e3cf51a7a5e6ba3cbb118804c36dd1ad17312e0d241ba0f2b7d386 SHA512 5517b720f81200a6d086e05a016d5192e982960980a3f2c03923a41d132ea3771de380c35f9a167bc6c4824b14847bfc21208e415c25cee41b537bb2533ab94d
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild
deleted file mode 100644
index afd7df37c6b7..000000000000
--- a/sys-apps/openrc/openrc-0.41.2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs usr-ldscript
-
-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 static-libs
-	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? (
-		>=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() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKZSHCOMP=yes
-		SH=$(usex bash /bin/bash /bin/sh)"
-
-	local brand="Unknown"
-	MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-	brand="Linux"
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	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
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	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
-
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-	# 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 2b6a1bcd926c..52a8a014a837 100644
--- a/sys-apps/opentmpfiles/Manifest
+++ b/sys-apps/opentmpfiles/Manifest
@@ -7,7 +7,7 @@ EBUILD opentmpfiles-0.1.1.ebuild 1018 BLAKE2B 59d81bbe686ada0f7e85fe30c3a22d029c
 EBUILD opentmpfiles-0.1.2.ebuild 1115 BLAKE2B 015d7932a02633e2b1b01d87e48a2e1d6c674fed500c0647e02e83e2b7110797c58245e21576965b0d37edf60616d9a9fc0ba2dd2d493a8268fa9c6744235627 SHA512 d4d36bbdccffd0bdf611fff46d8f25dce49a9a4941906f782eb820bd1ddb845c6b7cb23e0ba2199b095a1ed32313664727fb1889349a0b6704fe9b2cc45e98bb
 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 1393 BLAKE2B 9918fccad67f9d34924505a3d303f9380c1fe677fcc4d2610fb3c09cc32e3fdff5252125ca92e83a71cebdda27d7a6a190958b91db975344de323175f83aa4b0 SHA512 7f94f5fa96a3105b7e5ab1ac17c4d6ea48e6c0d6fd4d36ea0d40f4c5ae701447f5e4cc6c8ecfc4a0306187dcf9e089b82c0d7e38a5ee6abadf6ec2df5decdfff
+EBUILD opentmpfiles-0.2.ebuild 1382 BLAKE2B 8b5fdb30d45b4c1fc3fa10938ca3d2b1b9d2dbe007c7a3c95188dc71af7484b7ac7d2794517affc75e697b7bc6485890e58d8369cc88284e58636f9dbb61717b SHA512 98e815ecf98e4533afc258a0a4837bdad429d78759fd3f8d3884967ab6d443f9f22fca8a96929a2ddd1937963b88f6d6ef1ea398d055bf99d8e625f0471459ef
 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 7ef4133faa6be767de26139d7f9348e892363b327fda9103b24410e09043b9a27c4a155037ef72754b2200b0b799f01adb478d6519abe41d551742084dfdb75b SHA512 eef375fdacdf78b008c8205a8b1e86eb5715f6a18999df0b71ae81e02a366e052346222d7bbcb05857b2d1c882791972f143881d62ad8a9ca264f73911d10e33
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
index a0448ee702d4..961ff750fd52 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.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
@@ -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 ~x86-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/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index f1a6caeff51a..272f03885ebc 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -6,7 +6,7 @@ AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19
 DIST pcsc-lite-1.8.25.tar.bz2 757099 BLAKE2B c34727833206b4c868e4f0cd6f8bcaf6899695a92488df8e2fc815c00771ea2f248d9d5fa457c02fc437b8350cbfa37390e07f45b90d08630c8afc34b247034a SHA512 0da63cefd70d9524b2afabd62c5f404758c805b84bbe9ef64fb801ef91a8934c38495513022565ea31bd8550b23bc95b9e9b098ddc76930e3d0643c1fbfb5deb
 DIST pcsc-lite-1.8.26.tar.bz2 754838 BLAKE2B 98bc1abdd66a08dde479821f8b1ef489980a6d58d2a624902de12d0862a4e11b47ed7b12eceff438ecd794bd78a91a7a376e7f4c78c1b03867555dd0e5b734d5 SHA512 23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037
 DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
-EBUILD pcsc-lite-1.8.25-r1.ebuild 3080 BLAKE2B 0638cf497e0f888e3618813de68cc4396bcf2d9bf94cd76c545dd847892089e018348885b2a233a484479d126e173746a5af6c60c6e2d9623c2c2ee0e02b02b5 SHA512 32af168486e570fe12bb76f214ec3ada93bf5282f0f03cb7d5bbf20fefb44aa87dbb220008f4f660e012ff477efdbd36967a6e9d934ad2f5c5b633cd91ebd9f0
-EBUILD pcsc-lite-1.8.26.ebuild 3180 BLAKE2B 3c285edc804c8588a7e5bc262fe80ddf7eaafa17cd613cc3a4907e6ef9b495687f1653d444fcda99141b3e463b3008abf632d170e77af4453f29e6e2bf9d5541 SHA512 445b7c85f01dd5f7e74f82edeb8b08e575244a450c99e09f8d6f2043ab99cc09a3f0e1c0d3adce299bd470e93ee0fcb9e172467a3d91c320ecef67ae3af50d80
-EBUILD pcsc-lite-1.9.0.ebuild 3176 BLAKE2B 8e9989505d0254c3b099773d104af4983942a0a54d7741789567ab54a75c884ddd593b815e0c48ddb2de0913128968f3b0f4591fb16cb3153a47ac46577a3023 SHA512 bab30a2b775d01142ec08abd35ba4618fc40f11bb335007f7563dfc1902774159d9ee5e3350930d20a593c5ab0d66d7e7812c98de2c88bc0c5937e2774b54327
+EBUILD pcsc-lite-1.8.25-r1.ebuild 3069 BLAKE2B 38f39ac010742a7fc8a26956b706003420ea93da7c1fd5e90e54c941bfcc130c6fce0dcbb5f2aedb15e2966ec7596323bbba53f0a4dfd0ff11b604dc7136cbe2 SHA512 9612f648bf51132f0e389f07d9c0c5513cc33e785d72d8de88b49ed706374f1ed6edf752f70777fe638606d0bec7511ff8b4cfb89d3872831d3e88b460f22939
+EBUILD pcsc-lite-1.8.26.ebuild 3169 BLAKE2B 015dd457d5c3a754022cf7d2d7b5958d54b11256112449f68146c4c5cd8190d414c29d8ff1d6ec462c2a73a9aa43bcb111680f94b50f186425815ac1fd7465f3 SHA512 c222971da9110c11af0ea4da6becdd58564cd02a648bc17dc1d6384a13f6ef224a115d3c4eee8ef01d3f9c9c6079704a66836a78f54542784dc2d2ebb441ca65
+EBUILD pcsc-lite-1.9.0.ebuild 3165 BLAKE2B f0ea2112dad7e9f1541484663f44e805c4a61b03b3030df9fa661b92445b5de4785a591d0ba980a359483cfba3f253146793e76de842e822e2efeaa6951b3fc5 SHA512 547d29a953857ff692b8de2a5e9211daebe222d3ac7e9b842340c5d244e28333c70a5d00533450f898240425ae83c929660c559e70d3f6a248de286297b50e56
 MISC metadata.xml 1078 BLAKE2B b47112f9457ca29308517a6cbac1502a83bb8c3ac19f95db1788d0695808c07e3cd1955cbe0ea2f861e6cd9a78cab793f9fbeb699ffb0952d1fa4c3372b8ead9 SHA512 b1804b8e9ec6044221e4158a0127e1dfeb2381d264383f3ba4faa69d6a6ac8a1bd0fcf7681dec92ef7105c05463191bb6e890962bbf419f839d47d51f1d8f7d2
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
index 79dbb26ce203..0acbecf94d23 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-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
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
index df54b9cd2376..8a21a9361461 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.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="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
index 1c65ee7590cc..ec7386ccf059 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.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
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index e93cb47ee431..2a810b575cb8 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -2,6 +2,6 @@ AUX pkgcore-0.10.13-metadata-xsd.patch 750 BLAKE2B 93a75ca69597422da66b42aed94e0
 DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
 DIST pkgcore-0.10.14.tar.gz 627149 BLAKE2B 05012f21998ae97212364f63ca6d423806e20d0f2fd5785b9a52ec3c535c12675cd2a8f300ed1b3fbfe627d33ab9b138bf28a3a2792c405dbe068045d73243af SHA512 f4e4959d55d412b81306a4e7205163814b95b2f454dd7bb233c9a16d5a5975c0d2e20882e73859266ebf1bd6233e4d88e97291632b2f6cf2c2ae58cb5a680a3b
 EBUILD pkgcore-0.10.13-r1.ebuild 1146 BLAKE2B 1b94b7836087ace2e4b5a3b366a97fc42bfda6de298d8db11a54c6b495c4c9f22b41d56e1c8d15a51cb3dca0fba0428ae23f93c3248b624f371e7c1d90fac034 SHA512 b9347581bf17afbaa09a57cea1a9a161d837fe64d430754d3579c6ec1844e5cda273253f52feca4a80e3fb5607e91c8d01b2646a3ec3903811bbd47d8f3520ea
-EBUILD pkgcore-0.10.14.ebuild 1094 BLAKE2B f16e7f51549abf65254e678869785ad96459ebcbd6fe6742afdc40ef654b09f4cd0284d583eb0f7e9580faf88d1dc66ea6b7b5c50deb66374ab11a0e461126b8 SHA512 55aaa20ac47c118e57247847dcbfc59a3553d2f0c477081a1543f2c88e3c14f3179e8a919bf2b12e3c46aec094ad39a169e475da933dbe05578eafb6ff29ee2c
+EBUILD pkgcore-0.10.14.ebuild 1092 BLAKE2B 17275b35c805e84b4ece1da35bfc6dba4fbff5a84fb199395883e41039ec52399164235f811d6aab0a0ddef4e9aaed3fa633ebfdfedbcdef71d69e0121421bc5 SHA512 c41c2f332a98f77bb577ef8dc999753bf00037cdd449416383899148949a544c0e88e7fb9b8d0c38a576c2a0feaf13ff80c5e7de02d43dd99ddeb1aeddce62c9
 EBUILD pkgcore-9999.ebuild 1094 BLAKE2B a69c2f28b93b31865fe4cccecbd38c37fb500c0b75f4f864cd5da5e7ea6daddc334c98b336694339b5001484c0eeb1cf2c403cd73a37eafa63eae7b5a3f1535b SHA512 74bb7df8582464aab7c6f71a9731ec5b3dddcfe3359c629e4b409439e7204c338fc3895065e52cf8add22e5965c655a18e14675e26f8ec44eed4d306ef4b74bb
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14.ebuild
index 2561e25371d1..2d52d107eb91 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.14.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.14.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 @@ 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
 
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index d02a137e5376..3f242ec1b004 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -3,6 +3,5 @@ AUX pmount-0.9.99_alpha-exfat-support.patch 499 BLAKE2B 11045f138c9b20c03f39760d
 AUX pmount-0.9.99_alpha-locale-regex.patch 753 BLAKE2B a79805f883143f6beea9597ab88059e15ccde83d08ce69625c8c3387b419e46f8a6ea3c3937c17adfdbaeaa4dd5c3f9ad7aef8d67cc5dd406e79dbc250196c1b SHA512 423d52a372c7cdd73206a9001fcc717b50b834023130cc77e4e063ac2b62ae5c84698d127646e3658ae44e3a47f2c77522d007664cf0c4277dc49b47413c8563
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r5.ebuild 2013 BLAKE2B 0140eee43a88f8f892ed31746acf4471610d4b39b6aece38900da524b2254e2ca4704bd3927e2554a478e07562f6b07a060cbc65b0f68c6fffb945d70c9105cb SHA512 dbf9b575961207bb62ef09e8e18667e1df831d228ed49dce8cb983e6016851887c4c45ff56ff61d390967cacd3e44d04984a72a548ad9a3d0960e79fe482cb72
-EBUILD pmount-0.9.99_alpha-r6.ebuild 2055 BLAKE2B 523e73403e5876368ea18f0de453e5a4c1747f0af11ef2f3f4454f0adc9f670680bee0f80eb86e047c4e8924762e5443b752e6ca200c7def8d7391fb7425fddb SHA512 d14261587434fa30b9c2933c1b3ecd9ac48b1856be039fedb37b03d145d2bdac4104bbb88602be7d5d876093ef3570f8eebaa7e1fb6307ca2b70ea23194e675b
+EBUILD pmount-0.9.99_alpha-r6.ebuild 2054 BLAKE2B 6fd8f5a1d5a3f68636fa85c0ac07e2ad666694173e7d6712fe85c0b0caa8908c12133159c5d19b56972060eeb19b1e7f7966eb29690d734ba357e49d521190ee SHA512 dd24bfdbe6f7cd5e2d1ca844976d440ef0c76476c4c0808a689ba2fc607613b916dab12b091e7a29492e898bdb7bf2fc7d3a1aee719699a0285a79ff0136553b
 MISC metadata.xml 434 BLAKE2B 4e7b5746a0ec1a037eb91e0fe55a2fdd14e70320bf2b30ac8640e77f4c005cc533cee3a50ef2907a4e863987bcbf9aedca9e8be51210cffd2ddcf570a05a7714 SHA512 a11a466c6b52b576d55120fd5a142918ed4fc942656f13c923c210ee19dda00867cf66e9e4a6074caac4e1f7683ecdbbae5a72ebe4035300af8bcd41dc4e4f93
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
deleted file mode 100644
index da81d534c5dc..000000000000
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1
-
-DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
-HOMEPAGE="https://launchpad.net/pmount"
-SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="crypt"
-
-RDEPEND="
-	acct-group/plugdev
-	>=sys-apps/util-linux-2.17.2
-	crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch
-	"${FILESDIR}"/${P}-locale-regex.patch
-)
-
-src_prepare() {
-	# Restore default value from pmount <= 0.9.23 wrt #393633
-	sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
-
-	cat <<-EOF > po/POTFILES.skip || die
-	src/conffile.c
-	src/configuration.c
-	src/loop.c
-	EOF
-
-	default
-}
-
-src_configure() {
-	econf --disable-hal
-}
-
-src_test() {
-	local testdir=${S}/tests/check_fstab
-
-	ln -s a "${testdir}/b" &&
-		ln -s d "${testdir}/c" &&
-		ln -s c "${testdir}/e" ||
-		die "Unable to create fake symlinks required for testsuite"
-
-	emake check
-}
-
-src_install() {
-	# Must be run SETUID+SETGID, bug #250106
-	exeinto /usr/bin
-	exeopts -m 6710 -g plugdev
-	doexe src/{p,pu}mount
-
-	dodoc AUTHORS ChangeLog TODO
-	doman man/{{p,pu}mount.1,pmount.conf.5}
-
-	insinto /etc
-	doins etc/pmount.{allow,conf}
-
-	keepdir /media #501772
-
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-	bashcomp_alias pmount pumount
-}
-
-pkg_postinst() {
-	elog
-	elog "This package has been installed setuid and setgid."
-
-	elog "The permissions are as such that only users that belong to the plugdev"
-	elog "group are allowed to run this. But if a script run by root mounts a"
-	elog "device, members of the plugdev group will have access to it."
-	elog
-	elog "Please add your user to the plugdev group to be able to mount USB drives"
-}
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
index d5b7d279d3ee..e6a575c9f139 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r6.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 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="crypt"
 
 RDEPEND="
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index d998a4691223..c8e7627d56cb 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -3,5 +3,6 @@ AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b12
 DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd6401c9e923d2c775c7c8c47f0e803749feaec4247fec5cc1cb766314954402fd2506370bb397f746437ecfcf65b384f3 SHA512 0592f218563a99ba95d2cfd07fdc3761b61c1cc3c01a17ab89ad840169e1a7d4083521d5cacc72d1b76911d516bf592db7a3f90d9ef0cc11ceed007e4580e140
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-3.1-r1.ebuild 4857 BLAKE2B bd3811ab4897547498d1677b5c0071ed6a9f1f2cdae234e4ef697151bad616ff828319d067621601f310ede0f787bcccb831c7220888bfa32fba13bd7221f00d SHA512 1584f7f965ad31095697843ee3a289681cb8175c3c74a582ace11a61431d8972b44677587c5974c1b3caa951dbd952420cb121e9ac45f6ce4807c49b4929cf45
-EBUILD policycoreutils-9999.ebuild 4859 BLAKE2B ca6828493673752d5a0f733839ebbc270f0f5e35a383039802fa4b987de3807cabadf182c97f1056ced86967cd7bcd14ba765dde5d8ade37bdd81dca72eae955 SHA512 71cab653be4b00dd20b48795a7b8148bf2880746b2b0f306f9cbaf79a479b662d091c7ee6db319432600e0742878f37f2fa231e7e2d96aca78d4f9d5600b01e8
+EBUILD policycoreutils-3.1-r2.ebuild 4625 BLAKE2B 21e9658912e3996caa16b11833909d337c68cb6e78cccd9d154985a1e2a915493ba604023c538e9fc022f911471318f16165983870e2c4e184629e2123ec6bb1 SHA512 de4528068c83761659312ad6ac5830c21c0443f8b2f74c8fcd7fb30730599bd6f465f33ce4f2dd7312993929da589927728c8edc7957fdeb2d9b1583e9e7f8ec
+EBUILD policycoreutils-9999.ebuild 4614 BLAKE2B ea3709d27dfc3201d8176677ec5acf04802400fcdff1d98d733da1aead14ec872e5bbc753e9eab29c7b0ba7cce6521a3f57680b0a31570ed513c512e0ae26651 SHA512 f67e386d1adc6ac69739285b0c99012a80e74fb374d3d0ee078760e24bf76b9d6f27b0c7fb4d64edeb5c433795619850b744304e00a977343f0e5440a597652c
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
new file mode 100644
index 000000000000..d93a1a536362
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,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}"
+
+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}/${MY_P}/${PN}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz
+		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	S1="${WORKDIR}/${MY_P}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+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}:=
+	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 8f15a3bee236..aed7968c418f 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-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"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
@@ -15,7 +15,7 @@ SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
 SEPOL_VER="${PV}"
 
-IUSE="audit dbus pam split-usr"
+IUSE="audit pam split-usr"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DESCRIPTION="SELinux core utilities"
@@ -41,16 +41,10 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
-	>=sys-libs/libcap-1.10-r10:=
 	>=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}]
-	sys-libs/libcap-ng:=
 	>=sys-libs/libsepol-${SEPOL_VER}:=
+	sys-libs/libcap-ng:=
 	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipy[${PYTHON_USEDEP}]
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib:=
-	)
 	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
 	pam? ( sys-libs/pam:= )
 	${PYTHON_DEPS}"
@@ -59,9 +53,6 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
 # (Still exists in native)
 BDEPEND="sys-devel/gettext"
 
-### libcgroup -> seunshare
-### dbus -> restorecond
-
 # pax-utils for scanelf used by rlpkg
 RDEPEND="${DEPEND}
 	app-misc/pax-utils"
@@ -110,7 +101,6 @@ src_compile() {
 			AUDIT_LOG_PRIVS="y" \
 			AUDITH="$(usex audit y n)" \
 			PAMH="$(usex pam y n)" \
-			INOTIFYH="$(usex dbus y n)" \
 			SESANDBOX="n" \
 			CC="$(tc-getCC)" \
 			LIBDIR="\$(PREFIX)/$(get_libdir)"
@@ -129,7 +119,6 @@ src_install() {
 			AUDIT_LOG_PRIVS="y" \
 			AUDITH="$(usex audit y n)" \
 			PAMH="$(usex pam y n)" \
-			INOTIFYH="$(usex dbus y n)" \
 			SESANDBOX="n" \
 			CC="$(tc-getCC)" \
 			LIBDIR="\$(PREFIX)/$(get_libdir)" \
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9b73e9bcd1c4..8d39e53dff3e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,7 +13,7 @@ DIST portage-3.0.9.tar.bz2 1047839 BLAKE2B 44cf96ac69c1b6d2f95aea8b6e87af5665bfa
 EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d
 EBUILD portage-3.0.10-r1.ebuild 8627 BLAKE2B 305994b05147a9e3fd5c8fc8f4281c23f356371dd8bd016f7976e0411da6f55d7b37cd6bff0f3d2e6c05cf7ae3f6d6e58c1f1ee6d7256d4933992b713b3a3118 SHA512 92679a639c18d00b38f9dae80e07641e5c78801111ac1a9b8f0e99f226ecd4fa1453417a9da4c6468412ad783683edbf84c63fcef4cc63dfc3da6f3d2ad21b26
 EBUILD portage-3.0.11-r2.ebuild 8785 BLAKE2B 735df2fdb2481176693a377fe9aeda86e3122ac6c60aff3ccace8cfe7ba42cb2c66130a5bb8d7914e8e885a636a89d81d13a9f1eee3641257ab6ce0fda200308 SHA512 569f0a6f6d4d8dd2f61611c88857da2ac4fd613cb1bb487687f7e5567a9add4b2bb77b2b0df717c34c4c591d451a573fe2f93268dfb1293a194f14d4c5f91dc3
-EBUILD portage-3.0.12.ebuild 8400 BLAKE2B f6010a2c2be45da9d6e28955ba33b96da30598a42e1b61aee5d8ae88b6fd6294db40cc66523962e4ad54271242222f98456b690627e94cfab3cde4fbf7643f5f SHA512 e13111b158d433294f3c3845b1ed0f93383fad2acafdbc36aac935a2cb8b7d4ae48481a55fb1a8ae82fec2db95c7152906d9770d514faa57eb6fc993147a2ead
+EBUILD portage-3.0.12.ebuild 8396 BLAKE2B fb901d6ea7947920456a76d8185b70f4a83db2ea0a607b15c06e4553100065f01c8ec0cd3327c68ea6c5d47a5529c27f2e25e96b88760a76515c3c3cd81ee492 SHA512 fbdddbfc8663294880a9e15048547b1df10371e5646807f2b7ede67c63021b1463b845f1115f3aa5ca419980d64868c92a04da5865f8846bfcd29b0c9bff9416
 EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1
 EBUILD portage-3.0.8.ebuild 8379 BLAKE2B d2c21e67e7e182c79c0435033dcafdef239a28d4108a953a74839bd6cd8fc83076bdd324f35cc2d64028c13f6a9b4bbb6a725b3f797be035e1a0710f07a9e980 SHA512 b000f7461b73ea27b71e228df180f7cca078890d93a89f8c835986e49eba31d9faa1b6ade34db6aa9e35a4fb9cfed05eb104611e9952dbbd6f99cff41f75b850
 EBUILD portage-3.0.9.ebuild 8377 BLAKE2B 8c9826354e9e3ca8633f20a14ce5e861b1d2b117b0c2dd33bc097692c4193065404aaa6745029c6cd07692d2d6c0ac34415c3e4048b655dbe2240374c25a1f00 SHA512 b22a6a04a419b935fd02f34140918f93dc9c28a4d8cdc59e97d1c5e696ff877901c6054cf859b2a203a9ecb6d632230cd6583d970f4cdcb97e0e2e732c61ddaf
diff --git a/sys-apps/portage/portage-3.0.12.ebuild b/sys-apps/portage/portage-3.0.12.ebuild
index 2fef246d2086..3048a7d74ceb 100644
--- a/sys-apps/portage/portage-3.0.12.ebuild
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -13,7 +13,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/progress/Manifest b/sys-apps/progress/Manifest
index 09a669aa3e5e..f15da3341099 100644
--- a/sys-apps/progress/Manifest
+++ b/sys-apps/progress/Manifest
@@ -1,5 +1,3 @@
-DIST progress-0.13.tar.gz 57959 BLAKE2B 11d0dbcf6a4cdf96f3fa6b902d60c5ce0fa4a619c3b40db44d6ac3e05464876c054359399af8cbbfc5304849654e5decfbbecd449da2e5abfc0cf653c787151e SHA512 789e188e60137412f3ab0f47c82a969066eb1c312711982a4a77a28b1b334055a233b12d4840653a80ac6339e66f8c120e0312889369bbdc71fa10661e7c407e
 DIST progress-0.15.tar.gz 58549 BLAKE2B a75d9b4cb965419cc1677ff80d1990c2b2069031e71e982ff6e83381cbac53aee37e9cc22984e132929c0502dc89f860022def62b886e7b6122f2111aa314fc6 SHA512 8b446d04e156b8d3d905caf9a8c9eac2ff2d24ca3b118ebdf6b2aa9f9f99d0d219c026020c33bc3f2fff936f4a29d95f89fe1cbc1ab66b7b33f5e32bf18710ca
-EBUILD progress-0.13.ebuild 635 BLAKE2B d9f876b06a46b93d4485518a13e9c2670ac019dcfdbed45d4ba3476b2f7db537df7ac6e994eccf556ec441f391c04ddd34936f0c02f298386b4ec1cb3ae40176 SHA512 3ac8c447c51f0fb156229c0df7f38b717fe464aa7fa379056abcbd48745f8b9fd21b0d60b09da11438af784cf3f0daeedab18e92e1ae40df7cce7160ea4084be
-EBUILD progress-0.15.ebuild 585 BLAKE2B 6311532a4dfe7c0c409dba06d9151bf14bcf0def32e6b9960d8fe1fd1492fe53845c8db9689546c2affea494227227e7febc47366171f84d8eb66eb29d1f07f4 SHA512 65b106b36c82d833e10c0d7d6fcd3c515819a58a399d3cf639a0ea756a98cbea5668611a5a2f16706ca598aec7b43e1e58e357bfdb6ebf76da387c6eaebcba5e
+EBUILD progress-0.15.ebuild 582 BLAKE2B ce5fe5b82958b5cc897b704f809390d99e0b13d1841474ef901ab027457fdf28588584fa0d61dcce1f608ff1fc4e8a75ff20d5c592c4fcd2aea1e2b996f4c292 SHA512 45d3c87bfeca22883b5650d1d315d70a71a28021bc6924dac98a09837d04090f1a76031273c83038a70d7e5bffeed5ef0671d19d57c5daa0bf7650171bebf66a
 MISC metadata.xml 335 BLAKE2B 720a8160043a20aa7d50e4fab61b6b55044c6a62b5baa848edf83f5954b824a3a3a21908e9e0712fae3773b122858eaa7b53a2aaf4365ecc500bc6e818ae327d SHA512 903ec46393a006768a24ebf7be7fed66b5ce5eb1db5c68f29feda30e9d79812ff4ca9303b2ad00def4ffe4e4f1f31e1faa6ef4bf868059459beb026331a3232b
diff --git a/sys-apps/progress/progress-0.13.ebuild b/sys-apps/progress/progress-0.13.ebuild
deleted file mode 100644
index 7cde6caae915..000000000000
--- a/sys-apps/progress/progress-0.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Coreutils Viewer: show progress for cp, rm, dd, and so forth"
-HOMEPAGE="https://github.com/Xfennec/progress"
-SRC_URI="https://github.com/Xfennec/progress/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i \
-		-e '/CFLAGS/s:-g ::' \
-		Makefile || die
-	tc-export CC
-}
-
-src_install() {
-	emake PREFIX="${D}/${EPREFIX}/usr" install
-	dodoc README.md
-}
diff --git a/sys-apps/progress/progress-0.15.ebuild b/sys-apps/progress/progress-0.15.ebuild
index 5b3188ccf45f..2f46847710f1 100644
--- a/sys-apps/progress/progress-0.15.ebuild
+++ b/sys-apps/progress/progress-0.15.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Xfennec/progress/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index 4a1580779a3f..d75266b98981 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -1,3 +1,3 @@
 DIST pv-1.6.6.tar.bz2 109220 BLAKE2B 1cfb60e49f6301f0d990467a58013522bbc1e28e2936a1a2141918af05149b59b6cc494f290d99ee7072247b8f0e230b799cd5dae6f8aa59d116691319e952cb SHA512 cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26
-EBUILD pv-1.6.6.ebuild 1390 BLAKE2B 4d6dfc3ac03be3a279cc59caeb7d83c42ca07790e77978d0e828d22218192c2fbdaa7a6e67d2d2d4d02c2370256d331bc58c7044ca3566d1bcbd8df1faada544 SHA512 580640bf306e1c864487f1c9f0a2343d856017bd67662a353d15c7160f208d0146dcc43b49d79a0682fd5b107997522b0dac356342d35b2ef6b22790a14303e1
+EBUILD pv-1.6.6.ebuild 1379 BLAKE2B 0f3f018c0325aaef297dce38a6ae1917f9b53eb2499f38a020666d5d3da567c18f23ba173af6d805977450a6bf4c01bc25dd340728ad435ed46fb040508621c6 SHA512 f0cf93a3f5ee11c5327e640b3965da60b66115fe293016e7b35f57ea704a65b7dbe4844a2ec4d75176e4aa2901a2d342b1e2ef9485dcc52a6696ac0a730b345a
 MISC metadata.xml 431 BLAKE2B 85d1be89636b3cc4a7910ad00aa9d7837bf6a4ad155785157fa08742c46b9479a4148a432bb62ad073cd2615689c07b28a24be7f7525c173fded9d7d76337bf9 SHA512 cb9a5ceb4164154107dc4be74388fdaba757e9dbe1ac3e3b308fa81e97297464aa1b4d2cf6d163cb9a212a5423dbeb9f1303093d784c0d16b80d3cc2878e0dfd
diff --git a/sys-apps/pv/pv-1.6.6.ebuild b/sys-apps/pv/pv-1.6.6.ebuild
index 47a857d61c38..6b7c79cfe1ab 100644
--- a/sys-apps/pv/pv-1.6.6.ebuild
+++ b/sys-apps/pv/pv-1.6.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
@@ -10,7 +10,7 @@ SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris"
 IUSE="debug nls"
 
 PV_LINGUAS=( de fr pl pt )
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index 87e24e9c79d7..0a556b6b5466 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -2,5 +2,5 @@ AUX rename-1.3-build.patch 172 BLAKE2B 47ae1d23ce99ad6ef2099bd6484cfad23a7aa46cd
 AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789ee6a7525824d2ac0a11403a53e33a31dc843eb295b31c8119ced7bc3f0393482e60003673c9cf83d43d78b80 SHA512 5a40ab4c81b4c197af051e01682f4fbb580b3fea9287539f601b4c07c6155c3aba802e38752566f9d2a41239cf2d20d748bfd64d2f7007eff578344cd12852c9
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
-EBUILD rename-1.3-r2.ebuild 896 BLAKE2B 875172214d98edfcb29d416383f4d865e237444b1be1476fafd7be530284a4cc00095056a2f1d2e4e4d979977e839367ee00f82aab9a3f076d1dd222f86b49c7 SHA512 c563adf162d8d263e07177cec40dcebd0d6b250837ff3608fcfffba68163cdd1b8f006cdb87468c1d0fafcaadba5dcd5f369039e6ffd5fe61ca0a59204e7a9b0
+EBUILD rename-1.3-r2.ebuild 885 BLAKE2B 0672e6f4f0dc94b709f7cbaa03878316db1a0329af18650e45da88464534c6b017321954a72412106043a887669305334820edbc866b7c1e4c8b7e15a4d81a5c SHA512 7419f53b7a50fd328e5bdb9c53bb03816025d87dda82ef6f927f7a29ac4281c6120d671f1edb5e0d131baf60c3707c3291daf449f9eb50333fbad1eda82784c8
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3-r2.ebuild b/sys-apps/rename/rename-1.3-r2.ebuild
index 32c86214f471..57f4b006dfbe 100644
--- a/sys-apps/rename/rename-1.3-r2.ebuild
+++ b/sys-apps/rename/rename-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 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://${PN}/sourceforge.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 MY_PATCHES=(
 	"${FILESDIR}"/${P}-rename.patch
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 25402d2ffe7c..9a190dd8d240 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,5 +1,5 @@
 AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f082c9c9c9ef458ef87c48bf2e6cacc8c2603a51d9c639938056cffb49a0b089eb4b2a088a11af8eec0c SHA512 dd68ba095d67ccc6f698a8ab2d86942458763619d97a68f421eff0a48d72e66021df40121440107b9402a30a4e4351526d0878dca29a7eb57d68399052b1e2a6
 DIST restorecond-3.1.tar.gz 18939 BLAKE2B 3a3fcde057dad3ed05692d679ba27e0b24f191d92ed5114fa38cb5f846c4cc00d85bb09b5d4e560ed2b914444e0c2d1c407f6c03900610624d5626d05f2991bc SHA512 cdcf299f48b89a7c641ded9507b9b966bf648497394f8e988a9cb1ceb3224c86369706027f3416a4f9750836f7a8f4580a4b3df76673e03f897b383d7ed0e2c8
-EBUILD restorecond-3.1.ebuild 1223 BLAKE2B ec5249e704e332e23cb35504417f7d16828e9b54885f0896d09306a2ffc91ab11fa3e93bef34c11d4f3cd33373d1f5caa1fade40da9002dc992dd6a1de2aedea SHA512 5eb40f7d4fd35de6508874babbac075b2e0c3afc15b963f5696135c866a5782b57fa6096e12f128814e501f7d29cd567db2d35eaa8a70e1d2a6d9da468fef99c
-EBUILD restorecond-9999.ebuild 1225 BLAKE2B 3b9cef9ce1ffada0499058dbc7999707bb49ba253b9fb7c50a4b88cc5fb03f5a8469539480eb2650aec0d8958e4020684bdfc1fc4bf3926ad525d73a8a0d3e82 SHA512 fea6248c0b7f99efafb7cb9b33f38d2566792277a04e41c1336f21a906e0c58092dad436508c8d266403545b4e38bb6db4a65be1fde26e67050e4dfebc1dfd04
+EBUILD restorecond-3.1.ebuild 1170 BLAKE2B 98e3caa2596762f7a123252aebff2b9d2fd774e070fcbbd5bfcf13445b1ee1afe9e6850fcf37491cc6da6d382c0a6af360902180dc17905384eb78840dae1055 SHA512 68d65a4b44f6d1b5cd20226a25e8813af4cee19bb2d197ad188c79fa4cf3f152307c2cfd0ef4198f9684ada8efddcb243db97ec13b9dc5843d4fb4859938c91c
+EBUILD restorecond-9999.ebuild 1172 BLAKE2B 3141fefbeb5f95ce31c8a6272609ee292a4496bc39b52121513981333643058019c735dd56c480de47e3f14c2442299aeaaa352550ab7cd27d35b86cf7e12ca9 SHA512 8e2317555f188e3a3c3e4af895add0b1140276ebef6f3c75fe5cacce9c98d3f193438b29a78ecf60a8437b7e78fe41ef992b421a6aec1488f78ca02cc4a807d7
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/restorecond/restorecond-3.1.ebuild b/sys-apps/restorecond/restorecond-3.1.ebuild
index 90da950241da..7184259428fe 100644
--- a/sys-apps/restorecond/restorecond-3.1.ebuild
+++ b/sys-apps/restorecond/restorecond-3.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"
@@ -26,11 +26,9 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=sys-libs/libsepol-${PV}:=
-	>=sys-libs/libselinux-${PV}:=
-	dev-libs/dbus-glib
-	dev-libs/libpcre:=
-	>=sys-libs/libcap-1.10-r10:="
+DEPEND="dev-libs/glib:2
+	>=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:="
 
 RDEPEND="${DEPEND}"
 
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index 001d8cd6d3f8..9d1e9b1ad76a 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-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
 
 EAPI="7"
@@ -26,11 +26,9 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=sys-libs/libsepol-${PV}:=
-	>=sys-libs/libselinux-${PV}:=
-	dev-libs/dbus-glib
-	dev-libs/libpcre:=
-	>=sys-libs/libcap-1.10-r10:="
+DEPEND="dev-libs/glib:2
+	>=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:="
 
 RDEPEND="${DEPEND}"
 
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 38292c54de81..198589172ff9 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,4 +1,4 @@
 DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2be628479f517412ca876fa225ba0dd63ef3200ed15ff693cd5f4cb4ff537d81666fef3a008ba4b3a7577e0c SHA512 79e3e4910178af49ea164d620aa997adb21dd18581c054a4023dd9116ec9dd203bd12989ef308aa1d253b47fcd251ee2b99c26e143d1db3de22a7f374ff38e0b
-EBUILD secilc-3.1.ebuild 902 BLAKE2B 3a2c205279d1d2870fb89bad1506fda1864b044fa6788f02ebba8f9b4c9b1155541dfa26fd18e3cd2823cad09597553be2510ff9058f4de2640d800a225ca19e SHA512 b418e483ca94112e6ae467b60a93231b20d45ff065d9d6bb6d20df41c4baf163f140114a0c7e3745423bc2283023df4d5e37815abb95c6d68cd1f4c57c9dc377
-EBUILD secilc-9999.ebuild 904 BLAKE2B 4393b427e8c7bfa3aeffeed3b22c43d561b1f7e82a3b444562151bb79e70ab66e40b2555b090b2704ad83c574eb95d1f44cca193add74ce00a464ff72c377a8f SHA512 fc08f700371c287d7b9dee5cc2af798981358c9c0f97b045d1dbd039d1088833a7d8670c4ae9aa4d411732eb4b2d42f5b0f0b7282d4d5bee34cac39d5a075068
+EBUILD secilc-3.1.ebuild 872 BLAKE2B 755350212203ab5e1ad5a96c22c275f304bcccf96a7b2cbbff4eaf41ef35eddc4cb80cf72a781844a3ca19c3bdcf003216f834a1241ffef199cf65fd5d40b6b9 SHA512 d5fdd15eb659992be37725aa1434550b3ba5cdd775462f081c7785865083c7b40642b789076597a7c81db465e08d80bf3b708666c735b9eb4a198a93ec02fe3f
+EBUILD secilc-9999.ebuild 874 BLAKE2B a1b094750de07eaea9f6893c30e5cd844c41349c8ec88a1143fe4eacd91f5f39270f0b1ec5de0824cd77d94db613c803481282aaef7e6847af20cb2d1c640b78 SHA512 5630546e79ad0eaafe6b00571747185df1d5c842e649ddb154430cc68d24f23ca2e5e4dd1a49b1c1e4c01ea38fe77d01bac71492822790b27dd165d235cea82e
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-3.1.ebuild b/sys-apps/secilc/secilc-3.1.ebuild
index 84a3781d99e3..5ba3983cf787 100644
--- a/sys-apps/secilc/secilc-3.1.ebuild
+++ b/sys-apps/secilc/secilc-3.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"
@@ -24,15 +24,10 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/xmlto
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-RDEPEND="
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
+
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/xmlto"
 
 # tests are not meant to be run outside of the
 # full SELinux userland repo
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index db36c3ca9f49..0642e837b999 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-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
 
 EAPI="7"
@@ -24,15 +24,10 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/xmlto
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-RDEPEND="
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
+
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/xmlto"
 
 # tests are not meant to be run outside of the
 # full SELinux userland repo
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 46cd063ba698..2f1c7a27f0ce 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,4 +1,5 @@
 DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
 EBUILD selinux-python-3.1-r1.ebuild 2592 BLAKE2B 4e8887963e09d6138443885f7a52075206118bf5711e2ca1b4fbd3ce4251e3c7c7a2982d8ea263e45d9308211e6f614680870dad023465dd89d5c909a08a32f2 SHA512 da4d84af8e26af692c07b4009fdc7549c2fc13236dc7574d8967864976a83094ea877dde63591ad88a48c7be3391720ebfc8895476202fa39b7f29b73f5adea3
-EBUILD selinux-python-9999.ebuild 2594 BLAKE2B 253043520f734e82b27141c2e2d1088dbccb3ca016f35607ace5808f365498060400500172e7c5bd217168464f5fd14c09328ab3b19df47ad29ef74692aaa4eb SHA512 8814d31ee68f9bb1ca40b354b4f955982eff55f13a4f8022d433083cc9316e2fa3f32d799c8157e2a5573f6f083c3ef5c6794be8f812bafb6b5c803439bb4ce9
+EBUILD selinux-python-3.1-r2.ebuild 2545 BLAKE2B e9b6d9be2ef1d38cd1a096d3d959973e3b557fca3760eb51dbdd38b1d67d02c4e703c0506a603cab418e80c48e5c1b6afa8797511ea38456d09fa4bda75cfeee SHA512 df2f191dbfd26b1c642afffd6dbf22fd6f04f610fbb56f12606aeb534e39c7741b168aa2fcb47b713cfa18b4d583c286606cb015da43dda7b06ece6e2f2bed40
+EBUILD selinux-python-9999.ebuild 2545 BLAKE2B e9b6d9be2ef1d38cd1a096d3d959973e3b557fca3760eb51dbdd38b1d67d02c4e703c0506a603cab418e80c48e5c1b6afa8797511ea38456d09fa4bda75cfeee SHA512 df2f191dbfd26b1c642afffd6dbf22fd6f04f610fbb56f12606aeb534e39c7741b168aa2fcb47b713cfa18b4d583c286606cb015da43dda7b06ece6e2f2bed40
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild b/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
new file mode 100644
index 000000000000..b244747ca977
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+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"
+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-}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_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}:=
+	>=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 e3fe4738a86b..b244747ca977 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-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"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
@@ -14,7 +14,6 @@ SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 SEMNG_VER="${PV}"
 
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DESCRIPTION="SELinux core utilities"
@@ -37,7 +36,6 @@ DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
 	>=sys-libs/libsemanage-${SEMNG_VER}:=[python(+)]
 	>=sys-libs/libsepol-${SEPOL_VER}:=
 	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipy[${PYTHON_USEDEP}]
 	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}"
 
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 1ddc5466e766..93c51edacdbc 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -2,6 +2,8 @@ AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
 DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295
-EBUILD smartmontools-7.1.ebuild 4042 BLAKE2B 26d0154010e29e986f8c08953b1c9b6bd949957bb1011ba0f473b63270f29dd2682263a8d1919eec423c0af3496e87127774566f155da3f90ca080e53422a7cc SHA512 e7f302e6564a4f3f16bb0d29900c1f37f22811b38f13a144bdfbb42360aa777321c2ee64c529d7793de68f494f48ee28bc26b92b0226c4a1a2859f98132a263a
-EBUILD smartmontools-9999.ebuild 4050 BLAKE2B a8ce8d55bcf3dda65d4e31f71feedc4f867a985e74dccdb4da9aff8e7cbfc80db1bbd7aeacb3809f154507ac4aa05b40fde8e865182169733cdb6dd1fc3dd058 SHA512 b84bddbec5e896f9fa60600d5a60c142ec6b23482fbf8239bb74297eab20c231850aa2c63cfd6b2a3be29db7f278417d7eed72e0f43cf4556628a53d1051220f
-MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
+DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea
+EBUILD smartmontools-7.1-r1.ebuild 4042 BLAKE2B 46c72078bf69257c1a9658337d49bbb3da43387ca8a05679f552c3879caad128e3c63c045a524f4d93d11b51893577b118a7cf6bd59b4b93922914a297fd7a28 SHA512 223826860e45decc575cb74465f3f6a5e503749bfd430a39f938e490391ca410ce8d9f0dd894c6acf137d8dc8fffc16fcce45eb05d123cdb9b7b41c27618653f
+EBUILD smartmontools-7.2.ebuild 4115 BLAKE2B a2d0de1ebe9e37cf4d58c6dd4477ba572219eea5b48f5a524aa0eade68e03bc781feef5bd93be3a13862cc4cf41a731736008b3eb1763edcab6a11fd4ac4fdc4 SHA512 d2e932dd464c65f1b402f0d615c121b195a4da4e843b1a69c30bb042ea773f08d0179d715b389e7e6a85a59a156fba88e418f4c17770afcafcf3366796bc4233
+EBUILD smartmontools-9999.ebuild 4115 BLAKE2B a2d0de1ebe9e37cf4d58c6dd4477ba572219eea5b48f5a524aa0eade68e03bc781feef5bd93be3a13862cc4cf41a731736008b3eb1763edcab6a11fd4ac4fdc4 SHA512 d2e932dd464c65f1b402f0d615c121b195a4da4e843b1a69c30bb042ea773f08d0179d715b389e7e6a85a59a156fba88e418f4c17770afcafcf3366796bc4233
+MISC metadata.xml 628 BLAKE2B a619effbf00a8b83df53ae6b7e191ed97af2e996ba3f025328021b67b49a167c3eae0be016b1fe106bef263a8b29e5add385f067efaef18ea07da451ede84ebc SHA512 ae5c3076410f080d87db55935a6254768ed07faf5bafed2ed9bb9d469b263b6bd8d418a1e50d1030aa6873f0c82014887ef7f2df8e032b6487f782f72a1ea54e
diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
index cb72f5108e40..4ee89aff231c 100644
--- a/sys-apps/smartmontools/metadata.xml
+++ b/sys-apps/smartmontools/metadata.xml
@@ -8,7 +8,7 @@
 <use>
 	<flag name="caps">Build against <pkg>sys-libs/libcap-ng</pkg> to allow smartd to drop its privileges.</flag>
 	<flag name="daemon">Install the monitoring daemon (smartd) and associated scripts.</flag>
-	<flag name="update_drivedb">Install a script to update the drivedb file.</flag>
+	<flag name="update-drivedb">Install a script to update the drivedb file.</flag>
 </use>
 <upstream>
 	<remote-id type="sourceforge">smartmontools</remote-id>
diff --git a/sys-apps/smartmontools/smartmontools-7.1.ebuild b/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild
index 0b1811bc1f8c..158bfd6444fc 100644
--- a/sys-apps/smartmontools/smartmontools-7.1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.1-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"
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.smartmontools.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps +daemon selinux static systemd update_drivedb"
+IUSE="caps +daemon selinux static systemd update-drivedb"
 
 DEPEND="
 	caps? (
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
 	daemon? ( virtual/mailx )
 	selinux? ( sec-policy/selinux-smartmon )
 	systemd? ( sys-apps/systemd )
-	update_drivedb? (
+	update-drivedb? (
 		app-crypt/gnupg
 		|| (
 			net-misc/curl
@@ -61,8 +61,8 @@ src_configure() {
 		$(use_with caps libcap-ng)
 		$(use_with selinux)
 		$(use_with systemd libsystemd)
-		$(use_with update_drivedb gnupg)
-		$(use_with update_drivedb update-smart-drivedb)
+		$(use_with update-drivedb gnupg)
+		$(use_with update-drivedb update-smart-drivedb)
 		$(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '')
 	)
 	econf "${myeconfargs[@]}"
@@ -84,7 +84,7 @@ src_install() {
 		einstalldocs
 	fi
 
-	if use update_drivedb ; then
+	if use update-drivedb ; then
 		if ! use daemon; then
 			dosbin "${S}"/update-smart-drivedb
 		fi
@@ -93,7 +93,7 @@ src_install() {
 		doexe "${FILESDIR}/${PN}-update-drivedb"
 	fi
 
-	if use daemon || use update_drivedb; then
+	if use daemon || use update-drivedb; then
 		keepdir "${db_path}"
 
 		# Install a copy of the initial drivedb.h to /usr/share/${PN}
@@ -113,7 +113,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use daemon || use update_drivedb; then
+	if use daemon || use update-drivedb; then
 		local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
 		local db_path="${EROOT}/var/db/${PN}"
 
@@ -137,10 +137,10 @@ pkg_postinst() {
 			ewarn ""
 			ewarn "     /usr/sbin/update-smart-drivedb"
 
-			if ! use update_drivedb ; then
+			if ! use update-drivedb ; then
 				ewarn ""
 				ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
-				ewarn "with USE='update_drivedb'."
+				ewarn "with USE='update-drivedb'."
 			fi
 		fi
 	fi
diff --git a/sys-apps/smartmontools/smartmontools-7.2.ebuild b/sys-apps/smartmontools/smartmontools-7.2.ebuild
new file mode 100644
index 000000000000..bcbd184c16d7
--- /dev/null
+++ b/sys-apps/smartmontools/smartmontools-7.2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools flag-o-matic systemd
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools"
+	ESVN_PROJECT="smartmontools"
+	inherit subversion
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
+HOMEPAGE="https://www.smartmontools.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps +daemon selinux static systemd +update-drivedb"
+
+DEPEND="
+	caps? (
+		static? ( sys-libs/libcap-ng[static-libs] )
+		!static? ( sys-libs/libcap-ng )
+	)
+	selinux? (
+		sys-libs/libselinux
+	)"
+RDEPEND="${DEPEND}
+	daemon? ( virtual/mailx )
+	selinux? ( sec-policy/selinux-smartmon )
+	systemd? ( sys-apps/systemd )
+	update-drivedb? (
+		app-crypt/gnupg
+		|| (
+			net-misc/curl
+			net-misc/wget
+			www-client/lynx
+			dev-vcs/subversion
+		)
+	)
+"
+
+REQUIRED_USE="(
+	caps? ( daemon )
+	static? ( !systemd )
+)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# The build installs /etc/init.d/smartd, but we clobber it
+	# in our src_install, so no need to manually delete it.
+	myeconfargs=(
+		--with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
+		--with-initscriptdir="${EPREFIX}/etc/init.d"
+		#--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}"
+		$(use_with caps libcap-ng)
+		$(use_with selinux)
+		$(use_with systemd libsystemd)
+		$(use_with update-drivedb gnupg)
+		$(use_with update-drivedb update-smart-drivedb)
+		$(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local db_path="/var/db/${PN}"
+	insopts -m0644 -p # preserve timestamps
+
+	if use daemon; then
+		default
+
+		newinitd "${FILESDIR}"/smartd-r1.rc smartd
+		newconfd "${FILESDIR}"/smartd.confd smartd
+	else
+		dosbin smartctl
+		doman smartctl.8
+
+		local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO )
+		einstalldocs
+	fi
+
+	if use update-drivedb ; then
+		if ! use daemon; then
+			dosbin "${S}"/update-smart-drivedb
+		fi
+
+		exeinto /etc/cron.monthly
+		doexe "${FILESDIR}/${PN}-update-drivedb"
+	fi
+
+	if use daemon || use update-drivedb; then
+		keepdir "${db_path}"
+
+		# Install a copy of the initial drivedb.h to /usr/share/${PN}
+		# so that we can access that file later in pkg_postinst
+		# even when dealing with binary packages (bug #575292)
+		insinto /usr/share/${PN}
+		doins "${S}"/drivedb.h
+	fi
+
+	# Make sure we never install drivedb.h into the db location
+	# of the acutal image so we don't record hashes because user
+	# can modify that file
+	rm -f "${ED%/}${db_path}/drivedb.h" || die
+
+	# Bug #622072
+	find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
+}
+
+pkg_postinst() {
+	if use daemon || use update-drivedb; then
+		local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
+		local db_path="${EROOT}/var/db/${PN}"
+
+		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
+			# No initial database found
+			cp "${initial_db_file}" "${db_path}" || die
+			einfo "Default drive database which was shipped with this release of ${PN}"
+			einfo "has been installed to '${db_path}'."
+		else
+			ewarn "WARNING: There's already a drive database in '${db_path}'!"
+			ewarn "Because we cannot determine if this database is untouched"
+			ewarn "or was modified by the user you have to manually update the"
+			ewarn "drive database:"
+			ewarn ""
+			ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this"
+			ewarn "   release which can be found in '${initial_db_file}', i.e."
+			ewarn ""
+			ewarn "     cp \"${initial_db_file}\" \"${db_path}\""
+			ewarn ""
+			ewarn "b) Run the following command as root:"
+			ewarn ""
+			ewarn "     /usr/sbin/update-smart-drivedb"
+
+			if ! use update-drivedb ; then
+				ewarn ""
+				ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
+				ewarn "with USE='update-drivedb'."
+			fi
+		fi
+	fi
+}
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 9c4544209c16..bcbd184c16d7 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-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
 
 EAPI="6"
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.smartmontools.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps +daemon selinux static systemd update_drivedb"
+IUSE="caps +daemon selinux static systemd +update-drivedb"
 
 DEPEND="
 	caps? (
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
 	daemon? ( virtual/mailx )
 	selinux? ( sec-policy/selinux-smartmon )
 	systemd? ( sys-apps/systemd )
-	update_drivedb? (
+	update-drivedb? (
 		app-crypt/gnupg
 		|| (
 			net-misc/curl
@@ -43,7 +43,10 @@ RDEPEND="${DEPEND}
 	)
 "
 
-REQUIRED_USE="( caps? ( daemon ) )"
+REQUIRED_USE="(
+	caps? ( daemon )
+	static? ( !systemd )
+)"
 
 src_prepare() {
 	default
@@ -61,8 +64,8 @@ src_configure() {
 		$(use_with caps libcap-ng)
 		$(use_with selinux)
 		$(use_with systemd libsystemd)
-		$(use_with update_drivedb gnupg)
-		$(use_with update_drivedb update-smart-drivedb)
+		$(use_with update-drivedb gnupg)
+		$(use_with update-drivedb update-smart-drivedb)
 		$(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '')
 	)
 	econf "${myeconfargs[@]}"
@@ -70,6 +73,7 @@ src_configure() {
 
 src_install() {
 	local db_path="/var/db/${PN}"
+	insopts -m0644 -p # preserve timestamps
 
 	if use daemon; then
 		default
@@ -84,7 +88,7 @@ src_install() {
 		einstalldocs
 	fi
 
-	if use update_drivedb ; then
+	if use update-drivedb ; then
 		if ! use daemon; then
 			dosbin "${S}"/update-smart-drivedb
 		fi
@@ -93,7 +97,7 @@ src_install() {
 		doexe "${FILESDIR}/${PN}-update-drivedb"
 	fi
 
-	if use daemon || use update_drivedb; then
+	if use daemon || use update-drivedb; then
 		keepdir "${db_path}"
 
 		# Install a copy of the initial drivedb.h to /usr/share/${PN}
@@ -113,7 +117,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use daemon || use update_drivedb; then
+	if use daemon || use update-drivedb; then
 		local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
 		local db_path="${EROOT}/var/db/${PN}"
 
@@ -137,10 +141,10 @@ pkg_postinst() {
 			ewarn ""
 			ewarn "     /usr/sbin/update-smart-drivedb"
 
-			if ! use update_drivedb ; then
+			if ! use update-drivedb ; then
 				ewarn ""
 				ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
-				ewarn "with USE='update_drivedb'."
+				ewarn "with USE='update-drivedb'."
 			fi
 		fi
 	fi
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 35a20cf52cca..bef0db78d253 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 1951 BLAKE2B 62574142dcd269ea80807d43d8c8211a3670b080b2a51f43af80a5c606bb4b83073de40b2d36c346c4eae5b303368afd2120aee7cd35ec0b52ae38cd99311625 SHA512 9b44247e3acb3901e79f8bbd12e349d1157364f3dc7095b88f084f3d2bae692fa7e5db4515667dd03730cb3f133f0c0a2706030b0d788c20cfd127929c1cc0b6
+EBUILD texinfo-6.7.ebuild 1940 BLAKE2B e68ff2e3cc5b53a7b23783be28950b01689cc2608063a36b1eba6b9c89898d9144de15060ef5ab970658092e16bf5cf1cb97aae9bcbb2583b03fc57f5aad3afb SHA512 2df9622d5cb9bc18bb4f062878f3fdc1722086f64365fa47e051c3dd4babad3f09f48b98a431353cd4738011bae90b6b335f0a8f4cfb227f0cdc1d2e2b9c0db1
 MISC metadata.xml 539 BLAKE2B 5445a2b07c6bbecb3c33c64e80227f57ff80b17b0b440a3d0220a88ed1bb930deb1b0274eff8db1a64fe82c64e7f34b1183c533b1a1ca7b41694668e2c5b682b SHA512 4d0b0b223f04e6ebc4e7a7546dbf6b731fc0676657c8d3c3cd38a54c327f4eebda927f1793ead3f8f255bc82d7884b5acd6df8431674db48c2ebbbd1098cb032
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild
index 3302ea6162b3..9050516349a3 100644
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ b/sys-apps/texinfo/texinfo-6.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
 
 # Note: if your package uses the texi2dvi utility, it must depend on the
@@ -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 ~x86-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/which/Manifest b/sys-apps/which/Manifest
index ecc2a1e2b769..e00872b9b907 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 646 BLAKE2B 073287ab5b5495ec7f536ed7d463a54360cc89b92d5d57ce312efce831a139822cad298885ca9e327d05e4c2aadb961fed15f53d37e1fc353ab528858efb863e SHA512 58036c8af7d7117b2cb3a5cb92cd0095e4279b20712097ba6019a0df1c5abf9fb0113eff3651db8360c5ec4c7a8d0c0e619110600c027a4958849715ac4f34a6
+EBUILD which-2.21.ebuild 635 BLAKE2B a313a8e20d0face63b3be433134f4118f97b2abc24a43e6b8dfa6c0f2d9a7d83a2ede0d4998d4b2363e37226e5f122b84369f4d9a4584979cd72244cc00641b3 SHA512 3cd0b4cfbf3ee71908137d5c8d7c68d212badb3269cee04c2fcc9652f8810aaca2bb89527661fdc561888cbdd356db6afddde9216ffab43dd49084bd31427403
 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 7e4ceb6d1f25..a292cba08689 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.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://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 ~x86-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=""
 
 src_configure() {
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index c20987742ee0..dcb5a9b5aa51 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 989 BLAKE2B 444acfed3ba0d08f524d9988d3b282ead88d81562b231b02ad221ee0e06922a11d938f2ccde1d953f30f334dfb11dccdea14cbcc296a4918c3253bce3722d6d8 SHA512 2406afcafce75ca6fc1e415e8beec73ced194f43ffaa91edc17ba24a6a2899fcea9b8b8cf9420c501218f162758d9e0c73c595735abc77a23f6e6fdb439d2e66
+EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 987 BLAKE2B 5bdf3f125a5f557ff292dfe60c5d7f1bc63207ed2655c1f44e9c9a1437c8af7c14130dd6ee6eb17c65b02fec98be7ea02804e5bd16b551e504d8b46d4a086d22 SHA512 e894c73a439901681821aeb3dc8dc5c4ba54d0d11e99556ff6e134b0ef138e0330a2e2166e0f5f91c54a4dfd0790f8cea7bf59160d79a6e261e1cf2bf4a52387
 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 27f6469c046d..f35e8cfddecc 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
@@ -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://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="wayland X"
 
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /sys-apps
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)