gentoo resync : 03.07.2021

36 files changed, 121 insertions, 52 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e7e3c50469b8..b7efc3b12906 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 6782d25b8616..8503cf736b9a 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,6 @@
 DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168
 DIST checkpolicy-3.2.tar.gz 69035 BLAKE2B 263c582c8ed3c38822513899f3591edfc5d0132977451503a8b45d2074b5a1c5ce03973353b3ceaad44da913b4e35546cfef1988b68bd517618efdb942f994ec SHA512 133639595c2acc66c02b5a637c5e0c60d80ce2bae04f4a709d9fafabd31f9497d1a6e3334904b985c2a1bd94a7a7e3df782c2af2ae41d1fd79b69156a835edeb
 EBUILD checkpolicy-3.1.ebuild 1149 BLAKE2B beac3751ebcfc7969e662a3cc1b25a266b144db2155a8f469170781d1e6aa515a759d40adecec768e066f6424291e6fd7ed5c3e87f56eb39a309e0e56de45676 SHA512 68682e8384cd6ff456343fdfa611be2bce2e15edb732dc377e8839cd3b1fcf510d914d02c8b2433d34ee6e53fe5cfba46ad0712cdb25f91bff3532b5cf80c035
-EBUILD checkpolicy-3.2.ebuild 1014 BLAKE2B 08372b851c56f8392c54270335c7b4a7aac00f39523f4a1cabbe5a3c1855c3687fb580016589beba2d208f4199a428b72df93a093a1519c3a91a3e01199b0ffc SHA512 fe151a9a059ca7643dc0349dccad1c0eb80cb5c6455b02b85a2aaa747c8e13bdbb3f9cdc3d71313249f8f00ec1b8d5979a253eeea0d0a6b982f77183f798114b
+EBUILD checkpolicy-3.2.ebuild 1021 BLAKE2B 6abe22c0fc3c4985f29f566335121a42227b70f7704adb1a732f2ed2591ccd35bbea6a81c3ce9b1b866dd87b9a43257153c0ce5d4e2bf34b910f6b9e3acb5bea SHA512 5c875d640ccfcde065e1ea2800a7e8759a4ca0a62f8df0d6b82aa732e80e29ba594c3dbe7b1aa0f7506f44a00b897322e6204e1b8c7d365ac75ac6935cb110a0
 EBUILD checkpolicy-9999.ebuild 1014 BLAKE2B 08372b851c56f8392c54270335c7b4a7aac00f39523f4a1cabbe5a3c1855c3687fb580016589beba2d208f4199a428b72df93a093a1519c3a91a3e01199b0ffc SHA512 fe151a9a059ca7643dc0349dccad1c0eb80cb5c6455b02b85a2aaa747c8e13bdbb3f9cdc3d71313249f8f00ec1b8d5979a253eeea0d0a6b982f77183f798114b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild b/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
index f2cee8075367..377994434a35 100644
--- a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index ecfe068fadad..bcea56822292 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1,3 +1,3 @@
 DIST IPMICFG_1.32.0_build.200910.zip 1821771 BLAKE2B 60c10cb0375792bf944d1fe888ef6d0e45cda19248b77048c10e2be13cf641554b3cfeb355a091dd720b7f6110a08dd27e915330360e88bfd64990a925b7d605 SHA512 a50cc4757674dfd6a821b928dd76913fa349b532f6185fe2b1f52d13aa7a0b4a561c460af68fa5484e2f9461bd1782b99521fee361c0c5d166de48370f3f8429
-EBUILD ipmicfg-1.32.0.200910.ebuild 886 BLAKE2B 8199f948bc4871da882248b665ce459df0a7410ac0fb60b438572659ea9b1cc21cc25643cdaca75c148529836f7d28418eaa4cd6c917f579446d2bd992c83bcf SHA512 dafdd9010053066687ace49ea26dbe0251bd296067bb11901223177f215446177d8d6cabc42524df8edff471bed4fac8aa21d8bf6517994047fd4aad5ed7545f
+EBUILD ipmicfg-1.32.0.200910.ebuild 883 BLAKE2B bb98c76dc4b384986a772da3caa97e6b089686e23d91a56ba64886c86ab67502c75bca4066cce927e7fc0b5262aa8dc7feaed8289830a00627365b7c9eaa3cb6 SHA512 7b9c8a6be41d669592ca9d76e2ab93df4eee2bf7658420f3c1a292ae51dea3b5f927805a358b5f63800e1851de01026d5afb2a0fe799ab92c3a99b2c7963300b
 MISC metadata.xml 331 BLAKE2B 5f6297bfe1e48c20819f052322f825018f8ba39434a23fbb69e5f5630e92fafa43b3bb5e991175f69673baf79d8b4bcdeb95404502593faad8819c5a2c152871 SHA512 379175cdb1d7b9f18f80349817a8a46bcc75c4fd7d7cadd938b9630c341dec359328462072c4f72661af379c054a237a95d0dfb6937d49661cb8203108de0c80
diff --git a/sys-apps/ipmicfg/ipmicfg-1.32.0.200910.ebuild b/sys-apps/ipmicfg/ipmicfg-1.32.0.200910.ebuild
index 642ff2b9341a..1d873c26b306 100644
--- a/sys-apps/ipmicfg/ipmicfg-1.32.0.200910.ebuild
+++ b/sys-apps/ipmicfg/ipmicfg-1.32.0.200910.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,18 +10,17 @@ MY_PV="$(ver_cut 1-3)"
 DESCRIPTION="An in-band utility for configuring Supermicro IPMI devices"
 HOMEPAGE="https://www.supermicro.com"
 SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
