gentoo (valentine's day) resync : 14.02.2021

76 files changed, 942 insertions, 703 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 349896201465..61c4a0c8a3d0 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 3a82bf8160fb..90ce655ccad2 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -6,5 +6,5 @@ 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.6-r2.ebuild 11130 BLAKE2B e47bc88ea12c6779862175f3d194235d02a16a63c46f95c206d709b78687f96537fcb4134309fb854f5d6ecad6faaaccf4714748b288e66146acaad3f88593bb SHA512 cc044b70eedd10ca4eda69b0fba5223d7dbbfe77403943d52c3dddc587def378832177a594de3350698ebdc1164a5054e27b0f4fd1a592d19e96ff6848cabd6a
+EBUILD baselayout-prefix-2.6-r3.ebuild 11317 BLAKE2B 853762ddd1025de873e6d24160cd9e1448463b126d124e77fd6c09497abd27863274fa71b120c40cadc415bd6af2d82110069f0e82d094e7fddde712d08eb49b SHA512 1b52a0d0baf9cbc960f7477d32f5ecddeebc42ae91672503a73368471584f5cf0c3bcdef079eacbbc8946126b1f94a48d04b3ddd00991067c96d5d52ba67d475
 MISC metadata.xml 317 BLAKE2B 023b00acfd1afc0255ae1356c8a9627a2d3d81e762b8a7bbd155c2e5e626c4a7663ced36ac04590a127e3a845122a17e07f7c0614dec091919e958883e71ced2 SHA512 3893a08cbe1db5c7888ba808a3cf04c20c8ba5988078791a707978f91e56bf2049244e30096617bf5906e3ff4257538407a02645ceb1a49a61ffef57980bcb27
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
index 837a4b033565..d7bbee519208 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
@@ -240,6 +240,12 @@ src_install() {
 	emake ROOT="${ROOT}" DESTDIR="${D}" install
 	dodoc ChangeLog
 
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# add SDK path which contains development manpages
+		echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
+			> "${ED}"/etc/env.d/98macos-sdk
+	fi
+
 	# need the makefile in pkg_preinst
 	insinto /usr/share/${PN}
 	doins Makefile
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index b170e84ccdcb..dd3f2e1b98df 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,4 +1,4 @@
 AUX bubblewrap-0.3.1-selinux-configure.patch 5208 BLAKE2B 69db3066eebae54d34f02a02aa053a6bf5ed675329b3d18a4f261529a434d1c9dbfb637a3f96f4079a6adba586b666d7890370c8761c92dc9450f096a8368bbe SHA512 f6515a25c6b311c9b8336761c7daea2440964982f8a7a6587b6707ef9e9a5705ec380e13982b0765af205c221724ef418b44c3efd1b6e5f0c1788b143a88ef17
 DIST bubblewrap-0.4.1.tar.xz 214496 BLAKE2B bdbff50cc4e28c91d83c814df7f2ee15702962d26a9316bd841b1e63bf5976c4549c88e20869e8cc236a8a0c9a065518f945c356fa7a058f8831f5b1e9d4eb0d SHA512 0ff46dc0fda2d0cffbb36cc52ff43951b30cbd835a42cc56806acbbbd827796bfadbb1cfafc84d6b47a72c031ca44abe1c377acc0cc25fe3b33e854f5f687d35
-EBUILD bubblewrap-0.4.1.ebuild 1139 BLAKE2B 9f94cb92c33bb2ed0d3c4ccab96f4469386e3a812c5f636ad5979c4035e3a5a77a75225654c8519b2691e1586116d418da0952944a73381b2df029a2ee4ac261 SHA512 36984a98da1a40251109bacb8d7a7eda097bdecec2f2caf32edd00ff63e3372d811cdd59e78a4ca667890475bd3f83bc4b0e6f9d0a97797d74b907f5f6b73fad
+EBUILD bubblewrap-0.4.1.ebuild 1138 BLAKE2B 5607d1645cc81be516dac6146c6aa45fefb69d66137af886048664fec1d73f4cf00835ee9d7a21e72f93acc9ee49b9d079f6dbf2ce70f400eb9a6487a437dc31 SHA512 164790de09371c07d7df7311b022d9dbdb0cf28333152d96c0906d2966fd63aae99b7e6cb139efda2e8903b27302ed9d74a7e1071a6e4eadc42afe5f70dcb2ce
 MISC metadata.xml 452 BLAKE2B c11d7134d3623de9f970ddcb4782d1312f89b17955090ee7d4c56a1acb9b45f1c5ae0d08d091b57be21b696cceda0ed7d747c10aa6765c927df8dae81233d66c SHA512 3e6ec22d7109fdf7772edba88f6f76783df8ee233d9f927b6e5570d1453f611f93627c2ea3dfcbe9ae1259d1c23692b26d5403fef02558dcf296f569702c5103
diff --git a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
index df71b56f75f8..bcd591ab652b 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/conspy/Manifest b/sys-apps/conspy/Manifest
index 8d3e14ad8f75..c703dd234958 100644
--- a/sys-apps/conspy/Manifest
+++ b/sys-apps/conspy/Manifest
@@ -1,6 +1,4 @@
 AUX conspy-1.14-tinfo.patch 324 BLAKE2B ac9259d614d712164f5773ead18fd8ca7c60ec70be2d4d14c552a4293221971423e6bdc65f901ac74a0a314a6b43cb9192a13f36d43571028d4cfacf40b13ff5 SHA512 ae42dd823e5b99bcf4a3c556b9ae8724b0c35b2de4791293f7d83b2da69ddf3c5dc3454b1da2d82b5e97ef230911832fa8d9297df76e698fd6c190c98def978b
-DIST conspy-1.14.tar.gz 26637 BLAKE2B 6fd4e3c35bf978ca7041aac0de23745a5c7cb200e4b29ec841cc195ea75194ed9a65ef46c85fc40b549ca68593ddab1af39499725880da403a602f97650982cd SHA512 46c25770e399c46de5aadcfbf4cff4ab5bc0f83771d6930b5752b9493f8c6864cc86d787ef6f297a00944e65987a56f6bf2cf99975eff689864745c0eef45b0d
 DIST conspy-1.16.tar.gz 26893 BLAKE2B dfae1677a989c2b9107bf656186513c9624a02a1624976440346138b15f023deb9691d0f4ad651ab2ce0ba96a664d8501685db3ac1ad30a175d6662267d87601 SHA512 231f049c5af379ad6d4b87f462da363fad3fd70138d32986f3de42ba9ae4515b6a3e082ac8d523f70716260f9e4c84d3d01deda0df5e6e7f7f39c0e06ca87ea6
-EBUILD conspy-1.14.ebuild 555 BLAKE2B 6d6788b76b3c6f2a0c213aab6c85fa9f37182cf8b110f283f746c03bca48b399a3207018ee85dc63aeb4972f4560e4730cc6da99a18992e982814c9841364f53 SHA512 cf64540bb3e8d82fb66cc6673c3ccef8b4b59f5791b851ce151ee35f4058141675e6e54e375e7b2556bcb5fab44bb3b458aaca98cd1cf9b91a8020aa8eb5554a
-EBUILD conspy-1.16.ebuild 525 BLAKE2B 2b133ef41575c6d74f866094641fbe5f9a29d21914c11eae5c75bdd7f6e23b91d8110267fd49ba0a96dcf787f292ebeae583ecc169cf8fe5d37ccdd1d9ecd5e1 SHA512 b2317289ecc226d4c2ea651692fb6a2b1c0d41f6282083d109f4237e01a527fa8bad4c4864ec3d46dac33c20e1abaf4f360a3a5546214fde14b51e6f1af6cf6e
+EBUILD conspy-1.16.ebuild 523 BLAKE2B aa46439cdeb6563342797056d1ccbf83d1e05efe7b716adbc2b6d0d110e4283618f81b4c250aa308811f8ceb31dcf5552e223455ae67c9ac8a6b9cb11a58624d SHA512 61274fe4f61078748781bff35f5e20c926c3bfcc9f9c1c9ddda3e0612322ba333774544aa1c8cb057688825851ebc6e6f48f9e64f712832c665e1063ba59bfb4
 MISC metadata.xml 312 BLAKE2B 1f3a2c93eee2566bdfaec2341e2f915fc85299abc816eb946cfe3eb5164dcd612ed741b9c895458c1834af000556eca0b211daaae447f4a67adbb8bc588968b1 SHA512 5cb0c52bf89c53e54947467aa49704dbd75c13ed473a3083f1dd30df67e232908a9bf91631227b64114c892972bb0f95dd32655717ca0f780f89731dceb412e7
diff --git a/sys-apps/conspy/conspy-1.14.ebuild b/sys-apps/conspy/conspy-1.14.ebuild
deleted file mode 100644
index e44b2bafa38e..000000000000
--- a/sys-apps/conspy/conspy-1.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Remote control for Linux virtual consoles"
-HOMEPAGE="http://conspy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-1/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14-tinfo.patch
-)
-DOCS=(
-	ChangeLog.txt README.txt ${PN}.html
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-}
diff --git a/sys-apps/conspy/conspy-1.16.ebuild b/sys-apps/conspy/conspy-1.16.ebuild
index ad2a0d3382ac..1221979768fd 100644
--- a/sys-apps/conspy/conspy-1.16.ebuild
+++ b/sys-apps/conspy/conspy-1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-1/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index cbecd2ad3dc4..ca1ae4139b6f 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,6 +1,4 @@
-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-0_pre20201230.ebuild 670 BLAKE2B af3b34e5b5bcc498ce1eb1745e53efa95eb5c86b7d4cc47eb586ebf6f386a83b9e7088f8821af82b0ec737c21ac608dd012c5d70d399e1cd9a7a5abf7260be6b SHA512 429f4ad3cc489cd81225d8ae6659b31a1f8949103fbc96f0244811447efc2597002fc97b4d66234d9cb760773908430bdb06852c06d522c003c4c9c6bb46e420
 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_pre20200720.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20200720.ebuild
deleted file mode 100644
index 3685473eeacb..000000000000
--- a/sys-apps/edid-decode/edid-decode-0_pre20200720.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-EGIT_COMMIT="56dd103a0c20724ee956950f5bcb8cc1c8667af9"
-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/${MY_P}.tar.gz -> ${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/edid-decode/edid-decode-0_pre20201230.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20201230.ebuild
index fc373b025e2c..50b8e6af19f6 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20201230.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20201230.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 083ef1512025..1e2706454632 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,5 +1,7 @@
+DIST firejail-0.9.64.4.tar.xz 431116 BLAKE2B 1e64af1459cdbd6e753299796b2521efdc1fe364a66b8f0f40df1adabec32d0673cb9805a2ab385b96b64aca16e038e615ab1e4dc4df1dbcaa0b5b24f54c89d0 SHA512 580a074cb40e7559f6d532418b5e05e042c30306e8507d32ac3c71a51dec6648035ad810d253da02caaa4adc41f773dfdab55528618f5ca30ff30d4e7bbd12c9
 DIST firejail-0.9.64.tar.xz 419464 BLAKE2B 9425910bd78739dc628a05247877f3e96065f9eab6be1fa87a70932ff04a53817e03cd67a81b35b0e5a69b5598fc5be9d6191f9c5c2bf511bc76c1edaf0eb22d SHA512 89bab9aee944ebde6221a96f0f028380f607cd49046cad5348d5974efcc92c50a172edf5e50c56606091d2060d1d8f0c50a41f05f63327672a3c3cb48eb93699
 EBUILD firejail-0.9.64-r1.ebuild 2489 BLAKE2B 8a576a4e3780707c4a5e03bf8473b476b2ee77ee0e78fb2e6481f980e7405ec06383bb0a40da5e403f668c58a63c62e4aa765c9815b18fc7333f89a989b46555 SHA512 9b75ecd447887970506476ca44d885e42e3ae560d2d3c97c2be404cc38d0752bcda5e67fd573c70308d9eb4938a48afe99ac46e8699d2b70a89d3df401f3c1e7
+EBUILD firejail-0.9.64.4.ebuild 2450 BLAKE2B bd289c8bb56e64a79c9e62dc6f6909bae9b4b334a0b9e2e39e0ba27a24972a07098ba1e1b8eb7e607ac55f87415fe5622d6497bdb28e70897917e20cb5bf599a SHA512 8a903f8406cc307a377b5371114a400697e562e54096bfa595b496df2f92003188cf0684db2fea2731b0ebe9915160e301333c308987470cbf8a41afcfdaa03a
 EBUILD firejail-0.9.64.ebuild 2280 BLAKE2B 5f9661f30d885d551a078698e98c6686fc47ca6cbc973089b105a1bfed2b2510ee7ae2fe81c0a3cb0fd56880084b562fb5e5e54d3e846eaf7887726869455945 SHA512 8304043f6d419f82e7f810e98e9e77bcb77d790d2b3486f03da6196b4fc594e90324e8c19601061fdb28561667c02b48aa72c0dc02166f2c1488945344fd6569
-EBUILD firejail-9999.ebuild 2283 BLAKE2B 434fde2169c523fc263c519ebcdbc9cb92ff03dac044944be28d94be62e7f8bd526170112fe934391e9511a146013917a7d5a4abf06d0bb606276c8e85f794d9 SHA512 043b448bbd809db488aba6da310f38fc106a3a4f2bb56e3f30befad82c231406d4128e5569d6b0ea096b283273e297b05cfff720ac8056b742a8d9d974201a5c
+EBUILD firejail-9999.ebuild 2244 BLAKE2B e25c9688ffc059dfc0b69b2306e1ea7068a5344c10aee94c371cc3177f550cebf371f559b344a1c94ceff33ebf8375673c5bbd4e9bde5d277f85fc7dd1f9c178 SHA512 4e44059e59123a5e87d4a7d2425a5f7ce753e89afd368eac9ab602142dc08ebd798e9c0498bfe38a471ba5e36ae5b077ce7a36d8186800ebc1d2b69cbe02150d
 MISC metadata.xml 1832 BLAKE2B aec785bbd3674d6ec089390d65c064b6ce1f56c9ae459f39808a393dd478b9225821dbaad8892f22f367d5c163f40b664b29afcd130aa6463a87fe6c46ef592f SHA512 c1f8ee756c4bd7e79cfa81b4c5ac92a3377ab58a5d8df6f5535d9906d3fcb55d9f34664f2206c950b3b8ba560e3ed7e4d18b7f5637463ac8cb1934a90b2b68d4
diff --git a/sys-apps/firejail/firejail-0.9.64.4.ebuild b/sys-apps/firejail/firejail-0.9.64.4.ebuild
new file mode 100644
index 000000000000..1542ba12484b
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.64.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit toolchain-funcs python-single-r1 linux-info
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
+	EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Security sandbox for any type of processes"
+HOMEPAGE="https://firejail.wordpress.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home +suid test +userns +whitelist"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-apps/firejail-lts
+	apparmor? ( sys-libs/libapparmor )
+	contrib? ( ${PYTHON_DEPS} )
+	dbusproxy? ( sys-apps/xdg-dbus-proxy )"
+
+DEPEND="${RDEPEND}
+	sys-libs/libseccomp
+	test? ( dev-tcltk/expect )"
+
+REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die
+
+	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+
+	# remove compression of man pages
+	sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die
+
+	if use contrib; then
+		python_fix_shebang -f contrib/*.py
+	fi
+
+	# some tests were missing from this release's tarball
+	if use test; then
+		sed -i -r -e 's/^(test:.*) test-private-lib (.*)/\1 \2/; s/^(test:.*) test-fnetfilter (.*)/\1 \2/' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-firetunnel \
+		$(use_enable apparmor) \
+		$(use_enable chroot) \
+		$(use_enable dbusproxy) \
+		$(use_enable file-transfer) \
+		$(use_enable globalcfg) \
+		$(use_enable network) \
+		$(use_enable private-home) \
+		$(use_enable suid) \
+		$(use_enable userns) \
+		$(use_enable whitelist) \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	if use contrib; then
+		python_scriptinto /usr/$(get_libdir)/firejail
+		python_doscript contrib/*.py
+		insinto /usr/$(get_libdir)/firejail
+		dobin contrib/*.sh
+	fi
+}
+
+pkg_postinst() {
+	CONFIG_CHECK="~SQUASHFS"
+	local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode"
+	check_extra_config
+}
diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild
index 7a15ae3bdeb6..7c0a516bf0c5 100644
--- a/sys-apps/firejail/firejail-9999.ebuild
+++ b/sys-apps/firejail/firejail-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
@@ -21,7 +21,7 @@ HOMEPAGE="https://firejail.wordpress.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist"
+IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home +suid test +userns +whitelist"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-apps/firejail-lts
@@ -63,7 +63,6 @@ src_configure() {
 		$(use_enable file-transfer) \
 		$(use_enable globalcfg) \
 		$(use_enable network) \
-		$(use_enable overlayfs) \
 		$(use_enable private-home) \
 		$(use_enable suid) \
 		$(use_enable userns) \
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 508b56e23359..07e70c77cf16 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -2,7 +2,7 @@ DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35
 DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809a32f61486ab068b1f636502ac36d58e4c204b5f0d46f51a6624f134a457f246b520614213cf45cc5397de769b315e01e32720bcf SHA512 373892ca9ae8845673f9ddad74e0be0b71af944e109adf0d2ce8e54a9c24ffff5e90cfa92e74b7abc1e7d7b1598404258b90b549697bde28a1025a2d974e991f
 DIST gentoo-systemd-integration-9.tar.gz 65696 BLAKE2B 7d2105e37ff53d48e312b78a971f16124df1d3a1f99ae37eb757e4be31663eee15ba1a9fb31ef31250c79f902f7a00e1de84030f3fb67e41ab2243d58deabcb6 SHA512 e4810e74c713793f1e5aca7f025780c32e8f0fe404bf74b65263bfaeff1ae1398551fdff7de37a4050f0e48d5e0b90525217f5b3caa18111ab1981f57f41fc18
 EBUILD gentoo-systemd-integration-7.ebuild 794 BLAKE2B 7f33bc671174599f5a855a93522f7888f2a818a2a45f47742ed61f05f05708b976ee566625df20cfd422dd6f9f9ba4ebd21fcefd51e9bbb2059d48b542e795cc SHA512 fdef060281bf6c98ac0236a6e111bf8f36746fe80c335b4b2fec453502f903effd7ff261593a60a836beb1e333812102061165c9e1f86a340c9bf3db3729bf1c
-EBUILD gentoo-systemd-integration-8.ebuild 746 BLAKE2B 0c058aba4b832e547a1d46d41e3a2fe9868b0b6aa5e937776ac6a0906cc437d79e5e616fa740e2f6e8ec3d723a7258b4e5e298611afee111788b5faeca9b3e25 SHA512 d019036ef93682e70b66008893244fb268532ea7d03ec45c077278fdb5c9f548ebf59a578d798f6b8464c4880d88091d8d4d3a03f182546dd3ef5c767befaec4
+EBUILD gentoo-systemd-integration-8.ebuild 744 BLAKE2B ad9f6eee053dd9663fd6d104c7aa113f47d2d8b2317468c7c882ef3755e13ac6ef0e11778b490ee673dfad673550953c6dcee77de8f4baa8a04508443e404776 SHA512 0a60649afd8d29a3f3921911296a377788a22de14147cccd0a7cb1621b1aed7711148e69aee4e24a5020fd35ddbdc29afd740608c0e975337770cb04a8fea027
 EBUILD gentoo-systemd-integration-9.ebuild 734 BLAKE2B b7ce0ec95d313c57c99bae945d588833afbfc15a3e84632ac5296ca388bc2166b4f47321eb672ef725bdb3810297514d333250cceda63bd51ab287718e0bed2f SHA512 1ce8e63fe403aa3fb0c70c7ee1acf5670dc347075b780b277eb515b1bf6446e9dfddaab02d24583ef786f2f51be2ddebf3e5e2bca5420a8416f17d429233cc16
 EBUILD gentoo-systemd-integration-9999.ebuild 734 BLAKE2B b7ce0ec95d313c57c99bae945d588833afbfc15a3e84632ac5296ca388bc2166b4f47321eb672ef725bdb3810297514d333250cceda63bd51ab287718e0bed2f SHA512 1ce8e63fe403aa3fb0c70c7ee1acf5670dc347075b780b277eb515b1bf6446e9dfddaab02d24583ef786f2f51be2ddebf3e5e2bca5420a8416f17d429233cc16
-MISC metadata.xml 355 BLAKE2B e2e7d95fe4d4f671d0b8a24bee9db8c458232ceed374b7ed902f724ca5971cebb81acc19fe62a6d53bf98cff4c7b999d3dbcf674426e46accda3d591d6009545 SHA512 b590b927b555441da6f665dbf637ffaa27651f074a62d1738959c5913f45ee648146f9054e07ade42d5f28f93cb350b43c94299a50506d01d446de22ebacdbc0
+MISC metadata.xml 379 BLAKE2B 919123bb7da2e670a018404d1c7ff1ad669d6f07b5070d37e3a76c6aaa46a9d0e11c2e828c68e1c3616916deed8303b85eca7085c16ed31e9b5f91463d1afe1e SHA512 308f5eafbcb8109c260bf89fb0df90fb5ecde227402b18d322da8351c6bf0198b53faaafb548a86daba5ce58774c680ed4e46fcfc2c0759e2004bbefeca1289b
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
index 46a294eef2ec..d6fa26516aad 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 inherit systemd
diff --git a/sys-apps/gentoo-systemd-integration/metadata.xml b/sys-apps/gentoo-systemd-integration/metadata.xml
index 0c04b426d911..2f041a556c44 100644
--- a/sys-apps/gentoo-systemd-integration/metadata.xml
+++ b/sys-apps/gentoo-systemd-integration/metadata.xml
@@ -5,6 +5,7 @@
 		<email>systemd@gentoo.org</email>
 		<name>Gentoo systemd team</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="bitbucket">mgorny/gentoo-systemd-integration</remote-id>
 	</upstream>
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 79f7a3358acc..6372e834ffff 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,6 +1,8 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
 DIST help2man-1.47.17.tar.xz 211476 BLAKE2B 67b1ccd4b6b66510a2fff424663bc2051e49e93c37c7e2a2b4631f3781d3773a97fd1773f96ca5ca2ba644bcd79ae35338931eff857ce199a847cc312d778b0e SHA512 185cd04aa6db6d8a4c898b61ad6a0aded7775659c7f02244b45927310eb3f8cd932fe9dd725ccac3e793aa22c656338b5d16f291f3a0420ed121681d4a4bac25
+DIST help2man-1.48.1.tar.xz 210500 BLAKE2B 9993e1f0c1102025f80fb64fa1afe31efe982ef54c9d5ff88bed9038bcfe1f4d5624737e0953abeb252df78cf92a645bbbd8f3b44939d70a2b50494c22110991 SHA512 506e7a0e6571facc570df57b875d6d6b911b281b38af1831d3a058a6de658c3656e3a5be970fa3d89c053ab6eafd4853527512b48524ceeff6da60f946f1ecef
 EBUILD help2man-1.47.16.ebuild 1034 BLAKE2B dc7c42555d1efd3896ba09d0602017ad721ab5aa94cc2dad5b9cc4f127f191a64fffc19f47f838ed81d2f4918d5262189ff369c220e9afd4f02d6a2dc6f11bb9 SHA512 e6dac61eb7d535c184cc15ea54c70bda3e0745a21cb8d47acaf6186780fb836e90f92d1869c9335433f857a44b9d6be24cc21ffe25986320cd33b8bd4e2054bc
-EBUILD help2man-1.47.17.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
+EBUILD help2man-1.47.17.ebuild 1036 BLAKE2B b3d77f8cf4bb78a7adec3a7710d74f856f3b8f3baeb48cfef3d150a4b6458de7f614bdbd5cba0ae6480ded6956427799e916b2ed7f415a516c560552cb9603c5 SHA512 1cadbb8379a0d335875ea07609a6d8a4c9ea59a9013287ffb28d8ff6d53fc95c1f703084ae4ea971240b8eeb83cf2c086ce3e657de85fcfee51da60c537c81f5
+EBUILD help2man-1.48.1.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.17.ebuild b/sys-apps/help2man/help2man-1.47.17.ebuild
index 2f5c10989e9b..4b975fd76ccc 100644
--- a/sys-apps/help2man/help2man-1.47.17.ebuild
+++ b/sys-apps/help2man/help2man-1.47.17.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.48.1.ebuild b/sys-apps/help2man/help2man-1.48.1.ebuild
new file mode 100644
index 000000000000..2f5c10989e9b
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.48.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND="${RDEPEND}"
+
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+	default
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files #555018
+	local myeconfargs=(
+		ac_cv_path_MSGFMT=$(type -P false)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index fde06c46c4d6..2075bcf3cd8b 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,10 +1,6 @@
-DIST hwids-20200204.tar.gz 3495191 BLAKE2B 23075b6728d9b0e020be45729d0df4cef95cac5e912e646b612266337d1add59c87a1031e6672c5b6eb23e13c26e6299b62a5886aa25017242a86fd474c1e9ae SHA512 1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741
-DIST hwids-20200306.tar.gz 3512152 BLAKE2B 6a6ee48598e72f97a90bff8f45aacb699218570ede5b60ed119ebae78de6cd4b92e02f96cf57c83710da699be9a7dcdfdef8d404539e04b664298874b35e54ce SHA512 eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250
 DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc
 DIST hwids-20201207.tar.gz 3749352 BLAKE2B a968e6daf5686c4f73d9d900fbe80a5b3844c006102ed8801f88e378dc43c1bb66aaeced42bc2703a9c8ad624a1a7167bba485b1bf0c0d0e6043920e015c9177 SHA512 ec638edd1bbf00bd66e9baa50e3b9c9a5004a96a359e6bea306f1509c69bb3c7ede3569174007ab8bde11d49300da452b06be96136cde6bd2d84a76cff9251c2
-EBUILD hwids-20200204.ebuild 1669 BLAKE2B 8e070debcc0dcd428d49726af36a640642e699e7811706694cbfcd6f03d07251e7dcef29759eb5b9da36ff8c72a33fb50fdf365c81304b179e155b2307e73707 SHA512 d32cc90225945dc8a6f4b9dace7e99fcec8369116f1e9e04a447c6dc83ba7ada6054c5bcad706ea554b2836f1eb4d91c237a0a31123f4bed52eefdc614188dfe
-EBUILD hwids-20200306.ebuild 1678 BLAKE2B 15d252b1a9090d3b744a463c42a4d5e46c27df4c57807ae03acc5b524d4fb5f00a3e7acc01900a00eb17618d4685b606ed89abbc678c80c371fb7ff36e0b15b3 SHA512 d953589f15789952126486fb5f5eac733e33bc8c8c88e888887f7c92717efbdf8b716dc100bb7467226f8a0d762566a05ccac0ed2cf5d35e477c5d3fdaa4990e
 EBUILD hwids-20200813.1.ebuild 1669 BLAKE2B 8e070debcc0dcd428d49726af36a640642e699e7811706694cbfcd6f03d07251e7dcef29759eb5b9da36ff8c72a33fb50fdf365c81304b179e155b2307e73707 SHA512 d32cc90225945dc8a6f4b9dace7e99fcec8369116f1e9e04a447c6dc83ba7ada6054c5bcad706ea554b2836f1eb4d91c237a0a31123f4bed52eefdc614188dfe
-EBUILD hwids-20201207.ebuild 1679 BLAKE2B 6f3c0dc51d9598239348f1abfaf3f2c691b5c060dd21ab31fb79ccf4d9c240791a7ea061ae31aae201b15456459981ce1e06d15838b5dc136526c940dfc5c4d2 SHA512 f3a949dbda15206076e48d996bcbf6d9b1568a4338511dfbc05e87d6102eb5b08dffedf23cc24f06d2f9f17bc7247802e6229f01e23c5098b49b3768c0eb9c58
+EBUILD hwids-20201207.ebuild 1670 BLAKE2B 4ae3be878772dab32d7da2e4fd9c48c2c0742004f925fa2b76e4f5006ff930a6361dfeecbbf0d58564abc73b13959b9e630016260e7f85729145b4b4194d522e SHA512 fddec03837b238ddf2a62492ea1053a13155e317346d6f4fe309a2365a24f7845da243e0141e4f40c56d273824c2a89e69dcddb4bddb8eaa99a056d3744cedff
 EBUILD hwids-99999999.ebuild 1679 BLAKE2B 6f3c0dc51d9598239348f1abfaf3f2c691b5c060dd21ab31fb79ccf4d9c240791a7ea061ae31aae201b15456459981ce1e06d15838b5dc136526c940dfc5c4d2 SHA512 f3a949dbda15206076e48d996bcbf6d9b1568a4338511dfbc05e87d6102eb5b08dffedf23cc24f06d2f9f17bc7247802e6229f01e23c5098b49b3768c0eb9c58
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20200204.ebuild b/sys-apps/hwids/hwids-20200204.ebuild
deleted file mode 100644
index 13c9146d0919..000000000000
--- a/sys-apps/hwids/hwids-20200204.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
-HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == 99999999 ]]; then
-	PYTHON_COMPAT=( python3_{6,7} )
-	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
-else
-	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-RDEPEND="
-	udev? ( virtual/udev )
-"
-
-if [[ ${PV} == 99999999 ]]; then
-	BDEPEND="
-		net-misc/curl
-		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
-	"
-	python_check_deps() {
-		if use udev; then
-			has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-		fi
-	}
-else
-	S=${WORKDIR}/hwids-${P}
-fi
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		emake fetch
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e '/udevadm hwdb/d' Makefile || die
-}
-
-_emake() {
-	emake \
-		NET=$(usex net) \
-		PCI=$(usex pci) \
-		UDEV=$(usex udev) \
-		USB=$(usex usb) \
-		"$@"
-}
-
-src_compile() {
-	if [[ ${PV} == 99999999 ]] && use udev; then
-		python_setup
-		_emake udev-hwdb
-	fi
-	_emake
-}
-
-src_install() {
-	_emake install \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		MISCDIR="${EPREFIX}/usr/share/misc" \
-		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
-		DESTDIR="${D}"
-}
-
-pkg_postinst() {
-	if use udev; then
-		udevadm hwdb --update --root="${ROOT}"
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20200306.ebuild b/sys-apps/hwids/hwids-20200306.ebuild
deleted file mode 100644
index c964e6ebfa16..000000000000
--- a/sys-apps/hwids/hwids-20200306.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
-HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == 99999999 ]]; then
-	PYTHON_COMPAT=( python3_{6,7} )
-	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
-else
-	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-RDEPEND="
-	udev? ( virtual/udev )
-"
-
-if [[ ${PV} == 99999999 ]]; then
-	BDEPEND="
-		net-misc/curl
-		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
-	"
-	python_check_deps() {
-		if use udev; then
-			has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-		fi
-	}
-else
-	S=${WORKDIR}/hwids-${P}
-fi
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		emake fetch
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e '/udevadm hwdb/d' Makefile || die
-}
-
-_emake() {
-	emake \
-		NET=$(usex net) \
-		PCI=$(usex pci) \
-		UDEV=$(usex udev) \
-		USB=$(usex usb) \
-		"$@"
-}
-
-src_compile() {
-	if [[ ${PV} == 99999999 ]] && use udev; then
-		python_setup
-		_emake udev-hwdb
-	fi
-	_emake
-}
-
-src_install() {
-	_emake install \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		MISCDIR="${EPREFIX}/usr/share/misc" \
-		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
-		DESTDIR="${D}"
-}
-
-pkg_postinst() {
-	if use udev; then
-		udevadm hwdb --update --root="${ROOT}"
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20201207.ebuild b/sys-apps/hwids/hwids-20201207.ebuild
index fdc4a456ddd5..03bc78831389 100644
--- a/sys-apps/hwids/hwids-20201207.ebuild
+++ b/sys-apps/hwids/hwids-20201207.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
 	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 9b130f752ad1..49a84c77cf9f 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,6 +3,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
 DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
 EBUILD kmod-27-r2.ebuild 5266 BLAKE2B fdaaf909ed59811f502c721f1c616c8c0145afecb62df6bcd13b163a477b2dbd3110edc28baf3bf824c6e9d3bfc95a01f5ce69b7dc6345fa393370f0008ac529 SHA512 8863d4522fa38fa7425ea1ee4c733b57e89b4e794f106e50edf1be40424f3f5c549423a3c3ee1db938f657cb8e04b54656273979350a1097ebce6bb0355b0add
-EBUILD kmod-28.ebuild 5296 BLAKE2B 13a70511975b568598bd29a79790ba4d6bae2c153c5dc198a2670473ea6e38f846f770cecd97bc2ada44c805da9e7332609110935f958709e8f0e05445589342 SHA512 94be9030d49d4f585f96d10b800f71bd6a930ce31b19dcdfe94d65d535a46608caaacc870222675e1752690f2d26e804c480812c249d903dd77332f47f3f655a
+EBUILD kmod-28.ebuild 5290 BLAKE2B 80c4f0771641a90d5b5180cbc3a75aaa63176e07fa4daa555107228b824a740fcf1fba22c272dbd1a2872605fef9db13edc042eb77bbba2ee24c324a282c45d4 SHA512 07c628a589fa27f0705b1f147f1b5ce67796c1c049e12662e62c5d95aa6f4090f419c2ccd1c164c40752ebebcf96d1c4dca2d190fef8c873ff7049107f6a5af2
 EBUILD kmod-9999.ebuild 5300 BLAKE2B 1be8c47e29ac88475b5ab201147c5870e5b10fa9c1340b627ae690603c87aca6928587baa592e22fb1b9a7e3101236a2ad843974b6ea97cf795f589b01aab17a SHA512 9027d8b39b45a30c7721576a220a923c8a1a18adfae7348128c9303cce30aa7bbfc889de44c37addcb8b5c4aefae2084128c678403fd6d3da28f704396e0bc89
 MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed
diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild
index 5b098b96fefc..c163e6b8ac20 100644
--- a/sys-apps/kmod/kmod-28.ebuild
+++ b/sys-apps/kmod/kmod-28.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86"
 	#inherit libtool
 fi
 
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index b1fcb019b1b5..0cd58485493f 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -2,7 +2,9 @@ AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab47832
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.5.3.tar.gz 495110 BLAKE2B b28d7381d259a132de7d9fd347ac4bafb44440b187aa811f3d3f65d7b1ccbb00c6b5bb660229cd8155fa5d7bc9668e7b4dd1ebe7bbb909b48367c6a6dd6793e5 SHA512 ad404f031fe016599a8f8d8c0820b23db61a9ad102815d3713e5d13e9a810c819ca7ad9cea50891852982e073ef033dbe7595fde8846971336148e32cbbe29ca
 DIST logwatch-7.5.4.tar.gz 481766 BLAKE2B d86ae3afc33a100fc353948be3591cd13566568d47cad02fa5f390882a223ca9d4d78692214f2f0898fa8bf8687314f60ad9ce02f0987bb86dd7136150a1d2b9 SHA512 6e6a5e8b7ae977244ea97895e06cccde320fce3dfbd2b1c58c945fc8872325a9676c8afe122b1f7230cb6617b64813caf90ef37fc472a1b200eb0b24ea72fa9b
+DIST logwatch-7.5.5.tar.gz 474167 BLAKE2B 3e4183ea6dad4f415987870c555391d2a9496b4d4d894f1c06336876077b2a72e06b4e3f8d272aeb65aa5ea14f5f4d17a6f461ae54b2e50f073fef58a27a5241 SHA512 71df4d69d7e580b21dc0a0f813201822a161ada68a19c6d3f0df9c8576f22c8d43ebe90643d6184e91ee1c6628de9501896a9444ff7ad6af6fe17eba5d3573f2
 EBUILD logwatch-7.5.3.ebuild 2431 BLAKE2B 57e90b95f542f37bcc9c3353ab6992304d3ac1ed6ce7ff9652657e88d74f6f76eefdb0a064dab7dde622c866eaf589724bd6364f09d5f1c96494518780f53817 SHA512 317e2fd99284bd33e86deae1215e0d593343aaa888d0bf51c81c24d85b491d853744e0481f0795d48bbf6ba39f43ac024841dfa8c7bfe66a223f6d7e42e1c6b2
 EBUILD logwatch-7.5.4.ebuild 2431 BLAKE2B 57e90b95f542f37bcc9c3353ab6992304d3ac1ed6ce7ff9652657e88d74f6f76eefdb0a064dab7dde622c866eaf589724bd6364f09d5f1c96494518780f53817 SHA512 317e2fd99284bd33e86deae1215e0d593343aaa888d0bf51c81c24d85b491d853744e0481f0795d48bbf6ba39f43ac024841dfa8c7bfe66a223f6d7e42e1c6b2
+EBUILD logwatch-7.5.5.ebuild 2438 BLAKE2B 68c2ec79f3bde424b897dc551afcfcb1081c1264513ac753b2303183dc2ae906fd7bc77b42eeb1db0132e2fe8be56cb4cb2cab1965577c051adfe19d5e5a7a31 SHA512 945834d780b7e905055740b3b7f1eb9018d13c405a38694b157577d4947797b2b943669e6d10d50a3e27f7a5ffe404ee46cca384e2f8f6ca93d0418742445e17
 EBUILD logwatch-9999.ebuild 2438 BLAKE2B 257d42e1e27297affbf91e91375ed1c3c759dee0159a63f8bea3b3d0448d27b8bc0c852434f4278df89636c5fcfd40c8eb8184d099491c5dace1f1b49bfaf326 SHA512 acfcdb3949bbcb72caab77a5843d2e46635bbfb1f88d262325488317e216c7b6c4fb07ecc48ea98b9cb14a97ffbe9745385ebaf8b66e9801dfdc6bfa6fcc5258
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.5.ebuild b/sys-apps/logwatch/logwatch-7.5.5.ebuild
new file mode 100644
index 000000000000..3bc98aecc866
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.5.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit tmpfiles
+
+PATCHES=()
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="https://sourceforge.net/projects/logwatch/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	# logwatch.pl requires cache dir (bug #607668)
+	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else #100243
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+
+	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index b4742bb8428d..3d0404a50d09 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,8 +1,11 @@
 AUX man-db-2.9.3-clock_gettime64.patch 1493 BLAKE2B 5c080767d380c26ee97983cb82ad58d186157e3c976f1db492cca5135e38fbab1f854b592d517148fea0041d48e794e2108419b458727a8ff6d2f48f81ecf350 SHA512 37a1dc37452e3722bf53c23503317cf17082f7e73715f974ff7798e624ca2b711f2f604bb58741550d3fad7a970e711fd2c8b67148e217dc29963f35f93b0d38
+AUX man-db-2.9.3-darwin-libdb-intl.patch 733 BLAKE2B 864ed2ac8a3626ad5474412ce59560100e48516ad898b974a6d9d900d4b96fd3bf36a2e292b1bafd77a7196e485e6f4aaaa053a8b9c031f29d15c2608a31e224 SHA512 5c2d493dac9f895a0d9ddd24311051de3961b554ee395143159fe661ced64253e38db6a2e6c280831e30effd5cc6316e8480466e29dea81c4b61c3e603626c89
 AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70ee664192db05fbe74013724fcdbe112ead2d4288f90be032777a58ee41515c23d5561ab9cde495a92aa9f74ee353479ef884e3 SHA512 d8840d45c3b115f51bb9b3fc11ece2fecadfe284cd7db29cd012ed32faed990b12a9920cf11282358e5dd27df4bcf3c1a0316116ecae58917ef3c65efb1eb22b
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
+DIST man-db-2.9.4.tar.xz 1909020 BLAKE2B 43427e851f0e661ca1cee55211dd7636f4ffde067c75de7715f525029b22c205728f8e86ac49abff60e47a4a4c9e1fbd78e2c87e70bd37778b88594a3897275f SHA512 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c
 EBUILD man-db-2.9.3-r1.ebuild 4129 BLAKE2B 92a05bea3a84a6dfd3945d8aa8c5a9136c8e92a35aff356046de6e2af0ea8de784fd9112595e8a42046fe6eec8f82cf6af87db6231d8476344c73623430efb44 SHA512 4e273cb69e23f49054eb9133f7ddee58837b6cccfd6d08cc8fc70a71d6f74fe3e08d5a2aeb00792df201eef803eeb1f8125b33f50c392a64ddfdc145f7239a09
-EBUILD man-db-2.9.3.ebuild 4077 BLAKE2B 19274e434d5fc98ce1df87ffaa49a884c633311d9d5a93c777bb54c074309d5e65c84bec754bf1381a41ee9c060aebf6fafcbad8ae2107fa7feb99f694147ae0 SHA512 a37207b489c41d6db34c31d7e5e6f7aaf269482d16bd9d3a276bdbb5efa30c62949acfd4b31cd990cd3b938b1baba57f9a5efd32f4a0f4175cbdd2bddad990c1
-EBUILD man-db-9999.ebuild 4088 BLAKE2B 87925a8bd8a382f2cdff2fe3e05b734ef8e41086ad5fe3c7619b9209eacd6ee1da37e5ec68c73ef648d1eea7c323c42e4b273e10abfe1bbcb183329f9ea11c05 SHA512 706759d5da2b2704ebdc4537405613bef5095bd750a02128a5825f38548f9ad6fa3ae1be3cc09b83b90f436e39f25810cef9d6bfdb32da6d38c5a164ff33a558
+EBUILD man-db-2.9.3-r2.ebuild 5199 BLAKE2B aafb16a1685d0cafca99ac54a55fc7a9371d6d1a1c040b09e2c16ec37598a0a679316dce9bde18aec17aefb5fe767079d64771a986a3d0bbe9acb7ef6c602d6f SHA512 eb24108aabf63f6f936dd4c635c1a8b83f6f28a72ba45ad08561ac6e6dc262170c16f05739d11eebd8b8ceb0a835e62301a587b2fbed672086e3acf320edc88c
+EBUILD man-db-2.9.4.ebuild 5070 BLAKE2B 282b6d530643d4f98e1f5618865676f0eed81da88a599238f0c179777030eaa526182e49017e750aff403da713a1f6c598f87167fd8687be565320783e9c975e SHA512 fccf9aacad6d3b6fa86b08b30972a178599aa95eb596c7d0ba9d10284c870cd2dd86cfec77f5d58e5bc6f54ffcde05adba7f0d176bf9a5ded05a6584fd4f6f21
+EBUILD man-db-9999.ebuild 5070 BLAKE2B 282b6d530643d4f98e1f5618865676f0eed81da88a599238f0c179777030eaa526182e49017e750aff403da713a1f6c598f87167fd8687be565320783e9c975e SHA512 fccf9aacad6d3b6fa86b08b30972a178599aa95eb596c7d0ba9d10284c870cd2dd86cfec77f5d58e5bc6f54ffcde05adba7f0d176bf9a5ded05a6584fd4f6f21
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch
new file mode 100644
index 000000000000..a7df3c62fd06
--- /dev/null
+++ b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch
@@ -0,0 +1,28 @@
+libdb: link against libintl
+
+necessary since gettext is used for translations
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+
+--- a/libdb/Makefile.am
++++ b/libdb/Makefile.am
+@@ -43,7 +43,7 @@
+ 	db_xdbm.h \
+ 	mydbm.h
+ 
+-libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS)
++libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL)
+ 
+ libmandb_la_LDFLAGS = \
+ 	-avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined
+--- a/libdb/Makefile.in
++++ b/libdb/Makefile.in
+@@ -1541,7 +1541,7 @@
+ 	db_xdbm.h \
+ 	mydbm.h
+ 
+-libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS)
++libmandb_la_LIBADD = ../lib/libman.la $(DBLIBS) $(LIBINTL)
+ libmandb_la_LDFLAGS = \
+ 	-avoid-version -release $(VERSION) -rpath $(pkglibdir) -no-undefined
+ 
diff --git a/sys-apps/man-db/man-db-2.9.3-r2.ebuild b/sys-apps/man-db/man-db-2.9.3-r2.ebuild
new file mode 100644
index 000000000000..fc6eaf54888c
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.9.3-r2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd prefix
+
+DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
+HOMEPAGE="http://www.nongnu.org/man-db/"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
+
+CDEPEND="
+	!sys-apps/man
+	>=dev-libs/libpipeline-1.5.0
+	sys-apps/groff
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( berkdb? ( sys-libs/db:= ) )
+	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
+	seccomp? ( sys-libs/libseccomp )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? (
+		>=app-text/po4a-0.45
+		sys-devel/gettext
+		virtual/libiconv
+		virtual/libintl
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/man
+	acct-user/man
+	selinux? ( sec-policy/selinux-mandb )
+"
+PDEPEND="manpager? ( app-text/manpager )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.3-sandbox-env-tests.patch
+	"${FILESDIR}"/man-db-2.9.3-clock_gettime64.patch
+	"${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch
+)
+
+pkg_setup() {
+	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
+		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
+	fi
+}
+
+src_unpack() {
+	if [[ "${PV}" == *9999 ]] ; then
+		git-r3_src_unpack
+
+		# We need to mess with gnulib :-/
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
+		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		local bootstrap_opts=(
+			--gnulib-srcdir=../gnulib
+			--no-bootstrap-sync
+			--copy
+			--no-git
+		)
+		AUTORECONF="/bin/true" \
+		LIBTOOLIZE="/bin/true" \
+		sh ./bootstrap "${bootstrap_opts[@]}" || die
+
+		eautoreconf
+	fi
+
+	hprefixify src/man_db.conf.in
+	if use prefix ; then
+		{
+			echo "#"
+			echo "# Added settings for Gentoo Prefix"
+			[[ ${CHOST} == *-darwin* ]] && \
+				echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
+			echo "MANDATORY_MANPATH /usr/share/man"
+		} >> src/man_db.conf.in
+	fi
+}
+
+src_configure() {
+	# set sections we want to search by default
+	local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
+	sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
+	case ${CHOST} in
+		*-solaris*)
+			# Solaris tends to use sections named after the pkgs that
+			# owns them, in particular for libc functions we want those
+			# sections
+			local s
+			for s in $(cd /usr/share/man/ && echo man*) ; do
+				s=${s#man}
+				[[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
+			done
+			;;
+	esac
+
+	export ac_cv_lib_z_gzopen=$(usex zlib)
+	local myeconfargs=(
+		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--disable-setuid #662438
+		--enable-cache-owner=man
+		--with-sections="${sections}"
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_with seccomp libseccomp)
+		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
+	)
+	case ${CHOST} in
+		*-solaris*|*-darwin*)
+			myeconfargs+=(
+				$(use_with nls libiconv-prefix ${EPREFIX}/usr)
+				$(use_with nls libintl-prefix ${EPREFIX}/usr)
+			)
+			;;
+	esac
+	econf "${myeconfargs[@]}"
+
+	# Disable color output from groff so that the manpager can add it. #184604
+	sed -i \
+		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
+		src/man_db.conf || die
+
+	cat > 15man-db <<-EOF || die
+	SANDBOX_PREDICT="/var/cache/man"
+	EOF
+}
+
+src_install() {
+	default
+	dodoc docs/{HACKING,TODO}
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
+
+	insinto /etc/sandbox.d
+	doins 15man-db
+}
+
+pkg_preinst() {
+	local cachedir="${EROOT}/var/cache/man"
+	# If the system was already exploited, and the attacker is hiding in the
+	# cachedir of the old man-db, let's wipe them out.
+	# see bug  #602588 comment 18
+	local _replacing_version=
+	local _setgid_vuln=0
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
+			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
+		else
+			_setgid_vuln=1
+			debug-print "Applying cleanup for security bug #602588"
+		fi
+	done
+	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
+
+	# Fall back to recreating the cachedir
+	if [[ ! -d ${cachedir} ]] ; then
+		mkdir -p "${cachedir}" || die
+		chown man:man "${cachedir}" || die
+	fi
+
+	# Update the whatis cache
+	if [[ -f ${cachedir}/whatis ]] ; then
+		einfo "Cleaning ${cachedir} from sys-apps/man"
+		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
+	fi
+}
+
+pkg_postinst() {
+	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
+		einfo "Rebuilding man-db from scratch with new database format!"
+		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
+	fi
+}
diff --git a/sys-apps/man-db/man-db-2.9.3.ebuild b/sys-apps/man-db/man-db-2.9.4.ebuild
index 70728d703694..f5b961755735 100644
--- a/sys-apps/man-db/man-db-2.9.3.ebuild
+++ b/sys-apps/man-db/man-db-2.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit systemd
+inherit systemd prefix
 
 DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
 HOMEPAGE="http://www.nongnu.org/man-db/"
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
@@ -36,6 +36,8 @@ BDEPEND="
 	nls? (
 		>=app-text/po4a-0.45
 		sys-devel/gettext
+		virtual/libiconv
+		virtual/libintl
 	)
 "
 RDEPEND="
@@ -46,7 +48,10 @@ RDEPEND="
 "
 PDEPEND="manpager? ( app-text/manpager )"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.9.3-sandbox-env-tests.patch )
+PATCHES=(
+	"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
+	"${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch
+)
 
 pkg_setup() {
 	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
@@ -82,21 +87,56 @@ src_prepare() {
 
 		eautoreconf
 	fi
+
+	hprefixify src/man_db.conf.in
+	if use prefix ; then
+		{
+			echo "#"
+			echo "# Added settings for Gentoo Prefix"
+			[[ ${CHOST} == *-darwin* ]] && \
+				echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
+			echo "MANDATORY_MANPATH /usr/share/man"
+		} >> src/man_db.conf.in
+	fi
 }
 
 src_configure() {
+	# set sections we want to search by default
+	local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
+	sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
+	case ${CHOST} in
+		*-solaris*)
+			# Solaris tends to use sections named after the pkgs that
+			# owns them, in particular for libc functions we want those
+			# sections
+			local s
+			for s in $(cd /usr/share/man/ && echo man*) ; do
+				s=${s#man}
+				[[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
+			done
+			;;
+	esac
+
 	export ac_cv_lib_z_gzopen=$(usex zlib)
 	local myeconfargs=(
 		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		--disable-setuid #662438
 		--enable-cache-owner=man
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
+		--with-sections="${sections}"
 		$(use_enable nls)
 		$(use_enable static-libs static)
 		$(use_with seccomp libseccomp)
 		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
 	)
+	case ${CHOST} in
+		*-solaris*|*-darwin*)
+			myeconfargs+=(
+				$(use_with nls libiconv-prefix ${EPREFIX}/usr)
+				$(use_with nls libintl-prefix ${EPREFIX}/usr)
+			)
+			;;
+	esac
 	econf "${myeconfargs[@]}"
 
 	# Disable color output from groff so that the manpager can add it. #184604
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index cf3711365b0a..f5b961755735 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit systemd
+inherit systemd prefix
 
 DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
 HOMEPAGE="http://www.nongnu.org/man-db/"
@@ -36,6 +36,8 @@ BDEPEND="
 	nls? (
 		>=app-text/po4a-0.45
 		sys-devel/gettext
+		virtual/libiconv
+		virtual/libintl
 	)
 "
 RDEPEND="
@@ -48,6 +50,7 @@ PDEPEND="manpager? ( app-text/manpager )"
 
 PATCHES=(
 	"${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch
+	"${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch
 )
 
 pkg_setup() {
@@ -84,21 +87,56 @@ src_prepare() {
 
 		eautoreconf
 	fi
+
+	hprefixify src/man_db.conf.in
+	if use prefix ; then
+		{
+			echo "#"
+			echo "# Added settings for Gentoo Prefix"
+			[[ ${CHOST} == *-darwin* ]] && \
+				echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
+			echo "MANDATORY_MANPATH /usr/share/man"
+		} >> src/man_db.conf.in
+	fi
 }
 
 src_configure() {
+	# set sections we want to search by default
+	local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
+	sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
+	case ${CHOST} in
+		*-solaris*)
+			# Solaris tends to use sections named after the pkgs that
+			# owns them, in particular for libc functions we want those
+			# sections
+			local s
+			for s in $(cd /usr/share/man/ && echo man*) ; do
+				s=${s#man}
+				[[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
+			done
+			;;
+	esac
+
 	export ac_cv_lib_z_gzopen=$(usex zlib)
 	local myeconfargs=(
 		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		--disable-setuid #662438
 		--enable-cache-owner=man
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
+		--with-sections="${sections}"
 		$(use_enable nls)
 		$(use_enable static-libs static)
 		$(use_with seccomp libseccomp)
 		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
 	)
+	case ${CHOST} in
+		*-solaris*|*-darwin*)
+			myeconfargs+=(
+				$(use_with nls libiconv-prefix ${EPREFIX}/usr)
+				$(use_with nls libintl-prefix ${EPREFIX}/usr)
+			)
+			;;
+	esac
 	econf "${myeconfargs[@]}"
 
 	# Disable color output from groff so that the manpager can add it. #184604
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 8f43558ecdb4..07bd512bb649 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -2,5 +2,5 @@ DIST man-pages-5.09.tar.xz 1740816 BLAKE2B 5434453dc75058a2aef5d1ca04854abe3d2e3
 DIST man-pages-5.10.tar.xz 1747688 BLAKE2B 39da2ec75b0096db7b5af483e6096259b2439bf9ce3b651af82350b612c234375e3e34d70ff84f401c23189c0aa921f29cf77c0979e40efd3fda0f06378a7c2b SHA512 a23f90136b0bf471f5ae3917ae0e558fec0671cace8ccdd8e244f41f11fefa4ac0df84cf972cc20a1792d7b930db5e2c451881c0937edabf7d5e1ec46c4760ed
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-5.09.ebuild 1615 BLAKE2B aef12c4bd4190869ac6ea8ea15728370fcbd536efd75b1e6e746585909d401cbf62fb14644d34a0c456645d750e59600fbd5c5ecae734b1297466ea701e6ba98 SHA512 e18aa04a42cb95b926c076605d1d594faa999a46fa6f680f65364e91a31f061fd9ff058707adaef7f91c5098d27ea2e4006e87714cf35007b200ac04fb622634
-EBUILD man-pages-5.10.ebuild 1624 BLAKE2B 3ce3c687f162b8926bf9969e167a5e21571b0648e02505c334f0d63c1dcace21ee85f85e4dd6fc74e50e17e36bc80ade2c8f7275b31b45b5e21c97ecb1a43820 SHA512 7de0828430ec97feff671e2343bbabe86e4d4caa08dae068018e742c72def53e20e7b3b9244c27cdec6b62a38ee4113d399fe543b1de5eb313f4ad4dd0e54155
+EBUILD man-pages-5.10.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.10.ebuild b/sys-apps/man-pages/man-pages-5.10.ebuild
index c17bf4553435..2a296f092cdc 100644
--- a/sys-apps/man-pages/man-pages-5.10.ebuild
+++ b/sys-apps/man-pages/man-pages-5.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" de fr it ja nl pl ru zh-CN"
+IUSE_L10N=" de fr it ja nl pl pt-BR ro ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
 
@@ -32,6 +32,8 @@ PDEPEND="
 	l10n_ja? ( app-i18n/man-pages-ja )
 	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
 	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
+	l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] )
+	l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 	sys-apps/man-pages-posix
diff --git a/sys-apps/memtest86-bin/Manifest b/sys-apps/memtest86-bin/Manifest
index b1930c2a3193..10c804994bb1 100644
--- a/sys-apps/memtest86-bin/Manifest
+++ b/sys-apps/memtest86-bin/Manifest
@@ -1,6 +1,8 @@
 AUX memtest86-bin-grub.d 467 BLAKE2B cf36f784b4032f615e5e3cd07d67125ea54c2d4fd9c7ce2f05a6a87fb4a2636491edabc77a0833039c6a8667d0cefffb20c3d4a755bc9571a363b3c6193a1831 SHA512 0f8063689c2a1dcc5d5aee2b7a7e7db4c195012ab6c641bbd66c3c495bec5252a5733664e900483580e78ee47a29a6e8e078127ef1c723ee6419e9accb4a7bc0
+DIST memtest86-bin-9.0.zip 8748234 BLAKE2B 5034f480a81ee1e98ffd036af074af254a9675f0acb3c2cc1bac300c33853156fe3b3c78dbdfd82720f4a180d7858c2ae860bf2b07c31ad00c52da5971f95183 SHA512 185341985c7eec60af1553b1fd03a30a2dd77c38d2f4dee024570b353a387e0f4ab07ee5b329355567f35d28085205bfc83f534f33cafd8abc88a53cbf9bcc0a
 DIST memtest86-bin-9.0_beta1.zip 9208162 BLAKE2B d21a2755b08a61c56e25f57a2e253ff6ab8f5e7aec9b291aa33daeb817ee9c6a5da7d40c5d2e97bfa39ba633567c9e601971767c1d6a6e6f699616b37b2149c4 SHA512 86c7962ad5abaf300f7a29cbcfc33bd20ad6d3b363d0c76a426682ec7ea2195e351c2fcace387e81e927aa30d2c66050ddc5415180401d17af3ef77d6a8b41a1
 DIST memtest86-bin-9.0_beta2.zip 10126202 BLAKE2B b6b7e2e5f6bba76fedc37244fd92b56be6fc3ed40efd42c55fc061c403a0e492f58f2ed719b2ff7b47596f41b3b6ccab1e13fbe885c168f59b51a783d7eb400f SHA512 f28cd912e98b2fa0a3a0f98a10b57627073e85acc24eb79a4e326ff5fe9c8401fa093a8007179365137cac2654de9a762f31373fa0b66850400c9884f925393f
+EBUILD memtest86-bin-9.0.ebuild 717 BLAKE2B e611c26d9c7b5444b5d588c1f288cae8aef990bc980c7fef22a4a47bd59fdbc52e6d895e48885a35d5f5d623462bb464e41a9086eb63586bbd5d7b29eb790c10 SHA512 d100e12024887b192aff2d04597a1f3917f0b76bfe1a20451dcfa0b14d276642302552d3269b1740d837ab3633de7bb6c951a5a508814e2b4e8991c2d53a6dcc
 EBUILD memtest86-bin-9.0_beta1.ebuild 739 BLAKE2B 79c16ad886a1aded670b250536595e1ad9bba3002211ab034be32e5eda593e5f2aa1a0b486f82937c0157390afd10f85c9824ef646c9fe12e9efa2d22dd67c26 SHA512 224902ad958d528a821415d4aebc3fca510538f5c0304f05814fc60fb31abb5c174836134577c4ddb86992302feb9fd842ab171f8fc5a8437542468e7a4fc1f2
 EBUILD memtest86-bin-9.0_beta2.ebuild 739 BLAKE2B 79c16ad886a1aded670b250536595e1ad9bba3002211ab034be32e5eda593e5f2aa1a0b486f82937c0157390afd10f85c9824ef646c9fe12e9efa2d22dd67c26 SHA512 224902ad958d528a821415d4aebc3fca510538f5c0304f05814fc60fb31abb5c174836134577c4ddb86992302feb9fd842ab171f8fc5a8437542468e7a4fc1f2
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/sys-apps/memtest86-bin/memtest86-bin-9.0.ebuild b/sys-apps/memtest86-bin/memtest86-bin-9.0.ebuild
new file mode 100644
index 000000000000..ad72f858b53b
--- /dev/null
+++ b/sys-apps/memtest86-bin/memtest86-bin-9.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot
+
+DESCRIPTION="Stand alone memory testing software for x86 computers"
+HOMEPAGE="http://www.memtest86.com/"
+SRC_URI="https://www.memtest86.com/downloads/memtest86-usb.zip -> ${P}.zip"
+
+LICENSE="PassMark-EULA"
+SLOT="0"
+#KEYWORDS="-* ~amd64"
+KEYWORDS=""
+IUSE=""
+
+BDEPEND="app-arch/unzip
+	sys-fs/fatcat"
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	fatcat memtest86-usb.img -O 1048576 -r /EFI/BOOT/BOOTX64.efi > ${PN}.efi || die
+}
+
+src_install() {
+	insinto /boot
+	doins ${PN}.efi
+
+	exeinto /etc/grub.d/
+	newexe "${FILESDIR}"/${PN}-grub.d 39_memtest86-bin
+
+	dodoc MemTest86_User_Guide_UEFI.pdf
+}
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 55ec898c869f..8027a4e56014 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,5 +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.10.0.ebuild 1045 BLAKE2B 6fe1bffdf46fffa9fd7a9754f29072612e13686d5cb921807aa9b84de784ff3e93ce14c9be8729489e20ff6cd7c01bbdf5a0072071ce0e4b63b531c163f455d0 SHA512 1e5cd3c00a15a96a7868738e5c11655be1b6c02813e898337e503e432aac87a5b3f79b6fea11bead06f9d7ab6bf11b3b2776bac90cade10d2bb8b1e92916c5c2
 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
index e0e1b73a7b1a..0e24db797840 100644
--- a/sys-apps/miller/miller-5.10.0.ebuild
+++ b/sys-apps/miller/miller-5.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index dbf88e1ea14b..697223f7db6b 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -2,5 +2,5 @@ AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee9
 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
+EBUILD moreutils-0.65.ebuild 1697 BLAKE2B b62614d19666f240c8abe247ad03241e13f30ebe1e0e31606f09e0b6d75b744a8a632f8fb437d2e2d776d5a04bf87b3793969f49a8badad3331337491e00b037 SHA512 b70b29d0b0857baab8804219e0725f589afb830e10ab4bfca6012043230c30b03b0ef314506928f155f7c39046a081215af1283750730e356473bbaff6a7485b
 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
index 2a5608311949..c82f477f7ba2 100644
--- a/sys-apps/moreutils/moreutils-0.65.ebuild
+++ b/sys-apps/moreutils/moreutils-0.65.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-apps/mouseemu/Manifest b/sys-apps/mouseemu/Manifest
index a3c2915ac3a4..f65f6541f9b4 100644
--- a/sys-apps/mouseemu/Manifest
+++ b/sys-apps/mouseemu/Manifest
@@ -1,4 +1,3 @@
-AUX mouseemu-0.12-fix.diff 1715 BLAKE2B 304d966a994d535b71b119ba4c0e01149e34c46b73e28ea5e67e41967a826af3a5d17d669e557ab8d5c60d3a80e568958a19bbf6fd235596ba2f86c866b0de8b SHA512 98963e74636d83621b17281ef539102718c8ffc087dd0864b524fcaf6e2d0b6c58fbc84abb9959402fc67cf51e97e2f8d3beeb71b7360da4faff73d5e4250f01
 AUX mouseemu-0.13-fix.patch 707 BLAKE2B 6c0eaf3573d856899a43cd435d2c8f59434ab927f2e0c297d6db1da2bf16134344b59ffa2d9c0a61e245f02827a43a159346fef5f2a597e6de8706c2f41af830 SHA512 dfcd90a8e300d98e85ccb16455989a2a8e31f9b782887834e5ab3491391f0a681571f438e808860e095639e95fef4fbfc7f8d1c0edccd4b7b5d9bc915facfc87
 AUX mouseemu-0.15-build.patch 191 BLAKE2B 419963f29c2513906d0ef5f766fe2142e875684055a03726a9e4cb49f3ef39404e92cd7bcb8dd022fd355e22c8da09da1f081ddfab3effbe9beaa83d138c0acf SHA512 e0c55d7b77b18bfadd0b060d9fb6dd534e0fdf3cbcf5768262d8bdb8c26c0beb976c2c000bdf6cb9b26781dfb0e3dd5bb99cd005e34e49cfb0147ab4b19800e9
 AUX mouseemu-0.15-openrc.patch 228 BLAKE2B a05e7fdfb812f800b1c372fbf1d2f27d6eae5f476ae4fe39baee92208220d85e383c407e65f7d4d62aaa2385db2c5b5e9f49523844a6bfe9d15e00fef05ffadf SHA512 e26a9749c777852eb1a0feb5c15f6ed64635f40264e6065b4e9a7fb450db53357132e08b522724ae63735720d24fe92431f9a31d9b5ae2023783fc45f882269a
diff --git a/sys-apps/mouseemu/files/mouseemu-0.12-fix.diff b/sys-apps/mouseemu/files/mouseemu-0.12-fix.diff
deleted file mode 100644
index 993f7633e127..000000000000
--- a/sys-apps/mouseemu/files/mouseemu-0.12-fix.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- mouseemu-0.12.orig/Makefile
-+++ mouseemu-0.12/Makefile
-@@ -1,6 +1,6 @@
- all:
--	gcc -Wall -I/usr/src/linux/include -g -o mouseemu mouseemu.c
-+	gcc -Wall -g -o mouseemu mouseemu.c
- clean:
- 	rm -f *.o core* mouseemu
- install:
--	cp -f mouseemu /usr/sbin/
-+	cp -f mouseemu $(DESTDIR)/usr/sbin/
---- mouseemu-0.12.orig/mouseemu.conf
-+++ mouseemu-0.12/mouseemu.conf
-@@ -0,0 +1,10 @@
-+# Mouseemu Configuration File
-+# Each uncommented line is read by the mouseemu initscript
-+# (/etc/init.d/mouseemu). If you use mouseemu without the
-+# initscript, source this file in your .bashrc/.cshrc/.zshrc
-+# Keycodes can be found using the "showkey" program.
-+
-+#MID_CLICK="-middle 0 68"         # F10 with no modifier
-+#RIGHT_CLICK="-right 0 87"        # F11 with no modifier
-+#SCROLL="-scroll 56"              # Alt key
-+#TYPING_BLOCK="-typing-block 300" # block mouse for 300ms after a keypress
---- mouseemu-0.12.orig/mouseemu.c
-+++ mouseemu-0.12/mouseemu.c
-@@ -428,7 +428,7 @@
- 					"\t[-nofork]\n",
- 			       argv[0]);
- 			printf("Key codes can be found in "
--			       "/usr/src/linux/include/linux.h,\n"
-+			       "/usr/src/linux/include/linux/input.h,\n"
- 			       "or by using `showkey` in console.\n"
- 			       "Use decimal values. BTN_LEFT(272) is usable as "
- 			       "B2_KEY or B3_KEY.\n\n");
---- mouseemu-0.12.orig/mouseemu.init.gentoo.old
-+++ mouseemu-0.12/mouseemu.init.gentoo
-@@ -13,6 +13,10 @@
- 
- start() {
- 	ebegin "Starting mouseemu"
-+	# Source configuration file /etc/mouseemu.conf
-+	if [ -f /etc/mouseemu.conf ] ; then
-+	        . /etc/mouseemu.conf
-+	fi
- 	start-stop-daemon --start --quiet \
- 		--exec /usr/sbin/mouseemu -- \
- 			$MID_CLICK $RIGHT_CLICK $SCROLL $TYPING_BLOCK > /var/log/mouseemu.log
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index dac3313b7040..c74ecbf3256b 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,4 +1,3 @@
-AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 968 BLAKE2B 4104f8238ac3758e756b37dd281f1ca66f3f6d6dff9966713ffb108c539fbd19b9bffff94c929b829254c755cd0e1fc4530c74c5b8d6ef85889d7b8f9f54b5f9 SHA512 e732e809a4a17e3535c9ef009519808d5d1a6a792c1249e5cbaedc2aebc0245a16f4cdbc351c6ceaca676e942d909de548b036b8c59a62a68c277093aaa09445
 DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb
 DIST net-tools-2.10.tar.xz 229616 BLAKE2B 0d11a5c12f6447282c65ee74428c1b9f6da9fd6d26ca558813d002fac8a4f03fd25a26231a5f4e45f88d821e9a8281e3be1fea4a832bd09afbc2239634a1c25d SHA512 aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf
 EBUILD net-tools-1.60_p20180626073013.ebuild 2450 BLAKE2B bf0d8623306be59d53c0b475e053a2a2905de64c4488b8940080fda7c667d46bc2309daa450b654fbe719b2df1af8096101039b4658da84ff08494923f5ec71b SHA512 5b8917dd63904c5c9a66e8cd856a551b6dcc8e25a662ddd693dd12c2f87cdc4d02d9b20bb684a7b0237edd85873475718533df9de6f4191a308e9deb4a7cddd9
diff --git a/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch b/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch
deleted file mode 100644
index 5e330ace021c..000000000000
--- a/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ea3935bd7c0f36c86c40e5785326698fa3336c6a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 14 Nov 2016 22:48:42 -0500
-Subject: [PATCH] iptunnel: fix building w/older linux headers
-
-While linux-4.8+ headers work, older ones are missing includes.
-Dropping netinet/ip.h uncovered that mess, so add linux/ip.h.
-
-URL: https://bugs.gentoo.org/599542
-Reported-by: Conrad Kostecki <ck@bl4ckb0x.de>
----
- iptunnel.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/iptunnel.c b/iptunnel.c
-index 247ae10..d6e47e6 100644
---- a/iptunnel.c
-+++ b/iptunnel.c
-@@ -29,7 +29,12 @@
- #include <arpa/inet.h>
- #include <net/if.h>
- #include <net/if_arp.h>
-+/* We only care about linux/if_tunnel.h.  Unfortunately, older Linux headers
-+ * (pre linux-4.8) did not include all the proper headers leading to missing
-+ * structs and types.
-+ */
- #include <linux/types.h>
-+#include <linux/ip.h>
- #include <linux/if_tunnel.h>
- 
- #include "config.h"
--- 
-2.9.0
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index c2d04b5ad5e8..bb2aae96bf5a 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,8 +1,6 @@
-AUX policycoreutils-2.7-0001-newrole-not-suid.patch 351 BLAKE2B 84a67799662e6df3aeefafeda3a70e011856313beb4ac28e37312e7a53219b0a2d224a4be650200b537a39a58858c443e2b3253c1ebab617aaa6acf95b7e68fc SHA512 41c37a0711011ebdaafee01b357438ac3219b34b6c9e6ebe182c863d61c899e4819ae71bd9adf4b52bee37750c99b5b1cd40c6a92f119899bd227251d37ccd99
 AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b122b16e88190cad74891434c57fff3d9d4fa2529ac5e88cbbf572e710cf0bc313ffb83d8e80261265c121230f3975900a7ed97093dbd2f8930 SHA512 2e42dcc62be3a224b0bb153c615e12dc7febcb11bc46dca32d1ccafe51a8ceb4e57c63080b6cd8c8e87e16ea901dcfdc6aab9dd9c6f48b691a23da4eadad007d
 DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd6401c9e923d2c775c7c8c47f0e803749feaec4247fec5cc1cb766314954402fd2506370bb397f746437ecfcf65b384f3 SHA512 0592f218563a99ba95d2cfd07fdc3761b61c1cc3c01a17ab89ad840169e1a7d4083521d5cacc72d1b76911d516bf592db7a3f90d9ef0cc11ceed007e4580e140
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
-EBUILD policycoreutils-3.1-r1.ebuild 4853 BLAKE2B d622feb23afe63cb6bd94cead158534c1a4dfb09c94bc2639a1a8c086ede1b455f320a2210c597786eccbad150973ae954dcece9fc29c2703cc7c292612f5712 SHA512 7befa0087770f0b72a4b50922c76e2f66cddb853f7ba92a065996937cffb1d8a72b4ce944fa8c56dee54d53638a1e8945915393385724c078eadc2e62ef914ee
-EBUILD policycoreutils-3.1-r2.ebuild 4621 BLAKE2B 4a63e21ad74f3b2d7e53a06fe676d30eaa848309fa8a1a7ba0a7976137bce791991af609ab35735d2a93bfae2a47f13a30ae0f27c6978a7633cb735a290bacd2 SHA512 a742ae947a38b3ef4e6e0e9a10a24b5e2acdf8cf5c86cf03895248683244a0e425e52d5b9dc1309d94e08e83091652735d3a2ea9aee50dca7244f8f6a723bc02
+EBUILD policycoreutils-3.1-r2.ebuild 4619 BLAKE2B 7cc7726962441be4d61b2ac8f15d2505d05fe943663f9ebb34f86f381c3319126699626c5f1b37e2d24231af9723e14e58bf79628703565d9e5314095e360c53 SHA512 5f739867053bb98e1f63c3e59512ac31b077163b54f6e420687b833da4d7cc5c4db623147866b3765ee433eb243f12e0e0683736a024641cdd09c8207084fc23
 EBUILD policycoreutils-9999.ebuild 4614 BLAKE2B 3155cdf6c011ebd9c02d687200f6e2697a813efb8d490d535fbc6f5b8d5bf0399a42186949e3178697945db9bba8aa94daf271c8b0066c8c8155179712ebf8f0 SHA512 97c8a8a2791c2b629d53143d89dbb825ec3db30eae93aaed4551b247023251aeff904e358f3b1230efc9939c536456837b9c52861686c5b5f7c4d7348264a100
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch b/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch
deleted file mode 100644
index 6049bbe282af..000000000000
--- a/sys-apps/policycoreutils/files/policycoreutils-2.7-0001-newrole-not-suid.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/policycoreutils/newrole/Makefile b/policycoreutils/newrole/Makefile
-index bdefbb8..9cff135 100644
---- policycoreutils/newrole/Makefile
-+++ policycoreutils/newrole/Makefile
-@@ -49,7 +49,7 @@ ifeq ($(NAMESPACE_PRIV),y)
- 	IS_SUID=y
- endif
- ifeq ($(IS_SUID),y)
--	MODE := 4555
-+	MODE := 0555
- 	override LDLIBS += -lcap-ng
- else
- 	MODE := 0555
diff --git a/sys-apps/policycoreutils/policycoreutils-3.1-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r1.ebuild
deleted file mode 100644
index 9381dac4c146..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-3.1-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8} )
-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 dbus 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/libcap-1.10-r10:=
-	>=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}]
-	sys-libs/libcap-ng:=
-	>=sys-libs/libsepol-${SEPOL_VER}:=
-	>=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}"
-
-# Avoid dependency loop in the cross-compile case, bug #755173
-# (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"
-
-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)" \
-			INOTIFYH="$(usex dbus 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)" \
-			INOTIFYH="$(usex dbus 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-3.1-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
index b03d06939b1a..90e31a898724 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} == 9999 ]]; then
 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"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index e61858c099f3..d7312d311c74 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -5,5 +5,5 @@ AUX qingy_at.service 391 BLAKE2B 2dd7ea5a1c18502fb77a5bfa4beafe10e96877199c45c9c
 DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9cd18e7ee8c76d880eb2d0f0d379d56dc3693fac24ab7fd70db6208579c4302f3be390399503a8b9a7bb0978b6dfcc8f7efe7b SHA512 563a146acf92d7a4757abd8f537ca912882501d4ef407a3f0ce44f2b334da2872edafe8b489acfc6e4fdafefb60992f8ca13c322047311e5ff16eed091827d64
 DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54
 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd
