gentoo resync : 14.08.2021

38 files changed, 916 insertions, 41 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4910fd480590..3f114872889d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index cfa877a4e981..abe9f0a032cd 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -4,9 +4,9 @@ AUX fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch 1105 BLAKE2B 898f70b2ba
 AUX fwupd-1.6.2-dell-dock-requires-gusb.patch 716 BLAKE2B 470db7243fa0e7398778ef8c5d716013e04ef6429e1b4a35b644c3f4bca7148f3bb9f2fc08814b82edc50e1605dc00feb2691f3f1c09b371afdeb1b838181a6c SHA512 08546194d1dfe27a09b10feb6d63a1f29cae881a0ac23bd1497b91eea44fff21559bb67ab5feac3b5613d4f99626708dade0127cb6c7f5ea4c842612c0323ec3
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
-DIST fwupd-1.6.1.tar.gz 3786336 BLAKE2B 429e41cad3acdcd9b245532a38126a8e3d366081aba16b9f3e04a2029980b8d6e3f4ac3f8c6d6cd1332c344526a7901c976d6fa0bc1c4011e54d5dc96a427d2d SHA512 6d795e9898de6097d0f1185fbc3a6864566f90fc504e5d9cf192e5dca50c659d39f43f1922c7506151bd1538a23db507e95893436de733b1335bd69dc56f3b1c
 DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0
+DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
-EBUILD fwupd-1.6.1-r1.ebuild 4374 BLAKE2B 4081625c0d91e6d318e84ba368fa5abe96f3a6bcbf690ffde03d4995cd53d4ba2dcdea7c7b869da9fc29a0e00957a35de93376c9f49e6c2790103e80ddd7e134 SHA512 599c623fecd7dc801673cad0480c042eb7bc9095e74dcbf7d6431337916deb17a211d6c90cf12b4dc9ea0a3a111be6cdec34e91efc4d9b981f04d81088fa1367
 EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea
+EBUILD fwupd-1.6.3.ebuild 4449 BLAKE2B 88c3eb7cee8a8a2fbb90dc9d66cb26a25034ddd06acbd7407888e7f76fdcbf859e59b796caa35a8169aa7906a69cfb86ce1c023e559a1faac750658e24da332c SHA512 989d95e54a04ef4871e32208719765988562dd031f41cff7ee152e8cf2fc08175a5893c433bc2d9d8281dd63ffb6e64c3eed90a4faff5f78b7eb325ed21f9a2a
 MISC metadata.xml 1347 BLAKE2B 93c3805765fb699b8325f80aef9bdc1281d80619ae74a89fc95d764f7a52ccf50e97425360779a66231a8bb8013e4d5e90649f7c7ab8cca8ccfd2938a2377b38 SHA512 8e50016bb8339b9b278c19a6e580cfcd3426d0b6fb186cde07c4535f48c5bd7a8a4437338360a10ea4550504242722ab2ed99bb4573b8e8809de0015db25ddc2
diff --git a/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.3.ebuild
index 29a6393d4e0a..87c3835a1d62 100644
--- a/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom lzma minimal introspection +man nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
@@ -63,6 +63,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	gnutls? ( net-libs/gnutls )
 	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
 	lzma? ( app-arch/xz-utils )
+	modemmanager? ( net-misc/modemmanager[qmi] )
 	policykit? ( >=sys-auth/polkit-0.103 )
 	systemd? ( >=sys-apps/systemd-211 )
 	tpm? ( app-crypt/tpm2-tss )