+S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}"
 
 LICENSE="supermicro"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="uefi"
 
 BDEPEND="app-arch/unzip"
 
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}"
-
 QA_PREBUILT="usr/bin/ipmicfg"
 
 src_install() {
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 671b30e5dca8..be89c766afcf 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -6,10 +6,10 @@ AUX iproute2-5.11.0-configure-nomagic.patch 6701 BLAKE2B 8e4176b88adca58d5cc9f7a
 AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb797901886032bbbfc78b3116b548d317038144307a52ba86a01dc49460fa8b4524f03de3abc5b56f4901a9cb24f1f6cacfbd7a5b92cea7145 SHA512 a6184d1fc150717ab40a278c2a6ce439ea04e9967d55f1d10fecc8162452a1a38a6e11c2f736c5aebfe0ffe726bfa80e154169004ccc571b89dcef9c0dbe1242
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549a6687257498676a23e4fdc4a590a7215bfdba3c7ac4b1ccde6c38ba8e3eb222eea2532374fa9680633aa198d347 SHA512 a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13
-DIST iproute2-5.11.0.tar.xz 822044 BLAKE2B e52e2334a4f6271a23e9393a3b11fc7e8e070ecff178bda1cf87705a55b59018edc8c28751e4fc6a7d877c19e6da772765afbdc5944800f98bf176513595e5bb SHA512 f592728ec819fc34cba04b1c04275e783aed86084fe31948e1776e6e473c8c1416aaf8101c19b51ddb4044af1cd2157827c0f91546b33badb448466eae9a2fda
 DIST iproute2-5.12.0.tar.xz 835880 BLAKE2B 8e3e1b7188d7ab5014d06d7edaae2cb0c1dc65862999a2ca9f31902256d7f3d166de8a1c76e4e137acce2b445d72ea6850bfec3640d1919cb82351d45dd3e47e SHA512 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac
+DIST iproute2-5.13.0.tar.xz 845236 BLAKE2B e1c148e2a720236163e7f4d46aa38d244a02ae36ad86571c5606d54c9ccfd8d0363e2fb793d48cf39aae322b3c36b9f8a43eaf570dbdb8243092926cef3d2786 SHA512 a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d
 EBUILD iproute2-5.10.0-r1.ebuild 4764 BLAKE2B 4b9412a19f175d320ac4f1470f333d7f3ccec76f21a74bf8057a48bc59b2dd44eaa1f7d0466d9a791abaaf65ffc1e606e3722b4a82576e5abdee153534defa6c SHA512 455c325154f857be301998bbd0a693f1b3ae865f36e3e90dff9a23cf6e7d41a7c318bd4c4e7fca840571068f84337ef7bb5801ce4036ef1f430cbbab74528425
-EBUILD iproute2-5.11.0.ebuild 4842 BLAKE2B c26d2d8f73d132acea6513632596a74c9da54fe994e1b408ef90e319042a25ca657942e9059e9d2b97851f7d25d9e2c83034145d36792eb408047d6f75cdb2f9 SHA512 281edb2a65ea6ed65661b82a6d4fa100ff44896336d3d8eb5d2c3511cdd0d0dee262599bfbe3531e5d03074782276488ccd6c52e203b4cbdab71f87f7e198ef5
 EBUILD iproute2-5.12.0.ebuild 4867 BLAKE2B 8646b979a436352fd9ef16fda6d8fdfe90600ee3473f0c89ac1999baae5e72f6cd53b94cfa31cd24556c387b24afeb4b67e13c144c4ae3cb634cc8e0d79485c2 SHA512 f1b7a387a9982727b71d7740562114e8b4ebc1be47161b0612a7c556256d7af7f6f83130c9274f3d1d9127df0589f941a52df604c1d324b299ef3e913523e8f0
+EBUILD iproute2-5.13.0.ebuild 4867 BLAKE2B 8646b979a436352fd9ef16fda6d8fdfe90600ee3473f0c89ac1999baae5e72f6cd53b94cfa31cd24556c387b24afeb4b67e13c144c4ae3cb634cc8e0d79485c2 SHA512 f1b7a387a9982727b71d7740562114e8b4ebc1be47161b0612a7c556256d7af7f6f83130c9274f3d1d9127df0589f941a52df604c1d324b299ef3e913523e8f0
 EBUILD iproute2-9999.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58
 MISC metadata.xml 813 BLAKE2B a34634416583a3d6a75a0d02e5e2c89b8e3dd0766a33e13555ee66515dda7bd10c711226701e00adb1b92fc6443d7793adc25e6b446a8ecb901afe268c7e978f SHA512 8fd774dd6bdde1265ace7e9b3f96f19a8afa782bbdbb5633b0e4024663e2877fd4db8e0aae48870c81fa470467ccaedad52c95b0fa9cd2b64829aa1a07e6f061
diff --git a/sys-apps/iproute2/iproute2-5.11.0.ebuild b/sys-apps/iproute2/iproute2-5.13.0.ebuild
index 418a4583efb1..475fe98775ba 100644
--- a/sys-apps/iproute2/iproute2-5.11.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.13.0.ebuild
@@ -47,7 +47,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-5.11.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug 643722
 	#"${FILESDIR}"/${PN}-5.1.0-portability.patch
 	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
 )