-EBUILD qingy-1.0.0-r5.ebuild 3802 BLAKE2B f4218625e84f3bbcbbc3d5a8947792aab2b8b830b866a19e49568934b3212476900f33d661476819767eff459f6cad0103182ce50276d6f7ca7a4031e4647aad SHA512 c90fe53304698e86f9c95aa2c385f69ca2dc97f4592a1babca4f6988ac2496808f37bb375516c1887ecbbed955a13247974023599e750c69c5188712fe99a2e3
+EBUILD qingy-1.0.0-r5.ebuild 3840 BLAKE2B b70bacb93653e1e1e9aa7bdb4417850286954af7af26402e6ba8a15ff7c722b700d5652b15f09d5aa1ce38661650e3e6aaf9146920dc9030cdedbd72740b7c36 SHA512 dae7dde84dc7d20a1c21b13a2ac19bc1bc65f4916b72c2f678a3d24520b609e228c18573d93dbf6f30ad13574596f4489e3e937ee20d65eecef0ad7ecc942875
 MISC metadata.xml 455 BLAKE2B 1f5c9e9578a79b34f81001fe4123f9027bd1c08f669359992ec7f046ecbdefc0da541d0c72091c2ae51c1ff4e920f7d7f2c32bc6d7d9feef1c7d587fb3f18e20 SHA512 4f6eed8a90fb3b6dd96a3e7036aeead5b9bb550b92f5b3d519461775a6d1c710e0a3434b31b9e371392c2219e952419a38c1b90edb1f4ddc450281b165a0934b