@@ -87,7 +88,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
-	"${FILESDIR}"/${P}-fix-python-detection.patch
 )
 
 pkg_setup() {
@@ -102,8 +102,13 @@ src_prepare() {
 	# c.f. https://github.com/fwupd/fwupd/issues/1414
 	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
 		-i plugins/thunderbolt/meson.build || die
-	sed '/platform-integrity/d' \
+
+	sed -e '/platform-integrity/d' \
 		-i plugins/meson.build || die #753521
+
+	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
+		-i data/builder/meson.build || die
+
 	vala_src_prepare
 }
 
@@ -113,6 +118,7 @@ src_configure() {
 		$(meson_use dell plugin_dell)
 		$(meson_use flashrom plugin_flashrom)
 		$(meson_use gusb plugin_altos)
+		$(meson_use modemmanager plugin_modem_manager)
 		$(meson_use nvme plugin_nvme)
 		$(meson_use spi plugin_intel_spi)
 		$(meson_use synaptics plugin_synaptics_mst)
@@ -122,9 +128,6 @@ src_configure() {
 		$(meson_use uefi plugin_uefi_capsule)
 		$(meson_use uefi plugin_uefi_capsule_splash)
 		$(meson_use uefi plugin_uefi_pk)
-
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
 	)
 	use ppc64 && plugins+=( -Dplugin_msr="false" )
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 822c9f910787..f3d247e045e5 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,8 +7,8 @@ AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1
 DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549a6687257498676a23e4fdc4a590a7215bfdba3c7ac4b1ccde6c38ba8e3eb222eea2532374fa9680633aa198d347 SHA512 a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13
 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.12.0.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58
-EBUILD iproute2-5.13.0.ebuild 4861 BLAKE2B 60508d78b8d343ccc648fce9109344030f15c4d6320784df51b924dccdafc9de081087e60b807a16f7091f1ed3382654cc1f0f68aaf9301acc5d6f652c90499d SHA512 b1855948910e80ce6104ffd676d2299ee1b23fc54d70c6c396ac8c768af0a393f7e49b79ae4e8824d163b3785e63e0b49794e06f2a0ff5a3a2db5b0e146ad0bc
-EBUILD iproute2-9999.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58
+EBUILD iproute2-5.10.0-r2.ebuild 4768 BLAKE2B da748c6ebdb9fd578a9df0f33aedee79121c957b64e2f5f771185bb7907e187c24228e52352af1046957e767eb6d94cb3c73fd375c182d69132b5d1ccb5d5c6e SHA512 256d8759f3576639ff246616ccaa189bd57ab5215bf9b0e7b513e434b4104086c46ea32b19d8df6a6e98134193120fd4a6406c1a0a6d78032a75289e8f86fe2b
+EBUILD iproute2-5.12.0-r1.ebuild 4872 BLAKE2B 243ecc648c270f315e36b8f8b1ec0d52db8f9165edb2b24846eca9b0a5878ddbfe9381f2d0d2ebcbc3e4a5b16a89cf60ae5dfdf8cbc2a67c966705c8379ad51a SHA512 70b956da31061c44ac3faf7b4958fcd60561e35ac662ff877ba7345d22c02201049c1cd3dbdb8ac84c604c492ed0c515a0f3315b5aa865905b14dec20a70aa5c
+EBUILD iproute2-5.13.0-r1.ebuild 4865 BLAKE2B 5e0cd7493e406c13747fa968f4cc2c46547fe2ed4fd2b36412e5f5facb1cffa076d6b4a0de05a8dbe68e3b9a0f4f505da40d53c3ebf90051369fb99b8f10ec7f SHA512 70ee339153ac4010d153084559b17302bdea9921825c6089f5eb54b8bb0fbcdcc5ac30e91496d44cdca5849dbd722a8b1f06231a5bda391e03c6b6f21a77f111
+EBUILD iproute2-9999.ebuild 4872 BLAKE2B 243ecc648c270f315e36b8f8b1ec0d52db8f9165edb2b24846eca9b0a5878ddbfe9381f2d0d2ebcbc3e4a5b16a89cf60ae5dfdf8cbc2a67c966705c8379ad51a SHA512 70b956da31061c44ac3faf7b4958fcd60561e35ac662ff877ba7345d22c02201049c1cd3dbdb8ac84c604c492ed0c515a0f3315b5aa865905b14dec20a70aa5c
 MISC metadata.xml 813 BLAKE2B a34634416583a3d6a75a0d02e5e2c89b8e3dd0766a33e13555ee66515dda7bd10c711226701e00adb1b92fc6443d7793adc25e6b446a8ecb901afe268c7e978f SHA512 8fd774dd6bdde1265ace7e9b3f96f19a8afa782bbdbb5633b0e4024663e2877fd4db8e0aae48870c81fa470467ccaedad52c95b0fa9cd2b64829aa1a07e6f061
diff --git a/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.10.0-r2.ebuild
index cf963710340e..09e05b28c60b 100644
--- a/sys-apps/iproute2/iproute2-5.10.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.10.0-r2.ebuild
@@ -23,11 +23,11 @@ IUSE="atm berkdb caps elf +iptables ipv6 libbsd minimal selinux"
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
 	!net-misc/arpd
-	!minimal? ( net-libs/libmnl )
+	!minimal? ( net-libs/libmnl:= )
 	atm? ( net-dialup/linux-atm )
 	berkdb? ( sys-libs/db:= )
 	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
+	elf? ( virtual/libelf:= )
 	iptables? ( >=net-firewall/iptables-1.4.20:= )
 	libbsd? ( dev-libs/libbsd )
 	selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/iproute2/iproute2-5.12.0.ebuild b/sys-apps/iproute2/iproute2-5.12.0-r1.ebuild
index ae69e78cd831..14d225e3e580 100644
--- a/sys-apps/iproute2/iproute2-5.12.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.12.0-r1.ebuild
@@ -23,12 +23,12 @@ IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux"
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
 	!net-misc/arpd
-	!minimal? ( net-libs/libmnl )
+	!minimal? ( net-libs/libmnl:= )
 	atm? ( net-dialup/linux-atm )
 	berkdb? ( sys-libs/db:= )
-	bpf? ( dev-libs/libbpf )
+	bpf? ( dev-libs/libbpf:= )
 	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
+	elf? ( virtual/libelf:= )
 	iptables? ( >=net-firewall/iptables-1.4.20:= )
 	libbsd? ( dev-libs/libbsd )
 	selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/iproute2/iproute2-5.13.0.ebuild b/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild
index 8738ddc2e83e..87577d20ec62 100644
--- a/sys-apps/iproute2/iproute2-5.13.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
@@ -23,12 +23,12 @@ IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux"
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
 	!net-misc/arpd
-	!minimal? ( net-libs/libmnl )
+	!minimal? ( net-libs/libmnl:= )
 	atm? ( net-dialup/linux-atm )
 	berkdb? ( sys-libs/db:= )
-	bpf? ( dev-libs/libbpf )
+	bpf? ( dev-libs/libbpf:= )
 	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
+	elf? ( virtual/libelf:= )
 	iptables? ( >=net-firewall/iptables-1.4.20:= )
 	libbsd? ( dev-libs/libbsd )
 	selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index ae69e78cd831..14d225e3e580 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -23,12 +23,12 @@ IUSE="atm berkdb bpf caps elf +iptables ipv6 libbsd minimal selinux"
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
 	!net-misc/arpd
-	!minimal? ( net-libs/libmnl )
+	!minimal? ( net-libs/libmnl:= )
 	atm? ( net-dialup/linux-atm )
 	berkdb? ( sys-libs/db:= )
-	bpf? ( dev-libs/libbpf )
+	bpf? ( dev-libs/libbpf:= )
 	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
+	elf? ( virtual/libelf:= )
 	iptables? ( >=net-firewall/iptables-1.4.20:= )
 	libbsd? ( dev-libs/libbsd )
 	selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index d3deee9cb050..072cafdbc9e7 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,6 +2,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52
 DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
 DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
 EBUILD kmod-28.ebuild 5224 BLAKE2B a332a2e2544d737b006d0179974de3f86baabfef69ef8291d9c1dda3df94829e2b37fd44862e194eff6107395dcab0ec50ec8e6d99afa136e332212feb34a49b SHA512 9eb983c787a706e7ae56d6b73515d176257ce189a2547405062f5b71a3f6113cea949dd0f73bda634e109608c78869ff40d1bc0cf216b0fba42d780f2a937492
-EBUILD kmod-29.ebuild 5231 BLAKE2B c040a74b53bc30ae0bbed9b28ca5c97d6cb3dd8e49ae6f754ae400636d8b2c0cc285192286ba110f325be1c34dd5a4eb773d53b80020dd7c49c80c0ac4e2a88b SHA512 6f472fe7c20c7e6f7e57f1aad983b7143084ddcb0691d33d9ade981621bf8683f4c74cf9885a1a775d96b00862c94cc06ce47ff61adea02c7d5a50745903218c
+EBUILD kmod-29.ebuild 5228 BLAKE2B dbd7f670dbd2db25e7d5c3ebf9eeb8851040b938d633ea3c3ef2a86cdba5cf20d824e2257003a4cefdce859eed43d3b11614142d4e876de4d9b724e683720194 SHA512 b4c139fc87bce1066178b16d25d3e9806de5c9ab85fee5d9971f3252e80d098a4f20420e3c2b7cf16a60a2b0d8cf9851f6163fa6392c04f1d87bdfa2efe855ff
 EBUILD kmod-9999.ebuild 5236 BLAKE2B b8c89c6c4dcddf2b9da47b0b7a6ad342e155f30fadbeb74a1867b3ddee1b6575578407314c116afb19d1597d9a8ea34d5d4fb9ec7ce3a20ad62f51dc257c28ce SHA512 03cb2435a15e335a7a85d3fefea00b25e1a8561a7129b4ff173838092949d0cd88ff90df4ddf4522be5c1df5dcd4b030a22d3b545bb90d87b729167daabd3b1c
 MISC metadata.xml 610 BLAKE2B 5542dbcd20e0cdafdb03ed48b19c34c52fce92564c77cedbe2d254e139f6d7976f28ad3a385cb445d4e043d2aaae4349cbc44c8181aaa8f7a177425c0646dc3b SHA512 8aa83c2b3d40025544c23423359d59a9ae1a9595a7745afe4b719427099729ebcaf8feb7d707376e2af737aae6a6f08a2208856ec317de18c0e80d9ab2c49dc5
diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild
index 597d1a664056..0e54b83b0aa5 100644
--- a/sys-apps/kmod/kmod-29.ebuild
+++ b/sys-apps/kmod/kmod-29.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/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 48dba270f972..c889d1c2f6f2 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -11,6 +11,13 @@ AUX memtest86+-5.01-no-scp.patch 388 BLAKE2B a5b195d54c4a9d99c62771430822f87f20f
 AUX memtest86+-5.01-objcopy.patch 654 BLAKE2B 34295b2ebb0edbdf007652009de46fef56bb723188fe31f25d19bd965f6b80b18d6bc41edc96e761afa5e7184b63e46e2867e7d84000a37571162337736e192d SHA512 f9c1152ef3bf546bf346a9ff53212fba7cf1ff43bf94f7ea3a3b897336b6ff4516b02e6bbf74dde7acf8adcf6bda5afac9469d09e0fabb32c49ae05483624a16
 AUX memtest86+-5.01-reboot-def.patch 326 BLAKE2B a17bcde8563a3f1a8e88c50e981b3d93439a19d0b1186c511826f9836be8efb5bcc2f0031c28887bf0c67ef9e8c9942eca641f923f87c458f070507645007f0a SHA512 2309da17ae7bfd32137b02c0533a9d4f30c95d70dea309a009219457f07f36e0b9192e1ac55485513a23d6364247476886a4720ffe83d33a2c493124a82797a1
 AUX memtest86+-5.01-test-random-cflags.patch 679 BLAKE2B 62ccc56c3f127b3e3213d6bb9605094dd8ba2580d2047873583db8b7a3d48db225eb8b7013319903e92ba9c658569470fb6b3de4f4b7f6b3686efdd5f9c132eb SHA512 a000cf28d69396b0707519bb995f086457f8fa5283299164d969dbf02abea86b566016d71fac7e887c6089bc39c58be9e5c885cfb5f8e7eb815ea1741e097bb6
+AUX memtest86+-5.31b-gcc-473.patch 426 BLAKE2B c7ce26466a1d0a083e9da5ce4f1d5430c43c7a1264f9edf533f82905b8dfb290fcf4a67c8cff79277bd26a59003277ef9ea8d321e8c81b0952b2d662369883de SHA512 dde40a97c6ac8aec9b19ace1ab3cedf30146b908d6f9978eb0c6d1b2589242be35e1e4710b2aaa6f2def670d00add92761e4ab763f33724aec334f5b922254c9
+AUX memtest86+-5.31b-hardcoded_cc.patch 316 BLAKE2B 9be278d20cfaeeb01a32628bb433283aa7321f57703c32b4e191e9f6ebfe0659b33f72bbe4d9bde66b64ab62fa6d590b6c57bffc7f0ce59269f4b3a5524ec81f SHA512 6b011df2926b988769da9a257b7558bbb1733d18bcd113d8b04567da23456a6c5c22f0fc72818e43888e96d188cf572673563b123fe2a12750f31633118aaafc
+AUX memtest86+-5.31b-no-clean.patch 570 BLAKE2B 99fcdc691c44b4c116878713e48ec5056f7da80355ce17ba35ca6c3eb4de2f51bb84212bdc48127b870b87bff722be8e21e08b10e1b4f691b9111c374f2a70e4 SHA512 19ef0c4af27a6382729faa6c2b9666006d053cadf3f457e62d4e21fae266e42b54eb5db87d97817a0b3e2d6bd1f41a054bf6e6a85f8acda77816c6bdaf69a59e
+AUX memtest86+-5.31b-objcopy.patch 610 BLAKE2B a7a68cefbca249a2db578fa2d1eac2095ebe35f4fba67b6b44b1a85360fdac86a154585b6776ac95ac2963c773ccfcf4e8d828b2c1736bab2741f483626b61a6 SHA512 ad55e5448e70db93a19801cb6dd7cddfd4bf52d9d11582ba00335e59906cb8ee9165b828e59a1ecd1b0ddb2a52aff7165803d69c2ad3984a18ff07f069d36ea1
+AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d54daca34ad53a6eee0f7ce2592acfc60a60bf0c8f08adacc82ed67ae8e7ae7faa995d9b6efa0d0ea3cf0df33f5cda1a606a7e0d987 SHA512 98965cfe1ec90f5dee115da406609cd85651e09b9914232b717a3b8755b4c10b05f58ed08c8a470b2bd772f1ef4d93faf63516f902a0b48b9c33974eba4733a1
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
+DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 EBUILD memtest86+-5.01-r5.ebuild 2843 BLAKE2B 6094eb3d890de7f7fd72012104c0b467746a313a5ad04c3546e1932556889b108edc8b6ed44442c0443b2305c335c3bbcd4f178c80564b0da9d7a5e11fc17d6f SHA512 dcea721c0ac1abfe2f4f1ccf0972284025d841caf84d7d439ae1b4d9dd891e46418ab08cd4b0807dab93a132cc29a4ee4cae6f72da7cc5dc356e8ef6d3e40859
+EBUILD memtest86+-5.31b.ebuild 2630 BLAKE2B d97cf738c896fe5b34c59a667f8d94848222d66f00ca111f61562059f8d15f42da679ba416ee8a6d002f7dee622573ee09e08da10cf793ce851560e2be282767 SHA512 29c0051ca9b788f9c6db929ab0b77eafcbb82327a1c5192837840eb76e68a89ea9909ab8334237c6c7395959930b8e8d9479a3be010a80beaffa0d9b10808fd0
 MISC metadata.xml 563 BLAKE2B bd4e7ef2022ed705fc3902cd113f20b057b672dd50a9cf9362f56d4ccf1be9bab1fdb45d162cd646deb2acdab6829942da59f6dce0475a2d51c060662a33b9dd SHA512 26d725110c8b6214fce06feae590d1c437b64c9884ee5bc5421b4804b9391d7b928e11a270d84421ffbb5ea7a7b551dd26484565706499bdfbe871aef7ffb61b
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch
new file mode 100644
index 000000000000..76c0761512b4
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch
@@ -0,0 +1,13 @@
+http://forum.canardpc.com/threads/110950-fix-controller-loop-error
+
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,7 @@ FDISK=/dev/fd0
+ AS=as -32
+ CC=gcc
+ 
+-CFLAGS= -Wall -Werror -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
++CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
+  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
+ 
+ SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch
new file mode 100644
index 000000000000..4ee174478b7b
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
++++ b/Makefile
+@@ -9,11 +9,10 @@
+ #
+ FDISK=/dev/fd0
+ 
+-AS=as -32
+-CC=gcc
+-
+ CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
+  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
++CPPFLAGS= -m32
++ASFLAGS= -32
+ 
+ SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g
+ 
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch
new file mode 100644
index 000000000000..dbb560e506b9
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch
@@ -0,0 +1,19 @@
+http://forum.canardpc.com/threads/110954-PATCH-fix-parallel-build-issues
+
+
+don't run the clean target when building all as we run into parallel races:
+ - memtest kicks off building of a bunch of .o files
+ - clean runs in parallel which runs `rm` and deletes some of the new .o
+ - memtest goes to link and fails because objects are missing
+
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@
+ 
+ SELF_TEST_OBJS = test.o self_test.o cpuid.o random.o
+ 
+-all: clean memtest.bin memtest
++all: memtest.bin memtest
+ 
+ run_self_test : self_test
+ 	./self_test && touch run_self_test
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch
new file mode 100644
index 000000000000..9398c4163a4d
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch
@@ -0,0 +1,21 @@
+Allow 'objcopy' override with user's OBJCOPY.
+
+--- a/Makefile
++++ b/Makefile
+@@ -8,6 +8,7 @@
+ # Path for the floppy disk device
+ #
+ FDISK=/dev/fd0
++OBJCOPY=objcopy
+ 
+ CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
+  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
+@@ -36,7 +37,7 @@
+ 	$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
+ 
+ memtest_shared.bin: memtest_shared
+-	objcopy -O binary $< memtest_shared.bin
++	$(OBJCOPY) -O binary $< memtest_shared.bin
+ 
+ memtest: memtest_shared.bin memtest.lds
+ 	$(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-test-random-cflags.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-test-random-cflags.patch
new file mode 100644
index 000000000000..f3faf1392b3a
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.31b-test-random-cflags.patch
@@ -0,0 +1,17 @@
+make sure we re-use the existing CFLAGS settings so that we get all the right
+flags (like -fno-stack-protector).  just append the few changes we want (the
+optimization levels).
+
+https://bugs.gentoo.org/590974
+
+--- a/Makefile
++++ b/Makefile
+@@ -65,7 +65,7 @@
+ 	$(CC) -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector   -c -o memsize.o memsize.c
+ 
+ random.o: random.c
+-	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
++random.o: CFLAGS += -O3 -fno-PIC
+ 
+ clean:
+ 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \
diff --git a/sys-apps/memtest86+/memtest86+-5.31b.ebuild b/sys-apps/memtest86+/memtest86+-5.31b.ebuild
new file mode 100644
index 000000000000..8397e450b0d3
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-5.31b.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot eutils toolchain-funcs
+
+DESCRIPTION="Memory tester based on memtest86"
+HOMEPAGE="http://www.memtest.org/"
+SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+boot floppy iso serial"
+
+BOOTDIR="/boot/memtest86plus"
+QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
+QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
+
+RDEPEND="floppy? ( sys-fs/mtools )"
+DEPEND="${RDEPEND}"
+BDEPEND="iso? ( app-cdr/cdrtools )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-473.patch"
+	"${FILESDIR}/${P}-hardcoded_cc.patch"
+	"${FILESDIR}/${P}-no-clean.patch" #557890
+	"${FILESDIR}/${P}-objcopy.patch"
+	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
+)
+
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
+src_prepare() {
+	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
+	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
+
+	if use serial ; then
+		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+			config.h || die "sed failed"
+	fi
+	default
+}
+
+src_configure() {
+	tc-ld-disable-gold #580212
+	tc-export AS CC LD
+}
+
+src_compile() {
+	emake OBJCOPY="$(tc-getOBJCOPY)"
+	if use iso ; then
+		./makeiso.sh || die
+	fi
+}
+
+src_test() { :; }
+
+src_install() {
+	if use boot ; then
+		insinto "${BOOTDIR}"
+		doins memtest memtest.bin
+	fi
+
+	insinto /usr/share/${PN}
+	use iso && newins mt*.iso memtest.iso
+	doins memtest memtest.bin
+
+	exeinto /etc/grub.d
+	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
+
+	dodoc README README.build-process FAQ changelog
+
+	if use floppy ; then
+		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
+		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
+	fi
+}
+
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	if use boot; then
+		mount-boot_pkg_postinst
+
+		elog "memtest86+ has been installed in ${BOOTDIR}/"
+		elog "You may wish to update your bootloader configs by adding these lines:"
+		elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
+		elog "   as /etc/grub.d/39_${PN}"
+		elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
+		elog "    > title=${PN}"
+		elog "    > root (hd?,?)"
+		elog "    > kernel ${BOOTDIR}/memtest.bin"
+		elog " - For lilo:"
+		elog "    > image  = ${BOOTDIR}/memtest.bin"
+		elog "    > label  = ${PN}"
+		elog ""
+		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
+	fi
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use boot && mount-boot_pkg_postrm
+}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 91df7ff50ccb..5db0dd5b4e5a 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,7 @@
 DIST osinfo-db-20210621.tar.xz 118292 BLAKE2B 6051916322b52cc3496819a29257940421dfaa3071a7d3adc2aa644fd04e1100b2c6d272e88a9fb0205d97c4b7e9035f6e4d5833bf901b985c472164ab98034d SHA512 c0ed0621d799b6515038716bd3b78f6b9f7fa6f80dc83899f691e69a9dc604a43d8d36f0ba5810c68731f0e3ded5fac0a66b7be9c66a14d501384c6850bdb797
 DIST osinfo-db-20210806.tar.xz 120664 BLAKE2B 1b52a2eee65e947dba9929e09758212a02cd3b33930abf0fb90ee99692e9f454bc1151d75357e4d3eecd5cb65e39f70a0effeb153ce71c3a24ffc0ba334c77df SHA512 cd71e85e88bdb4d904ab078ef77799c3e74d922e466889713124cb5e3d4138a28fa6c83af6f30e299e33376b9ff015f679611d2e5849c36923428cd78bafb120
+DIST osinfo-db-20210809.tar.xz 120848 BLAKE2B 0d58c852c92d44d0e555bc572080f0390f2feb47904607486005f5d449fe8f732aaeab512cf5015f763c46af71ece536cd06dd2c9164a5c31c8ffd78533065bb SHA512 e191531b43a806acdd2b11f69d293c31ce809786bf1d224e15e54e80079ff9de49b6e7e44595a75c27d98585fe8389e293e333872a8c8d1c4e1cff9873a78b1a
 EBUILD osinfo-db-20210621.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d
 EBUILD osinfo-db-20210806.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
+EBUILD osinfo-db-20210809.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20210809.ebuild b/sys-apps/osinfo-db/osinfo-db-20210809.ebuild
new file mode 100644
index 000000000000..b76468286d57
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20210809.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="sys-apps/osinfo-db-tools"
+
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index fe497e961ded..9a7e97a15401 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -5,10 +5,12 @@ DIST pkgcore-0.11.8.tar.gz 631665 BLAKE2B 1e33ce394c1df9418d22fc8653fca4da1b4e27
 DIST pkgcore-0.12.0.tar.gz 621376 BLAKE2B d58390ad7251fc48465d744a0b0694210d1f1cf505b072c06dc9731819b327b1edfa60d0f89db113852c87109c6340c8c13c72ae2d89b517d5fca34b53632b6b SHA512 d066a2f2deb4f654b04f9e78d37bf88a97f67f0396f5867ffe3a18f8c0d6459d73721b66cad52a50581ee10420694a1fd195b28a013b3a97cb1ebf08bc59598b
 DIST pkgcore-0.12.1.tar.gz 621918 BLAKE2B aa3bedaf4d58d8e604b19ce3e6f97242d29eadbbeab85b7de029d0230a5ea77e2ee96b128381964afe92a327674d64878f833d8c1ddc983c0fe1381b008e2d62 SHA512 a78f3ffd5610f14adb07e2adce07c8446012e742c777d08bbc7ac711bf194508d66a14d21aa56f5d0c9353bd10354fdd34bc6eb4b6017c03bff5d1b565a53575
 DIST pkgcore-0.12.2.tar.gz 621604 BLAKE2B 15964d9a73727028010b7267a61802566aa59f28769f4ac67aa91ccd32708b1a27914ba14957e1da848dc1a2a24ee9fbf92a7b4cee055a7cff22dd1f0d204f58 SHA512 192532dcee696e7ce159efad2f90597aa68801759ceb5ae85484a99a11242c1da98b73290ce1e4c9e29f2c92607989991b3802c4d0fb9bd1f4a866dd80f13cde
+DIST pkgcore-0.12.3.tar.gz 621912 BLAKE2B 629c42b9d0236196d018302b0941d05d36d15d2bdf31f51ef0d212ab0aad2968ff58aa938d22ff8ba65d115e5a1e80e0f444959c2c63aa227f34bd2da3868165 SHA512 6942d13aecfbf0af2969b71b92fcf4e8e938c367fe61e4a748cae14eeeb4ba831b7ac50deb04f4afa8a7f1a6dc31a893ce4106e54b188ff0a1036f7afd6798a4
 EBUILD pkgcore-0.11.6-r1.ebuild 1127 BLAKE2B 044d792557c997a47814f18ef40a27b4136df40247a7ccd11c20bdf4baf5b2ac3cbb287c185ded8709409ce5d709a5fd4bfde145f1dd1e5f9a9350b7efa2162e SHA512 8795d3194db29c36862dd4d1ecf46e323f163a331b5aae2182aeca4e68838b446e64a1be7653e03662af18cac10e9849d9d736693df771828cc435e25f18a106
 EBUILD pkgcore-0.11.8-r3.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
 EBUILD pkgcore-0.12.0.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
 EBUILD pkgcore-0.12.1-r1.ebuild 1112 BLAKE2B 142795b861489cedd1abccd333803e814eda9356e32412dc5bcb6f68b17b5a5739f38eb53e9dd9faf2a2cdc170ccea9d0b1dcbca92b7dd196c1b16776a1d2199 SHA512 ce0e5e62ceb954ffe48ec510ddb658c2b43b3ce5b684c716a97ca9c2f61340bb1a1cbdace1fb2a24bb92fd4b7c7df5226814846195cbba3c6685fec18a89aa80
 EBUILD pkgcore-0.12.2.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
+EBUILD pkgcore-0.12.3.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
 EBUILD pkgcore-9999.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.12.3.ebuild b/sys-apps/pkgcore/pkgcore-0.12.3.ebuild
new file mode 100644
index 000000000000..5c7eeb03645d
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="
+	>=app-shells/bash-5.0
+	dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest
index 77ed11729a16..fc9fcce205cb 100644
--- a/sys-apps/roccat-tools/Manifest
+++ b/sys-apps/roccat-tools/Manifest
@@ -1,5 +1,6 @@
 AUX README.gentoo 858 BLAKE2B d3cdc925b286481491fdad08de6c2a61c811fecb1eb36fa1e0b2cedf98577f9f3c2deff4bb881c906bab3a799616b43601d2dae494674ae439f6bf561bd82417 SHA512 3f88197dc83d4bf7e3cb8fd71079754ffa355ddf5fcf151304ae439090da44b3bdef3ed9deab44b36ffffb4b28ded2a71b1abffe5d3e1aa87f56bfa264920a7b
 AUX roccat-tools-5.9.0-cmake_lua_impl.patch 236 BLAKE2B 833cb7662bdd1fc5942cfd3fd75fe3a7ce56616c8fb616403a056bbea6d0e5ecb8bd91b7ef39ecd12c30235172631eff839bc803910d1a8808c1d152db080bda SHA512 5bb4d236a053cbfed99f046d8cac4dcc1fb94535497e49f4be5338fc8c287623f4afeffa5164597d84aa16bca98b135d275f75e85df3e03bed95099caeb00d6c
+AUX roccat-tools-5.9.0-fno-common.patch 216 BLAKE2B da4c297a8efbe66afd6796a00e32424b46e84a76d9ee746d599d71ada7a64fff1a2365dc25183b4013c001b63f259516c2501db9bbff6e1bb185a95274a164e3 SHA512 51df4761508094536a5c6c18a7400797ded66ed0bd39acf35ac9aafbaf063d887892a2de738e355b365967e0e4ffe63688da098d04b8b2097a5d51e8660e99e9
 DIST roccat-tools-5.9.0.tar.bz2 3736671 BLAKE2B 4cdd0c6b50021cfae127a692d5a2a7fff5e7e1281da7add0cf9cd8f5fbfd8882186142d56982bf929867bde2950440f26ced167b52707c9d810ab53a62a4bded SHA512 d825fc372654257f330abbc7e611e87c4888924288ad56c8e57c9db5c8c25426d454ae1ab4dd591ef3b930bed410497c0aa88095d5319e2708f4b263d16eca00
-EBUILD roccat-tools-5.9.0-r101.ebuild 3360 BLAKE2B c2a3f7f301e28cca3530c22a75aa932d0f729062e709cba5d4cd931fe07ccf87cc92becf5aaa2e6e3c51373735004d7062f5e4aa4502226250ab7c7145b45627 SHA512 0e4918c14cd7620d1a18820bd21d2b77b75fa8e2db91ec089525ce1d74c4ceaf96040329d349ecb0cccd6871f8897fe5d4323afed6b9a739e718a771c57c4cab
+EBUILD roccat-tools-5.9.0-r101.ebuild 3404 BLAKE2B 0a72381c759ebd820179a19e3d22bc71e8e4456f04da910e70e16c4f1f2dd9953be384b0b9d91b31a6fe64dbb9551309a679278963339e6452912fc08ef77d6f SHA512 24d9d57147649199d55db11cea310b04d78072ce185d8a61b6d94d78544ebfd0d9db3a0667384ace97a8a6ac423b2f6adf21d2e739aa6ee47329109bfb4da356
 MISC metadata.xml 327 BLAKE2B b3a42ce918857aaa3ebe1705560661d80d9dc1cce60b5d79bddc1ead356cced572fe18d8b8d18f6c8f2ebb80393cc02efc4df3ad711aca08a67a15a1abd93e60 SHA512 99ed72c1a2a183157d0aded6f95c41c81c9c3d97f81c7267743ad3431676e2af1d7e08e4904761583af17806f5befd7254ca9f2ad170266d038053c7076a630e
diff --git a/sys-apps/roccat-tools/files/roccat-tools-5.9.0-fno-common.patch b/sys-apps/roccat-tools/files/roccat-tools-5.9.0-fno-common.patch
new file mode 100644
index 000000000000..ba37866efe77
--- /dev/null
+++ b/sys-apps/roccat-tools/files/roccat-tools-5.9.0-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/ryosmk/libroccatryosmk/ryos_device.h
++++ b/ryosmk/libroccatryosmk/ryos_device.h
+@@ -22,7 +22,7 @@
+ 
+ G_BEGIN_DECLS
+ 
+-enum {
++typedef enum {
+ 	RYOS_WRITE_CHECK_WAIT_LIGHT_CONTROL = 10,
+ } RyosWriteCheckWait;
+ 
diff --git a/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild b/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild
index ee1371ca60cb..84bfb0cbab3f 100644
--- a/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild
+++ b/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild
@@ -75,6 +75,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.9.0-cmake_lua_impl.patch
+	"${FILESDIR}"/${PN}-5.9.0-fno-common.patch
 )
 
 DOCS=( Changelog KNOWN_LIMITATIONS README )
diff --git a/sys-apps/syscriptor/Manifest b/sys-apps/syscriptor/Manifest
index 95be397c81d0..9af87d6de80e 100644
--- a/sys-apps/syscriptor/Manifest
+++ b/sys-apps/syscriptor/Manifest
@@ -1,3 +1,5 @@
+AUX syscriptor-1.5.15-dont-inject-additional-flags.patch 833 BLAKE2B 2f74b72db138e2390bf618f475f76b6ce6e197207c4a435eba38de25a891f875876f3946c50ee8a36073f65c4138576efc7913c95c2f648028a61aa0e7348643 SHA512 36fcb16e3704020e46455ba5750291fd8972d1c5be3da7dc56bad2993c8f4c9efc2340429927581ba37afb04bb4361832412bfdcc17c9cdec7ae1ee74464fb40
+AUX syscriptor-1.5.15-respect-CC-environment-variable.patch 538 BLAKE2B 9908fe8241c64cbc9de1f0c325463f3ead230babd104726cb0f96b17c6fd33a75a5146ad8a6288a93fd8e18c6cc9eeefac62baef9c423cb8718d149330551a55 SHA512 ee3d8e2715ae5e5b365e6b9ebf6eaae1edabb8e743581ebd433ed6b00d28a3bfeabf81ec5e36a73dde76cd56b4d7c9a400a1781ff0b58f3f23020357a8d9cec3
 DIST syscriptor-1.5.15.tar.bz2 58732 BLAKE2B 1527d9baf18d51543f2be07e55fe5e3557fcbf616a0770a1d17920361af41e45c7a0191246c6e833674c073bb06dd5b05eb54fbe882f9700fd928284277a232d SHA512 12fadc8bee58b8001f805383f0bab5ca4999f5d463eb69ec15486aeb2eb407671d2a4007f017e35df450f3616c4e1096bc86b34413485bae4ca6a9460e9056bd
-EBUILD syscriptor-1.5.15.ebuild 357 BLAKE2B bdad021921fcd14442a1f5fe5e649e554c6c6855dc0b96aa418bb0b959a4cf529c749379ad8699894a0b61a8b0c93c42d29279c7622c5c425024f33e1e86df55 SHA512 f2efe1a57c7a50b00b35e97f0b3c0920ba05282eb46c6d1a6c63cd4bd582402519e5f170cbc3250ef3033a4a33c9ae3e05a5b30b0a8a47d15ae35942b0f657f9
+EBUILD syscriptor-1.5.15.ebuild 579 BLAKE2B 4c0e976ddfb05788a2e8a55f95b1ac95fa6879ccdc96166daa070bf1934c9084906c5149f63c840b1555efdaf2ad74052678fcab9319b24c20d1b051b6bfcbd2 SHA512 dd82a6b648fc75e39d28d77348e3de910c4b219a014e8cb79f8ff6f49e1876fc1d76a95d226511500333ca68d6a5b3c574fe7d77331cce42cf4526620e3a8f23
 MISC metadata.xml 330 BLAKE2B 76b31db3b847c70f18388d67b3ed93acba1a8fa2571459ba917b92afcc8f3288185dd4133af7b35539d8a5b29069ed8536844fb1190a98ebde82b9134648d56d SHA512 746cc86310142135f45c241de444d7fe4c47e0d36d08c52bbe7bd6c60d391c28b3f299cbd58f0fc65751aff6bdb3077d7d2880e9e2380b7cf2142a2ba91abbe6
diff --git a/sys-apps/syscriptor/files/syscriptor-1.5.15-dont-inject-additional-flags.patch b/sys-apps/syscriptor/files/syscriptor-1.5.15-dont-inject-additional-flags.patch
new file mode 100644
index 000000000000..c80d9fc9dce6
--- /dev/null
+++ b/sys-apps/syscriptor/files/syscriptor-1.5.15-dont-inject-additional-flags.patch
@@ -0,0 +1,30 @@
+From 613abd8a0b82f5f6e01e728e31bd90f01f6be441 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 13 Aug 2021 20:57:48 +0100
+Subject: [PATCH 2/2] Don't inject additional flags
+
+---
+ Makefile.am     | 1 -
+ src/Makefile.am | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 070e568..d139570 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,2 @@
+ SUBDIRS=src man
+ CFLAGS=@CFLAGS@ $(EXTRA_FLAGS)
+-CPPFLAGS = -W -Wall -g
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b917ba4..f35923e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,3 @@
+ bin_PROGRAMS=syscriptor
+ syscriptor_SOURCES=main.c cpu.c help.c ide.c memory.c network.c os.c partitions.c scsi.c sound.c uptime.c version.c video.c
+ AM_CFLAGS=@CFLAGS@ $(EXTRA_FLAGS)
+-AM_CPPFLAGS = -W -Wall -g
+-- 
+2.32.0
+
diff --git a/sys-apps/syscriptor/files/syscriptor-1.5.15-respect-CC-environment-variable.patch b/sys-apps/syscriptor/files/syscriptor-1.5.15-respect-CC-environment-variable.patch
new file mode 100644
index 000000000000..1f4851dbd1b4
--- /dev/null
+++ b/sys-apps/syscriptor/files/syscriptor-1.5.15-respect-CC-environment-variable.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/725804
+
+From 7796e3f63254c42017a373349e3da3e789acb9d9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 13 Aug 2021 20:57:19 +0100
+Subject: [PATCH 1/2] Respect CC environment variable
+
+---
+ configure.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a29e9cd..5c30b3d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,5 @@
+ AC_INIT(src/main.c)
+ AC_PROG_CC
+-CC=gcc
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+ AM_INIT_AUTOMAKE(syscriptor, 1.5.15)
+-- 
+2.32.0
+
diff --git a/sys-apps/syscriptor/syscriptor-1.5.15.ebuild b/sys-apps/syscriptor/syscriptor-1.5.15.ebuild
index adef11296006..fcbf56ae2e25 100644
--- a/sys-apps/syscriptor/syscriptor-1.5.15.ebuild
+++ b/sys-apps/syscriptor/syscriptor-1.5.15.ebuild
@@ -1,15 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="display misc information about your hardware"
+inherit autotools
+
+DESCRIPTION="Display misc information about your hardware"
 HOMEPAGE="http://syscriptor.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc x86"
-IUSE=""
 
-S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.15-dont-inject-additional-flags.patch
+	"${FILESDIR}"/${PN}-1.5.15-respect-CC-environment-variable.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 4e67e3bf18ea..89b88bf7fb1b 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -5,5 +5,5 @@ DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec58
 DIST tcp-wrappers_7.6.q-31.debian.tar.xz 36256 BLAKE2B 3ffd8b014c120f54b9231f375d3ec77a1894db8c48e56a57b52c5d796be42b78a1ddc35a45c816a05a1cbc603b88e3fe6131b4a562fb9d2169685031ecbf44d5 SHA512 de2bd7b081fca0f182def93795014332baf7b5edf339eaf81dff82772aea1dc866ccddccd5273e7dc49cf760953e164a66f1e5945cb54f2b8dab090c11712c33
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
 EBUILD tcp-wrappers-7.6.28-r1.ebuild 2509 BLAKE2B 79b2fbb4710eab85626c207d78f1d0cdd4b995ff3e32b267ac9be30b6fe29602cb6ab395f617c9a9bb67a598dc16a33da48765a7fd1e796a45f6cba991c8e1d3 SHA512 b1007fc41f6c357c0f2b1e2ef62396dd1e30ed09994ac77935fe95b580947affd0674494097a38b0174b1af99310b56f87dfd022ae748b57d2684c44f9e8b4ef
-EBUILD tcp-wrappers-7.6.31.ebuild 2630 BLAKE2B aed16260ff668acb5b1d0bc7ba5381edd6c77517e3a8cd3d1d1bae135e47b205099810ec70cfba41e831d4cfed90ce190749e94cc68fb37042bc355b6dbdb625 SHA512 f86846a8023352a5ba4a76c31ef7edcbc16b9160dee9c5c9da4f41b92173ee75fcbfc3bddd648b7251bd2847ce35a3d0f4e36dc044fa5d58313917ca39334b4c
+EBUILD tcp-wrappers-7.6.31.ebuild 2568 BLAKE2B 1d6582fb738c6c3c43027053c9d1b156cceb7bbebdcb0770b46ae6f55e5bea0fef3bcd33f8ba770a34893ebf1821ccf5e2591e665dd4d7a84042a2e6e895012f SHA512 5bf49b12e5b607865cd34c433617ab5f160da76db8bc31f6bfee5c3aefb1bd8540d618e45e035601f6fbc85bc0cd43c512596df0a3a2e9ee7b6cd3c149d85738
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
index 7ab6995f3d7f..69030d9a27c7 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
@@ -16,8 +16,8 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="tcp_wrappers_license"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 netgroups static-libs"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 netgroups"
 
 RDEPEND="netgroups? ( net-libs/libnsl:= )"
 DEPEND="${RDEPEND}"
@@ -54,7 +54,7 @@ temake() {
 		NETGROUP=$(usex netgroups -DNETGROUPS "")
 		STYLE="-DPROCESS_OPTIONS"
 		LIBS=$(usex netgroups -lnsl "")
-		LIB=$(usex static-libs libwrap.a "")
+		LIB="" # disable static-libs
 		AR="$(tc-getAR)" ARFLAGS=rc
 		CC="$(tc-getCC)"
 		RANLIB="$(tc-getRANLIB)"
@@ -79,7 +79,6 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	into /usr
-	use static-libs && dolib.a libwrap.a
 	dolib.so shared/libwrap.so*
 
 	insinto /usr/include
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 22b3ba91f7b1..3ef88f94caa1 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,6 +4,10 @@ AUX util-linux-2.37-avoid_autoreconf.patch 3661 BLAKE2B 5098c11338238c944b69a4f4
 AUX util-linux-2.37-lcrypt_link_fix.patch 1545 BLAKE2B 85b9259ae3f8f4d39b94387212cd3db743194c7f8e645deb9b626792e78084f0d786f37d7c6fca0051ea161f020d72a89b3359d9dd9f624e0e009285d9cc937d SHA512 8f0f6ecbbab84b7f0f64111d9fd27852f6a8d9bac69598ae292b2978c0d7a9bc6beaad509ebe7d3bbaf239c9c04a592db13da6642b0029a485c2ad354b0a13ce
 AUX util-linux-2.37-lcrypt_use_LIBS.patch 2486 BLAKE2B bc1e73604932f6dc65c3ed262af37a6a180dd89d9196c531678f713ec3c3d979cef3f0f0627652a891079b71952463250e4edf29e9aaa898eefb9f25b99a0adc SHA512 cb2c37c8f5d668430eef15d87af0dcf237102d5b196ee674e2a4d5fe14482b323f2e915a1cb4f538f07330869dcf04af93281a955ddaa796db283971b1921723
 AUX util-linux-2.37-ppc-nortas.patch 1038 BLAKE2B 0e1ea63056a78476a86cb1fadc5a46e39d2d91af5a4de703857cd3720bc328c931f0ca10383930c414ab98aa7d85c16388da6d91c1192d68cca91365619423c1 SHA512 d8253a3c81cf703533a577e0efed7f1508ee5e979a3ec319e42eedd1e9b8883e0defcdca37852088557d2a027eac6e9008ad95355b7f925b98b165327a017da4
+AUX util-linux-2.37.1-agetty_ctrl-c_erase.patch 1900 BLAKE2B 570c03cc5059198efdec4bfe367c560bcc863de61e8b0e1055535d4731525613ee20eaee5efeac6f96b399df1a60865c29e554df6684e3525f71dac821c8205c SHA512 e970c7b3c6e50bffc2e57f90f3284ba55906d71d286e8d23f06fd9905f66273796712cbd8cf3fa1a12bbb2dc404c72b790caba11ec63c8ff84ed9e4e041f64ca
+AUX util-linux-2.37.1-ipcutils_calloc_check.patch 845 BLAKE2B 44e92d33ccf3bd56c86f5d9d0e4acc9e31fdc7c5e7f9e19c76eace88dbe1488140d57eb73a00e7e15f0b11bcdc676032f5b58597a5a369c4a24b9975a0b1a993 SHA512 d2f9ca3180867d23eeddf2dea89bcf7ec1294b24fec8a5116208ba187b816bc29f3456f6daef3f5a55560e1a06da4f6f08113214d8040ea824a79c00480ac4f7
+AUX util-linux-2.37.1-libmount_setgroups_fix.patch 1039 BLAKE2B a04ece245e5f27b48d585795c2bda419a710382801e518cfdbd9c304eb9329d5e6c41deae6c23f13885f20ec60e8dad403c1b5f51e04961b279d363b8bc3055b SHA512 cfa5b399509740109e034401984d75245ec6f84ea57ac01945fe3580f317967a462cced4f002ad34639c37c37dbe22471043ccee8814587cf36e02532a428027
+AUX util-linux-2.37.1-lscpu_NULL_dereference_fix.patch 1796 BLAKE2B 58034cae22d589640010bbeccc5d13dfb1d5ed6f51bbc17c6977732ddefb346a0bf46ea472e5dfddfd7f21b62dbc8b92212f18ca4e976ab67f9c6da1b21aa07d SHA512 da7114d008c52f27662aecb9aecfea05f54c5d8ce4a5948a43ce6fac3b12a61c86f8f943848f05f04d65eeff6595a0fab65e0df36436aabd25a8aff9baa8e80f
 AUX util-linux-2.37.1-lscpu_nullptr.patch 828 BLAKE2B 1847450e9b3580964d54184718f3e8971d42c00a4ba51f320a969058ace35a00bac9eae4e188dd6be6ce4c120aca53429011f4e3a2d9affea03000bdcfa6362c SHA512 29228cd5024eb94394f665656cd033ac52560e023a4575ce311393dd0922b80a753508dc9b23f16ba92fe0f00a171dada8b4789660225f571823614dfe439f9e
 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
 DIST util-linux-2.37-manpages.tar.xz 160156 BLAKE2B 39572332cfe4cac2313941ae922a01f5f4fe34cceb2ca3c806e87ec55187053dfce044790ad497d04adafc2abc513ae1429a1686e71b3b4e0e7907d17c9b6548 SHA512 2f3f1da3eae10b90daa672690ec90de303d87e9b0390f795daf80927a7c42f6aac9d3516b63051a6237a5609b5fda1dec92a1b8adc172115f3478b7edfa04918
@@ -11,6 +15,7 @@ DIST util-linux-2.37.1.tar.xz 5628360 BLAKE2B 309ea7202f32c0ec750cb01486cf32c3e9
 DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
 EBUILD util-linux-2.36.2-r1.ebuild 8943 BLAKE2B 02deedf4a71d2acc2cd15fce983471237f84bf131debc2f161ec9afa7102b70dcdbd0aa70062ca4208d0e2fa444f5a9effe4650d07e4d9ec027fa7c1004b0e85 SHA512 4ac8f481c02d804078a16c3d92ffaf9320028630ca4bd9233ca5461a1ed373cb8c5aaee7a08be49b38ed103698f089cb5db0e87f119911423154b4754e39d23f
 EBUILD util-linux-2.37-r1.ebuild 9999 BLAKE2B fc8118a93be6b7c434d86773da8e3b5dd78e18153cce7eb6b806a9e6e0741cc2a30e2cce4cf9f0637fb2fab73b1db27396abb06023e722642350779135ed775a SHA512 5588ac089b27a20df5f813a15164ba282d3321cc288b4c0fcbffc7fba36db57eed496af7f8cb05d372bc87e1466195bc3a31035ea2de03b74bf65784035ece9c
+EBUILD util-linux-2.37.1-r1.ebuild 9500 BLAKE2B bc24b39aef44405c5a2043fad701fec7ed115378e18c309322aa2543b12b1d3747c76259cb28f5bdccead828f46fbdbbee08a73a7f642f5d00ce1f035f5d8cd9 SHA512 bdfde984bace6c53f186be04eeafa1491e052c3e6c4d5b13fb23241bd4611fa4c758bdd8bb1b47fec592eee4196025654e699161572789c8fc36ae633b6ca210
 EBUILD util-linux-2.37.1.ebuild 9288 BLAKE2B 3be449936783f0da3269d4e45f8c39881cb28c96a6844a14f498991a697286e168700bafe092df750e941bbe099e503c2782ca098027733dee8f46aa2f12ec50 SHA512 d6accd9769ec8dfc23bd6602e195d1b62a8776fec5754418cf2f8fd06caca48d4bc90c5fe12c86f53782fe5d334d528c517f5ef558e52958d460fd297a843161
 EBUILD util-linux-9999.ebuild 9227 BLAKE2B 2b797ee2166256daa32f4d04593d28663746937fa81a07821b7204b07b31b92874c8266e0ffa3d9b1eeb7191f0329d6d7d13e228360f47e0e94a2e4921a74db8 SHA512 9a430472ec02d0e3c76927f9479ee4b5bdab9231e249991c8c6ff48f4922a099bc15d6533a2502ddd455f18def6530ad21c7d166fb39790614348db6eed3aef7
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch b/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch
new file mode 100644
index 000000000000..4828fd449f95
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch
@@ -0,0 +1,50 @@
+From 6eb1c01e9dd25a73100f06db37190c63fd57d4d9 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Fri, 30 Jul 2021 11:50:46 +0200
+Subject: [PATCH] agetty: use CTRL+C to erase username
+
+aggety(8) from the beginning ignores ^C (the small exception was
+between 2.32 and 2.34 when this char has been misinterpreted).
+
+This patch forces agetty to interpret ^C like ^U, it means to
+erase the user's input and wait for a completely new username.
+The small difference is that for ^C it does not set 'kill character'.
+
+This change does not affect serial lines where ^C is still ignored like
+in previous decades. I'd like to avoid any regression as I have
+no clue if any serial lines do not send this control char in some
+context ...
+
+Fixes: https://github.com/karelzak/util-linux/issues/1399
+References: https://github.com/karelzak/util-linux/issues/1046
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ term-utils/agetty.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/term-utils/agetty.c b/term-utils/agetty.c
+index 3b3d5101a..d072d64d3 100644
+--- a/term-utils/agetty.c
++++ b/term-utils/agetty.c
+@@ -2267,6 +2267,11 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t
+ 				break;
+ 			case CTL('U'):
+ 				cp->kill = ascval;		/* set kill character */
++				/* fallthrough */
++			case CTL('C'):
++				if (key == CTL('C') && !(op->flags & F_VCONSOLE))
++					/* Ignore CTRL+C on serial line */
++					break;
+ 				while (bp > logname) {
+ 					if ((tp->c_lflag & ECHO) == 0)
+ 						write_all(1, erase[cp->parity], 3);
+@@ -2275,9 +2280,6 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t
+ 				break;
+ 			case CTL('D'):
+ 				exit(EXIT_SUCCESS);
+-			case CTL('C'):
+-				/* Ignore */
+-				break;
+ 			default:
+ 				if ((size_t)(bp - logname) >= sizeof(logname) - 1)
+ 					log_err(_("%s: input overrun"), op->tty);
diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-ipcutils_calloc_check.patch b/sys-apps/util-linux/files/util-linux-2.37.1-ipcutils_calloc_check.patch
new file mode 100644
index 000000000000..44490ce1bd06
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.37.1-ipcutils_calloc_check.patch
@@ -0,0 +1,25 @@
+From 86d5de52d43501711586054e7b601fbc57403085 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 27 Jul 2021 11:58:31 +0200
+Subject: [PATCH] sys-utils/ipcutils: be careful when call calloc() for uint64
+ nmembs
+
+Fix: https://github.com/karelzak/util-linux/issues/1395
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ sys-utils/ipcutils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c
+index e784c4dcb9..18868cfd38 100644
+--- a/sys-utils/ipcutils.c
++++ b/sys-utils/ipcutils.c
+@@ -218,7 +218,7 @@ static void get_sem_elements(struct sem_data *p)
+ {
+ 	size_t i;
+ 
+-	if (!p || !p->sem_nsems || p->sem_perm.id < 0)
++	if (!p || !p->sem_nsems || p->sem_nsems > SIZE_MAX || p->sem_perm.id < 0)
+ 		return;
+ 
+ 	p->elements = xcalloc(p->sem_nsems, sizeof(struct sem_elem));
diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-libmount_setgroups_fix.patch b/sys-apps/util-linux/files/util-linux-2.37.1-libmount_setgroups_fix.patch
new file mode 100644
index 000000000000..ebde207986b9
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.37.1-libmount_setgroups_fix.patch
@@ -0,0 +1,38 @@
+From 420e914c4cc4c2ba34fd75790ea194d7f4a47d2c Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 11:50:48 +0200
+Subject: [PATCH] libmount: fix setgroups() use
+
+* keep process in single supplementary group, which is the real group ID for the process
+
+* make sure we have rights to call setgroups(), requires group permissions
+
+Fixes: https://github.com/karelzak/util-linux/issues/1398
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ include/c.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/include/c.h b/include/c.h
+index c1e4c5ffc..a4504e3ba 100644
+--- a/include/c.h
++++ b/include/c.h
+@@ -340,14 +340,16 @@ static inline size_t get_hostname_max(void)
+ 
+ static inline int drop_permissions(void)
+ {
++	gid_t newgid = getgid();
++
+ 	errno = 0;
+ 
+ 	/* drop supplementary groups */
+-	if (setgroups(0, NULL) != 0)
++	if (geteuid() == 0 && setgroups(1, &newgid) != 0)
+ 		goto fail;
+ 
+ 	/* drop GID */
+-	if (setgid(getgid()) < 0)
++	if (setgid(newgid) < 0)
+ 		goto fail;
+ 
+ 	/* drop UID */
diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_NULL_dereference_fix.patch b/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_NULL_dereference_fix.patch
new file mode 100644
index 000000000000..50322e63a8ec
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_NULL_dereference_fix.patch
@@ -0,0 +1,50 @@
+From 0d7cef3ddbd2aacbea8c11e8524a3de68dfb8ff6 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Fri, 30 Jul 2021 14:35:25 +0200
+Subject: [PATCH] lscpu: fix NULL dereference
+
+Fixes: https://github.com/karelzak/util-linux/issues/1401
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ sys-utils/lscpu-cputype.c | 2 +-
+ sys-utils/lscpu.c         | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c
+index 795a4acf5..be16199e0 100644
+--- a/sys-utils/lscpu-cputype.c
++++ b/sys-utils/lscpu-cputype.c
+@@ -569,7 +569,7 @@ int lscpu_read_cpuinfo(struct lscpu_cxt *cxt)
+ 	/* Set the default type to CPUs which are missing (or not parsed)
+ 	 * in cpuinfo */
+ 	ct = lscpu_cputype_get_default(cxt);
+-	for (i = 0; i < cxt->npossibles; i++) {
++	for (i = 0; ct && i < cxt->npossibles; i++) {
+ 		struct lscpu_cpu *cpu = cxt->cpus[i];
+ 
+ 		if (cpu && !cpu->type)
+diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
+index 827e84a6d..e11b2f42f 100644
+--- a/sys-utils/lscpu.c
++++ b/sys-utils/lscpu.c
+@@ -991,7 +991,7 @@ static void print_summary(struct lscpu_cxt *cxt)
+ 		*(p - 2) = '\0';
+ 		add_summary_s(tb, sec, _("CPU op-mode(s):"), buf);
+ 	}
+-	if (ct->addrsz)
++	if (ct && ct->addrsz)
+ 		add_summary_s(tb, sec, _("Address sizes:"), ct->addrsz);
+ #if !defined(WORDS_BIGENDIAN)
+ 	add_summary_s(tb, sec, _("Byte Order:"), "Little Endian");
+@@ -1033,9 +1033,9 @@ static void print_summary(struct lscpu_cxt *cxt)
+ 	sec = NULL;
+ 
+ 	/* Section: cpu type description */
+-	if (ct->vendor)
++	if (ct && ct->vendor)
+ 		sec = add_summary_s(tb, NULL, _("Vendor ID:"), ct->vendor);
+-	if (ct->bios_vendor)
++	if (ct && ct->bios_vendor)
+ 		add_summary_s(tb, sec, _("BIOS Vendor ID:"), ct->bios_vendor);
+ 
+ 	for (i = 0; i < cxt->ncputypes; i++)
diff --git a/sys-apps/util-linux/util-linux-2.37.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.37.1-r1.ebuild
new file mode 100644
index 000000000000..74d874455d9c
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.37.1-r1.ebuild
@@ -0,0 +1,338 @@
+# 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 libtool flag-o-matic bash-completion-r1 usr-ldscript \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="
+	virtual/libcrypt:=
+	audit? ( >=sys-process/audit-2.6:= )
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
+	hardlink? ( dev-libs/libpcre2:= )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+		magic? ( sys-apps/file:0= )
+	)
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	ppc? ( sys-libs/librtas )
+	ppc64? ( sys-libs/librtas )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND+="
+	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
+	!net-wireless/rfkill
+	!<app-shells/bash-completion-2.7-r1
+"
+
+# Required for man-page generation
+if [[ "${PV}" == 9999 ]] ; then
+	BDEPEND+="
+		dev-ruby/asciidoctor
+	"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.37.1-ipcutils_calloc_check.patch #806070
+	"${FILESDIR}"/${PN}-2.37.1-libmount_setgroups_fix.patch #805218
+	"${FILESDIR}"/${PN}-2.37.1-agetty_ctrl-c_erase.patch #804972
+	"${FILESDIR}"/${PN}-2.37.1-lscpu_NULL_dereference_fix.patch #802606
+)
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU ; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+python_configure() {
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+	)
+	if use userland_GNU ; then
+		myeconfargs+=(
+			--enable-libblkid
+			--enable-libmount
+			--enable-pylibmount
+		)
+	fi
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
+
+	# configure args shared by python and non-python builds
+	local commonargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+	)
+
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(multilib_native_use_with audit)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with ncurses tinfo)
+		$(use_with selinux)
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU ; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-newgrp
+			--disable-nologin
+			--disable-pylibmount
+			--disable-vipw
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable ncurses pg)
+			$(use_enable su)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_with cryptsetup)
+		)
+		if [[ ${PV} == *9999 ]] ; then
+			myeconfargs+=( --enable-asciidoc )
+		else
+			# We ship pre-generated man-pages for releases
+			myeconfargs+=( --disable-asciidoc )
+		fi
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-asciidoc
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU ; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_install
+	fi
+
+	# This needs to be called AFTER python_install call (#689190)
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU ; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use userland_GNU ; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam ; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+pkg_postinst() {
+	if ! use tty-helpers ; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index a79c2496f9d8..cf19e6c54920 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,7 +1,7 @@
 DIST yarn-v1.22.10.tar.gz 1244965 BLAKE2B 6a9471a6905d89481665c099f00a985daacc8c7953327ee12b3d70f3f42dc304ceca01446281964d1af7a005ecae4a12ca55df637732e52821b4ecb9cdce6418 SHA512 d75dccd318f280abcbfd8d78b63546e11e7a8459c5dd737d0c8da2742cd5d7e3d7a5e668ce680234b0c09e71d128787777061d24c6e3ae4b6626086461e3ce25
 DIST yarn-v1.22.4.tar.gz 1244785 BLAKE2B 1f1eeb829096eaf19a8fdb48b46fa736769d9d3c247759e434413665186e4cccb750024afa836dae8a0130fc472df3c01805d263d81346e1dd7509e1b106e88a SHA512 a1833b862fe52169bd6c2a033045a07df5bc6a23595c259e675fed1b2d035ab37abe6ce309720abb6636d68f03615054b6292dc0a70da31c8697fda228b50d18
 DIST yarn-v1.22.5.tar.gz 1244837 BLAKE2B cf5054893c8937ceb6788c27f23005386449664b36dc31c6c0c3548438f1fdc5c5ec4b1b1642786c4d8732faf46ab58d2784d3768e12233f241b9b1c6f173734 SHA512 c33c040ed57eb05c04905b8996db31a34099f0c18dbf1818959c5592514abc99f1180592561ec5d3e760c084dbcf2dcdf3ebb4fe8918f082b6aa089cf10921bb
-EBUILD yarn-1.22.10.ebuild 1070 BLAKE2B 049c5a5cdbb20425ba71385b41725ae5bbb7965eec3db80394ffbfb57ec506be22cf712324ba638d486297fce65d004c0b51ea0fad387f012884d1da04ec82e8 SHA512 b092d1a53a5b6c6f1586a75bca7581a13c8c2a420bd84e33b46b82f8a7b9c6f65429401c2a6b093d4e44bdb59573752227c478d5a4dda7a707e226f061b9b4c1
+EBUILD yarn-1.22.10.ebuild 1069 BLAKE2B 362375e59c35e3a4a8c8d8990bbc9662ac2a0da9ce389007b824c8cd2c6369dce2e6a4ddd3bb85934a689829b9dcbdb74fd35bff11d00f26eb88546af5e86eac SHA512 7886b477b9e87d0c7cc67d219693564d17ec018c391f99ce874ffe0726bb9c5e9137755af58bac5151238e8099096ca246c644c29c08adf2d681a6df28c08f2f
 EBUILD yarn-1.22.4.ebuild 1057 BLAKE2B 40ca4f1e345f8914a672817c21b0a5974ac314b9bc10f54937dd7d607f492725e7e41632d4b75a0ab62b43607a2aa90b6f2ea83b4a1844ae098f0f12cefc7b45 SHA512 a50ec0902a9a509918b979a634350e048d9ba5f768cceab11b1b2af08076aaa85cd2e22174934f010330eb9ce0c08402ac77cfb7a58d6e33d7162e27784c261b
 EBUILD yarn-1.22.5.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
 MISC metadata.xml 684 BLAKE2B 34b72baadc1750b01ce8d205c272950cab3e883fb646cef6bfd5cc3b62b5da2963f220ecbd3ca6b82f1560406c69606719434fd3c387e4aaedf80653d2f1c4ce SHA512 f72bcf2a5fbe055652c29df20a3f0796394bed5fd6ed9e5f0e49582b8d68263f2905daed2fa90cda6b71f5b4c648d7363f8d3fc641fa4e26dc2265c9b84821da
diff --git a/sys-apps/yarn/yarn-1.22.10.ebuild b/sys-apps/yarn/yarn-1.22.10.ebuild
index f320aff0f830..bb8df23d1c0e 100644
--- a/sys-apps/yarn/yarn-1.22.10.ebuild
+++ b/sys-apps/yarn/yarn-1.22.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="!dev-util/cmdtest