@@ -63,7 +63,7 @@ src_prepare() {
 
 	# Fix version if necessary
 	local versionfile="include/version.h"
-	if ! grep -Fq "${PV}" ${versionfile} ; then
+	if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
 		einfo "Fixing version string"
 		sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
 			-i ${versionfile} || die
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 5240b353ca14..a941499bf0f9 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -8,5 +8,5 @@ AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378e
 AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
-EBUILD lm-sensors-3.6.0.ebuild 6437 BLAKE2B 881c07726a43b51e3d252b7d04fd8ad36ee649d351b9b174fe6a466ee990f1b44ff0840db4085b6d2768116299fe1313cad48611af32593afcd6e4973ee46481 SHA512 d605df45e8d36ea70e99fb84b67cb0b967c025b3e2cdf890f5563915090f534362d236f62c7d79b41fc6763b355fb5f647f3f790e8531c1b03b151da695a3930
+EBUILD lm-sensors-3.6.0.ebuild 6444 BLAKE2B 2a8b5e5cad51b9a3cf8da1341b1fdda4b10a7b35f47a79a13734363580026ff21773204381c85192a2c3e8bcc8b0f4206b0c2ad73cedb1a85fbc961c475727b9 SHA512 31ee337e9aecf8bd066432b8fbfa4070ec84fd47d68bbdb9ce15733f4478af22b6900b256d22dbc8afab2adacde08f655da477d2c8e2b963cb4f1d1a7d10179d
 MISC metadata.xml 943 BLAKE2B e88d21fd3475dcd3de6168ae87904460826b379d41e803b29afae94a5376e230b4dc2376bfff5d60d5deec13a1671eb1371fff7666c02745c77bb5fae8778a10 SHA512 a27ac8c06494d6ab7c4c69fbee2e4de07dd1bdbc68be4625f1331aaae4d11902d41eee3b66c94cbc46ee6fab9ec8f6a021f4d6c2f52fcba789c56e9679dec35f
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
index 71acc46a09f3..1fcbdb4b3826 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/5.0.0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index 5eab0f8a5f52..2e8ba7d830a1 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -1,4 +1,4 @@
 AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca31b87fd910b770b212f1d06aef668f184343f7d961aa38a1ba35e2bc1628750bd1680a70b7405271fab59c5f732fde66c SHA512 289795f45144071f5f166a3dfd387267fd3327767bae9d8e9c48818de0c60b961ac35952eb8b42b3ebfd415b337c096fa2db8009fdfbc218814a3ace633a8483
 DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
-EBUILD lsb-release-1.4-r3.ebuild 922 BLAKE2B 54aae431200c08d4428bcb4bf0a00346e90cb298d29ba313231dcc15028529e760c4e57441bd6206adc7c3e8c593ffb30abb5c98e764a07eefd0093cce8e87fb SHA512 6d06f0972b3cb421067f9f9cbacf9fe1d3468174439b4e856ff7f3bd3b8229df3a1766c4d7b04895aef2af3a7d72080e417cc994140d5e924c082e2df7943060
+EBUILD lsb-release-1.4-r3.ebuild 929 BLAKE2B 5d1679ab5aaf4eadc596580d58fae90e71d927e56f40ff47c592b1c41183b91c2727f7fd7a959f0ccee84932d9e70e9612775242615bde7c31c5004c1fd42397 SHA512 a574fdb18f66a320c371963a71e6886b7c1c34da43e1d0587288aee5d1bc5225ce9670969af8a7186301374e0155d567374964f866ac02ed9cd79a1b8785c0ff
 MISC metadata.xml 808 BLAKE2B cb931504b70813859d35bfda6408cb28f2bd56cb4f0cdca944c051b9731c2c1e7c38d87bfab70cffabf82d4f537ea68eaa88bf05e2c90e27899238315fe29ad5 SHA512 cc252166fb933fc78a5b5479c9cc2a49a0d9224371cd14635cb92e7e3c4c801bdc6f837b6680704d20f63dc0b8872b67c72b952361e9328dc12305f9351f7a87
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
index a03a05fdec6a..3a8dfe5cf969 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Perl isn't needed at runtime, it is just used to generate the man page.
 BDEPEND="dev-lang/perl"
diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest
index 69d02212572c..a4db90c29564 100644
--- a/sys-apps/minijail/Manifest
+++ b/sys-apps/minijail/Manifest
@@ -2,6 +2,6 @@ AUX minijail-12-makefile.patch 1511 BLAKE2B 74b620f44ffa3a3f82771d10dfff5999f223
 AUX minijail-9-makefile.patch 1589 BLAKE2B d2b253f769e79c179fce51b858ce9b7b70dec806e7f3f330928e5befc7a6fc12e4a09e5fca0e29404badbab2f389bb4c9385d0ecc555610d3b45df272c5d34e1 SHA512 38a3afe8c17f591e8172ad6725f04d5a898ee3ec3a97ee99c6118c1c12189061906a442b95243e7907031c194f0477c3bdbc6d96df4923b43487f60ededa403b
 DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2
 DIST minijail-9.tar.gz 118700 BLAKE2B 7d2959d5dd71bd9d8d8a0b7c278dab66771740f73acec20f19502da33990ca858796b4734676ffedc404cef72eee8c419c669ba7092ac00cbafa2e410564aba2 SHA512 6d05fbe8615f410e8314045d11f7a3638f563f3311f7d52b5a0c47cad8692d11b0a7db4fbb45141b56453a9beb0de7683d58e5298f0a27029aa017539bb48717
-EBUILD minijail-12.ebuild 1797 BLAKE2B d28cef527341f960f5d58ea0578ac7a10fe000413bf5e12739ddb6c0b107c8dabb287c282e20798352471ca0e121d0cb7c42918ca70201e474997a229ce7980d SHA512 eb3f04b4b5a586306e6364887e4d728a1dc661db11b639d1c9134a0286f42322d2769c921bdaa04a3fbf11bb0d1ede780cce73ac6e48af571331bd01c31ae11a
+EBUILD minijail-12.ebuild 1804 BLAKE2B 7065e7c2dc8bdec18ab687e8b2cbc5ca8ca14adfbba4c1ebf2064d9da0f274823d35e1b79e30975824363373a59affdb795585376019ebd362562d5b59350f8a SHA512 bd180ef8ddfd13e061cac2e8cebf0f200817fd0f9b7894fa7e082461e910a773f670634ad4b889fe406a1dfdccb1f33ef7cdcb1bad5f81f149459eb127df8da6
 EBUILD minijail-9.ebuild 1714 BLAKE2B 26d4cfafe924ab1616065eda666a69915f52c337aba699e100d5c18c7e9e711c4f79ea74725f0570dcb9dd71d8c32338a7aa6bde2a5173f426c2cb4e87ed4f14 SHA512 25592129d6483b2713021994a43d25b8eb103bd80fd40e844ed27d7040f16733429f36072048235a1c5ed86dc9150d5db32d7400c158cdb8d30333b27a799c33
 MISC metadata.xml 315 BLAKE2B c2a00fa1d9a8400721a08edfc86a0c416522345a305e810c5781d3edb1415840141ba46dffcc8056be65ddc0902d8afc5a7039c241ed3e8e0141d82b2bfb9f9a SHA512 fe148de8a20f5fd0cf076e83d5a870063ffa0e23ee94c05f27681a8915c9e4f444af1fb0f4d9753e5e68a003991335fb1cf10c538ed69ba8b08ea1c0b64155a0
diff --git a/sys-apps/minijail/minijail-12.ebuild b/sys-apps/minijail/minijail-12.ebuild
index bf20c5f832a1..9f0c093fd994 100644
--- a/sys-apps/minijail/minijail-12.ebuild
+++ b/sys-apps/minijail/minijail-12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/linux-v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="+seccomp test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index c6ae8ce1ffa1..d8c830c31471 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,3 +1,3 @@
 DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
-EBUILD onerng-3.6-r3.ebuild 825 BLAKE2B 5f3ee86627d4eab3c63abae5489122131cbc5fa1614a8222efa6451bee68b4c06197e1ba0d1367149237882765958f2c7e1789e033066ea8fddbbfc640e09569 SHA512 e18dd985a347d659af9fbd096212c6cb9e59bd2b85d0e4d889a94011e75b1f76d9a6f0bd91f5751ec98dd3f277a4195c7e25241f9794e547b8a50603f7297990
+EBUILD onerng-3.6-r3.ebuild 825 BLAKE2B 8822eb3c81a185df17655ab6a30e217aee29d3f73bf813940c7675fc5ad54501328af07add89a2d1ff5d627389a8e71274a74dcf640a788886ce28889e7f3f8d SHA512 1e3482aa5e92099673692ca08f8bd0cf98a9c9606ae1e3edc3afd80500918981c87deb59d3338d887162db97ea3ccec509aa7dd56ba3469c3e785ee8a8a78e8e
 MISC metadata.xml 715 BLAKE2B 2d4b842c0ea11b2633764e385898ce8df514a289b482c5e528b962ce00d97289abbd666acc367b1f170f95b785409712950b44b284a550fc796a3017fdbd10a9 SHA512 4f004de8fd56338d850d2fbcb4c8bd94f695f55b2c16eff687f1985a22f86094b4f01f63599029f52d0056a8e6f214f7f0396413093ea8cd01970be29d0092ee
diff --git a/sys-apps/onerng/onerng-3.6-r3.ebuild b/sys-apps/onerng/onerng-3.6-r3.ebuild
index efd2c08c8a5a..dd5803955bd2 100644
--- a/sys-apps/onerng/onerng-3.6-r3.ebuild
+++ b/sys-apps/onerng/onerng-3.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-single-r1 udev
 
@@ -12,6 +12,7 @@ MY_P="${P/-/_}"
 DESCRIPTION="Software for the Open Hardware Random Number Generator called OneRNG"
 HOMEPAGE="https://www.onerng.info/"
 SRC_URI="https://github.com/OneRNG/onerng.github.io/raw/master/sw/${MY_P}.orig.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
@@ -31,8 +32,6 @@ RDEPEND="
 	sys-process/at
 "
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_postinst() {
 	udev_reload
 }
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index a500a4b68cd2..fe334113d92d 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -2,5 +2,5 @@ AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a932
 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
 AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
-EBUILD pciutils-3.7.0.ebuild 2842 BLAKE2B 0a67bbe234aa2ad79d02a151a46a76ff5a9582a1297d1180d969462d404f2532ec46e7c95191b37d1c4d6aa5c407d0c5e504af18bdf5018340b4445bd1445a09 SHA512 717ceab1a44cc5a606412aa6f70e893cf34d1edfcd1ef42f9bc85bee694854693042bf346619cf7a783eb13124230f91178060718a51ba86c9c931bf110bbcb7
+EBUILD pciutils-3.7.0.ebuild 2849 BLAKE2B e819d2460128200c41dd1a1a9f5b517858e956520999c8dd246f9c22acd83a5a97b57ffce0289f1a90360b55a1f600ccff3703c684bda034fb0d42780bb73c54 SHA512 28f87a4af2a91313349b31d1963c7341afa2c79594bb618254f9f29d4f95d9949827217f74179be1816c90bc563e5e19b331fe07a0b359fd4cd7ef7fc0a72d1b
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild b/sys-apps/pciutils/pciutils-3.7.0.ebuild
index b5b0621bd7df..b36f536b973e 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 3059cb94ea52..cc3ef44b749c 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -2,6 +2,6 @@ AUX plocate-1.1.5-no-systemd-check.patch 764 BLAKE2B f2a97b7c85339e7b7de663e1097
 AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc16a4662b606f5a0c6c62e4b1475a02ec3f244dde1ff73fe0ad16e0850aec53e6e8836fd0ba1273ad07 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
-DIST plocate-1.1.7.tar.gz 71546 BLAKE2B 3ea93c7fcea243d60e61dd9956d4eaef3f09d017d5b2487466e4bccbfb6ff6d2e2e328c3df7809eac3ca5c5e0941e67178c1707f3e16154a9d2c756dab3aea00 SHA512 48ca7bcb439e6ddfbc11f0679bb44ee7173be7f7a856d51d56143bd86e219e19683312036bfa96434a0eaaf0b6df58a1843ecae917143f8f0fbac83b39cb0b4b
-EBUILD plocate-1.1.7-r1.ebuild 2057 BLAKE2B a84f97d14af3204e33a0b4dd144a6766baba0f429e8e1c4e66383dfa16bc2fe6e8a7c23d483bd644f5cea2155add9ac119b62fa3e0486f54f62d35bc3c9fb817 SHA512 e0d9c63f9e358e931ef2817c6ae1738a99c6c4442b61aca1c0d3905e4297f7dd06d3e670d479aed89229653df0442fde6cca7b82d4eb6a5d11358c3ed53c4fa5
-MISC metadata.xml 1285 BLAKE2B 778c722e0b5e673f97f22f3c60fb2ed5cd1ce18ceb6aec3426049010eaa930a51bb68c2bda2b9a3f471a9737dec406c52fc849cb674df913410868d3c9dd5479 SHA512 f558b515d2dabb31d11ace480ad94c8c2a925c5ffab618930bb3fecc29fb710f7ad3ff253955272930004ca96344950ce5aa743bece0862a3a6c1c1675be22ff
+DIST plocate-1.1.8.tar.gz 71569 BLAKE2B 06ad0e9535b76bf0102cdeeb6014e2d84f85f51f5926520566e9c6871f04ac09651bb0674ed679d2a4c0d4e516e55dfef35a7021112fad3549bf76993554aeb5 SHA512 a685347df64ac1a3eb7789cb7023b4d0ffed5fb7435a4bd88c3943991e145a387829532ec0c01d30d851b97b8d3173ff4c7c274775e639b75f0b1b45e5bca2a6
+EBUILD plocate-1.1.8.ebuild 2057 BLAKE2B a84f97d14af3204e33a0b4dd144a6766baba0f429e8e1c4e66383dfa16bc2fe6e8a7c23d483bd644f5cea2155add9ac119b62fa3e0486f54f62d35bc3c9fb817 SHA512 e0d9c63f9e358e931ef2817c6ae1738a99c6c4442b61aca1c0d3905e4297f7dd06d3e670d479aed89229653df0442fde6cca7b82d4eb6a5d11358c3ed53c4fa5
+MISC metadata.xml 1392 BLAKE2B b0e97157995ec77af0df5fe42d8bfe2949163b3f1ac9631e5b79942786491a3f9c2e29d004901abe994735373cef5cbe4f31646847e9cde1d26620b229396e81 SHA512 35cfb62bc7d28abb528835566018b03a724a1c4fa0a68661478007f924a685f42c5b43a2661e7a0b27548d3feae1f64223ac0f9be1c6d3ff600a57aadde69dcf
diff --git a/sys-apps/plocate/metadata.xml b/sys-apps/plocate/metadata.xml
index ffe1b7daa0ad..3ce009d46710 100644
--- a/sys-apps/plocate/metadata.xml
+++ b/sys-apps/plocate/metadata.xml
@@ -10,6 +10,10 @@
 		<name>Jeffrey Lin</name>
 	</maintainer>
 	<maintainer type="person">
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
diff --git a/sys-apps/plocate/plocate-1.1.7-r1.ebuild b/sys-apps/plocate/plocate-1.1.8.ebuild
index a708c02300a6..a708c02300a6 100644
--- a/sys-apps/plocate/plocate-1.1.7-r1.ebuild
+++ b/sys-apps/plocate/plocate-1.1.8.ebuild
diff --git a/sys-apps/smc-sum-driver/Manifest b/sys-apps/smc-sum-driver/Manifest
index 0297f4f7c180..655849069c6e 100644
--- a/sys-apps/smc-sum-driver/Manifest
+++ b/sys-apps/smc-sum-driver/Manifest
@@ -1,4 +1,4 @@
 AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
 DIST sum_driver_V1.6.0_20151201.tar.gz 1423921 BLAKE2B 76e2439148749b708a51e0d9c95545b53762f03793e6b2ea6e63e9f79aaad77432f728e94713e0cfd4085e8b090b6e0ff8e779e2627764e71794453cb7e02b49 SHA512 809fdf164e29aabde74306d966de7e07488d8dacc01963b56486477f23bdf3a469d059bc5d302aedbfd4b8dc854a82357747add2626cc22d0ab3898c7bc0a625
-EBUILD smc-sum-driver-1.6.0.20151201-r4.ebuild 943 BLAKE2B 0a4f85340c020b1cf16650b29aa2e47b5a97b799e1098f1e79a8f49b5bcf43ab94b317a92d24fb935b37f6c68c6648d8d258d6eeed5ca012a045cc0db0c0e100 SHA512 6099a317e30dab6d8d39a4b637c0fca1a5a99ca6d09851042c246627c880cd76747cf3b30998510326c33e6f47f3d435c868f091066d5d637288f2a341ee1736
+EBUILD smc-sum-driver-1.6.0.20151201-r4.ebuild 940 BLAKE2B 3ac30ef95eaafd78e3d92a734c62fbb01220c4408a9a5b585980b268b82af72f181e6c11ea06250db57aa799894c75019ab82f9b389687a8fc036c7b25959d9d SHA512 8025e1f30b97b9be5b5512bb2d5702a49217a37d7d88675ea2a2abdd2d5bf838613397255f896623e4abe8221615215e10871e60593533e4b887bdfafe302204
 MISC metadata.xml 483 BLAKE2B 05700b3332f81f8a53b82a02445e38d56f8b0acc47d97e076a5b61ebeec2b0dab3d0f9f1c1af6918368da82b2ae5f3f6c0bce808738bd5885e54debba00afebe SHA512 e3da2424e8433f449b9a713a19bd8ce3492c9d80f7d523e68ec7647348b98d163df27b2eb2ebda199f965c4b827ee3dd6e40e726c44ab5d262d408218c7b7492
diff --git a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r4.ebuild b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r4.ebuild
index 7b9e68795b4a..cca00d6b3614 100644
--- a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r4.ebuild
+++ b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,15 +13,14 @@ MY_P="${MY_PN/smc_/}_V${MY_PV}"
 DESCRIPTION="Supermicro Update Manager (SUM) kernel module"
 HOMEPAGE="https://www.supermicro.com"
 SRC_URI="${MY_P}_${MY_DATE}.tar.gz"
+S="${WORKDIR}/${MY_P}/Linux"
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="supermicro"
 SLOT="0"
 
 RESTRICT="bindist fetch mirror"
 
-S="${WORKDIR}"/${MY_P}/Linux
-
 BUILD_TARGETS="default"
 MODULE_NAMES="sum_bios(misc:${S})"
 
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index 9750a5fb0d8e..96cbc7ade31b 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,3 +1,3 @@
-DIST sum_2.5.1_Linux_x86_64_20201112.tar.gz 10589459 BLAKE2B 94a5306b0e0aafc942c8fb75043a74502b28837b599977a8850065688e8606405ca911e12229c1a4c25830cd33f6232c088572e545cfcd4a691f155735133958 SHA512 33e20b966dc10586be594eb416715fe68b2c9435e9784569fd49808a7efdc65a8bf89c94e9fd28bf22a87b1581d877a8bf0ba095204cc3eb2eb2bfc329d74982
-EBUILD smc-sum-2.5.1.20201112.ebuild 938 BLAKE2B da628d52d8e560424cb5aab9f370865966e5af1484849cddde149268fe582707fd7d4216dfc3775f173b691fccb812d0080e284cd179d65595a419a128e533ab SHA512 8e679dd845a7a0a37836f09e4af5c2ed9d27edd1216a99fb01873aac21c397b29f3dafa00d2889cd5214206221b49cbac3a33bc8f4db84ed8040102bfdc8fa73
+DIST sum_2.5.2_Linux_x86_64_20210112.tar.gz 10859378 BLAKE2B 7e25cc3d6414cf9f59c1aa6dec5b183b91bb6fda8cd1fb59e5a3af37ed662859b39732c3c898d4791f0eb084d539a68bd4328814641ce8aafc166c852e68a091 SHA512 604968a367aa118a3167dad3755af4d1c6b90d164b9485f677aa393466e29f63f8fa67e1661dd22990c92c866fc3e22177a0e5a776ab5fd7ab8a674f60751fdf
+EBUILD smc-sum-2.5.2.20210112.ebuild 937 BLAKE2B b2bc1c2e2c545f8ae1dec27ee7cc09481dddc3f1997c0ec0ff92cf896787fd5502226528d995a16606ebf8c3d20ec8b3fff81cdebd855e96f0a81dbc5db5fca8 SHA512 8b0d043b697f25b5d7894e75fa85ac2c16aa6e54bfa88bb4952f3762a1ebab20b5d7ee9f4e9d1f49c187cc3d4a5477d552816855949783cb86e5b66841d0ee5f
 MISC metadata.xml 1097 BLAKE2B 2614ed1fd32c33675e1e78fc069670ec2b156efc376beecead2ebc2d7212e918f0fdf923d90f9d6db61a1c672f565701c2fff812e801a6ed955d299506653cf6 SHA512 cebd02c5e048668caf78a5bfc19114ebef9fd55ae9c25adb8c61275b847d7311ae38ab1825b029770bc191b65b334eafcddcbf1c50825c234542e1454b78e730
diff --git a/sys-apps/smc-sum/smc-sum-2.5.1.20201112.ebuild b/sys-apps/smc-sum/smc-sum-2.5.2.20210112.ebuild
index a0915d539ee5..d3808ba67961 100644
--- a/sys-apps/smc-sum/smc-sum-2.5.1.20201112.ebuild
+++ b/sys-apps/smc-sum/smc-sum-2.5.2.20210112.ebuild
@@ -10,6 +10,7 @@ MY_PV="$(ver_cut 1-3)"
 DESCRIPTION="Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards"
 HOMEPAGE="https://www.supermicro.com"
 SRC_URI="${MY_PN}_${MY_PV}_Linux_x86_64_${MY_DATE}.tar.gz"
+S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64"
 
 LICENSE="supermicro"
 SLOT="0"
@@ -20,8 +21,6 @@ RDEPEND="module? ( sys-apps/smc-sum-driver )"
 
 RESTRICT="bindist fetch mirror"
 
-S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64"
-
 DOCS=( "ReleaseNote.txt" "SUM_UserGuide.pdf" "sumrc.sample" "ExternalData/SMCIPID.txt" "ExternalData/VENID.txt" )
 
 QA_PREBUILT="usr/bin/smc-sum"
diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest
index 5e57809fa438..a7ca856887f7 100644
--- a/sys-apps/smcipmitool/Manifest
+++ b/sys-apps/smcipmitool/Manifest
@@ -1,5 +1,5 @@
 AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172cb8547706725c05244c827489929faf19c0375630db0597427b1e42c758521a4b4d352d1e742d33 SHA512 bb5b4a57a0492df04f9428bbeedb6917fe5cf7273f0c73a300adb13e4d8b6e5cd907729cabfad548bafaa71a98e4ee1d996914fa4dafe0cd6e5a5310b1625e6d
 AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7
-DIST SMCIPMITool_2.24.0_build.201007_bundleJRE_Linux_x64.tar.gz 81360010 BLAKE2B 9903172cdfbe962b8147489bb96be57550b61dc4e4dff3728e980d105c6fbfbde1448c0264153e3bb38be1fcac7580e4fd96e2cd7de3a9ecdf797839fde7f133 SHA512 9ac85b79d3addbbedf938bd07d001ebd421f5261aad7d0ebe11b26d69c7d4ebc7c48a57a1a9c6538f51289962c8d18d09b6cf52946a686ca030012bb915bfb05
-EBUILD smcipmitool-2.24.0.201007-r1.ebuild 1825 BLAKE2B 790f51598495ef5e791da5ba9cbbbb677d8525d93e70061cf7ada04ce9f2a2a3528766350c81efcaa97f8b84cc688d095ba7dc74478ff423ec429aca4fa3638f SHA512 22a989fc5e2633503d05d26ac5ea2eea078924c77a39ef50896679a7151b9714c6c6a0e7583a1adeceb4d68950c1147123ce60fb52aaf1ea0544a9f9a0427a8d
+DIST SMCIPMITool_2.25.0_build.210326_bundleJRE_Linux_x64.tar.gz 120356581 BLAKE2B c3106bcb4d1f3e0cf3197e605b741d88d662824ec7e0aecde1a2b9bc1db0313b1cb6fba4d41b792dbc2f0f6da2cab7eab75ae912b329feaec9e2f601774eca36 SHA512 f0e11c7ca7c46ffda8a37e510e1653d413679b54f19e00d05379b422a37a008c2cae6a7a06c184f73ac0925b73ddb449364bf9178ad8fea4ddc718ebf8425dae
+EBUILD smcipmitool-2.25.0.210326.ebuild 1825 BLAKE2B 7d993fe7e879a4788e74f632af6e1ff36bb5c7c085be152a4bb83390057ca5f21be48447d766d3c395583dfcf0320542adeacaa1b2993753d34ff677df2a7ac1 SHA512 29faa2254c6e066c9d13ac6b88ae9c020a2ceb22930b245bb8cb4131bb5e99be04dabd3e51a76e5893be6f7dab93d808bba62cb6e1fff8e43e555c84f0e3cdf1
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/sys-apps/smcipmitool/smcipmitool-2.24.0.201007-r1.ebuild b/sys-apps/smcipmitool/smcipmitool-2.25.0.210326.ebuild
index 585fc347333b..32a3379ef7d1 100644
--- a/sys-apps/smcipmitool/smcipmitool-2.24.0.201007-r1.ebuild
+++ b/sys-apps/smcipmitool/smcipmitool-2.25.0.210326.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/superdiag/Manifest b/sys-apps/superdiag/Manifest
index 589a7be11393..34067a348438 100644
--- a/sys-apps/superdiag/Manifest
+++ b/sys-apps/superdiag/Manifest
@@ -1,3 +1,3 @@
-DIST SuperDiag_1.4.0_20201120.zip 5537813 BLAKE2B 014a3770944fdf9f9396e894320cfa65acebc63cfc1f396b4170a351813b72cca5902a27df21f62bf04a25ab5f9db306795ab108d8669045a205f990b1ef73a1 SHA512 d1e33f0fcb22c0b3794dd3677efa6d1041c81cdf09b92e297035a907e4110482daf896c109437380750ad2905008651b017718e97b1ca1e9f8ceee8c24ee0943
-EBUILD superdiag-1.4.0.20201120.ebuild 1523 BLAKE2B 60955320e47a5a0e5083b13c1ab6e2a69ac9d4e381bcbc844a851432d46318595ec0bff3f8dac3b5b8bbb81f630972932a8e57d84d6766830f14ac98b022eb66 SHA512 bfeee1d19b0e3a26cefa5b4de489637b0f4d83b69c2d3f8c0731d1a2b3522b2652d7105261099d42ab061a59e11637f4cba51149f523bf18e5e0158469406c5c
+DIST SuperDiag_1.5.0_20210507.zip 5039420 BLAKE2B bd249b7c2517857ce9079e3691cb31b3982dd097f11eb09288caff660d7f5e4a779519081cd27f89137d8173ad5419189122bc42bba5374f81f20c86f9e3e106 SHA512 ed457da1204b8670163f1186618b672cf088426461a1fb56c1bd618268e4f4420cd94bf05b62b3d6964499100583fe8ce72ced3ff8bafde3ac7db5c3ca0842e1
+EBUILD superdiag-1.5.0.20210507.ebuild 1523 BLAKE2B 60955320e47a5a0e5083b13c1ab6e2a69ac9d4e381bcbc844a851432d46318595ec0bff3f8dac3b5b8bbb81f630972932a8e57d84d6766830f14ac98b022eb66 SHA512 bfeee1d19b0e3a26cefa5b4de489637b0f4d83b69c2d3f8c0731d1a2b3522b2652d7105261099d42ab061a59e11637f4cba51149f523bf18e5e0158469406c5c
 MISC metadata.xml 910 BLAKE2B 59eaa7f51cc6c2c733b62b5f5bdebac5737b3af580fb8afe91f6f5b96e5cb49e66635b182d204a6536141aad275307d0e580ca272ba8d5020635c9c96f9e106b SHA512 e066b98f13d3669a2dd97a38b454c20ec59f5e40ad95fcad43e29bb6baf6958091517f95d94380c2ea2edd41b057f284b687267422bf01da62628f07ca255e0d
diff --git a/sys-apps/superdiag/superdiag-1.4.0.20201120.ebuild b/sys-apps/superdiag/superdiag-1.5.0.20210507.ebuild
index cea0aa94f07e..cea0aa94f07e 100644
--- a/sys-apps/superdiag/superdiag-1.4.0.20201120.ebuild
+++ b/sys-apps/superdiag/superdiag-1.5.0.20210507.ebuild
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index e21aa7b10cac..01492d88ac40 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -4,9 +4,9 @@ AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-249-rc2.tar.gz 10576295 BLAKE2B 4eb750dc3649f723c6b88185ad59ce1c7bf06d57982d0a85eba702a38b4031e21f61860f9f39f272b24fedf865a9a38cfef6844db6cee39e4cc9083d6b1f0ec8 SHA512 97570607fb3262cbcf9c956eb6a05d83877de411b6de90d2b359e85fa4cc0e14fe7efd6e71e135f9922374fb69ee7f328c3d2240bf736d0016b8fbb68e3f0725
+DIST systemd-249-rc3.tar.gz 10580191 BLAKE2B 137aa9a736b9c38dd075db536bbb9cb9de122dcefa7f422f53847e22d1e42daa21fda9bdb364e92851090115e1b54dfd3d528ea0a959ffd3cbcae7509992b580 SHA512 137835faaaffe843330b24b8c6ce589fad1981e08056b8c58dbd68f7586e984a515880c5e917013b184c5382eacbb180c9a4a9a83bd4861b1eb2d69115cfacac
 DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
 EBUILD systemd-248.3-r1.ebuild 15199 BLAKE2B 9b9803595b04d9b1cb43f4e0bacd6f42b51c371d4d0e554aec40f3cf33006cc6863039dbd00d7a8672990e9074ad674c41b371240589c4108a259ec4911c3037 SHA512 94747763be930f606395c933a0050ff46d6996c75cf8acff4fe728efe1e5b1156754e04dab2572763154ea62f60d98d3d526f548af5f5451828122db92c6e24a
-EBUILD systemd-249_rc2.ebuild 14879 BLAKE2B 40d794320467f5a82b19186d178637621410b3b6895b635b15056cc80ab9fb981eb2b9cac646fc6a7838dd4903b68d6473b39f71b8b8b34f20a71302cb3e39f6 SHA512 a398fbebf7be6625fa5c5025660787fefe978ff6166b16020df99f05e8a1a5e233760ea0d67b43ec321819dfdf14b39accffbb115d2b07bfaa96ecffd2c726cf
+EBUILD systemd-249_rc3.ebuild 14879 BLAKE2B 40d794320467f5a82b19186d178637621410b3b6895b635b15056cc80ab9fb981eb2b9cac646fc6a7838dd4903b68d6473b39f71b8b8b34f20a71302cb3e39f6 SHA512 a398fbebf7be6625fa5c5025660787fefe978ff6166b16020df99f05e8a1a5e233760ea0d67b43ec321819dfdf14b39accffbb115d2b07bfaa96ecffd2c726cf
 EBUILD systemd-9999.ebuild 14878 BLAKE2B d3c9b5a208993f8ebdbb111f5d99a1781f54e4cd1de27b95fc81a0b7a982ebd5593dc8dfab651067dd4aed7b3be1868bc71f454cfe50c6a5c9556ba28006f324 SHA512 7835f35a23c59a51903b23528b20b98bb7b973dbda7c4dc98e1fc9f38fda18043e55e71892987279fe2f84dd4b3e88f36d66ee53f9801afd381505a90c203be7
 MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/systemd-249_rc2.ebuild b/sys-apps/systemd/systemd-249_rc3.ebuild
index a9e94af56ef5..a9e94af56ef5 100644
--- a/sys-apps/systemd/systemd-249_rc2.ebuild
+++ b/sys-apps/systemd/systemd-249_rc3.ebuild
diff --git a/sys-apps/tas/Manifest b/sys-apps/tas/Manifest
index a35331eb95f6..ba3b5e84c9d2 100644
--- a/sys-apps/tas/Manifest
+++ b/sys-apps/tas/Manifest
@@ -2,5 +2,5 @@ AUX tas.ini 81 BLAKE2B 2dd7bc87d72d00d7dd73e496d253810dfe110aa1d754f1fe923f4bf0b
 AUX tas.initd 422 BLAKE2B af394bb87952d7e5ddb20e3b688372f7e526ebde59a3862112a8c723252575683e8218297b801b0ef027b3953e8e78898407f6d85b7bec4f166fad4469d114ed SHA512 0cced493bd7a451bb8a76be1b24171fbc72c0571fb6337e52fe0140184a0990baac9a95e512738366433c3516b859f1958546a8e0ca8f718f7fc48b32f95c792
 AUX tas.service 162 BLAKE2B f9f8d8f9e8dbe1b6aa6e7c531cb69b3e6f39e563cc64f2630a0db2b48cc0425806b166f39d7b2dc356c55b4771da7023ab5c0f10dd2d2857beaff7699fa1a0a7 SHA512 53a6ad9f0d42b26f2a2e9462a5f14a31e4bbde4d8badf7beb9e96e2a916d81ccda96be9bad80fbcc1a8f9e4a72ac5cfb1e13112785de8fe978823d97de145efd
 DIST TAS_1.6.0_build.200601.zip 15528952 BLAKE2B f2514180c1335c2c8afd5cf0234da8dd22563086cf2c85e38b8dc2bc28b27fd3dac6a09123a0d4f57354cf729ad5050a6253608d15682577c75b551c921aa1b0 SHA512 725e8134a51a75b23f566f1321e87faf44f96603d63b4a253f03c262ec2c40c339e024162ba84da37647cd301a039ca4aa34e42936d1a47303c7fa68e1e5f2f3
-EBUILD tas-1.6.0.200601.ebuild 1605 BLAKE2B 09c5ed5740c8fb70ce83c4e4b4ffa14ae343a20daeafc2641e5bee84daf6f20833022a29bb270b6b7d799dc974c204ff8cbee4508dde28f5089a8506145d54a2 SHA512 f98300064d58d2a0e612fb5ff3db26b274c0465f96652788b9a2365a7727e670231983b8d6dbee2d41282e647d73a190f0ee7cb4aff72c4733ce21f91be5fc05
+EBUILD tas-1.6.0.200601.ebuild 1602 BLAKE2B a51116f6db55d417bb77c2937230851a1a6dc893c2244959c0482f649486f575875821dd5bfd96a836f41a430a9881cbb0618e77e316ffa16fbcf9b2d64125b5 SHA512 54e93020cabd25efaf7b9cdced31b99b208f6184583bdd1c01c14e5c01df4483600db94602f74e732c08feb6804f4fe07148d7295d58e713f5f30dc86f78853c
 MISC metadata.xml 871 BLAKE2B c8666715b4e9c7704f8f5464c95a9a3411cb4f97fe6631eccb4bb2a1ae70c987e858a4d32d3f6eef3ddc77d4ff1d8e441877da198e17f47fa65bec7bd915a565 SHA512 6b9b63a492af33946ac54c3a46fb6c27a48e8bd65472e10ab79510722a5a7bcdbd6cbded8f8182773e7fbd478e99d2a520a968e080996aa567289aa14ffe01ed
diff --git a/sys-apps/tas/tas-1.6.0.200601.ebuild b/sys-apps/tas/tas-1.6.0.200601.ebuild
index 6301047a3e21..c7e5a3cc2190 100644
--- a/sys-apps/tas/tas-1.6.0.200601.ebuild
+++ b/sys-apps/tas/tas-1.6.0.200601.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,8 +12,9 @@ MY_PV="$(ver_cut 1-3)"
 DESCRIPTION="Supermicro Thin-Agent Service for monitoring through the BMC/IPMI"
 HOMEPAGE="https://www.supermicro.com"
 SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
+S="${WORKDIR}"
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="BSD supermicro"
 SLOT="0"
 
@@ -31,8 +32,6 @@ BDEPEND="app-arch/unzip"
 
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="usr/bin/IPMITAS"
 
 DOCS=(
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 70d88dd1b21c..98871dcdeda4 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,3 +1,5 @@
 DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2
+DIST texinfo-6.8.tar.gz 10119420 BLAKE2B df9dc1698e7bb4f7c97ba4d44b08631502e3f997b91169ae64161b69701fbb0f85c82295ef6867e716a0addfd7c5677e14079645b167bd74933a0153fee92200 SHA512 f46dfb1c0f324a9c54959a8f256f0dcb8aaa59caccb0f027a5ee39a173b6e51a31a488f9d787707e7aa8401a439b2a01a1f3022dbae24ef377a1c021c1ebeb37
 EBUILD texinfo-6.7.ebuild 1941 BLAKE2B 26caf30f52c31e1de0718ae11eee9043910d6d80b81c70797102c3a026c6e767ff68a9f6f055fb67c88019c56af8ed678fed14c5d4ac290d76c2a42fb9adfc38 SHA512 c1e18457082628d892e5b58a3f514a1058b0b53a681da0863f72da6a6120d98dee47104155e84618fbab2e794f6571cc3803c32577b9602ac670ecffe98efa69
+EBUILD texinfo-6.8.ebuild 1933 BLAKE2B 11ffd7f86c56a8b9f96e5251ab159762624cf2c7eeaa69905621fae108ad2a34ca033b1ea38471904f42c90e40f8212160e7f1b55bc0cc33aced9a1d5134f068 SHA512 d998953fb2e2f16074e5a570b7379e376058fc15b4dce565e1c26c7223fd7d60b3d8effb1310ace1ab2c4a7946d4180e2e201dcfb709be2182a04f958d07a6d3
 MISC metadata.xml 539 BLAKE2B 5445a2b07c6bbecb3c33c64e80227f57ff80b17b0b440a3d0220a88ed1bb930deb1b0274eff8db1a64fe82c64e7f34b1183c533b1a1ca7b41694668e2c5b682b SHA512 4d0b0b223f04e6ebc4e7a7546dbf6b731fc0676657c8d3c3cd38a54c327f4eebda927f1793ead3f8f255bc82d7884b5acd6df8431674db48c2ebbbd1098cb032
diff --git a/sys-apps/texinfo/texinfo-6.8.ebuild b/sys-apps/texinfo/texinfo-6.8.ebuild
new file mode 100644
index 000000000000..3f25e5592134
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-6.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: if your package uses the texi2dvi utility, it must depend on the
+# virtual/texi2dvi package to pull in all the right deps.  The tool is not
+# usable out-of-the-box because it requires the large tex packages.
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="https://www.gnu.org/software/texinfo/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls +standalone static"
+
+RDEPEND="
+	!=app-text/tetex-2*
+	>=sys-libs/ncurses-5.2-r2:0=
+	standalone? ( dev-lang/perl )
+	!standalone?  (
+		dev-lang/perl:=
+		dev-perl/libintl-perl
+		dev-perl/Unicode-EastAsianWidth
+		dev-perl/Text-Unidecode
+	)
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
+
+src_prepare() {
+	default
+
+	if use prefix ; then
+		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
+		touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1
+	fi
+}
+
+src_configure() {
+	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576
+	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
+
+	use static && append-ldflags -static
+	local myeconfargs=( $(use_enable nls) )
+
+	if use standalone ; then
+		myeconfargs+=(
+			--without-external-libintl-perl
+			--without-external-Unicode-EastAsianWidth
+			--without-external-Text-Unidecode
+			--disable-perl-xs
+		)
+	else
+		myeconfargs+=(
+			--with-external-libintl-perl
+			--with-external-Unicode-EastAsianWidth
+			--with-external-Text-Unidecode
+			--enable-perl-xs
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 74584c15be34..feb2ef73f459 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -1,5 +1,5 @@
 AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbaed904d8387a4ac686f730e2f0ddf5ee90575bd0a7d73588a23b25ec4a6e9c73d48714f5770f5d SHA512 03bf05e544c0e52bc2bdeadf494dabd49ace985687b656baae869be99ef65a5f7129492c37e062bf6f196f70561d6239f2d3c4e8171fddc04729d3e266bfe2b2
 AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604
 DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d SHA512 1d9bbf5f60b299746adf3e57a669bf1a554b50066563b65cdb7584f00dcab2d3d331df705eefb56b51c52a16b5ed6b109cd832c27df87c7f262bb304e17ddc0e
-EBUILD xinetd-2.3.15.4.ebuild 1264 BLAKE2B 7f84671131911d6b2a633ee5526207308cd2741b967324c2cb04f55b7a9ead38a86fab70752a0586c895ee69fcfde09c6db4d44be55b3f82c2763c12f388db1a SHA512 f0f810b9d44a0e95141e56211cbff4fa2a50d773546c8631f4843b396458c5677882cbadf51e21a7b18bd9a18abdd32dbb6094e342f49bb3c4cdf43ab3ed32d5
+EBUILD xinetd-2.3.15.4.ebuild 1271 BLAKE2B 78641b77dc50e0a6ceb70d962acff14bd95ffc28f66df41fa5d2e9fa9d2f1aae38bd4bfc09969830139ed57fd5346c591c89ceec0b83187bbfd8723afd7051ed SHA512 dbe701dc2f8f64a54deebd0c2df836d69c330b9c36192597759d304f9a6129e626b2fe025c19c26d431205cf87ced12c1ee793883d11008edb84e288e7614574
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
index 98f924c040b0..08ee1e302472 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="perl rpc selinux tcpd"
 
 DEPEND="