diff --git a/sys-apps/qingy/qingy-1.0.0-r5.ebuild b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
index 0b1c6141e41c..c842ba0889ca 100644
--- a/sys-apps/qingy/qingy-1.0.0-r5.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools elisp-common eutils pam systemd
+
+inherit autotools elisp-common eutils flag-o-matic pam systemd
 
 GENTOO_THEME_VERSION="2.1"
 
@@ -48,6 +49,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cflags -fcommon
 	local crypto_support="--disable-crypto"
 	local emacs_support="--disable-emacs --without-lispdir"
 
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 589cb64650f3..902982b37619 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -2,5 +2,7 @@ AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694
 AUX rngd-initd-6.7-r1 1683 BLAKE2B 34bea128a94f2fc8479ebd8e8a398a01bb96dcbe8dd74876f8b8725f701862908448deca3768437d1cd98b138c9203106c199942910f63e7c95598d3e1b27818 SHA512 c1e3d94509d5cd3301836961598e221ef0db2e7310386f0467a4f3068eada8ad4010b063202b8a8c3d163d39799aea7d6a4dcb4d8ca569fe7b51f5c870100b6d
 AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2
 DIST rng-tools-6.10.tar.gz 56806 BLAKE2B 6cce0579a47f638cd90b51ba5216712fe39bf92dd59b288691a5e9783d520212cfb62e875a7e8f85de7a932568fdf0287cbea6f4869c9616a4c9325a111b0243 SHA512 b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389
+DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
 EBUILD rng-tools-6.10-r1.ebuild 1859 BLAKE2B dbed15bdab91852dc931b593aa9c5a625aa77b7721827d9edbbf5005beaad20d88aa086b6deebbc3dbccd59179c36a0c24e8758fb50d6527ed3a405759d9f9a8 SHA512 5125b29f1a842e590e94e3808617378a0a05908a584c52f1ad52ae60880c163c6cdda72b2b78269a47f912482163d5807b9b282b50418bcb45c8b763f67a0399
+EBUILD rng-tools-6.11.ebuild 1865 BLAKE2B 84fbbe4c5bb4af42c2f31c8be67ff8c3fa0b9b838bcbbfc6c0cf7a04881f748b847038e0df3c7caad3540108997eb67e280a3e9462452f6831e754eb1996fd3f SHA512 356a1f6752423100229b3159d0c2a538ed9afd84e35fc88bd43976e22d5bea13ed829357b1d38c48fb9210045b0b070809473a25517eab14a701a212cf78dfd1
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.11.ebuild b/sys-apps/rng-tools/rng-tools-6.11.ebuild
new file mode 100644
index 000000000000..3e3aa014ffe5
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.11.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="jitterentropy libressl nistbeacon pkcs11 selinux"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-fs/sysfsutils
+	jitterentropy? (
+		app-crypt/jitterentropy:=
+	)
+	nistbeacon? (
+		dev-libs/jansson
+		dev-libs/libxml2:2=
+		net-misc/curl[ssl]
+	)
+	pkcs11? (
+		dev-libs/libp11:=
+	)
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rngd )"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+
+	default
+
+	mv README.md README || die
+
+	eautoreconf
+
+	sed -i '/^AR /d' Makefile.in || die
+	tc-export AR
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable jitterentropy)
+		$(use_with nistbeacon)
+		$(use_with pkcs11)
+		--without-rtlsdr # no librtlsdr in the tree
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
+	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
+
+	if use pkcs11; then
+		local DISABLE_AUTOFORMATTING=1
+		local DOC_CONTENTS="
+The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
+to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
+	'${EROOT}/etc/conf.d/rngd'
+reflects the correct PKCS11 engine path to be used by rngd.
+"
+		readme.gentoo_create_doc
+	fi
+
+}
+
+pkg_postinst() {
+	use pkcs11 && readme.gentoo_print_elog
+}
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index e5a2d5d2cd79..d0f21e752384 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,5 +1,4 @@
 DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
-EBUILD selinux-python-3.1-r1.ebuild 2588 BLAKE2B b76d9221aff94a889bf0e478b36f5d0b58c4252734c5ea9966fc7464012ab958d60ec3aca97fc0f43b70bf1f19b149a19a8efac9dad17887fa88f9d1ed689017 SHA512 44dbc59bad47294d6dde5f2c4348e080c1090827eb54657beddc2877bfb013de43f95c6385466dae869781e335d854a06a3e5ab8b219ab7dc6e5b2cd99523759
-EBUILD selinux-python-3.1-r2.ebuild 2545 BLAKE2B 7f5b9c6db2d0e88516e4e53512432b95e8c546fefce46b02efa481cc06aea80e0aafe7ad04aeb9e9bff328ab260b5c19f889bd3e17a87c9beaab91d2c51f0e6e SHA512 449604db5ba1d8331416e0d51bc6c5613d074ebcc3d309706a81392b745a6069dd1e041176c53c24a9632c318c21d65ffb4cb43947c41e728e9c5288b8a6dc07
+EBUILD selinux-python-3.1-r2.ebuild 2543 BLAKE2B fd5cf8e64f172da259a7ff0f6be5d9d3f4824584b2d4e816689b5ac2c00c516b3692e748debd0dab51db4ef2faf07b10510b6b39147c0238969a6ca9cce25c45 SHA512 ae2066a82dd516c983aae8f00b1a7c14d25f61120904ce3cfcaf5958866d659386860598b76137a6ed311e7c6ad550f710f4b6daf099db4c125501c6768c1c72
 EBUILD selinux-python-9999.ebuild 2545 BLAKE2B 7f5b9c6db2d0e88516e4e53512432b95e8c546fefce46b02efa481cc06aea80e0aafe7ad04aeb9e9bff328ab260b5c19f889bd3e17a87c9beaab91d2c51f0e6e SHA512 449604db5ba1d8331416e0d51bc6c5613d074ebcc3d309706a81392b745a6069dd1e041176c53c24a9632c318c21d65ffb4cb43947c41e728e9c5288b8a6dc07
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild b/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
deleted file mode 100644
index 8bafa3c13fb9..000000000000
--- a/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 toolchain-funcs
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20200710"
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-SEMNG_VER="${PV}"
-
-IUSE=""
-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}]
-	dev-python/ipy[${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-3.1-r2.ebuild b/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
index 59dad86d9671..1237105e82d5 100644
--- a/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} == 9999 ]] ; then
 	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"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b58e88e1c504..af0b0ff390cc 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,7 +8,7 @@ DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7ed
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
 EBUILD systemd-246-r2.ebuild 15222 BLAKE2B ff9dd3e5ffbe8332b51b82416b1320b6ee7c7c4ae6c3d20ccc85b18132a6d75ccf3c999b35d54c22b94f8828f40ba34c880bb123caa2840d25ee009a5d56c9ed SHA512 6e81ffa68802db9b576391329557ce3223748889e74ff3868deb170411871639d293b38b7c294c1ea7b075b603e86cb803655200d26b01edc0d9a6d054439b34
-EBUILD systemd-246.6.ebuild 15256 BLAKE2B 6efda811fd51a44422163fc03db22edf7babaf9d4c11ea2b7ed09cf4a19e428c71c45bf1fb66bc4e85f0ebf8407e04480ebd181788880df9fe873f0c5a2f3fcd SHA512 a4ffc091f56816e44006205894ab59d715c08622a05f7774803f971edce388d876815e0c068e7f708e420111b3edd000b8edadb21dab56dd8e9d747f111772dc
-EBUILD systemd-247.2-r4.ebuild 15594 BLAKE2B 326270b0b1f1f6b2841d24fdc7bb0f62c2121d8eced261213dd445f9ee3eb4a72164aa7fba72c8e36acc5874b4121086db4b832d6ee7843168af2f21e88a54a9 SHA512 dae24223785a42f50fda8c54da16498664228c3459aa87d970de00fb5f702405625d0bcac37511766ec2ae3dc779f9697e6b18e7feba5a4371e0478a0f9132d5
-EBUILD systemd-9999.ebuild 15594 BLAKE2B 326270b0b1f1f6b2841d24fdc7bb0f62c2121d8eced261213dd445f9ee3eb4a72164aa7fba72c8e36acc5874b4121086db4b832d6ee7843168af2f21e88a54a9 SHA512 dae24223785a42f50fda8c54da16498664228c3459aa87d970de00fb5f702405625d0bcac37511766ec2ae3dc779f9697e6b18e7feba5a4371e0478a0f9132d5
+EBUILD systemd-246.6.ebuild 15282 BLAKE2B 16b7fcc621a922589d62278289460eab7a7edf4520c5297947a2c36a6861b7444f6bf384ff0756563c9e454718176c7258878fb4ba758ffe74bdb6edd0c88a9f SHA512 de1cef007b466bbf98057f9fd9fdfdcc0bec655b2396205b19bbaf6c698663c9f3b4b0ba4352fcf5700168c4e7aaacce5c1e6f15bb2d4c961e7a4e254971539d
+EBUILD systemd-247.2-r4.ebuild 15620 BLAKE2B f73c04ccc2f683941634ef9bf2be17683db869a4293199e6cc5e694857ac637f06eaf667f3b6b284196111b82728b58e205fa7ea544ac5c0baff212a9f068c14 SHA512 53d39f04617b5da817424eec18e07c5a0e5f1d4fed72272120942165aeee76159f4ba4e17d46b853ae2d7bbb2705420a86c5004bcb75b39b709ccbb9b12c55a3
+EBUILD systemd-9999.ebuild 15620 BLAKE2B f73c04ccc2f683941634ef9bf2be17683db869a4293199e6cc5e694857ac637f06eaf667f3b6b284196111b82728b58e205fa7ea544ac5c0baff212a9f068c14 SHA512 53d39f04617b5da817424eec18e07c5a0e5f1d4fed72272120942165aeee76159f4ba4e17d46b853ae2d7bbb2705420a86c5004bcb75b39b709ccbb9b12c55a3
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/systemd-246.6.ebuild b/sys-apps/systemd/systemd-246.6.ebuild
index 8bcb3fab7dd2..52ae9bc4baaf 100644
--- a/sys-apps/systemd/systemd-246.6.ebuild
+++ b/sys-apps/systemd/systemd-246.6.ebuild
@@ -31,8 +31,9 @@ SLOT="0/2"
 IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd"
 
 REQUIRED_USE="
-	homed? ( cryptsetup )
+	homed? ( cryptsetup pam )
 	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
 "
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild
index 543242858842..abf3150703d8 100644
--- a/sys-apps/systemd/systemd-247.2-r4.ebuild
+++ b/sys-apps/systemd/systemd-247.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,8 +31,9 @@ SLOT="0/2"
 IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd"
 
 REQUIRED_USE="
-	homed? ( cryptsetup )
+	homed? ( cryptsetup pam )
 	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
 "
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 543242858842..abf3150703d8 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,8 +31,9 @@ SLOT="0/2"
 IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd"
 
 REQUIRED_USE="
-	homed? ( cryptsetup )
+	homed? ( cryptsetup pam )
 	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
 "
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 6760e5e93ba7..57f06e4ecfa7 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -16,6 +16,6 @@ DIST sysvinit-2.98.tar.xz 127028 BLAKE2B 302219cd0753dee20772d78ad073e279f430ede
 EBUILD sysvinit-2.93.ebuild 3565 BLAKE2B b299bb15ec4a6525f033f74b1a853d351545fe34807bf1b17716e92736582adb023ef0e4c5b8f745d37699a51067c1577e8b06cdd11e3f50b2f7eea445001f6d SHA512 e390b9560cf58f6f25ab9586dc5203ee8232eba0073348cda085f091216675458e4f5c0203013ffc93a8641697bf8827ffbdf382cc3243f118e081e84a43e974
 EBUILD sysvinit-2.96.ebuild 3834 BLAKE2B 8b33ac1730e961d1c6a2a07c5489f8393471616b94ca1ec6a401a92786e6adf28a1ecf4870e3f54c9d95f22925a5c8c4671f07d582e87b0119eadef68b33a6fe SHA512 62685deab0a931693dcfbb4ca58a73cf71538cd56ea97dbcaec81807b23011c5bec01c4ebd86a597b7d6c6d1c3870456a4542febd9a4fcb28f135769dbf910b4
 EBUILD sysvinit-2.97.ebuild 3955 BLAKE2B e8c55bd2b99b1bd32dd298911a4e6a83e36c5589e1af29f7c55314428dce9fbd335dcc2919f6401cc4e55adefbe12e02f5fc7d7d4db39247844e86f307271761 SHA512 045dfb3b3f01db57781b87fe2ba6561fd78a713e7b9636dfdbf9193b1eae5a1414158ade0969b426737e2c8d45c4c9ea8921c5bf4f60b756191be4eea895cf29
-EBUILD sysvinit-2.98-r1.ebuild 3972 BLAKE2B c7c1da438cc7205e7a64da5f8b552ff490625e836a5077fbd4944897117d52906ef0536dcf6d19468e614a964b05fa60c8ff68baea84e874aaaf7ba3628af66d SHA512 6b45508d220613ac4b1573969165a576d6ad5e2700fd0cdc276954fc1f08f47167f2e44cc631568e3cc33a7363569192552381120e7112c28b3a01c5390e04ea
+EBUILD sysvinit-2.98-r1.ebuild 3970 BLAKE2B ae65585a49a850902c9b96c237b0ec53e450a28bc587d49f6faf6ff76a9ccc93f542afa16632969e3fe6b3fcc4dd7ef2896a34727c3c7f3584c00af1401badd5 SHA512 b3e1e541557830dcf2cc2f55e1be9639b010bc7d0e843e5c2bc6a67f73dbd5279589f17d3062dfeb8746dbd89647f49af0d3207c2ac70be4e14ea2e7f8e69202
 EBUILD sysvinit-2.98.ebuild 3969 BLAKE2B 1633252f3fd5655e6db87c4afd6ca0ff53a4901e63fe0ab9bd2f23f123bf69d6d062ce6d587baae0062d6bae86e4b41b15bda1d8e1567f3573f7f5c81e62cc2d SHA512 f3da1dde0027a1ff82d0c8674d3e6ce35bb04a5d87e34c0948806a6dfd72e1c7c176987b8e35dacaad06772a5f6f1ac8f25cc24d730bc5c144824305aa5232fd
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild
index 3fdd9425576c..3d7822e542af 100644
--- a/sys-apps/sysvinit/sysvinit-2.98-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.98-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://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index 00c3702b3dec..b517cfc66ecf 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -2,5 +2,5 @@ AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e
 DIST tuned-2.13.0.tar.gz 193816 BLAKE2B 1e51a9da855f54db9ac8ed6e764c091d513c1101771422a62c7c501dc3c8741430eb3503803b408709868d16d4791fbedb9dbc088b36fb693f065a1b6054fa15 SHA512 d81b0a80f911fe808ca324319da3e42c3c15196c0c37343d33b45c2b34f33e205e2913d77ffda8598379a91ef72ab73d88d7b83a4684b6a067e3f36d98a85927
 DIST tuned-2.15.0.tar.gz 207775 BLAKE2B 307b0598d9e99831526f2b26d5544df3832db7e17f28935c6f8d9293ec0d03729fb66906dca4739d48690e488f05383d448e7e714f6ae4824489564c295784c9 SHA512 67acdf10ecccd7910c4dcfd737610b4cb7651c7bf937bc0ed9c51869262d9f3a46f262d0b7636bc7a86a8abf579542a46f551e4f6c7561a061d8d58459be4589
 EBUILD tuned-2.13.0-r1.ebuild 1324 BLAKE2B 6235ecf7c383cb4cf69572509c48c23d8f13cc6cd07474cd134543642e205849cd4a8c5e8e60b60b1a9ce547673ceab272692d8995cf48049ce5987735f80aa4 SHA512 cf22b7446cedf1f5efe7886e43ad14bd284be62ad1b3250c6cadc1c34fdf390008458dab350dc741f3b9606d032d307f6cf6bf77f4cbfda6fa140d33438dcc62
-EBUILD tuned-2.15.0.ebuild 1379 BLAKE2B 5140fb49892f9a972fe5a4c7b62d6101617d7646ecae54f10608c486be5f052c955495422a52bac7e03f95f849b293ac07639921c7b3956e80166b1e827f7f7f SHA512 4719bec9d30da185675e6e3d36f8850f3709834a5355b20ddb5cedbf7319fe574b9e29280deb86ffb5a5b454237ac13f64f0bd47a4a03a5c1a5058f814952ca2
+EBUILD tuned-2.15.0-r1.ebuild 1398 BLAKE2B 86d079a6b6661746b063f6229aada86f6c1b62a1d817e5e90fd5f1dba69ff3d49b797724c6662feae1234fb5c7edb4792a851ca7910e504b09ab8362640de04a SHA512 9ae8d5966bd251d936a9faee47d5146b5070b35cc31dcf2f8e210a94307aaf0a20540717b9b844c627595b5094fbfbd86a702d0ac05cb74acd3cd45ff6c37fd2
 MISC metadata.xml 388 BLAKE2B fba6c8b1e8afb1e474dca668ef0f1d9adc633f9c382ce7772235a8a38c1530dcb9329730d9b1c912a7b44a48ef43572f046751f51c3efcce3f4a6c7c2cdc012e SHA512 6f25c8d915777f95c6f134ba77006290b2d4c02ba70c7254ce7225062da042d8c9f7eb312f842a2988866804ff5069f5f3871e54f97d23bfac936da994d456ea
diff --git a/sys-apps/tuned/tuned-2.15.0.ebuild b/sys-apps/tuned/tuned-2.15.0-r1.ebuild
index 371dfed07252..e39575c6a99e 100644
--- a/sys-apps/tuned/tuned-2.15.0.ebuild
+++ b/sys-apps/tuned/tuned-2.15.0-r1.ebuild
@@ -41,7 +41,7 @@ src_prepare() {
 	default
 
 	sed -i \
-		-e "/^PYTHON/s:/usr/bin/python3:${EPYTHON}:" \
+		-e "/^PYTHON/s:/usr/bin/python3:${EPREFIX}/usr/bin/${EPYTHON}:" \
 		-e "/^export DOCDIR/s/$/&\-\$(VERSION)/g" \
 		-e "/\$(DESTDIR)\/run\/tuned/d" \
 		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index 5eb5d959e993..1c76c5d3b87a 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -1,5 +1,8 @@
 AUX usb_modeswitch.sh-tmpdir.patch 596 BLAKE2B 6198685654131161989e03ac28ec4f4db5a2d8ba57c4f3c4b5c1fe96086c36bf450b4854995d098610faf12f89eaf55a5bcd95f1a68f0f2d2c3956ee92870947 SHA512 45e3a3f78a9404293a8b7e864f22db94a617be1d34d2c91fdaddc9b6a183dee1e3e2b5f4376e417d2c56b13b772a70e5e5cb53d0a08adf4cdbe60f1378abfa1c
 DIST usb-modeswitch-2.5.2.tar.bz2 259820 BLAKE2B 263d0b8c4ec79eebb1f79cfd171973f0d6cab96bd361b54c5fed8908745eb4643af935edff788b0913f8ba5ba1edcb683c75aeff6c426437c8436c74f875982b SHA512 ad2a7e5134379664fca83b85803e52ec8e3fe3c2d6c633eb5af3c291c43b15ca4a67198612864de01d146a029ee5c475c8c7dc71d16e3a475b532837c5dd34ea
+DIST usb-modeswitch-2.6.0.tar.bz2 44971 BLAKE2B c1b7484e2c9df9eb0097b3d560adedafe169bf797cc6d8702a83bf47ebadcb9601f32112b14fb65fe164455c536a0d5f66319d5927d81e59298b7820c9fe9b11 SHA512 43e6d885380602ddaaf771af73a302a7de30f7ae6ea58b2b572a9ad9ec77a453789020595de33a8b04ec209414fe08face2bbf84c67271d7b6b90700face09ef
 DIST usb-modeswitch-data-20170806.tar.bz2 32700 BLAKE2B 954aa513a74774cdabb2e3820fa56f1244de74cbfc0adda5309e4dc3bd79c2b6dd2023a5180f8d39f8b496485e1991de2a7fabbb59f6995fc7e0c0bb0b782243 SHA512 818bc9f3d9b75df245bb25f959075041667607e7681bdbca7006ec036613130a0fa5e41da9e939ca510e524a78a7a76aef82ecfbbe19611887b3735987b951cc
+DIST usb-modeswitch-data-20191128.tar.bz2 34069 BLAKE2B f6bf0c54ea51cda361ef9476875e0311f2c0e839c9e5f0a9ca2a0e5444fa16be65a436d98291e97d338d0416a7367c6abcae1a9877470246ed9f84d25dbe3e06 SHA512 4b5954ad83f7281e42321c16f5cc5b956923cc0e2db5f238cc64b3ea37a419768f01f2e26310f2b4fe9a9a5b1d901517933effd6e6edd23bc9b8d0c039ed0ba2
 EBUILD usb_modeswitch-2.5.2.ebuild 1671 BLAKE2B 304ccc0dee0fccac9beaf220e7ef1e6c07c549f197180bae7c6d3ae3ea8d9e64300f4b39387b0d7739e572f5575f3f3826929277c7ee6799f2f3b23bd1cbe343 SHA512 06bc65bb27d68ddb41d994feceb97de8dcaad790fecccfd247993d2bc2d54aeb9a97ba150b7875fd1a78a4f998ec88a3dd61efdeade725c2839b6081d27ec33c
+EBUILD usb_modeswitch-2.6.0.ebuild 1596 BLAKE2B 8c3d5d8c02b67808d72d79a7ba733cfd7bf5aef71e6a92c587940358a2d930a85df308f68309a898bc3d9cd27a376cbd245ea391e1ea7e3397c72836bc685392 SHA512 1ed1beb2f5a9df7c45ebb1a4fb3ff571ab61a3f9dfb4f3b9602043b4c43f397ea55e5e65ba7e37327f7eaf9c3d5ac0af92c8398639a93110561de903fdf2fe8c
 MISC metadata.xml 419 BLAKE2B b10eae75d3eacc64acd82b38254b85362f2301c6a5c2447f5113dae4d7769a260cf8b7d82c478d0589f05791ffab9651727f24a7709bff3f89d8d8dd0b8bd805 SHA512 6032951cd03029286f34a452c911d977a92cd3eb56c3c588c27d091bb506e1f3f963e87fb262270bc1108aeefeeb4f49b18ab8aaaa38383e35cddb8c5f43b06d
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.6.0.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.6.0.ebuild
new file mode 100644
index 000000000000..fdfb03816c97
--- /dev/null
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.6.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info toolchain-funcs udev systemd
+
+MY_PN=${PN/_/-}
+MY_P=${MY_PN}-${PV/_p*}
+#DATA_VER=${PV/*_p}
+DATA_VER="20191128"
+
+DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
+HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
+SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
+	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/udev
+	virtual/libusb:1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="~USB_SERIAL"
+
+PATCHES=( "${FILESDIR}/usb_modeswitch.sh-tmpdir.patch" )
+
+src_prepare() {
+	default
+	sed -i -e '/install.*BIN/s:-s::' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		SYSDIR="${D}/$(systemd_get_systemunitdir)" \
+		UDEVDIR="${D}/${EPREFIX}$(get_udevdir)" \
+		install
+
+	# Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
+	# which is why we need to force the .service file to be installed:
+	systemd_dounit ${PN}@.service
+
+	dodoc ChangeLog README
+
+	pushd ../${MY_PN}-data-${DATA_VER} &>/dev/null || die
+	emake \
+		DESTDIR="${D}" \
+		RULESDIR="${D}/${EPREFIX}$(get_udevdir)/rules.d" \
+		files-install db-install
+	docinto data
+	dodoc ChangeLog README
+	popd &>/dev/null || die
+
+	keepdir /var/lib/${PN}
+}
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index 7ffa9753f686..1893d8047fa1 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -4,7 +4,8 @@ AUX usbguard-1.0.0-pthreads-link.patch 1013 BLAKE2B 78daa200908b47e3db9b77938395
 DIST usbguard-0.7.6.tar.gz 1189194 BLAKE2B 4fefd9ccf13b094f64942559f481144f08986dc71154b87c1623459d2429c07e2738a17877d3f6c275e83ce904067b1284c588c9a95023c7205cc5e21ca118f0 SHA512 0b0d42276e48baac2dc1f9031eec25e3f622a8d6178cb0400b97c7d32005bfa158b60fd286fdc66206a8684658fefaf6389ef93511e942f025e75671d7455628
 DIST usbguard-0.7.8.tar.gz 1220764 BLAKE2B 8127acc0ef5dd89cc540097a71f10d56f3cb0a166453e27161e444d37dbf51cc4861bc9c71dcca16e9fec7187b3dcabb2bf08af522b2aaa4693fa4f4913a9ae0 SHA512 315c25ed7eb61cc0920047836dcca035cb07aecb6dfece9e4f6dc2ad61aaf6fdbf86898e43493958f3d12a146eb4c8f88b90bb246da0df83bb2097ce5b853e88
 DIST usbguard-1.0.0.tar.gz 1260374 BLAKE2B ea9b48f14a4091f4ce61b6c171947cf2412c47e9aa3edb816e933f7aad6247b32e89bee90675ca5a0136b460fef8f2d423c0c81ad49d52453d0d3803b881503a SHA512 068a9be8bd5ea05efcdad79e2c4beb5e8b646b4703fbe1f8bb262e37ae9a6284a6eeb811a6bd441250a38bce1e45b7f44ad15726aa5963da2e1b56e85f5e16fd
-EBUILD usbguard-0.7.6-r1.ebuild 1907 BLAKE2B 5cde16f4d987a58407ced3161b78840464b349d647cb32652cc6090e3d18946b711226610af2a69bb2facabf58708eac7fa2dc74976d9f0775c608c774906e3c SHA512 3678951cba045a47164edf3bf18ec977fd96a14ca89a14afca515d6c83a22f9ea3273286c463d80147befa52c60ecda53a52f94c8c03ab04a06b83f72147c6b1
-EBUILD usbguard-0.7.8.ebuild 2059 BLAKE2B 9dfb64b540267df979a03555281852ae50b702ec64d21fe8b72f9fabb9cc4d4c6c9203ba86c2245ea54833b1aa647625a85ac29dda9db335b7e677a0db865ca2 SHA512 9e382c96108b99636d729d37ced81561895ccbbb85971a5a3f42bfc02dbd00073f8d999d8fd3320a0769e808f71aed34ebb4749960985f928453dd1ae49421c1
-EBUILD usbguard-1.0.0.ebuild 2094 BLAKE2B 510b7259924cda2a6ed12fbfd196b6ac2ddefb42e7d416d6bb1887ed5b03fb9fa643bbb0eb25555f34088e256a19d8ee37a65484aa4f5d07ba197e0cbfb15cb6 SHA512 3b57af8206eab8940dc7feeedeea6ff102dadfa175f9c64eb59f8791c6f42d2525da6c40624ea19bc21750db3c3e6bd1f09bfa195a6274607d7a6972003ba3ab
-MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
+EBUILD usbguard-0.7.6-r1.ebuild 1910 BLAKE2B d708d26de6da007518ea857a9d8852d3444cb76ce688eebfeeb9f27a7bb182a2ab847db3259d1cc2593f8b5a87e1169c69ae33fb5114e18b117e357228d5d925 SHA512 8d47d66b6d022382610354e744d3ab18fb595391a4a9a7285809816763988e126cc9a50d3f1c6bb8293942de00fd52be3c453c8247a53749ec0fff3b1c3cffb0
+EBUILD usbguard-0.7.8.ebuild 2062 BLAKE2B cf1d12238d7b2b846119fc11454347cc92cb550aa404fbe8afb3364c29b49abb444f4cbf559eb3aeda68fe0f73ba59f134a7d4b8a947f81687e14a148c8bcd06 SHA512 e8efc8156d5b5d565843baff754b70a12dabe43aa65f2090249901fc088587821fa6b5fed7668933105319cf58a22576764b4cb43e688ce142ee9e34a604e916
+EBUILD usbguard-1.0.0-r1.ebuild 2320 BLAKE2B e96e88d83a14f93283f708e9b81f1ee221c97400189434093f77de6b3d99f498d29a343c5b825640e5f573daedb8d9a8f44447b3a819e671dfb65ff137a5bb22 SHA512 bf4ef727a7c5545262385d4e11a85074026d18f38f5cfe941da2999e104e20d936ee822992c5b38e5a752ced29d0c6adff43ae5b82055df8a6af363b7cd4344a
+EBUILD usbguard-1.0.0.ebuild 2253 BLAKE2B 036fed4776dfc7d13e05f006be5a15e31522cd8eb22cc3e80d1f3fcba48aa3941d82a97354582b297b37d8b17b777952eb762ec7606201235517b5435cff5a2e SHA512 b88fe2ec0a531fb533bd85e85fb8a9e89be89e1ce2eb52c10e1f7ea284c5be0edf1520ab34f54cf8b37311ed68c4e2f0564e0b20d6703b1a0226876a877b1d6c
+MISC metadata.xml 344 BLAKE2B ccb8c1c611694dea10c4d0809ab46ccdc30efeadcd60904ffe6aa98420d489ea64bf8b1f0f46caea3d77ef448bd2b8d510f355aeee6ce98e5f3a3f76c6fbe141 SHA512 a661530757754d0640302d966aaa1156dfdda95430a3c0d80cf178ec4ffcfdcc13e9c19de7a22fd5269bc877d177d7a80fd15e9875247ea1f829601c2be19777
diff --git a/sys-apps/usbguard/metadata.xml b/sys-apps/usbguard/metadata.xml
index 6d2298876faa..2335eab4d864 100644
--- a/sys-apps/usbguard/metadata.xml
+++ b/sys-apps/usbguard/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<use>
+		<flag name="umockdev">Enables support for <pkg>dev-util/umockdev</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
index aa7debe0b591..3f76442a7df2 100644
--- a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
+++ b/sys-apps/usbguard/usbguard-0.7.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
@@ -15,7 +15,7 @@ IUSE="bash-completion dbus ldap policykit systemd"
 REQUIRED_USE="policykit? ( dbus )"
 
 CDEPEND="
-	dev-libs/pegtl
+	<dev-libs/pegtl-3
 	>=dev-libs/libsodium-0.4.5:=
 	>=dev-libs/protobuf-2.5.0:=
 	>=sys-cluster/libqb-0.16.0:=
diff --git a/sys-apps/usbguard/usbguard-0.7.8.ebuild b/sys-apps/usbguard/usbguard-0.7.8.ebuild
index be1f9ae5b840..cc4ab8ff6f37 100644
--- a/sys-apps/usbguard/usbguard-0.7.8.ebuild
+++ b/sys-apps/usbguard/usbguard-0.7.8.ebuild
@@ -17,7 +17,7 @@ IUSE="bash-completion dbus ldap policykit static-libs systemd"
 REQUIRED_USE="policykit? ( dbus )"
 
 CDEPEND="
-	dev-libs/pegtl
+	<dev-libs/pegtl-3
 	>=dev-libs/libsodium-0.4.5:=
 	>=dev-libs/protobuf-2.5.0:=
 	>=sys-cluster/libqb-0.16.0:=
diff --git a/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild b/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..45cb81c1a51a
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-1.0.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Daemon protecting your computer against BadUSB"
+HOMEPAGE="https://github.com/USBGuard/usbguard"
+SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/1"  # due to libusbguard.so.<1>.0.0
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion dbus ldap policykit static-libs systemd test umockdev"
+
+REQUIRED_USE="policykit? ( dbus )"
+
+# https://github.com/USBGuard/usbguard/issues/449
+# https://bugs.gentoo.org/769692
+REQUIRED_USE+=" test? ( static-libs )"
+
+CDEPEND="
+	<dev-libs/pegtl-3
+	>=dev-libs/libsodium-0.4.5:=
+	>=dev-libs/protobuf-2.5.0:=
+	>=sys-cluster/libqb-0.16.0:=
+	sys-devel/gcc:*[cxx]
+	>=sys-libs/libcap-ng-0.7.0
+	>=sys-libs/libseccomp-2.0.0
+	>=sys-process/audit-2.7.7
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	dbus? (
+		dev-libs/glib:2
+		sys-apps/dbus
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd )
+	umockdev? ( dev-util/umockdev )
+	"
+RDEPEND="${CDEPEND}
+	virtual/udev
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-cpp/catch:1
+	dbus? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gdbus-codegen
+	)
+	"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myargs=(
+		$(use_with dbus)
+		$(use_with ldap)
+		$(use_with policykit polkit)
+		$(use_enable static-libs static)
+		$(use_enable systemd)
+		$(use_enable umockdev)
+	)
+
+	econf "${myargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/log/usbguard
+
+	newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
+	use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
+	ewarn '                         a rules file at /etc/usbguard/rules.conf'
+	ewarn '                         so that you do not'
+	ewarn '                                            GET LOCKED OUT'
+	ewarn "                         of this system (\"$(hostname)\")."
+	ewarn
+	ewarn 'This command may be of help:'
+	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
+	ewarn
+}
diff --git a/sys-apps/usbguard/usbguard-1.0.0.ebuild b/sys-apps/usbguard/usbguard-1.0.0.ebuild
index 78b104813dad..f93887630a22 100644
--- a/sys-apps/usbguard/usbguard-1.0.0.ebuild
+++ b/sys-apps/usbguard/usbguard-1.0.0.ebuild
@@ -12,12 +12,16 @@ SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0/1"  # due to libusbguard.so.<1>.0.0
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion dbus ldap policykit static-libs systemd"
+IUSE="bash-completion dbus ldap policykit static-libs systemd test"
 
 REQUIRED_USE="policykit? ( dbus )"
 
+# https://github.com/USBGuard/usbguard/issues/449
+# https://bugs.gentoo.org/769692
+REQUIRED_USE+=" test? ( static-libs )"
+
 CDEPEND="
-	dev-libs/pegtl
+	<dev-libs/pegtl-3
 	>=dev-libs/libsodium-0.4.5:=
 	>=dev-libs/protobuf-2.5.0:=
 	>=sys-cluster/libqb-0.16.0:=
@@ -47,6 +51,8 @@ DEPEND="${CDEPEND}
 	)
 	"
 
+RESTRICT="!test? ( test )"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.0-pthreads-link.patch
 )
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 791e238d3ba7..a0b7ab3db6b3 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -8,11 +8,11 @@ DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7
 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
 DIST util-linux-2.36.1.tar.xz 5231880 BLAKE2B 52d867aa0b722a84828c37958d80b0bdcc1ceaae4e46fa6550ad0f2f152c52e4aaf2c8bc5fdf4f27b522037a870ff2554382abac0eaa50a6791d8b8016e3d74c SHA512 9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a
-DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
+DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
 EBUILD util-linux-2.33.2.ebuild 8413 BLAKE2B 91cf11ece3866ee440ab658a0b11891b558fe3cd2c896ab294ecca69d6697ee587d64d16749ca383698ecc422cede27f5474535377e191d777cfa813ccaa0409 SHA512 cc5c0ebddc2e496211ccbd22fd7ff3bc88451de55fc4c0884b700107260fa2867eb17a43a29560f46ce79f12e8c740b041d1806733250804eb2c41b34de40795
 EBUILD util-linux-2.34-r3.ebuild 8446 BLAKE2B a52fb003aaf00e7c9bd49014955c7faffef9f46b1b720a1dc74617699f6717ab2f5d33e9b3f55cad0382704b31ad09a8453723fefe9cc3fa0bbd80448c620db0 SHA512 10344c02f3e30fe2c4441de2ccfd5702cb6395cefff850c3a4fc9625ce06f68ce5ead7834cd6c9994fc2f3000d9c15fa63761216aa61b853fc2ce6efddfc996c
 EBUILD util-linux-2.35.2.ebuild 8890 BLAKE2B 1e8607c649882ed1c9d93f1e15c1bbc54d190f61703a084e97208bc887bc6fc31a0718a324c4e7b33dcdb53fe459ec9632509525084a9fcd2373077880c60151 SHA512 065e3989eabc4d56b6345c38a707cd3af787e5ab92924b96d917f3db8a5a249628725820c733dc86b1ec19cc8fae1a657599e7df0c6189014c81b25578a89d0b
 EBUILD util-linux-2.36.1-r1.ebuild 8936 BLAKE2B b2437c366ed36a232aacf10b6ad5e5a84f0e067f88db4840cd89df78e176410927e0f0aa8e624e6f8e8e76a8bcfbccb928ce41d308b7c4a5644016cbcbbe2402 SHA512 d6145c9114c806f57654dc2a5886cc99223713a3fc7299fb742f7d749196ca757ef389856dac89a9afde0949297a1871d0a52aec98800a474190fb07cce7226a
-EBUILD util-linux-2.36.ebuild 8827 BLAKE2B 197d420861bff819939f05c8d3d0a323aa5e2de9b6a6f212d3760c7c385d2d74f54c691d7746623d21ced0ca4a8c1a9434f0e9e7b4484c85897f5e09ec00b976 SHA512 987f32b14e5f7760e961cfb6674feacdf6acdec116aa97e3fd7e0d959e6243fef392dae1038cf862f547d3f47c53ce0900fb2bde4b8e8983f56577bb4db0d680
+EBUILD util-linux-2.36.2.ebuild 8827 BLAKE2B 7224a61ddb2ba83e3b127be0d48c1a26c9588ceebb2610e8ac8a34bd1a7fe945bd6afefd111e9755dcfe1d9b6174c869fc679c13b6c4bb204a6e763d8cfe3bcc SHA512 d32e9ac794a46fe4dcc3e37f405596bb2b4e46a8529396ea926162d4f26d2cef584ffbeb45754465803417dd9d3983644e15ae74d843d5645b9f903273cce8c7
 EBUILD util-linux-9999.ebuild 8762 BLAKE2B 6a64f715d5dbd5b9f57186d2790cd11a78fb2269d89cb65d17db522d09af3e5395c6a5af728287589858018d98564c78ebb44cc14efd8581ab4d8eb5adaf1a70 SHA512 6cf6b4993db8dda2d80c32185ce4b40be86d227a53c78062058e3e0449c0f8ae67ae36fcd21b5861a0c43bf8a169b2ea3f8c9f4897a4bd8b0ec99b3e34b28744
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/util-linux-2.36.ebuild b/sys-apps/util-linux/util-linux-2.36.2.ebuild
index 153da1c7e55d..daf96cb33aa0 100644
--- a/sys-apps/util-linux/util-linux-2.36.ebuild
+++ b/sys-apps/util-linux/util-linux-2.36.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
index d996a18f175f..c685a31f8846 100644
--- a/sys-apps/xdg-dbus-proxy/Manifest
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-dbus-proxy-0.1.2.tar.xz 119264 BLAKE2B 9f9fb561dd434e146636dd2e78275065c3f249b0486b1cb09ac0df2a2a9bd534f84192bb6f0f4b0627d47b9d490e3f5c10a6a4dca67d36a2465e4a971b28c64e SHA512 c76460e365778efeb1ef7cb9e479491afd1dc270680d108e7ece82b27be30bb4f958d4d218ac7d4497dcc749da25437f62119003866dcdeafcb6cea843dcbe1e
-EBUILD xdg-dbus-proxy-0.1.2.ebuild 558 BLAKE2B ac4db5377d7832aaa98a0c2cfde0f2d27637c0e18f6b102633f91915d08c0418895c3d9a24276065e171e5b4530796193c06d50aded45dcd934d7d8c86b42cb9 SHA512 f0de023eddc0c64810a17cc98d6a4ec9369fcc767327666bb88e2f88cc0dfbd4d39eeb3532fdb1edf1f2c2ecbb9d60d32c788613d1bcb6a56c6eab9cbe16f1f6
+EBUILD xdg-dbus-proxy-0.1.2.ebuild 557 BLAKE2B 1c1d0372bd221e2f0a19408685ed59097c3123c0dabc581c25b53d97cf42558596affa4752a5d3d0f29bf03b0227ccb762b2800bf423dd10ee3b8aba58b50ffa SHA512 8104cd566a1da457eb8a693e2ac212ef0bab0684fa32cadbde4c308b849a225e91afa3df4476b8641c3458562271033d3c7546f0f21b9e433ee3e0bff8fb4d6c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
index c7971f014d42..61cd561b7241 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="