gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-fs
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
112 files changed, 1173 insertions, 630 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 46e16b9c68cd..32ef34dd3cc8 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/arm-fdisk/Manifest b/sys-fs/arm-fdisk/Manifest
index e657d2a6d5b7..c1d7c98811e6 100644
--- a/sys-fs/arm-fdisk/Manifest
+++ b/sys-fs/arm-fdisk/Manifest
@@ -1,4 +1,4 @@
 DIST acorn-fdisk_3.0.6-6.2.diff.gz 5580 BLAKE2B d4c70c874cb60b02403edadd51a2547781f78efe7a09f3d776c1ce3a135a07f1c856e640f5cf0e2a1308ff80541f9a0c68cadfa44f10000bd81f576fc823ce2a SHA512 076587945548f10fef92a93910aee670927a2de9b1b32fd1b4ab72b1cfc26440177745f09b62f9b903987e3802060f4e278e1647ee12b7e2f29a0fd7b36ff188
 DIST arm-fdisk-3.0.6.tar.gz 62266 BLAKE2B e9554325562fd8fa03b896927fd9dca4cd61b86a4dd1a9d0bcc8aff638e0f0d1a9bca5c5b4bdf7bc9f1799f712497c8677af74f5204646bd505bc107818dfecf SHA512 954c1112c8108da676a0c4223de3a7b0320a37286b0ed099f3000bf4777ebb483b0b62eb0a5dd480f775c503020e7d9ed6ef737ef7bbc5bce858ae68aa471a3f
-EBUILD arm-fdisk-3.0.6-r1.ebuild 937 BLAKE2B 6d64e7e39b8b0de3e522c942bdd83d61a2792481f391d587cd28d4eb6b7897300bb8e494f47e8fb71ecc9de8f61c5c0e39a84e0e16451d2e7f82d66977e65719 SHA512 a17af0188cab77de1398f3f4a91bba2280467d06afef9ba73bcbf4bc4637cf2860ca9f3e3b982cf36e6fc30aee72ebd131239b94bcf7550fc567f240de013fb0
+EBUILD arm-fdisk-3.0.6-r1.ebuild 938 BLAKE2B e1ab3bf63e3600befd18ceeb0a51a544d10437e111c6869b23092ef6628ac6723d57387b60d9db72689feb533952e891a34302a307bd833dd81e4bfb87dd676e SHA512 dd9e40480347954906230717391d14e563f5f25568c980f0deaa601609e33cc2e5a118d0d638ff17908acfb316dcd896a041211a92603b941b5099b7baf49d12
 MISC metadata.xml 255 BLAKE2B a9541f4bfab6e4a12975e8b3d56e433e65828b6376510448f11930d35451e23cad5bbf264180f150629ce9c1dea24eb7fb4f2b3f950ee5ff5d345811e017773a SHA512 4408b5018e974df4d7508f29e255f318bbd09b4056927cae6406ff1f427c06d5d655f677a28440cb84af04e411c88e4582f9ad1ea76829afeee0bbe4e3841c2f
diff --git a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
index e1e7186ca1e9..41d8d411cee0 100644
--- a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
+++ b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.arm.linux.org.uk/pub/armlinux/source/other/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ~s390 sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-fs/atari-fdisk/Manifest b/sys-fs/atari-fdisk/Manifest
index eac46993896d..cc85f9bbc04a 100644
--- a/sys-fs/atari-fdisk/Manifest
+++ b/sys-fs/atari-fdisk/Manifest
@@ -1,5 +1,5 @@
 AUX atari-fdisk-0.7.1.5.4-gcc-5-inline.patch 722 BLAKE2B 8c1e0697b77c34aeb90d6d0c1f3cb0fe7f9e22f73bbaa194c158d0cf5f6add1f0932be4808879a0150ea6e25084693813cd93c652638615c1cd6dff969f94b45 SHA512 aeda384a27e6ed408e82ede3e7821976daece0b577b2aa26250b183697387ea39a01ffc1bbe8aa09c570f0897ecf6022477e7a4126c6e90181a5c0a88cbe11c1
 AUX atari-fdisk-0.7.1.5.4-prompt-logic.patch 495 BLAKE2B 4c4224850c10cefaa0d85f14f6f12d048808ad75314cff755785bec07d12e123b2f4520533c61c60d5c06d52137309c4e08ae9ccfff2fe9cd0e546611b2aba6b SHA512 7be32b061f2aaea03579282e9df5b78d207b823551ffeb91a20a96bd28fc57969e21b7e54da2af15bd0c74ea346ef904dee798405b61a593bd9149064b9bbec5
 DIST atari-fdisk_0.7.1-5.4.tar.gz 47576 BLAKE2B 42154c48399a47aafbbddfe6bacfdb9997b2b6d93f7548c60e8b614fbc3abbef448ea514a168b39590c1c907a5b7d881ce58fa8c25fa41d24680d1786ca4bc15 SHA512 014be9a92b19f81901f814308b0f380df77de712f1e3f69438cf7ae7c57c53111cfc39f60899facd04af8b5457e980fdc689bfbfe2a91e5c2a0de8446a724961
-EBUILD atari-fdisk-0.7.1.5.4.ebuild 1245 BLAKE2B 4627cc32833fedc819659b9f2f0796023e42e6d0b165488fb72aff6f345876a149cc5a016c88ad5b98ad29ae3b3ce64d2d7cf00d85def2fd0a0452ae54c978f4 SHA512 c8a29bbdb5c17c4877511f5b6131001d11f48eb2fd1cafad4ac2e5d55937fd2307c36714bb06b7a48befaa18ae30ec629ecc90f668d420f356ad6b8496c505f8
+EBUILD atari-fdisk-0.7.1.5.4.ebuild 1245 BLAKE2B 756c573995900a750305374bed8e43318524030bc9cdbf22fdcfb930dd77f26a0ead92b4dec340eeaad615a9c68da4a7f79b169c61691c215b75e4b73278eabc SHA512 1bebfe3b5ea472e5f9510a00ab404d5ae986c29b55324c78a0f54eed41be095d17625fbc6479151c27e784be8266200ef8dec6ed09dbfbdae3c582e4ad2a71c1
 MISC metadata.xml 213 BLAKE2B 9cfb840971c5a4f3188b32fef19b55e8cc693fa5b17f0a1231a26287f666f27ccaac578946b240f1c93dd7c26e4f2ca8e5a5831547bec8a6caf6153ebfca06d2 SHA512 66584639f70df67edf15360939d73d26f6097167cc24df4713171d34527fc373a3685b6ad531b9cd629a76e861d13b231284c633d863482b59347580e04037c2
diff --git a/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild
index f5c41bab0e90..fa3d8b70fb95 100644
--- a/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild
+++ b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit versionator toolchain-funcs eutils
+inherit versionator toolchain-funcs epatch
 
 MY_PV=$(get_version_component_range 1-3)
 DEB_PV=$(get_version_component_range 4-5)
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index 0506a0eb06d5..fd63fee286cf 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,3 +1,3 @@
 DIST aufs-util-4.14_p20190603.tar.xz 104096 BLAKE2B 901c7405866cc8db490248b86e45e57375ea5d8db11505c0c15fd49f5bd9e7ea5a6c3d272bd8f001ac3db11665a9c3607565c7eb5be8cd5f45acf4b5f994ceb9 SHA512 803ce51a77c3e4942d3b8817be638c5e2440821088eeb58742eb0395b9c83f68975ed64a0410b6155b18edf0af47ef9df916be07d912fdb2bd4e94987a037fa7
-EBUILD aufs-util-4.14_p20190603.ebuild 1078 BLAKE2B d1627bfcac4d66856cff0040f6dec53cdf48d3e5ba8ff6b90b5722ed86b349d83f5200927c3e28bee34427e2b09462d7df076d6adbda8a2e947941d321fb6426 SHA512 d3e970e5b98fec4ccb5750614c25a5ccc27696fd00e2167d6ed1871de0c968c97649cc8c0b02597196e60637efd9a083aed30851f29064397b399274bf01ccb8
+EBUILD aufs-util-4.14_p20190603.ebuild 1071 BLAKE2B 85a030937ab92dd37dc8d2f10da101c60ac1a75fa73fd3563a7c524fed5ea60a31f0433c5bed46434d243a7d444339a0d198d1599a9caac93b8c07b699847230 SHA512 c040caad3d02811f95cfae7c42df7dc879da0cd5c93c7e375fc70cf442f33d86af3e9f3968f2f42d373ec723b1d99527386d2041c40ec5ed3d25afe0b5ae8ab0
 MISC metadata.xml 246 BLAKE2B 54e23dce6915d5dd3bcd3ef84d487319a22a98e6c6dfa2addfce08b994aabe988e81204bbf956fc403c7fa1d660488a1a140d48c382a01fe11b6c154757956c2 SHA512 e3170e1d40a96c800cc21a6f8a3d54f6896865eba97d04f2e3962f7627af5460312de37f9c7eee34f9f2428dc752d6fb32c83e27a958e2b3a046805d48c2698c
diff --git a/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild b/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
index 98b1a6c96eae..966a157684f5 100644
--- a/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
+++ b/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils flag-o-matic linux-info multilib toolchain-funcs
+inherit flag-o-matic linux-info multilib toolchain-funcs
 
 DESCRIPTION="Utilities are always necessary for aufs"
 HOMEPAGE="http://aufs.sourceforge.net/"
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index 4df7777e542e..2f9faedb4d4b 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -1,14 +1,6 @@
-AUX 1.0.8_p20140220/bcache-status-python3.patch 320 BLAKE2B b3fdc9b16a3528947e4ef5820fc24c6983fd7c72d49404df87765973338e5832396cffb94b7118467e54455714a6ddb483234fee6b67b778290791a9ee7070b0 SHA512 d522cd5e6296a55ced53dab25a5e0978d04ec8eb0a6b353753b4627a3f0318658b0c52a27e6cd4a81d39e6f646aa0c936797b89280cb32490d4e671fbb532476
-AUX 1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch 1869 BLAKE2B b9545aa070b0a1c8c3f6dcbd8455288b46e745120c650edd681d40cd47248f51445532d67a813a41eafae07e0fa2b031fb3f03d45bda1099fe817d554ef876b9 SHA512 ce4706849c2c4f7c414682d2f9df37989eb79a0b52d8ddf1e903065a6f5fb190cb3476f6579670d5a6cba0f2d13ab843e454966798edbf9cd4e54cc4a1a6c2cd
 AUX 1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch 1335 BLAKE2B bb99576cd404dca383a04f49693b083d09618272aea92194c8e7108340a786ce31f8fb2c2bf37559fe3aece73c8305447e1d5fba2f6d27351ff81818a4ab9567 SHA512 d1a28bb32f28a074c46244213c09c6dfdd93b18647b94cabd29c2e3f2e6d28fba015bfdda4bcda412ea511ee6eee057becf1bb913bc4007e3deb378c0da5b735
-AUX 1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch 531 BLAKE2B 3e1ec0b19cf4e68cb30197c94f4a2c85f3479e60b9ca953553f2c5c5730a30cd1bef7b013c5d5087a9220f05bf0d634903a4ed263df250673641f78982d98835 SHA512 883dbb66051bc7d1cbb170235ef8dbb4a1d115d0a598eae907d89fae6365c2e6725929e1297f9f74c742150d893ed8febb99a03bf55e91f0b90cc33314cf51d2
-AUX 1.0.8_p20140220/bcache-tools-20131018-fedconf.patch 253 BLAKE2B 74ebc9f660eab05c6633ac9574951ee5b6355bceb0e32ff6bc586a6cc0e4bde70bbe085e71fe6186fc4e29317c4f7d7d1556945f1ec237688d555695a95112c0 SHA512 459875969ef1a80a5bb635e5da2187222a01aefe9ea49eb7feeab89d5290e4d478a0e5e37e424dd77a69916811b0ad3f82f7ec4e0ae91ae686e3fe7f5eac9d57
-AUX 1.0.8_p20140220/bcache-tools-status-20130826-man.patch 1095 BLAKE2B df33f5ce76d5e5b9b859588ebe4be1ea5c710281e21595cc80438ffd2dece7cf9278936bc08c9f8250672d4d3f9daa4b52c9723340650fbc9d348794cfead564 SHA512 44f4227e7cd3e4ec3b4c90d27445be8bfa36b229aa11a08b9b66c08c224dc9c006c0d358580b0906a8372eb83b938c0a5a199665680e96898aa2070bb55000de
 AUX 1.1/bcache-tools-add-bcache-status.patch 13158 BLAKE2B e986d81d6fdf76f809ffcaad0c93869421e369e77efb7a51f81c1abe07b941c703bf80ce89e4c09bad42f5b4d76a7bb7c40fa5ad94c87f31237b676c40b41049 SHA512 bdcc2912d3b6e47781e9023433e2b152d628ce9fa538ae4ff7ed8385a495752786cdb32bd8f82d7a7c84ad068d49b22b3911c0125e235f561a729c20c8223363
 AUX 1.1/bcache-tools-add-man-page-bcache-status.8.patch 1431 BLAKE2B f88c54286ad07766e4ebe216a27b99838ee9eb63412bb50a1036c93e1e41d77ea9d02cc47c148105ab63115f954c4dcc52903e7c726399b2d2ec2066a7b24ecc SHA512 e6e5f073b01e0272710bc6effeecf5ce6786f1606986e12f18bf37a1124d25858a4ed25fa42f2da85bf04e95844e3c6156af2e83bed323bb83621601774b0802
-DIST bcache-status-20140220.tar.gz 3779 BLAKE2B a3fa5e9d87b2c51f1f5178693db6d9f8b4bde31c77783d1ebd9de6e81995d89a4b07df43178cba384757b212087c474a0508640d1d3ddcd97d3d928643971e4a SHA512 0c8db02dc865b469f3a5964f679a3bfdf5cdbf5a2f6ccd5d81544f3bb3c06df2f5d06b9f09aaec527ec90229740dcd31fbb33e2628721b6da139cfcee6b48d7c
-DIST bcache-tools-1.0.8_p20140220.tgz 22153 BLAKE2B d40a64b02e0d66ef8868151870715f6e6ab54633e4875c32d0e03dfe1871e5aa98d7e133b9eed583ac4898b1598f38b71e47109210009ca51c4dfe9dbd31768c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc
 DIST bcache-tools-1.1.tar.gz 34548 BLAKE2B e6ebc0f609debe0cc123deba0e21076441c37cdbc6edd02bf2c16c0e36fe806f1fc160b9e9baed577f86f6358884182a4e3903f34bccee81943191c0ba6a2d11 SHA512 4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca
-EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1598 BLAKE2B d9eacc64525ba8669ae624c52812eb5b13aa2c2db467f0fa0a5abd276efba473b270077a8220092e81d2506068ba391eedbca245444e702da4c8fecb1e9107e4 SHA512 f3594e28dc0e0cf922af7c6bcf292f7042796f9269a3c3fe7f960f566c816e390097cca0c8762aa838d861b81540f7f90127a3f06d0d6e920ca3aa18e8569cfd
 EBUILD bcache-tools-1.1.ebuild 1350 BLAKE2B 0d6049bd33425fade4f7de92b223b0453daa15f0cf79a1c3751ce45813c6f1304996ecfcb145a49d42e82ab30d733f907f14924250fba73c937934f3e1fd2ea6 SHA512 7e43a1a108c67b77c8e75fce35c0f212e5731d3d8e1870fbf231be3bc027f0002355eb5c2ab419229825ca1167e33da74456b2ae1647b6030e3706663da5bd19
 MISC metadata.xml 253 BLAKE2B 053cd7caa33b4ace537584fb68b0fd010978dd08ec030003d4f4cad19896018102a7fa85ccdfd6cbecb8f8c62c63fd97b7babc6a5b72d2a6f37d4aec14442694 SHA512 3ea0dad00b289add099c74cf0b6b8202e9adc0ac7537b16b7673d2fadddcf83c7c686b0662bfd4766819d37af300cf978bb939133aed74b9a8aa8de2b84e805a
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
deleted file mode 100644
index d53d514a64e2..000000000000
--- a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit eutils flag-o-matic python-r1 toolchain-funcs udev
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="https://bcache.evilpiepirate.org/"
-SRC_URI="
-	https://github.com/g2p/bcache-tools/archive/v${PV%%_p*}.tar.gz -> ${P}.tgz
-	https://dev.gentoo.org/~jlec/distfiles/bcache-status-20140220.tar.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=sys-apps/util-linux-2.24"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}/bcache-status-python3.patch
-	"${FILESDIR}"/${PV}/bcache-tools-1.0.8-crc64.patch
-	"${FILESDIR}"/${PV}/bcache-tools-1.0.8-noprobe.patch
-	"${FILESDIR}"/${PV}/bcache-tools-20131018-fedconf.patch
-	"${FILESDIR}"/${PV}/bcache-tools-status-20130826-man.patch
-)
-
-S="${WORKDIR}"/${P%%_p*}
-
-src_prepare() {
-	tc-export CC
-	sed \
-		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g:-std=gnu99:' \
-		-i Makefile || die
-
-	append-lfs-flags
-
-	cp ../bcache-status*/bcache-status .  || die
-
-	epatch "${PATCHES[@]}"
-}
-
-src_install() {
-	into /
-	dosbin make-bcache bcache-super-show
-
-	exeinto $(get_udevdir)
-	doexe bcache-register probe-bcache
-
-	python_foreach_impl python_doscript bcache-status
-
-	udev_dorules 69-bcache.rules
-
-	insinto /etc/initramfs-tools/hooks/bcache
-	doins initramfs/hook
-
-	# that is what dracut does
-	insinto /usr/lib/dracut/modules.d/90bcache
-	doins dracut/module-setup.sh
-
-	doman *.8
-
-	dodoc README
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch
deleted file mode 100644
index 0cb08cc1a281..000000000000
--- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-status-python3.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- bcache-tools-1.0.8/bcache-status.orig	2015-06-20 08:56:22.343589706 +0200
-+++ bcache-tools-1.0.8/bcache-status	2015-06-20 08:56:39.971692433 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Dumb script to dump (some) of bcache status
- # Copyright 2014 Darrick J. Wong. All rights reserved.
diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch
deleted file mode 100644
index 9b11d80c0091..000000000000
--- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-crc64.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ruN bcache-tools-1.0.8.orig/bcache.c bcache-tools-1.0.8/bcache.c
---- bcache-tools-1.0.8.orig/bcache.c	2014-12-04 23:51:24.000000000 +0100
-+++ bcache-tools-1.0.8/bcache.c	2015-05-22 19:40:41.039355096 +0200
-@@ -26,7 +26,7 @@
-  * x^7 + x^4 + x + 1
- */
- 
--static const uint64_t crc_table[256] = {
-+const uint64_t crc_table[256] = {
- 	0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
- 	0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
- 	0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
-@@ -114,16 +114,3 @@
- 	0x5DEDC41A34BBEEB2ULL, 0x1F1D25F19D51D821ULL, 0xD80C07CD676F8394ULL,
- 	0x9AFCE626CE85B507ULL
- };
--
--inline uint64_t crc64(const void *_data, size_t len)
--{
--	uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
--	const unsigned char *data = _data;
--
--	while (len--) {
--		int i = ((int) (crc >> 56) ^ *data++) & 0xFF;
--		crc = crc_table[i] ^ (crc << 8);
--	}
--
--	return crc ^ 0xFFFFFFFFFFFFFFFFULL;
--}
-diff -ruN bcache-tools-1.0.8.orig/bcache.h bcache-tools-1.0.8/bcache.h
---- bcache-tools-1.0.8.orig/bcache.h	2014-12-04 23:51:24.000000000 +0100
-+++ bcache-tools-1.0.8/bcache.h	2015-05-22 19:40:34.924320569 +0200
-@@ -115,7 +115,20 @@
- #define BDEV_STATE_DIRTY	2U
- #define BDEV_STATE_STALE	3U
- 
--uint64_t crc64(const void *_data, size_t len);
-+extern const uint64_t crc_table[];
-+
-+inline uint64_t crc64(const void *_data, size_t len)
-+{
-+        uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
-+        const unsigned char *data = _data;
-+
-+        while (len--) {
-+                int i = ((int) (crc >> 56) ^ *data++) & 0xFF;
-+                crc = crc_table[i] ^ (crc << 8);
-+        }
-+
-+        return crc ^ 0xFFFFFFFFFFFFFFFFULL;
-+}
- 
- #define node(i, j)		((void *) ((i)->d + (j)))
- #define end(i)			node(i, (i)->keys)
-Binary files bcache-tools-1.0.8.orig/bcache-register and bcache-tools-1.0.8/bcache-register differ
diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch
deleted file mode 100644
index c6ca74d68882..000000000000
--- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix underlinking in GCC 4.9 and below
-
---- bcache-tools-1.0.8/Makefile
-+++ bcache-tools-1.0.8/Makefile
-@@ -24,7 +24,7 @@
- make-bcache: LDLIBS += `pkg-config --libs uuid blkid`
- make-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
- make-bcache: bcache.o
--probe-bcache: LDLIBS += `pkg-config --libs uuid blkid`
-+probe-bcache: LDLIBS += `pkg-config --libs uuid blkid` bcache.o
- probe-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
- bcache-super-show: LDLIBS += `pkg-config --libs uuid`
- bcache-super-show: CFLAGS += -std=gnu99
diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch
deleted file mode 100644
index 993ec216f888..000000000000
--- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-20131018-fedconf.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-diff -ruN bcache-tools-20130827.orig/configure bcache-tools-20130827/configure
---- bcache-tools-20130827.orig/configure	1970-01-01 01:00:00.000000000 +0100
-+++ bcache-tools-20130827/configure	2013-08-31 15:12:41.093218432 +0200
-@@ -0,0 +1 @@
-+#!/bin/sh
diff --git a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch b/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch
deleted file mode 100644
index 3eabb3f4b832..000000000000
--- a/sys-fs/bcache-tools/files/1.0.8_p20140220/bcache-tools-status-20130826-man.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN bcache-tools-20130820.orig/bcache-status.8 bcache-tools-20130820/bcache-status.8
---- bcache-tools-20130820.orig/bcache-status.8	1970-01-01 01:00:00.000000000 +0100
-+++ bcache-tools-20130820/bcache-status.8	2013-08-26 23:32:02.477274882 +0200
-@@ -0,0 +1,45 @@
-+.TH bcache-status 8
-+.SH NAME
-+bcache-status \- Display useful bcache statistics
-+.SH SYNOPSIS
-+.B bcache-status
-+[\fB \--help\fR ]
-+[\fB \-f\fR ]
-+[\fB \-h\fR ]
-+[\fB \-d\fR ]
-+[\fB \-t\fR ]
-+[\fB \-a\fR ]
-+[\fB \-r\fR ]
-+[\fB \-s\fR ]
-+[\fB \-g\fR ]
-+.SH DESCRIPTION
-+This command displays useful bcache statistics in a convenient way.
-+.SH OPTIONS
-+.TP
-+.BR \---help
-+Print help message and exit.
-+.TP
-+.BR \-f,\ --five-minute
-+Print the last five minutes of stats.
-+.TP
-+.BR \-h,\ --hour
-+Print the last hour of stats.
-+.TP
-+.BR \-d,\ --day
-+Print the last day of stats.
-+.TP
-+.BR \-t,\ --total
-+Print total stats.
-+.TP
-+.BR \-a,\ --all
-+Print all stats.
-+.TP
-+.BR \-r,\ --reset-stats
-+Reset stats after printing them.
-+.TP
-+.BR \-s,\ --sub-status
-+Print subdevice status.
-+.TP
-+.BR \-g,\ --gc
-+Print subdevice status.
-+
diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest
index 28f4739d70e2..ad4f6e176e11 100644
--- a/sys-fs/compsize/Manifest
+++ b/sys-fs/compsize/Manifest
@@ -3,6 +3,6 @@ DIST compsize-1.4.tar.gz 15001 BLAKE2B 7e4d4a1f3ea59b23fec891c084f68ddb74838320a
 DIST compsize-1.5.tar.gz 15015 BLAKE2B 1a7fc676ffaeb69fd410a834eab54ef63c5fa11e428bd0567ab5dec5dc27fe1b4901fdd47760c07a7fb26375b81ba997528c0aa83409eb364a3b9f2cb1942cc8 SHA512 25d6f1973e8a0a86bd857dc1e1ba99760451cf388f3bd3ede6a6ef35351ff63f100646d313010aff3de9e70b2c68866a31c4ea31d9c6df9254648cd1bd0272fa
 EBUILD compsize-1.3.ebuild 966 BLAKE2B 190fe583af11b73cebc53de403e6db93b227640d211501ad7f0320c47684cb1ccc9e4fcce6248eac7ceebdb8bc188e1f518e15091c71acc2d64489eb75ecde35 SHA512 0e8e2cb492d64db2192e7eeeece71628e9395bbe30bfed2530ce9b7411dd12033f88ffd5260f1a0b0c40d7d7f35137c50b68ec7017eae528b353e9e11251ade7
 EBUILD compsize-1.4.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366
-EBUILD compsize-1.5.ebuild 914 BLAKE2B 37d963bcc28850836f514113a3daaea0fd3343d9421becb533ace7679daa8abfbe1d845d186328283e40b41c6098a9ec8a7c31d5867a739007bf87988356349c SHA512 ab8973892250b1c432d28cdc060a49bcf17a721770dac7301ebc36f00e7a8fb0c38eb643f51bed398e1781b26d80c30db9ba10b96852462c8e8b8546dfdf6be7
-EBUILD compsize-9999.ebuild 909 BLAKE2B ed676805a2e426bb25874aefc1f8335949f5d2576d9963b748479f66a47f23dd52e1857bf22cb74e3b5af42ec9474834dc3917142978f196f7b6284693861350 SHA512 62ec27b02a1c338e1dcd4528fb5042805761a7a7e45bce0a99feeacbc888065d5e5f4528f56ab5b110699fe41e790fbcdbb0cb040c0895c09f953f87c5d04628
+EBUILD compsize-1.5.ebuild 921 BLAKE2B 71ec177637d558bf1b13682f61f0a842d711f523c7d762f9a2314d13e27daf9c686d83570799569d69e239add78719e7ebc3e43b3dbd678bc026b8f8333eed2b SHA512 1ff43f6b513bd42131810d6a8ec7b9cfcef922d9b88f76a39d8d0218036576cc8089ebfd3ee87aa64496eb91515b29b429c0655adafa8f63d03b2c4e107f42be
+EBUILD compsize-9999.ebuild 921 BLAKE2B 71ec177637d558bf1b13682f61f0a842d711f523c7d762f9a2314d13e27daf9c686d83570799569d69e239add78719e7ebc3e43b3dbd678bc026b8f8333eed2b SHA512 1ff43f6b513bd42131810d6a8ec7b9cfcef922d9b88f76a39d8d0218036576cc8089ebfd3ee87aa64496eb91515b29b429c0655adafa8f63d03b2c4e107f42be
 MISC metadata.xml 474 BLAKE2B 93fb6451e4aea9bace615da2fc15b996aa88e286201f6b95d7e3029f55dc97d189291a64033b87fde42d61db60524244777fc280d2bc0e4225ac8a3dc3a80e55 SHA512 6faacdb272a6c0aa8c19c4970c6eb00d15ffab23a0c6c20178503f3fe0de77747d0b43d63f558e5063b03fc2456456dbb4471976fa4ef5c5ab942b649ac7c4b0
diff --git a/sys-fs/compsize/compsize-1.5.ebuild b/sys-fs/compsize/compsize-1.5.ebuild
index 21474d2e998b..1fd07df8eb27 100644
--- a/sys-fs/compsize/compsize-1.5.ebuild
+++ b/sys-fs/compsize/compsize-1.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kilobyte/compsize.git"
 else
 	SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2+ GPL-2"
diff --git a/sys-fs/compsize/compsize-9999.ebuild b/sys-fs/compsize/compsize-9999.ebuild
index 471c60d719d1..1fd07df8eb27 100644
--- a/sys-fs/compsize/compsize-9999.ebuild
+++ b/sys-fs/compsize/compsize-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kilobyte/compsize.git"
 else
 	SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2+ GPL-2"
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index bd31ebb2d387..152e82bd3571 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,6 +3,6 @@ AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2
 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
 DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae SHA512 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf
-EBUILD cryptsetup-2.3.4.ebuild 3915 BLAKE2B 2bb7a4ed0608e243817430bbe1bca5b1549c5dee4b7f457cbcf6bc0846474638f0396e5682e1c235f969c078ce95ed92b3c8003e2ce9354ec76f8eac7d9b648c SHA512 0836b3355c17a7e5bca45cd5e285e9b564be5c6532f79c492bfe75a1aefb135442fbc5d0830f8c985d61796259042ab4ca1ed044263dea879bf205631f488aa1
-EBUILD cryptsetup-2.3.5.ebuild 3924 BLAKE2B 42b1b65232417a30fe0caa919cdad44114951854bbdf64ebe7b22c908ea46750d4e4b5f788b538b6df947a1929e1984d9c0b83c7c9de42ad3b343708812d4df4 SHA512 d3c9047d88807a6bea41ba8db474a0f31708a8452c11251988e4a3fb2a8e4fcd24a0ca88432c27c701aa8e59d66068d4b43c54809e6a4d4b68a84abf4d725334
+EBUILD cryptsetup-2.3.4-r1.ebuild 3964 BLAKE2B c77b0f008e8a2a754517347fae0f9082d446cf3f32df86bfc038937f91e80b44ec4b68c87406118ebbac1d1fd63acfe053d6d95a01b1f74990a71d87a910d6f5 SHA512 16790c43e77bf497ef3a717c10d384a4fc3ac1406c8206267052f12da5d44ee3986ead3a25c0db69b116eb3d6da8e7c507584d540e76011356a18ba4dea92510
+EBUILD cryptsetup-2.3.5-r1.ebuild 3972 BLAKE2B 1349eaf4a16acb120678c4d19a80a1f3ffc03e36d26e72b5de03c3aa1a41153e8c1849b07d7b822985432275140aa3bade14a4455cd9b1c68854ceb7d94df9f6 SHA512 64bdf39c4ac3e8a826bd40f6c86ebbc690f36daaa08835d42e813b61cfb961515a0b8abf0a8333add8ed7b06ad3960ee82e6c4936f37c0e2232cb879767b1786
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
index 42ae3e6e9397..506cc07dfd93 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
@@ -89,6 +89,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable udev)
 		$(use_enable !urandom dev-random)
+		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.5.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
index af8bdea1118b..c752e6c27228 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.5-r1.ebuild
@@ -89,6 +89,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable udev)
 		$(use_enable !urandom dev-random)
+		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/sys-fs/davl/Manifest b/sys-fs/davl/Manifest
index a37d32b9cb00..a13b5d674203 100644
--- a/sys-fs/davl/Manifest
+++ b/sys-fs/davl/Manifest
@@ -1,5 +1,5 @@
-AUX davl-1.2.1-asneeded.patch 921 BLAKE2B 76ab317401b4f66dad575be14056a7e88760f9db4b3e4b40057b3729c3e4221ab45b8df759f4def1be40d8a4dc82cabd2553aacbcaa0c4c7fffa4bddfc1be334 SHA512 6f5bc5fb0a8e3ab220f9ea32bdec7c04209a412d9ead78aa0198088ddb5c7c8ac01536ac0356470d84e1347504023e015e0cbbadd16c53271142a4f694d9f8fe
+AUX davl-1.2.1-asneeded.patch 927 BLAKE2B 77b946fcb6638546d44d2201dd8597efc3cab1edb8272a0e75c4533597100f6104af5946b279c3094a8000002966a10a161113842ae3bdc1091d20c2805737af SHA512 25584fa46ba9f7a6cc0547844eef5d74eee4663c2d3b2742b2357a5ac6c5ddf3eca465213f2f9199a3a3c8930d01b897148b1f5c265f05e2e45315835ac8660d
 AUX davl-1.2.4-fragment.patch 1051 BLAKE2B 283920bd6ff70fde735269962e211b5c40ed356a67536619867b5a7409a8a57c534ea15c8206250950eafed14f4ce59b888794d50ec2c15d01463064e37577e3 SHA512 28ae8da5d2f2a910cbbd5b7f5a97de3fb5a0700d070f9f1e7b4b4462dec6f334ad486b298b3bcc7a8314c56b3215245b55880884bbaaf2e03ca9961b0595c133
 DIST davl-1.2.4.tar.bz2 47539 BLAKE2B bf07c23dd8d81289e91b5eec68f2d8995ae7851aa9cbc9b551f76a2d0fd90144ac7047b8c2ce71a2ef99fec2233bc491a3760b4da0fa01cf5f0211b94c869795 SHA512 71c33c0bfaca7c7557541517ec9e7b084e4d50e7504e02d412442566c6046c8a68fe4020e05a3e2da5c9309bd75ba06abba8f16fad96b476b5c961814d24d602
-EBUILD davl-1.2.4-r2.ebuild 672 BLAKE2B 30c71bfc459b46067d93e53986170aab42839c88b3cd7695f3b37c9e32388988305e1abd06805c59a4fdd96dbfc6adca60433ee3ed54b1b4ea3f91c5db187e3a SHA512 80414c7f42f97fa53a5fe376eac28804e4e0bb2c75176cc3865176e4b67427c661c7c290c421413c10f9718314f7265a357c5c3e0b707d30fe68abc45f6e450b
+EBUILD davl-1.2.4-r2.ebuild 692 BLAKE2B e8e4a81af44c6fe07658ca571a8f18157e06664fb1bf6dbb5f59af3818a7bb15c1c2ef82dee2393ce71b7daebf648fa248afc135136aabfe39eeb2d07e6fd262 SHA512 dd9b108aad2ab7dfbf943c0b589cdc6c85b654992873fbf6b061399a4c5ce048333015c7c776c483d44524b725b56d55d7e9d044c742d0d41ff2748602ed12b8
 MISC metadata.xml 246 BLAKE2B 72fd90b06a5dc5216019573b9028c01d7ed1e3928c1b97ce3e79839a9a68cd8aed33cecc81291046c8ae4678ce2873e518139b303d9129a99c2f3da9020478ab SHA512 432831d7b45256845a789fe5b611fc5192ea2cc3186ed8ce04cf28f44756187c3343f7f156fc039017c9af2e842c09b36918ee48b9cd07139ef0e9278c41a35f
diff --git a/sys-fs/davl/davl-1.2.4-r2.ebuild b/sys-fs/davl/davl-1.2.4-r2.ebuild
index 0fdc23693d0f..d91a538ee69d 100644
--- a/sys-fs/davl/davl-1.2.4-r2.ebuild
+++ b/sys-fs/davl/davl-1.2.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,8 @@ PATCHES=(
 )
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	emake CC="$(tc-getCC)"
 }
 
diff --git a/sys-fs/davl/files/davl-1.2.1-asneeded.patch b/sys-fs/davl/files/davl-1.2.1-asneeded.patch
index 819d16d09e75..58646e7dd492 100644
--- a/sys-fs/davl/files/davl-1.2.1-asneeded.patch
+++ b/sys-fs/davl/files/davl-1.2.1-asneeded.patch
@@ -26,8 +26,8 @@
 -else
 -	CFLAGS += $(CFLAGS1)
 -endif
-+CFLAGS += -D$(GTK_VER) `pkg-config --cflags gtk+-2.0`
-+LDLIBS = `pkg-config --libs gtk+-2.0`
++CFLAGS += -D$(GTK_VER) `${PKG_CONFIG} --cflags gtk+-2.0`
++LDLIBS = `${PKG_CONFIG} --libs gtk+-2.0`
  DEBUG =
  #DEBUG = -D DEBUG
  GDAVL = gdavl
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 3948da5242bb..3761c86300bd 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,6 +1,5 @@
 DIST dislocker-0.7.1-fix-find-ruby.patch 25942 BLAKE2B bd9d93c5eddcbade0039c1787dae36f5dd01f91cd435dfb9dbcfcb16f0f09cba7e73a3221c8b2f3843d0a68199fb9e38bdb91428fa784442659f7af53ab6d4dd SHA512 70f5a628659ef4645d757b899f3e6310e3a4d2ab89f429748c711177a0944e9b0eabf5341e394ab09216b0fa18e3c2b0832406b27f40c04510df937ffe5f65ef
 DIST dislocker-0.7.1.tar.gz 103194 BLAKE2B 05421b0d3e7686480e40a41e67086017c454b76e0852fef78a7b5d10134cf388b4bf7b9669d87b867418f4c074cc023ea9b0260dbdbc837322d04f217aa40b28 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226
-EBUILD dislocker-0.7.1-r2.ebuild 1185 BLAKE2B 25249a42cd4a6fcc165de59306d7da01eb5ad2eb661dd92d38934f0b9bdc88286a68f6c9f05337ba31b5de3de2e23af8cb5863b4bfb7f307004aafd095158d6d SHA512 c921cd7034b7e7a48d636e9b6a6420d5eb16a0e5382a29c829762a7742409ae2f371765ac3218402e7f42eeac292fdba568a3d66a1487c3fa8480cd69951a4a5
-EBUILD dislocker-0.7.1-r3.ebuild 1703 BLAKE2B e5b61c9f2073fa2ae4e6b6d8c8e14ba6dd6a6de64f391522adfa216c4f7aa3bea18741c8cdcdd372e59df276b0e8a9b97ef5dd49eb2af8087fcb2f5fa046ceda SHA512 516beb16eadf29cafd5e4792bd4dfcd21b5b49d91faf0f58ce50500b8a945f509d176fe0cd8955afb037c8ef8b8901e66e056fd7dc90325b1a7239cae379a1db
-EBUILD dislocker-9999.ebuild 1703 BLAKE2B e5b61c9f2073fa2ae4e6b6d8c8e14ba6dd6a6de64f391522adfa216c4f7aa3bea18741c8cdcdd372e59df276b0e8a9b97ef5dd49eb2af8087fcb2f5fa046ceda SHA512 516beb16eadf29cafd5e4792bd4dfcd21b5b49d91faf0f58ce50500b8a945f509d176fe0cd8955afb037c8ef8b8901e66e056fd7dc90325b1a7239cae379a1db
+EBUILD dislocker-0.7.1-r3.ebuild 1668 BLAKE2B d409322717e5e4ee21b7d6a5dfd1493281bb49fce85f72c520d155fca17f2dee394179e37be226dbb34039c5de8f92f98bae75c52a315b4d733640b352b97249 SHA512 627b3097f121bc8990eb0fdfb42f225f2beba3ca6b152bf3159e1a87280c8e5e3f1ad6250f8efe7ae9f879b0478fb7064adc57708b1ee7e7c372f8543463b5d6
+EBUILD dislocker-9999.ebuild 1668 BLAKE2B d409322717e5e4ee21b7d6a5dfd1493281bb49fce85f72c520d155fca17f2dee394179e37be226dbb34039c5de8f92f98bae75c52a315b4d733640b352b97249 SHA512 627b3097f121bc8990eb0fdfb42f225f2beba3ca6b152bf3159e1a87280c8e5e3f1ad6250f8efe7ae9f879b0478fb7064adc57708b1ee7e7c372f8543463b5d6
 MISC metadata.xml 343 BLAKE2B edbbbf3c98bb40a48d9b39f6fbe579a306f44539eb9415585c3e8045f4bfa2c2b7864be18313f2dd50aa73c14aacb5e446d4eb94f4c7116a7c0407ec651f3d02 SHA512 479da4294232d9c49530e2ed2c936c824c697b08d722309addb64bc77dd083365b0d4ce063dd331e4dbd13a0185885dca7bf5d62a6a09dfc6e7a38fd7e25f448
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
deleted file mode 100644
index 08e0e54087af..000000000000
--- a/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
-HOMEPAGE="https://github.com/Aorimn/dislocker"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/Aorimn/dislocker.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ruby"
-
-DEPEND="
-	sys-fs/fuse:0=
-	net-libs/mbedtls:0=
-	ruby? ( dev-lang/ruby:* )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-# We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
-#    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die
-	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die
-
-	sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_find_package ruby Ruby)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	find "${S}/man/linux" -name '*.1' -exec doman '{}' +
-	cmake-utils_src_install
-}
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
index 73f3b33aa545..90375bf7590b 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
 inherit cmake flag-o-matic
 
-DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
+DESCRIPTION="Read BitLocker encrypted partitions"
 HOMEPAGE="https://github.com/Aorimn/dislocker"
 
 if [[ ${PV} == *9999* ]]; then
@@ -28,8 +29,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
-
 src_prepare() {
 	if use ruby && [[ ${PV} == "0.7.1" ]]; then
 		PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
@@ -37,17 +36,17 @@ src_prepare() {
 	cmake_src_prepare
 
 # We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
-#    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die
-	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die
+#    sed 's:Werror:Wno-error:g' -i "src/CMakeLists.txt" || die
+	sed 's:-D_FORTIFY_SOURCE=2::g' -i "src/CMakeLists.txt" || die
 
-#	sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
+#	sed 's:\.\./man:'../../${P}/man':g' -i "src/CMakeLists.txt" || die
 # Do not process compressed versions of the manuals
-	sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "${S}/src/CMakeLists.txt" || die
-	sed -r 's:^(.+\.1\.gz):#\1:' -i "${S}/src/CMakeLists.txt" || die
+	sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "src/CMakeLists.txt" || die
+	sed -r 's:^(.+\.1\.gz):#\1:' -i "src/CMakeLists.txt" || die
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake_use_find_package ruby Ruby)
 	)
 	cmake_src_configure
@@ -57,6 +56,6 @@ src_install() {
 	if ! use ruby; then
 		rm "${S}/man/linux/${PN}-find.1" || die
 	fi
-	find "${S}/man/linux" -name '*.1' -exec doman '{}' +
+	find "${S}/man/linux" -name '*.1' -exec doman '{}' + || die
 	cmake_src_install
 }
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 73f3b33aa545..90375bf7590b 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
 inherit cmake flag-o-matic
 
-DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
+DESCRIPTION="Read BitLocker encrypted partitions"
 HOMEPAGE="https://github.com/Aorimn/dislocker"
 
 if [[ ${PV} == *9999* ]]; then
@@ -28,8 +29,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
-
 src_prepare() {
 	if use ruby && [[ ${PV} == "0.7.1" ]]; then
 		PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
@@ -37,17 +36,17 @@ src_prepare() {
 	cmake_src_prepare
 
 # We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
-#    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die
-	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die
+#    sed 's:Werror:Wno-error:g' -i "src/CMakeLists.txt" || die
+	sed 's:-D_FORTIFY_SOURCE=2::g' -i "src/CMakeLists.txt" || die
 
-#	sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
+#	sed 's:\.\./man:'../../${P}/man':g' -i "src/CMakeLists.txt" || die
 # Do not process compressed versions of the manuals
-	sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "${S}/src/CMakeLists.txt" || die
-	sed -r 's:^(.+\.1\.gz):#\1:' -i "${S}/src/CMakeLists.txt" || die
+	sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "src/CMakeLists.txt" || die
+	sed -r 's:^(.+\.1\.gz):#\1:' -i "src/CMakeLists.txt" || die
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake_use_find_package ruby Ruby)
 	)
 	cmake_src_configure
@@ -57,6 +56,6 @@ src_install() {
 	if ! use ruby; then
 		rm "${S}/man/linux/${PN}-find.1" || die
 	fi
-	find "${S}/man/linux" -name '*.1' -exec doman '{}' +
+	find "${S}/man/linux" -name '*.1' -exec doman '{}' + || die
 	cmake_src_install
 }
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index a2fd2d284565..254782575d43 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,5 +1,5 @@
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
 DIST dosfstools-4.2.tar.gz 320917 BLAKE2B c55c7592aa80f1fe39e838c83e147ad7141ddd0f72c9c000ba7708ecb7287c3a92b4b52f72c8d0d1171b0f9609dfb7861bbbe475c5cbd7011151c93c2b1d3d0d SHA512 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156
-EBUILD dosfstools-4.1.ebuild 1026 BLAKE2B 98bcc331cc8e6e4837eff7d74a8d71e40646d1a8ebcb208d5a34fa34bbb8161906e74b4470d22b8f3a95ec125990f01e2ae8bf8aff338563e50af0b1b5a7dd04 SHA512 c2ae1a386ba2b21fc8d15d8163d79ee5ce28285d9f3b418cebb2a7dcf646eecf94824a496eb7851b51392bba87b5820a2a9095f7a60786d2816f90ceddb497e4
+EBUILD dosfstools-4.1.ebuild 1027 BLAKE2B 3ccdf37481739069199a76a87881a826fb0ecadb89d4290d210b4ab913a7d07c6c08b40cb5fafb9e61fdb77d48e1dfbb5adfaf7aadc4eac5e33e62f522e22b2b SHA512 b867fd86212063257d5cb6795f3eacc509cd6039ce5448b88b053cbd4836995714b8eb973707255f8305f9900faa160fc04cdbf6b3d32fb660b709355a94326d
 EBUILD dosfstools-4.2.ebuild 957 BLAKE2B 28cf10e50b016c2d373f8c063ac70e8b8148b1402b8b6697ca18e0b720c8b001769d5b543eb246b1b996581165d021679b9e0de507989aac18880047d9785b57 SHA512 a2b7d3ff340080eef38214a670583f125eacb9d3ed9ac6353fcc8a37969a2c126910377127b0a3bbcecc1437a5a65972f7821a259b2f0cd6598431d905fbdf48
 MISC metadata.xml 496 BLAKE2B 32b7ed76d0385441b8a40fff8ca15d6848fce7cf1ae511a6905d3c12b8a7593bbc11494f7ca720c465f61175d8d84cd9e6d41f084a140fce88513c6b95965615 SHA512 40b886dc36d892d733a6a6528eed5dec3977eecb71a22b5cee2ea6c0417401951b966509c3816ed5a2761eae4b8c5def7ef5e99d9aedab2e09000a3f3de6b354
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index 123303adec5b..c4382e2ef1dd 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="compat test +udev"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 076310a713d2..b1854255c9a7 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -8,7 +8,7 @@ DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fed
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
 DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69 SHA512 fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c
 DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
-EBUILD e2fsprogs-1.45.6.ebuild 3976 BLAKE2B ff4ae16ea6146eec58ee8a0b1bcca21d245cbec976a3905b84a1b65804bef437f4f2b3062e08d63caea4ed762fe2f5e3a5d1a7edc42f376f4dd0c30cb01bd659 SHA512 b2f855eee3141b9ab0a7228abdd89c201443d3a8de0af83593c09eecf66e20974912d483190800fcdfcfef4771d446a423c45fa043f0a7b0e72c471053dec373
+EBUILD e2fsprogs-1.45.6.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
 EBUILD e2fsprogs-1.45.7.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
 EBUILD e2fsprogs-1.46.1.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
 EBUILD e2fsprogs-1.46.2.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
index a66e5f0def32..9325951632f0 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e4rat/Manifest b/sys-fs/e4rat/Manifest
index 95a9f41e4565..3ddc2c4c87ce 100644
--- a/sys-fs/e4rat/Manifest
+++ b/sys-fs/e4rat/Manifest
@@ -4,5 +4,5 @@ AUX e4rat-0.2.4-gcc6.patch 542 BLAKE2B 9548cb2f2fa7f7d43db35e0f97915fa2a81d63f93
 AUX e4rat-0.2.4-strdup.patch 1427 BLAKE2B 1ab2f089f346ac635a8417d9e608695e18f77d12c15cf0fa35b4c1dc1fdfca2761308e8d21b1fa2daeee83e82f9f893a9d4e014e77538c3d345b2cca4b85676a SHA512 62d2b4b2b5e8a9b309b920d20fee98057f7e7564cf86e01f8d4cbd3219b47caf7d78ddfe71b01fde46997bb8966e2ce76df4d32ec6ab9a6190a1351bc2faf6cc
 AUX e4rat-0.2.4-sysmacros.patch 288 BLAKE2B de96b8e8dc03359e2eda1357dcd76233ac9a7a5e6a6c8f2c187372e5dcfeccc3eb89d8aa349a0a07e2fc7ab59320428b46c3dcd5c45c0eb2433bfdc63355806f SHA512 50883828bf95368c31c620fac46728c6bfaf768a794158b30614cb2c0b7a65ee82e8bcf12268a26de93e87fb6b0466bc93e29a7dd69895234693745e24a6da59
 DIST e4rat-0.2.4_pre20141201.tar.xz 60408 BLAKE2B 4ebedfcca7f21bb1f3be59dac64694e0f69ecb5ebdc1637210c68097178e2ae38959581a51fc55b8773d63ce629aaf69765bb755d45467bf5e4f4e741b715101 SHA512 61a53f6ac420392df5894d3f76de28c5d2e33fd3a6548cf8c9de52818bf937ba8bf8629db1b89103faa73b660548d7e467e17d7f2794a4100ca07971ded0cfb9
-EBUILD e4rat-0.2.4_pre20141201-r1.ebuild 1607 BLAKE2B eea9bebd13660030bc9c48579feb3a97178f78376a9f16a3270c6ba4bf59c469399725dc12340e2bbe47a6f1d79c140fab358e5c9efaa0f92a29a460ba50def8 SHA512 41b27d9ede7f5511ea9174ff541e6309aec4adbd855d27c528971dc63d13724d9c8dd1035c03e196ceeb30b8f3229eb585716ea1e4f634c5dfa91c3d91159dd8
+EBUILD e4rat-0.2.4_pre20141201-r1.ebuild 1601 BLAKE2B bfa6e4fd6b0e10a1df31e389d3f2cf1e8932415ec2a33c02dd9d181ce9550ddf9043aa50cf9d0d5898cf2d3bf9b2c9d351bf4ad8e2c142f001317e14285b500d SHA512 2d0a19bb976f99ef8b39f170d5d4838e543641e9e1cc546a51222509d37a9def78cd01fed26095ce7060053d417fe985d58cfaf85e45630c35c6212c4319f0e7
 MISC metadata.xml 325 BLAKE2B fbbaf2b12226db46c1204d826d2e47f3ff4d77c6aeaafcc299011c9ca93b4d44af769766c95c3f074047ed4d6e6d043844ac4f4f1728e7bb060238dd88f32cc1 SHA512 3630260f53b5922cd23604a77495370f77cef226d9ca2ba42b31f3ed342f53f9f00c5c4a22eb2f9041dde577f612f8ba2ea9af1a649d105f52c1d15b41a0d516
diff --git a/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild b/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
index 1c3294e79e8a..1894e09017df 100644
--- a/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
+++ b/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit cmake-utils linux-info readme.gentoo-r1
 
 DESCRIPTION="Toolset to accelerate the boot process and application startup"
@@ -12,7 +13,6 @@ SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${PN}-0.2.4_pre20141201.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	dev-lang/perl:=
@@ -21,7 +21,7 @@ RDEPEND="
 	sys-process/audit[static-libs(+)]
 	sys-process/lsof
 "
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~AUDITSYSCALL"
 
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 50b5aaf2c4bf..eba1cc88fa29 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -5,11 +5,11 @@ DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d1810
 DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40
 DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42
 DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
-EBUILD eudev-3.2.10.ebuild 6978 BLAKE2B 5c4c3d2dc903b4c4fa22882f85bd7498705a2537093c67c8556d44981ea8991e91a9d8b27f9827aec3f423c5facdb4cc540100ecb0600bd56da0a11f48be3389 SHA512 14727ec2332d4ae5630b13e4a07573992b2e5f831341d5a391a2a556f9ecf066d55e7715d20adfb5647b6d303b48cfb930500d41387ce688b2c9517d6730f168
-EBUILD eudev-3.2.5.ebuild 6812 BLAKE2B 0fdbb319de304026fb2c3f036f759cb47abdf33585062ecb3ea2491b68182b7fc29af8a50761ecf5642d5c4e5c587951db4e8e8bc6cd8cc807c4ab44fde24290 SHA512 6444a8d845287d76f8c20add841d1e2cca7ce398647c694b34d4388c9a29ee03e1c640e2ec7cdb9fb8265a5c812dce04d4536684f7ae67f04e3e39778f8d3bee
+EBUILD eudev-3.2.10.ebuild 6979 BLAKE2B e23d90cd49b2029bc53c434a05d6c9cb40b7a62b1a66e45b123ac09862bf4ced60f6ec7686c07c5e5a5f0594d94845506e78aad5377ffe439a15f118ebcebf8b SHA512 c159306e61f1e8d4fe43ef0a655041260c48ef5c145c45fe23606f9f7587c841379adc6a306be2b77d1fd911fdc7ab25c1adc57a463f911b8aae78b94f7a91e5
+EBUILD eudev-3.2.5.ebuild 6813 BLAKE2B 2a3a5a7594a975a3de14e73de39c56f15fd36451b971beb2d04402aa760085a8a599c896ffa9608af6bb11bb7e5de7b1b96d1981648667f909d109906f235394 SHA512 48c14aa3400d9abcd159216185f39b3560860122c2b6090bffb3a8be3149e13574471bf345fcebb99eaf5fe0e430c3d7726494ce63056db30b4556368f7a63e7
 EBUILD eudev-3.2.7-r2.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
 EBUILD eudev-3.2.8.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
-EBUILD eudev-3.2.9.ebuild 6978 BLAKE2B 4cbc237fba8d2c35fa40ed0b16f37fc0bf1960384dbe22071498896995eb724130b8ffe5dac7295a1d231a65442e3e8136d930c2b90c53a6f70e37add7e5dc99 SHA512 f678c4869426d9b78c4382884781198c820cb957ef05508af781bb65d149700c6179dfe5a53e34b7ebcc8ed1b61cf2383cc3d413f6a74bd94cee16320f151e6b
+EBUILD eudev-3.2.9.ebuild 6979 BLAKE2B e23d90cd49b2029bc53c434a05d6c9cb40b7a62b1a66e45b123ac09862bf4ced60f6ec7686c07c5e5a5f0594d94845506e78aad5377ffe439a15f118ebcebf8b SHA512 c159306e61f1e8d4fe43ef0a655041260c48ef5c145c45fe23606f9f7587c841379adc6a306be2b77d1fd911fdc7ab25c1adc57a463f911b8aae78b94f7a91e5
 EBUILD eudev-4.9999.ebuild 6111 BLAKE2B 534328760b1714d5a487fe36a8b717fcf5588128bf9d2702fc7739dea1a58b514f231e0cbd9d50dd5c455d0c106f0d0c155cdb89dec881188c0c78791977ad13 SHA512 c101dd4ea16381991470e13388d80b86ddd8930cc2e03993f338b374b1ea27777fcb6f8f934ecfed67e297f3219c3252dd11886133596e2c5aa28f5e981edf24
 EBUILD eudev-9999.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.10.ebuild b/sys-fs/eudev/eudev-3.2.10.ebuild
index f7ba93d53eef..3296733f6bf4 100644
--- a/sys-fs/eudev/eudev-3.2.10.ebuild
+++ b/sys-fs/eudev/eudev-3.2.10.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index 697e11f2dedd..e7cf8529cb8d 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/eudev/eudev-3.2.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild
index 5d106dc8f46c..3296733f6bf4 100644
--- a/sys-fs/eudev/eudev-3.2.9.ebuild
+++ b/sys-fs/eudev/eudev-3.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index 033f38f93ac8..d18126a3c9c8 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,6 +1,6 @@
-DIST exfatprogs-1.0.4.tar.xz 255736 BLAKE2B de2d64853e94944dd5c1f961a94daf5d31266a4b8f51e20a0528344fed24a5482ae6412f39d47b7da9807d5b8d10f87106b88818318f26339c0c8e05d52b247d SHA512 c3d9b92101b9461d47a9b3c7a43a99b90160ec81121662b04947aea18ad1b2381dc1d71c491bc4a5f2439120d6c21533ba2714a548134d9c918c4b1c72063d45
 DIST exfatprogs-1.1.0.tar.xz 259716 BLAKE2B 56ead392bc5311352155b03eefcec4f74d333464f6d2d20491c9c9f7dd10abeeaff4bbd1a86808e5af5ad9a5d5423ff82d5e5762d75ef2b19ea1eb3f6213c87e SHA512 6266c10585250d4d4818719f22b7876eec1ba1f8424e966875d207d87d1870a91e05eb066962ab0ad9b750f087db39d9ed7578ec2f1c0e4d03a1b62f01ac6386
-EBUILD exfatprogs-1.0.4.ebuild 601 BLAKE2B bf01b45d28396612a1de65bab39576f0d0c671e88f5edf736af7d7e341ef4dd38bde5e76e7a1c2bf7eacc37bc69ce262b1ed96d9fd164f958bbd7b58a6ac8662 SHA512 1f585fa1671b8ab418a2f5fb9c9d2743bca511627a1bab540159a863a1e7712a679ee397429244cb9f654330fc8555214f34f46aea10720a25f73808ec0a4d69
+DIST exfatprogs-1.1.1.tar.xz 261632 BLAKE2B 92d05cf94b5d7a65cef2b5fd97a25401f130a9e649246ed3c1f2240f33a586787ad17ebc41f476eb1ea1e3441c66ffd53408f4024f397fc2de14d76bf94b3f2b SHA512 faeed51a8292d17e71e2f5061dbc530dced75048380d6ca835f19a4e3845de86a9970598222670c38e452cfd6952f3963d8f84086c79172d3c0058957a549755
 EBUILD exfatprogs-1.1.0.ebuild 605 BLAKE2B cd769a5353114714ccb85af96d6b10cfb0cdae507e2e44cf2fec60e6f4829979bc41b843ce60458010f60ce1e0babce2a20e243f28d6dbdcbb759262d78d5b60 SHA512 bffa94490b25ea092392caef07a55a486ea0d47443dbb5449ff40ffe2e803ea792dcd52e45332c9812b0cf85132c3b0f4afcaf8649e1715d149945730ef129cc
+EBUILD exfatprogs-1.1.1.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
 EBUILD exfatprogs-9999.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
 MISC metadata.xml 343 BLAKE2B 76c85c7abf0d2244304b72aad5f78ab1ed278b01c943b3380ff5fbd5cb104284accbc33b1b620309f1f9034625e98e0424e89ba4d1d13887c07502b6fd8efb63 SHA512 ca7a2f710812f1e5ee73b4faeadf9628274b1130e96f60af6155388746e0d14559a5e18262191ba50fcc1255cddeb88acf6c2d40df2af48548ce676a7a2fb91e
diff --git a/sys-fs/exfatprogs/exfatprogs-1.0.4.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.1.ebuild
index f262a17592a0..29a89c2d1f56 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.0.4.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/fatcat/Manifest b/sys-fs/fatcat/Manifest
index 5d8f6b90b73a..bc5aa4f43c12 100644
--- a/sys-fs/fatcat/Manifest
+++ b/sys-fs/fatcat/Manifest
@@ -1,4 +1,4 @@
 AUX fatcat-include-getopt.patch 268 BLAKE2B f197d14653e3c738bc096fe1f2865794e1cedffe87c49d62e769b542f6ff85caf2e8079cf17204010d4e5c5438c8df92c12aa780bfbdafb9bdbcd66b994c499b SHA512 71b6970aea57969099deba84bc1c7ad6aca025841140bdcb569d0e2b8f083618022eac84895522c33dc6f5e53bcccb0b21d380eed1ebb251928f17e08486315b
 DIST fatcat-1.1.0.tar.gz 57104 BLAKE2B 9ff69f576258a39b767db67e6934a35175af218a184516681300c646ce1ec508652cf1113bf61f9e2f628849de2b53152345ca12fe84e8a9a7f51799bb3e13a2 SHA512 f5bcffcb46b77e950241a9f957133083ea5d43f4e0f3e038c84310da926cc017048d22f85f3c8e90a2745ce26f513079997717c5b758649b7090694006be0078
-EBUILD fatcat-1.1.0-r1.ebuild 597 BLAKE2B e2ec5300b4f92ebf71922b5c5a3977347fa1a6497d10f7758f41d7cef1b83f70d8844e9c240d15bc95deb413cfb6e394487d0e887f2b68511161122edff59ef7 SHA512 bf0ae51c6015d4d9bbf5ab75c2f3bed230c922d889aeb0d24f7ad597e6f78cf32a73c357c5152d4b896d3b9f059442a2424c2a7e07f7d8d66b0912dc5261bc1a
+EBUILD fatcat-1.1.0-r2.ebuild 585 BLAKE2B dd97942c347548c64e3cc00d11204e56008a8cab5be81c2bd864cdbcbbcdb554e94c114f3bdd82092bb0c3556e22eb33c256feb0ca9e4b4ae41759b3914b767c SHA512 dec9e061f1130c7fe5bd1502b2f750272648dd27ddf83168624c19882e6eae3a37724f4508ca26d4d5fea49a450749106e9ebe274a9b57495a6424774a68f3ef
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/sys-fs/fatcat/fatcat-1.1.0-r1.ebuild b/sys-fs/fatcat/fatcat-1.1.0-r2.ebuild
index 3fd6f3130447..1b785a18b115 100644
--- a/sys-fs/fatcat/fatcat-1.1.0-r1.ebuild
+++ b/sys-fs/fatcat/fatcat-1.1.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="FAT filesystems explore, extract, repair, and forensic tool"
 HOMEPAGE="https://github.com/Gregwar/fatcat"
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}"
 PATCHES=( "${FILESDIR}"/fatcat-include-getopt.patch )
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doman man/${PN}.1
 	dodoc docs/*.md
 }
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index d0d38fcd4091..9654b4274df0 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,5 +1,7 @@
 DIST fuse-overlayfs-1.3.0.tar.gz 102059 BLAKE2B 30564f9a06ed04f7716170ee864bffeb899f8fc6b411cc95dbe920632dcb2ea2d9d7a9472b35fa33ddca86570978913f8651c35e3544bd650a95c52ca0d4d3ff SHA512 c374b5dd4d369ab0134f66ff021c8efbc35f173a2d53a7212d5ec459c5083cd0fb5fc93b68696db5903891aa33c719be7eb3beedcaab043459f8b506d7cf5c0d
 DIST fuse-overlayfs-1.4.0.tar.gz 102363 BLAKE2B cc614173b5f06b761c31ceb538b6322071dadc2328f92899988c6ff26549cfabd7e4a4bb18207bc4564f2bc26d3cd4b01dfed991f92a8b1f5afa4fc756e6517f SHA512 8ee42e0b11540c40200102b066a4a3009af81d5a5c120449b9f3291034a679602e476f42486c039215085eef0291d2b9390888e97f213d8399a5e8762d3fcd17
+DIST fuse-overlayfs-1.5.0.tar.gz 102992 BLAKE2B 847aafff7c82c88edd3e76a0e90e290a2fcf2e372cbdb816ee84d98841506ad8f87e4c0c201d5b26abfa08beab6051a74939755287c8c1c33d6183814f2ec5cb SHA512 8b902284c5306e9ee2c3e9e62aacc795828d27a86cc91d5e40a013b000662f3ee0896ef94b6bffb8c4919c04573cddefbd185394d66eb429f7e9e2a727bee4fa
 EBUILD fuse-overlayfs-1.3.0.ebuild 565 BLAKE2B 6cad51a1921aa1c48f25baa727c28c51c5876c83944be93529c8639bfa75f90adfed39c7247768b0beef5cbd612e4087485078c9a4508a1ddd8d982fb9797c9b SHA512 60da39f950d584bac0c032f2ecdd8a479875916816459083c7fb21888fd912d6cf4b78c4419a8f30f909473a52818aa60cd75d140cc771352677c30b88ddb65d
 EBUILD fuse-overlayfs-1.4.0.ebuild 565 BLAKE2B 681cdb253cf99c8509bd62f033cf3918be316fdcf8b6bfaa7be42097afe8cf053396f844b4fe68b9fe9d31e97bc8aa5e8e11db3d26f812310cb74739bbc25fdc SHA512 e7c802a3c44182c144d6ec417a3f7bb8154b17abe7c247c5a6ac930a490c2614e45a4f9924a70b6f19b91bdb743243677dcd1dd81f5d39d91b0ab122b6c14cc7
+EBUILD fuse-overlayfs-1.5.0.ebuild 565 BLAKE2B 681cdb253cf99c8509bd62f033cf3918be316fdcf8b6bfaa7be42097afe8cf053396f844b4fe68b9fe9d31e97bc8aa5e8e11db3d26f812310cb74739bbc25fdc SHA512 e7c802a3c44182c144d6ec417a3f7bb8154b17abe7c247c5a6ac930a490c2614e45a4f9924a70b6f19b91bdb743243677dcd1dd81f5d39d91b0ab122b6c14cc7
 MISC metadata.xml 334 BLAKE2B d159a1336d5c016f97f854c7dc8267a7df63d9352fc81670d09fb436aa1267c842a466bbe026443a57c3e910c927f361d0ad25e9785ea785e522500c966beca0 SHA512 c91863d890e5145d3e05d247455ee2d0bda70525dfbc15632e11df75ccdd40bdb0dca17b41d3f8485ad1768cf401915ada074ee05f739d74df93d440785b6fd5
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.5.0.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.5.0.ebuild
new file mode 100644
index 000000000000..1f39c42d5751
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="FUSE implementation for overlayfs"
+HOMEPAGE="https://github.com/containers/fuse-overlayfs"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=sys-fs/fuse-3:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 511124efed52..8e4dbfd18ed2 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -4,9 +4,9 @@ DIST fuse-3.10.1.tar.xz 1898800 BLAKE2B ddccf4dc697547edb6ed48ca76b4379a5f94884f
 DIST fuse-3.10.2.tar.xz 2071936 BLAKE2B 295c77ba7ffe2f56325bbc4eb8336b0765a8958152142660eca70b3e9b97f853adec917a161dbdd59f30d86ee19eb62f451a8bfca3fc797ba67a6139f0258a6e SHA512 8a306f69662126747321144b9e62fe43496ee2b5e96ba6094b7756a365205aefea477f39407c3d2b27528fae773a0662130de9d41503da630e17df564ce76260
 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
-EBUILD fuse-2.9.9-r1.ebuild 2070 BLAKE2B 2946ac81c95dbb8cc329247aaf0f123a45475113028b8d79a845ae71388d3fd639c1c660c784284436fc4f603a7a248f33f19687569fde508929f16ac9168822 SHA512 d005e464d34b1a0edb69c795440c56d74c2147cb04403f8067987964ae243bb122adcbacd6f330dd53ed0cd058fdaee2ca4642dd711dfb559903b30364927fde
-EBUILD fuse-3.10.1.ebuild 1833 BLAKE2B 411bdedf4c9da2872462e6c75a11ac397a2f07ed0d144ef8eb58806bf1f35fea3c5de33d3aac04e10d2b899f210ad6ba84c95c711616a9384a1f06e90918083d SHA512 351b75cb8a1aa390be5d208c0ca490a17053d2c90ce3363b2a4fdf133f7f0e4cad824f793f865d747cab470ef3c6824dec9ae16d57755de689d70cd25c7412a2
-EBUILD fuse-3.10.2.ebuild 1840 BLAKE2B e986793891d75b48bc28abf79707236790a1ff8047ecdbe89c75c8c094e52d1f51578a700edecb633ba483d4cbb3a10d5902ee486ac852f8aaa577ce87500f12 SHA512 9e963fc387c1082fcd3297b0b3e002a85c956c0b9beadd37564a427227bab08bb7ace5db9be4c3df4b2ec1eec3651de01a1fc87f1af52295c75110fadb6c6783
-EBUILD fuse-3.9.1.ebuild 1949 BLAKE2B 2446b31c9ebeb764a44f0bd1fbae922211cc243953705a1675e2efdf7cf5049e5d16b2483434fc02c4b6258afb7c1a313d32165f0b5c51d73d91922ccd11d48a SHA512 420ff41139dc9a9f049c03d7f53fa4a0493bdbebdec32fc2a2af33e060f71da23bcff33e37edf8f2d63007dd1801ab165ac107970fc01c42a627a807217812b1
+EBUILD fuse-2.9.9-r1.ebuild 2056 BLAKE2B a62986e92f4deb4993f4c0bd71996c1f2b4be435e396dc869f8fda9d6b0c3e74e397a6388fb66b076cc5bbc441d3122aa8ea7c788d5a96b82386621e1427b882 SHA512 0c65cac78140b2baf6ce8c3342c99cb52a1746b0a7d0a21d4e44955d56d7fd5b334b020ffd2cb1bb982f9652b422e7555d05ab2ff5746b664786e5c2f3c38bf8
+EBUILD fuse-3.10.1.ebuild 1820 BLAKE2B 699d75a28c8adecb7d5005b8e9e1cbeae9e2b1a132baad2b17066ce8c3e09f5055bc77fc34825a70f73da4690ff0f10c4b9ca855ffd05c2a8dfaaf73c3514108 SHA512 18313ba669e9548db8d9145bb641c0b38330f8dcf8b6aa7a3fe6171636d87eb739354f3c1057d2ca5c631b1156161d3096fb4ca6eab821fa9f10c414c6283211
+EBUILD fuse-3.10.2.ebuild 1827 BLAKE2B 8e1e37c8d9b7f80ebb2e4347e79957aab2da8593df1077d6c8e870115fb58704293fd585d255f9ce7887a3975c029f13a85dc9080ae60ed5068eb098a7a02aae SHA512 0e99a19d507815000bd3156f3cd5e679b4f1951becf64963ad970d527f513c639c7cc8f1d5d716a5c7825e1cfbcd3379494d3c996a597ed5f3df226b64f3a8c7
+EBUILD fuse-3.9.1.ebuild 1949 BLAKE2B 0b70e6c806a1b9fa1e8a7aa80743345933f8afa46cbc2fce8b238fef466877485f816e8618be5cdbdd3d7d0d5f8cf4763448db10b38e92e853a74171b9951838 SHA512 f1a1c5772b0c6a023ec7503a92960b4290afc3902cc1ee37a3c0b4cd0d61d9d05a84ee9a037d29e95c64f10a6773adae9afb39858f7f51c2a23c26d5f585c4a2
 EBUILD fuse-3.9.3.ebuild 1957 BLAKE2B 0d5745c3c3e0701b6837336c73d98018f690170f1a95fb39bef9017529ad0a070da5da5fe02d82d1e8c25acd14b2dcaded733a41847420df8de6af548c5fa0e0 SHA512 06b0fece0ece43391052026f53591a20630eeb8318110b96bee13d7dc71c5590f0915ca6f4fb12ba9aa6543ec2bbd1722e04caeee7038200f43764f2a868dfb8
 MISC metadata.xml 460 BLAKE2B a8f51e9fc0148b7bcc163ea5e0f72291f9e36f3dad8c20076495fe32cb8d5fe992579ab069f840bca251164ff646c522ee0b7ad5ffa7b3115effa89d5acfe332 SHA512 e56ba815557e847487dbc76dbec4ae657c7c4ecebc9b3c02c39402daa699c5ff90923bcaf1843747c94d2025f339ca6521f35f48c6c4583d36e9de33e6f3a586
diff --git a/sys-fs/fuse/fuse-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
index 91a95b0677f0..aaf77a867a81 100644
--- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic libtool linux-info udev toolchain-funcs
+
+inherit flag-o-matic libtool linux-info udev
 
 DESCRIPTION="An interface for filesystems implemented in userspace"
 HOMEPAGE="https://github.com/libfuse/libfuse"
@@ -14,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-DEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
 
 pkg_setup() {
diff --git a/sys-fs/fuse/fuse-3.10.1.ebuild b/sys-fs/fuse/fuse-3.10.1.ebuild
index 8025c8d65060..9296c09d0fe1 100644
--- a/sys-fs/fuse/fuse-3.10.1.ebuild
+++ b/sys-fs/fuse/fuse-3.10.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit meson multilib-minimal flag-o-matic udev python-any-r1
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit meson multilib-minimal udev python-any-r1
 
 DESCRIPTION="An interface for filesystems implemented in userspace"
 HOMEPAGE="https://github.com/libfuse/libfuse"
diff --git a/sys-fs/fuse/fuse-3.10.2.ebuild b/sys-fs/fuse/fuse-3.10.2.ebuild
index f4e0fdbf39e2..5af77ebc394a 100644
--- a/sys-fs/fuse/fuse-3.10.2.ebuild
+++ b/sys-fs/fuse/fuse-3.10.2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit meson multilib-minimal flag-o-matic udev python-any-r1
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit meson multilib-minimal udev python-any-r1
 
 DESCRIPTION="An interface for filesystems implemented in userspace"
 HOMEPAGE="https://github.com/libfuse/libfuse"
diff --git a/sys-fs/fuse/fuse-3.9.1.ebuild b/sys-fs/fuse/fuse-3.9.1.ebuild
index 57795826c8b6..20ece00766a1 100644
--- a/sys-fs/fuse/fuse-3.9.1.ebuild
+++ b/sys-fs/fuse/fuse-3.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
+PYTHON_COMPAT=( python3_{7,8} )
 inherit meson multilib-minimal flag-o-matic udev python-any-r1
 
 DESCRIPTION="An interface for filesystems implemented in userspace"
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index a932f708e982..73dfdcac2ef6 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -3,6 +3,6 @@ DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedeba
 DIST inotify-tools-3.20.11.0.tar.gz 84827 BLAKE2B 1d3e25c4e213c9c6da74575677a6dc491405077b0544be79ee95e5ac2ee2ef2606ae2fd0264ad83228dc580447f15afd16e486bd5a8d51f6254ed805ed985260 SHA512 77b90e96efe0c90ab6ca4309c2f08303c2047ebddfad93ff62c616f30df8ca01102197867571047475b19b7dcc0fe369d9dd41425c2973cdc06467787098f672
 DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881
 EBUILD inotify-tools-3.20.1.ebuild 878 BLAKE2B 9b6f38589aeefaeacb4d2591c4dfd01566b195a076a385f814db48e909ab0cc77b402164215f989a6645f2b390f312bbf372fcc180fb4ab38728e86b31b7f2de SHA512 17aa77439aaccb143eca5509373d3ff05499eec793bced223dc508291b7130c27ed9c64070118da6be24751bfba49bc695309894e4d2fecbe571e1adb2a21f93
-EBUILD inotify-tools-3.20.11.0.ebuild 940 BLAKE2B 6781dcd55ad545831371389cc9a824e1a6ef1873f09eeb34acb00010277a3929d78d2eda86b5dbbd0cbfbaa83e8862fb031790a2e0b4b1915bbaa90a54610142 SHA512 0c8f6e041fbb5730ff132d0cb7783b8137b161f18fefe77fee2444e862d1ecff856707b876ac966e585d4c4cdf88e7019bb3f0ec52e9c544080ef488e875a407
-EBUILD inotify-tools-3.20.2.2.ebuild 938 BLAKE2B bc07f0848f71767679e59c5e1ddc0e76c18705b4ff39bef4743ec1e709875e9fba11617ea1e58c456411a50a2de54721dc1911bf86b19cef6b170e27b8824cc1 SHA512 d773975fe71add5896ede0227ff04a6c215ba0c2a46905cdc3aaa60c83594e8a7e3d934ff2d0f1054b6408238385502877ede8937ee03b2d9d5c406a9a32bf45
+EBUILD inotify-tools-3.20.11.0.ebuild 930 BLAKE2B d80311a5642e7af833733c6f75258d857762582b7ff9663d623aad2d32a788d708571f6942faeaf2d124f76d9209748ba1973bf1ca04d08de2e0935d5e619c43 SHA512 61ee8874dbdc03f3749285a7fe072cca38353151d2ae8db10674ac38e850c6f6be872924ee5e2f6f953e7bb2f1d13dd1498d0bde95d62a78a58344ddc0e286e7
+EBUILD inotify-tools-3.20.2.2.ebuild 928 BLAKE2B 4edaa4cc87786d20501912537865ddd7d593e97c621908076c99a0f3e1e94d19edc39891b91f393dcaa6cb58fb2c0aa4cc1d1f525eb2ec0d74dd9b979b121841 SHA512 8c950cb06d35fae591f4ae6d37158fe338ed6e89e66b73058996661b54d2b43fc6c02c38a6f0e890008177f58e345c94e22ce3c2528cbe653599e86802385a57
 MISC metadata.xml 649 BLAKE2B 414281eb4ef1da7d9b3cbaf61603043a64c6b748b6d21f7693b1bc4e6fdb1c811fc59490c3246cdf0526de0658ada36251493ea9c5f00f5e700d8d4e68f99868 SHA512 62eaab525f91d97a37b526fb07b7ee4b5c7abcfdd9f785655d3252de2a4f545649da51341c5c0ff4201e0ea097bb7206d2dbe5285c9008a392c55e4802c229e7
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild
index 5e89f2bc1ca7..77cf8b46ca1c 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
 IUSE="doc"
 
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
index 8eff88206893..22720914efb2 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~mips sparc x86"
 IUSE="doc"
 
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
diff --git a/sys-fs/jfsutils/Manifest b/sys-fs/jfsutils/Manifest
index 64ddb2597afa..d8b223cba34d 100644
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@@ -4,5 +4,5 @@ AUX jfsutils-1.1.15-gcc10.patch 2015 BLAKE2B 58accef19b804367f6801724a443e9eefd3
 AUX jfsutils-1.1.15-linux-headers.patch 318 BLAKE2B c04fc414526ed854ed9fd0ac6cd8c1874c924e4446ade2ec85eec2ccbdd8a9c6f580fe6b4b91e61050a468855c46082f2373de08246640362ab81b8e74199cad SHA512 1fd097f403e0ffd434b433fcbf20664166b7ed9b9878f81719d45747fc96249ebac25f8afc9f1f6e532bfac90fe98f1474bb616da3c83fd69cc57d2fe3c11815
 AUX jfsutils-1.1.15-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5
 DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858
-EBUILD jfsutils-1.1.15-r1.ebuild 1219 BLAKE2B 09e7aff9baf2bf6f945f4cd7cd674ccd14fd6a5ad5d85f864515cae23a0e623501bcac391496df0f2742744a46a87d5709429998f5d06926559bb52b0145a70d SHA512 0eac361121dd5900450400d1634fae4656f9ade3c0ad9a3fa8b251407a2d2a55af9475f3099e2b7807e02b566a1160008773651e3822aecc6d630bfe552c1a4e
+EBUILD jfsutils-1.1.15-r1.ebuild 1220 BLAKE2B c9a589534a011a4b13a5f586485c96620aa1d65d9c4a7976ebe01eee2a88940b0fed9b3161fa907d1e8689fc9f08edb3654cfedaa85a2a56e6fec24ece7bdad1 SHA512 da313a2a40a387b7e146f9414c039059b2cca226531e0f2b71600783fb0ea435e47440c31feabc9a2de05b517bb76d08ee82915f604584eac15766f26297dfb4
 MISC metadata.xml 683 BLAKE2B db09548b3469462387d1835ad1c835cb45be5fdf5f18b4940ba35e20a1dd5a57159519e862672fdf08989a0c1b4351d721226ee289523fc214dfafb506150f23 SHA512 e81833363d32078db3c370d6a3faa1803857af05e6df470bc3b625da06680bcf725b443697ef356d73d3b4d4c7e4230ba54459e260f9a5e738978a08742af189
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
index 9b4d50930d3d..43e86a78bf49 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static"
 
 LIB_DEPEND="sys-apps/util-linux:=[static-libs]"
diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index 561b3e5fc935..acf91c6e096f 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,4 +1,4 @@
 AUX libeatmydata-105-undpkg.patch 308 BLAKE2B a6ad730f191ae342217dd7f881bab503ae662d3fcc9d8f782e23765e9b2385ab5d8f30a3ffdb0180d2ef22f22f327b7c6b3189674d65ac1aaacf68a4466e8620 SHA512 1f90cd5637babf47139c30f0b3a1c96e4dfaceaba7617108b76ef68f69a47287e509284e318cbbe1c0c62fc4f2fb5792b0d0ad0dd977388fd90f3ed54ba35e28
 DIST libeatmydata-105.tar.gz 419427 BLAKE2B 251fc4226ddddce16abc16c8a0717cd69621e8c166cf7a7dec1c8782c2a25edcf26e34f1a09bd2b6153a46eb99a6cf4b1adc334db188201b12a27b4a1562ed03 SHA512 fb2ac1400d5e3c44bfc952c72f29a4c7234edf5b756a9602ad822c57fbc9813c35d2da9492e2982abf81e0826d278da2d31ee1865e806754e0b387ad699367d4
-EBUILD libeatmydata-105-r2.ebuild 746 BLAKE2B 1a57dc157792ca1f25de7a1225fb762e88be60845dbf48f21fef3782b1950559399ebe048426452fd834910046cea379021849045ccf727e3dd4885bfd538acb SHA512 cd390db0b4e89e365de7ebb72784f87a139fafceee744d92200f1baf08e49d24a1b3308d41b67393ad32d6524fab0f4fe15461d436e15bbec3d565d646f5ab96
+EBUILD libeatmydata-105-r2.ebuild 706 BLAKE2B 14ee75e1d57bb91db40cdc3061941e6dffea7500056eb8dd65ac6865ad2e437f692e719c02e2741e8962fac26c3a52d27b41c7f89258997097ae3eabd6e6c1b9 SHA512 5dbf29d6f85a32561cbf005074fe53c2f928f82edbdfcfa0057434d73f4d15273b7b855e81b179ed692926b7da1b953e6935a51c114af6421be946a40d2b3a4f
 MISC metadata.xml 512 BLAKE2B 549d76a933090ccaf7100a6ae03b8a1f0c1c68454764018360184bcdce4e6628a38ac499bd8a568fc43240fa13596a6f0b4e108fff1c742d4e229aad59049b10 SHA512 4b436b230dfafd7554ffe9ef222fda5aa4e4132768f945c34cde4fed9359f2782e0f371617ecf52b55339f278fbd51f28fe58bf50ec600bef8644c82f594d363
diff --git a/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild b/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
index 2b6e0ab0a184..0d1428d550b4 100644
--- a/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
+++ b/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,21 +12,17 @@ SRC_URI="https://launchpad.net/${PN}/trunk/release-${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # sandbox fools LD_PRELOAD and libeatmydata does not get control
 # feature of sandbox
 #DEPEND="test? ( dev-util/strace )"
 RESTRICT=test
 
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-105-undpkg.patch
 )
 
-ECONF_SOURCE=${S}
+ECONF_SOURCE="${S}"
 
 multilib_src_install_all() {
 	find "${D}" -name '*.la' -type f -delete || die
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 5586cca76369..7be5853d2a7a 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -29,6 +29,6 @@ AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c9725
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
 DIST LVM2.2.03.11.tgz 2528527 BLAKE2B 4c02e630e033f9bfed44468b5b8dff4af52c943cb9d6385bfe568ba50463dfc97cd968d79c34eb2528d66930d6c2895de17fe546a34d80fd17a5892560bcb670 SHA512 50f21337e397fc5b4692bb08e5d48409b907b96b39168343bab2d40bb74fd84ff466e15f3d664305bc044f3f6be4369fa7378399d5a838793632e74706f17653
-EBUILD lvm2-2.02.187-r2.ebuild 10033 BLAKE2B e7a5fb4f7ba05f65f3136e9417e5a5dee962840c946977468fbd85dc40cb983086cb8be0acd7bb04ce13afa745252805c26603c4b33147776bd97bd4186cca49 SHA512 3b818a61f92ec92aa17e89d1cd78dfde543cc02dea717743c11c85f63da1e3e76fa1696a312014988c509cb99eb1686065e10cd78f36e4d8fa73f2474b7891b4
+EBUILD lvm2-2.02.187-r2.ebuild 10034 BLAKE2B 3a2417d5126141dd67488386fd2520856580fc82f1a9d6763373b5f3050a673a43787a7deef7b4b2ffa23558eea504e5c1ee81e2c9c0af8a9185a54ed657fd5b SHA512 d8e223ac76bb91c9596e0c9ba49dd150fb36403bd57dabe31d3bc2ebdd3c4c729ff33b2c85ed1154e4d5f38654739505dcd634ba9dfaa94f1f9d97ce7e37db7d
 EBUILD lvm2-2.03.11.ebuild 9487 BLAKE2B bf73d0d3a535485c35172217fefb2d0a3649bc53cec8d45e8efe170227c615993bca04f0b11d49d7f23243b9ab15a8309b92f245b2c3265313a04cbc15af75bd SHA512 42e8bd43676ccf4962f201f09fdbcf4edab82a1324c00326b07ed10aec95e872288dacc0b68346e01629bf936b3481aeeb1f7b257a9e5f96cb96fc11aeb15a1b
 MISC metadata.xml 1034 BLAKE2B f0f14e228cefe806333830eec09a076c06985750b08669036f951e7aefb45b2482091f4da404ccce7e5180e7294adc2940311d360773a7ec72e16f96d9d82961 SHA512 ccdb84869eaa98af048d561791879796ea8a82cb2603241496ce050133402f66e0e5b7d6eab161bc9739451712e73370616698ff492377e54d8dd5582abfbc69
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
index 413eaae8b611..339b9d3d225f 100644
--- a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
 	systemd? ( udev )"
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 4a367efde815..f8809316978e 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -6,6 +6,9 @@ AUX mdadm.weekly 187 BLAKE2B 50048d84cd57b384b98fcdb6b2a4a18380aab6e76877ee9edd4
 AUX mdraid.confd 383 BLAKE2B c61fd2c072a0d12ca21ad4f8a60a55101b4e452f9acc8cdcdf9a6069060b11bf90387830f516b69d266fef061112ba41f903b9371fff91c94c9332b12e436145 SHA512 37fe70f5df0fb2b68be01ee774e3a943cfb280322f2db0c5d6892e701fb58be26a225b78448814294bf68f154cca697278fcf9572a47b6201920d95ad05189d6
 AUX mdraid.rc 759 BLAKE2B 41f1b4cb9dd29411d56bea656dddc2cb2fd3cc14b183d05c502fb5e29407d1d816de9595e13349ef7e03240308cf4395578be31149f59d1960d1feee0165506d SHA512 d76190646b393d1480607b0d89d08ce4196738295fbb7790fa1035c53a041b5cb88fe857bb2070920a9c3ae21b9fb8f7838dde240fa0e275e5915add9c113021
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
+DIST mdadm-4.2-rc1.tar.xz 451540 BLAKE2B 04683fab09ee91f1f090bc1214e7d49a6505107e9a8b57f826cc6d5505765e3aea5051214aa9a541f3be1885f7a9bbe3ac56ebf7ade7c076dd4c363e0384691b SHA512 dbb836def3872ff079b8576c9d7506476882b211dd91c3f10b14a64dd6cb6e22ae3fac6c32eb40d991a47fe3053d44e783ecd947a9e5aeaae1ec0e48b5503e34
+DIST mdadm_4.1-11.debian.tar.xz 103044 BLAKE2B 16ec2c7f96125148df838af9c07ba6b94b0d886640effd8600dbb30f2b6d65eca5ef39020b7d1f221c91b08613d7080edb6535564b624c92f0c7fe463386f309 SHA512 dca9bc40a12fc717437f9881bfd985ce60a9e47117e2aa3d61a1b45e0798f4a310a37c4592a2e0dbd00ebd78fdeef7bcf505e9a084f48120f8130f17e94db39c
 DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698 SHA512 e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63
 EBUILD mdadm-4.1.ebuild 2385 BLAKE2B d47945719787cc0b2679f3ba7d1b9e4e9f138048adfbf5e90059d5bf828f0596b93f1833b5963d5dc6a7b5e7d896ea8760ebfbf2068d8878a3a3277590af41fd SHA512 0313b4c5e895b19a82fdc67717bf46e39ce7b6cfc6f6ce2d816759e881c5fbd05bddfa06ed64959329f14a276c3f7d3c304bafb90654a929718d39b964599874
+EBUILD mdadm-4.2_rc1.ebuild 2392 BLAKE2B 6c597cb94ca47235aa95320f967bc0e2ae5e8aee9a760664f2024aa6d65d043fa1238d054ef7f3582b49093b03ce0111c773076e42563315e446e411d3d06702 SHA512 9d1ff99866796d5afcd29a3048397c5ef589c717ce80dcfb5090eb44639bf9228cd165aa12b6cda40b58d3796d7ac4a5c377d0d0e051eb3ee393b39f7a64bd0c
 MISC metadata.xml 338 BLAKE2B 09821f9f1d507fccd175044288b7d5d8966b7bb807399c86e9e2e5b41134ac39a76f79b7c9000ecee890b902175aa86b7dd1ce2f288b6926fbe633496c1b1d9c SHA512 1f86c31c1f9c17f0a0d57a17c7bdfe6da70eed4e8102f3c545f447b58e892b0f6a3b0f6c4df9c611abcb544d6b26d3a0d0c591f1afd20f91a445746e3454eca1
diff --git a/sys-fs/mdadm/mdadm-4.2_rc1.ebuild b/sys-fs/mdadm/mdadm-4.2_rc1.ebuild
new file mode 100644
index 000000000000..acea997ecfb4
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-4.2_rc1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib systemd toolchain-funcs udev
+
+DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
+DEB_PF="4.1-11"
+SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
+		mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+BDEPEND="virtual/pkgconfig
+	app-arch/xz-utils"
+RDEPEND=">=sys-apps/util-linux-2.16"
+DEPEND="${RDEPEND}"
+
+# The tests edit values in /proc and run tests on software raid devices.
+# Thus, they shouldn't be run on systems with active software RAID devices.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
+)
+
+mdadm_emake() {
+	# We should probably make corosync & libdlm into USE flags. #573782
+	local args=(
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		CC="$(tc-getCC)"
+		CWFLAGS="-Wall"
+		CXFLAGS="${CFLAGS}"
+		UDEVDIR="$(get_udevdir)"
+		SYSTEMD_DIR="$(systemd_get_systemunitdir)"
+		COROSYNC="-DNO_COROSYNC"
+		DLM="-DNO_DLM"
+
+		# https://bugs.gentoo.org/732276
+		STRIP=
+
+		"$@"
+	)
+	emake "${args[@]}"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	mdadm_emake all
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	mdadm_emake DESTDIR="${D}" install install-systemd
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-*
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm
+	newconfd "${FILESDIR}"/mdadm.confd mdadm
+	newinitd "${FILESDIR}"/mdraid.rc mdraid
+	newconfd "${FILESDIR}"/mdraid.confd mdraid
+
+	# From the Debian patchset
+	into /usr
+	dodoc "${WORKDIR}"/debian/README.checkarray
+	dosbin "${WORKDIR}"/debian/checkarray
+	insinto /etc/default
+	newins "${FILESDIR}"/etc-default-mdadm mdadm
+
+	exeinto /etc/cron.weekly
+	newexe "${FILESDIR}"/mdadm.weekly mdadm
+}
+
+pkg_postinst() {
+	if ! systemd_is_booted; then
+		if [[ -z ${REPLACING_VERSIONS} ]] ; then
+			# Only inform people the first time they install.
+			elog "If you're not relying on kernel auto-detect of your RAID"
+			elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
+			elog "	rc-update add mdraid boot"
+		fi
+	fi
+}
diff --git a/sys-fs/mhddfs/Manifest b/sys-fs/mhddfs/Manifest
index 4da3db5b6a22..c07fc625e2ed 100644
--- a/sys-fs/mhddfs/Manifest
+++ b/sys-fs/mhddfs/Manifest
@@ -1,6 +1,6 @@
 AUX mhddfs-0.1.39-segfault-fix.patch 4237 BLAKE2B e97dcb4ee22cdf4a35aa74dd20daadfaa2428686950755131e4e7e09eccd3f5250f0d5c3da6232dfaf4c40a32f9b6f41d2005b3cafbe2456a74a06a0a7584ca4 SHA512 9fc611ba5771b04b8573db8b25556e15b2e37a1310c533f2b7a56323e887477c57820f62088100bed2784c14a6ffee3a0dfc2b8f88fa3c234d2a82f670eb07d2
 AUX mhddfs-0.1.39-xattr.patch 498 BLAKE2B e0a1a72c2883135956f885e974473fb3df10f4e1eb5e4781badde84d1545f4e2943583a62f3f93c68036aab83510d78970ead98ad45f24da1ac95620da4863c0 SHA512 5d2ffffea05499fbcacbae1d7b9062dd4bdbe7d0ee30b2e5ca30fcfc3e5a3de81a7664b09fe847b34f7e8016c7038b40a49a6f008fc8ea5bb377a0581c3d6bb7
-AUX mhddfs-respect-compiler-vars.patch 1614 BLAKE2B 281bf8643662f1b36cd33e4aa16de3d40a647e8feff7cca221a603f6dd726faa3098eb93097152735ef6389a4bf47d2e4fa6b6a824774641cb2e9e582e430bba SHA512 3c20a81010acc24c7ca1413adba5544c7d77c562861d9b33cb8423b4218f1a019d119996b62830add002e20fd9a618814b7338ca54a912ac35cb2cabd977c9e7
+AUX mhddfs-respect-compiler-vars.patch 1545 BLAKE2B 0767a923ce691bfc5b94980f6a3aa16c1e4f4b3c87930316ae54073d12adc18609d2208819d9dbd5546a33037a64575daab780bf68a90e1b447fa9136bda891e SHA512 426994f2ccbfe099657fd0dda09aa9925a91aaf054121bfdf9806dedbe8bc0f7539b4417758e2c561574c94824a87b8f4bef8ed485e2834b2d7f7c8cffe5d6e4
 DIST mhddfs_0.1.39.tar.gz 40665 BLAKE2B 5f7fa51d606985085fdb6346af5fdc6526d6f236b93a4deaad8143ac870cc3e85b5a6d9c94150567e2b34fd8ab0edaf4e0dfbf9c1cfc503f29386998bf84ed2d SHA512 cf1952e665e82a92ccfef9215d4faf78cd235566b67e6ebc3a60ab53089d9391bc41a08e6b203ad052e4a08bdd14428f2d9abe48f341aeb0c80ae1da80f83f89
-EBUILD mhddfs-0.1.39-r2.ebuild 1090 BLAKE2B e5e58d3e5ff317297ad83a765dbaa93ec137f21588f04615bb90d86ed9238fc154f5d853a31b6c8ae494653b9eeba80130a0109c172e90a983c3b92b7fd600f6 SHA512 e49f2d9dade5f202e3b9dc5a832811bb0e2be09ea8778da779a2773fb59fd7c310394696f8e6da55ceec5a9285d9d3177452052fd49f6858ecccee79f7d92d7b
+EBUILD mhddfs-0.1.39-r2.ebuild 1141 BLAKE2B 8f6dbae833f52ba8e9c472d69d4e3d4709d969d0aaf3d8bd2f1c91186c3833bf2ac75a1a6945e996dd1a8339e50752153073f586bf819697d1119f11d2e40fed SHA512 54bf8c18cc5ae93b601043f0875cbef309ed334528448188c509444e1ea8bae09ef63df1c5a51e4ec098a95c0f22a960f00066ed0aacf8ba3115d012b2850073
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
index 278c9876da73..5a3dc51c1431 100644
--- a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
+++ b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
@@ -1,12 +1,12 @@
---- a/Makefile	2012-11-19 15:25:21.665692111 +0400
-+++ b/Makefile	2012-11-19 15:27:08.406691288 +0400
+--- a/Makefile
++++ b/Makefile
 @@ -22,13 +22,13 @@
  
  TARGET	=	mhddfs
  
 -CFLAGS	=	-Wall $(shell pkg-config fuse --cflags) \
 -			-DFUSE_USE_VERSION=26 -MMD
-+CFLAGS	+=	-Wall $(shell pkg-config fuse glib-2.0 --cflags) \
++CFLAGS	+=	-Wall $(shell ${PKG_CONFIG} fuse glib-2.0 --cflags) \
 +			-DFUSE_USE_VERSION=26 -MMD -rdynamic
  ifdef WITHOUT_XATTR
  CFLAGS	+=	-DWITHOUT_XATTR
diff --git a/sys-fs/mhddfs/mhddfs-0.1.39-r2.ebuild b/sys-fs/mhddfs/mhddfs-0.1.39-r2.ebuild
index 78ca180e4bb5..201ecb8f7ae5 100644
--- a/sys-fs/mhddfs/mhddfs-0.1.39-r2.ebuild
+++ b/sys-fs/mhddfs/mhddfs-0.1.39-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,7 @@ RDEPEND="
 	sys-fs/fuse:0
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( ChangeLog README )
 PATCHES=(
@@ -31,6 +32,8 @@ PATCHES=(
 )
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	emake CC="$(tc-getCC)"
 }
 
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 3ca674c640b5..5f1ab377e1c8 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,7 +1,9 @@
 DIST mtools-4.0.24.tar.bz2 418178 BLAKE2B 96ccbde0e5ed5e304c73c7faaeb495751c43ae37970e5c2329299e0f7bf90f3a810f4ca95faea10a00e5af110be579a3b083043314e980bb0128226caffb5608 SHA512 b74becc4f696315cfabc016d1746e744b43e366de73bf1bffeec4fbab1e4815967594de8acb4af01f89d36a925f93672efbac205b89540161bd53ab7edebcf04
 DIST mtools-4.0.25.tar.bz2 421807 BLAKE2B 54b0de421d5de003c6dff9a524af2a37d7fe0fb88361e195b000b8c8637ed894ec01ca295ea71ed0df781e9503d609f5e21b987a79c7e9d2c2e0c7176d5eb825 SHA512 91b879de6b41bf9fd6d9282d846e21fe58dbcd3461d97d2d6cae752a309a5129091a0e6ffda5b28ef062c33970a1c0a43ff1cf19106232866bdbdb762c64a143
 DIST mtools-4.0.26.tar.bz2 420648 BLAKE2B 02f75722e8569c75d09fbee8667b24d8fd5c685940b235de33e268b8a349a49798f50db22470200e9fa30244768c07a568bfe124969f2a34f652c157ddb37e89 SHA512 32303ea16314ca00f33aee103451958f13c71ab1f3975e9a1dd9236c8e775286985ee776c38c64a1f8f5f8d0a66cbf84643182913e4e2c2dcaff384a9acd8633
+DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302155cf119db426cfc7a24b3d5195b560b8810613f571eed77584d47bb5125007cdcb8551b303db62ce264853776 SHA512 21072e1b6d22ea00913dbc856c5fbe1ecfbfc0207432c7632f0026ae2d9555743eb0710c86e8939a6b3183a03693b8d1297121df9d5702dd5bf6121ad240572c
 EBUILD mtools-4.0.24.ebuild 1045 BLAKE2B 2861833d297fdaf906239a2a52a5c922e0a195116ae73548c6d47212faa682b7b12f7bd20b68a167d86ecebfd2f6561236ff53bffcf093686bbf7c2c1893d6fa SHA512 dcb73024498715f8173c65076fa02a78873d01f22849fa568a6757384fc93e47981f1c95125a56646612f7dc4af39b4995ba0ef1ef41467f51eb60a99ee2b030
 EBUILD mtools-4.0.25.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
 EBUILD mtools-4.0.26.ebuild 1058 BLAKE2B 8236f510b4711b3d09257cc283075f271e02a704895930590a22ab9d6b9f91780bd4f0e47a6375b8e7dd2a149ba878b54d9df8fef0cc890f08df649044d37812 SHA512 c5330d2e62434e874b80bb13843d33c30a52e73a0ab64a588cd8a97481d413e4b166dcf538218be5e419ffa41515b2e621aa6cb290e42ea7a30636bb438e0815
+EBUILD mtools-4.0.27.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.27.ebuild b/sys-fs/mtools/mtools-4.0.27.ebuild
new file mode 100644
index 000000000000..3ebdd3b6df91
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.27.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
+HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="X elibc_glibc"
+
+RDEPEND="
+	!elibc_glibc? ( virtual/libiconv )
+	X? (
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/mtools
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local -a DOCS=( README* Release.notes )
+	default
+
+	insinto /etc/mtools
+	doins mtools.conf
+
+	# default is fine
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
+}
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index fd0bae229b15..3e2bbf2490c0 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -2,15 +2,13 @@ AUX multipath-tools-0.7.5-respect-flags.patch 660 BLAKE2B 1efc793d9741b1a732895c
 AUX multipath-tools-0.8.3-fix-gcc-10-compatibility.patch 434 BLAKE2B 2ebda2c60d3f2dd1152a1a6291d2ef476ad7e2ec96aa05a31353dedd22be7383e93f792498e7d73a017f1a66856caab582946b27df7bcdc50485816c97090710 SHA512 97bba4b041bac4cfa934148136cdd4795a09136d3671ba9c508f1e08516dc7515e3d7ff5ec5c79187f530afc22c46c8a7817449a763b200062f821c168fcb352
 AUX multipath-tools-0.8.3-json-c-0.14.patch 1125 BLAKE2B 70d5d1eb8b96e92f9bd2ec637b460784759e9a68970400d3007a21fcdd4e9ea4d27a9b2ced6c14d6a02d6331f38bce35ca13e5ca13284077f04d701c021b5b69 SHA512 d743ee4f31949ca8c65c536e379781394ab5de79e47e59b0ccef92d5581243edde0de641756ca28c902f6cba0d3c0fd0d51029e0fe3985fb3a353f7e3cf10c77
 AUX multipath-tools-0.8.3-no-gziped-docs.patch 6302 BLAKE2B 4d571d856d47cbb7cf6cf421a142fdb5d93fb891ae3c0c15abe8d74e6aeb35b02cbb70a80cede18f1dbd615581744f4144c0b03791aa6268c10e8bc08922bbeb SHA512 126245660ba589635437be32c7a7e72636e0bdcd72c177a6252b8e0c71e90426d12e78c10314d878d2e5a5b37b51db488c5fab8c1aae4f655650539ef1d1cd83
-AUX multipath-tools-0.8.4-parallel_make_fix.patch 3422 BLAKE2B 763460e1ee8d5df6a6b3ad0b742b3cf617e3f49f7001f7d951ee1f335a94aae773be40712bff26c8d83e380908a3a46bb26d6cf476e7ba6c9f6d33cd78539e13 SHA512 b68b196a3bc833d05d871b5e8d9abb93922a610b86c66f40db8defe446ca741415bb2ffb9083b45159700f5b1d82ba494efdf2407a26d2956e57428d38d5f59a
-AUX multipath-tools-0.8.4-respect-flags.patch 736 BLAKE2B 43530a05c438385a90e198631effe0c90a7789b2ad441260788529bd5b9e9c7f3f085ad396211cf0fbe6842d95cd5f59ad6e358d5f9d302c72449b673660df72 SHA512 f9e3596518011fb8b96323b52292978c46a06ce4c6b273469077507b68bbb25aff087e5b170f8def4621a635676a4fc82ea960e3359b73c5a5d23786903724ed
 AUX multipath-tools-0.8.5-respect-flags.patch 542 BLAKE2B b60dda770d8441bfd4026bb4b0dbcea6590e71b8d3da0d5645983a6e8e4ef5c00c0283682f9de335b029d3817786e6512c852ae411efe0cdd40416eb970f33e0 SHA512 89d9b9ec971a7afd5f80e19d9b8b691763c3f8a093e99a229a09307e44e5661b4952eed86e732279c0820f15b8f4c48b803823cf27830d03ca7213f9a7364c47
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
 DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
-DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307
 DIST multipath-tools-0.8.5.tar.gz 494750 BLAKE2B a42d17a47631107433a1d0a9da69a0bb10d2125cb242d2125d67da18f6bc6231c9233b163dc1d07d88dcba9f912830c047fdee5b42435f59ea2976598a72fd75 SHA512 f62a09107ccb18ffab97139fe2dba3dc22450836d8669c4381a8bce4072672a027a3a1e687f33e374429bffa49b3ba4a54d1e52294044d7bc1f82ed5d5aaf760
-EBUILD multipath-tools-0.8.3-r2.ebuild 2214 BLAKE2B bf6650365f7fe7548f6643e5935752851bc8b89ce0e3276f90d74398e8e198ef9cea082136781f2e89fb1447bdcdc8830478757fc347597af62d5b366ecd87fe SHA512 e01fe5c6c6ecd49c09afb3f9920a15d70d487d11c9a06a3214cd10a91170f557f152a847b867756cc61534edb0f9d3d21f75966e60fa77ca5b7fa7419e26e50c
-EBUILD multipath-tools-0.8.4.ebuild 2214 BLAKE2B 90daeab97f15ecfe9ffae2158825dce22578cf0d77c6bc576ad55d643a88759083c4270c3923d587ce7aa78709f2d14957c16209c745273ef085011b39e4f0aa SHA512 c748accc0babbe40ab7e8c5950a12df281bdf47a700e62d9b24c4737d5df967fbf23e5ca3902cf13c2d86fe9c26b9be8f15d1ac4b5f8d829e6a50382d5615409
-EBUILD multipath-tools-0.8.5.ebuild 2118 BLAKE2B 5020335e17c20232ca0d64aa6d80c089a94ecd85b62fc64bc02269bdb178927c1753df4674d85fb737cfcfbb7a1a67f700f438de7713be9d003a5dda2ba3f684 SHA512 6d94404ecc15976d43852cef103ed209151b17d1e16c78d1fe37fa7e81c0aabec04ae10f19308286a1876bbf5dae9c8363966add61e484b10dad8b68050a49c3
+DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
+EBUILD multipath-tools-0.8.3-r2.ebuild 2198 BLAKE2B a3fecefa7f8f07cb631b281a46bb918af85d5e6981b4244aadedf4e3e3ea18136248a462691e5e05998b56d4acc1b935500aa42859da78e8fb4c80fecfb0d8b7 SHA512 48bd320edd11c0e7fa71883bf9f72d05ea1144fdc9c79dbb1edeb0717c5eb51de408e421707fa80a1b3542ec41dec12b07e20999dbf950a3a7d6c0c9c6f8b11a
+EBUILD multipath-tools-0.8.5.ebuild 2102 BLAKE2B 42ad8f9fe928f0a57ecaf4868d65d3844da06d7de251188996452d9458e061b9462ed7a98785f15c44db94dcebf2840006d6d34a89d55933ec5d2f57d31428f6 SHA512 dc5dadd33046a8bc8c8f90d1f1badf5beae4119ef6d156b07b69dbf463203521a5f5de304ca066a0748d4a5f0dbc13279c4a960d3bdf85af359a9c7eca414156
+EBUILD multipath-tools-0.8.6.ebuild 2083 BLAKE2B 81d32b95ee8a89ad5cd2aa5d11d25490c1c66cd14f03ae9bf156b72e96a6da9cec4acf4f794fd20eed76903bf5b5d6163b26141688188088d0b3a21c4698d0f5 SHA512 0b42a0a299c5008ceefb04c6fa8bb52c90b9aadd32cea0df09928ccbd8bf233583f08ea145228098a17c2ccab4762dd8ab3bb4703471bd89d21192839d3a1b34
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch
deleted file mode 100644
index 651cd04f59fd..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 041472afebd1e621be1143f2bfb4c5650df171cc Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 11 May 2020 11:49:58 +0200
-Subject: [PATCH] multipath-tools: Fix parallel make issues
-
-build is broken like this (tested with -j16):
-
-  x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -shared -lpthread -ldevmapper -ldl -L../libmultipath -lmultipath -L../libmpathcmd -lmpathcmd -Wl,-soname=libmpathpersist.so.0 -o libmpathpersist.so.0 mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o
-  building defaults.o because of defaults.c
-  ...
-  /usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lmultipath
-  collect2: error: ld returned 1 exit status
-  make[1]: *** [Makefile:17: libmpathpersist.so.0] Error 1
-  make: *** [Makefile:29: libmpathpersist] Error 2
-  make: *** Waiting for unfinished jobs....
-
-install is broken like this:
-
-  install -m 755 libprio*.so /var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath
-  install -m 755 libcheckcciss_tur.so libcheckreadsector0.so libchecktur.so libcheckdirectio.so libcheckemc_clariion.so libcheckhp_sw.so libcheckrdac.so /var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath
-  ...
-  /usr/bin/install: target '/var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath' is not a directory
-  /usr/bin/install: target '/var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath' is not a directory
-  make[1]: *** [Makefile:28: install] Error 1
-  make[1]: *** [Makefile:38: install] Error 1
----
- Makefile                           | 3 ++-
- libmultipath/checkers/Makefile     | 1 +
- libmultipath/foreign/Makefile      | 1 +
- libmultipath/prioritizers/Makefile | 1 +
- 4 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 1dee3680..a9ade94f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -29,7 +29,8 @@ $(BUILDDIRS):
- 	$(MAKE) -C $@
- 
- multipath multipathd mpathpersist: libmultipath
--mpathpersist:  libmpathpersist
-+libmpathpersist: libmultipath
-+mpathpersist:  libmultipath libmpathpersist
- 
- $(BUILDDIRS.clean):
- 	$(MAKE) -C ${@:.clean=} clean
-diff --git a/libmultipath/checkers/Makefile b/libmultipath/checkers/Makefile
-index 02caea64..f201ca4c 100644
---- a/libmultipath/checkers/Makefile
-+++ b/libmultipath/checkers/Makefile
-@@ -24,6 +24,7 @@ libcheck%.so: libsg.o %.o
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install:
-+	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
- 
- uninstall:
-diff --git a/libmultipath/foreign/Makefile b/libmultipath/foreign/Makefile
-index fae58a0d..567deebd 100644
---- a/libmultipath/foreign/Makefile
-+++ b/libmultipath/foreign/Makefile
-@@ -14,6 +14,7 @@ libforeign-%.so: %.o
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install:
-+	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
- 
- uninstall:
-diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile
-index 9d0fe03c..b0b0b522 100644
---- a/libmultipath/prioritizers/Makefile
-+++ b/libmultipath/prioritizers/Makefile
-@@ -35,6 +35,7 @@ libprio%.so: %.o
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install: $(LIBS)
-+	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL_PROGRAM) -m 755 libprio*.so $(DESTDIR)$(libdir)
- 
- uninstall:
--- 
-2.26.2
-
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch
deleted file mode 100644
index 5e5258405b4f..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- multipath-tools-0.8.4-d491591/Makefile.inc
-+++ multipath-tools-0.8.4-d491591/Makefile.inc
-@@ -99,12 +99,13 @@
- 		  -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
- 		  $(STACKPROT) --param=ssp-buffer-size=4
- CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2 
--CFLAGS		:= $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
--		   -MMD -MP $(CFLAGS)
-+CFLAGS		?= $(OPTFLAGS)
-+CFLAGS		+= -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
-+		   -MMD -MP
- BIN_CFLAGS	= -fPIE -DPIE
- LIB_CFLAGS	= -fPIC
- SHARED_FLAGS	= -shared
--LDFLAGS		= -Wl,-z,relro -Wl,-z,now
-+LDFLAGS		+= -Wl,-z,relro -Wl,-z,now
- BIN_LDFLAGS	= -pie
- 
- # Check whether a function with name $1 has been declared in header file $2.
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
index ab5b8e5272a9..2949cba6cbb6 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
index cd850ca74aec..963e074a5ac5 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
index ab4f6f9cd3c8..ba7a9c7725ff 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+inherit linux-info systemd toolchain-funcs udev
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,10 +34,7 @@ CONFIG_CHECK="~DM_MULTIPATH"
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.4-respect-flags.patch
-	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
-	"${FILESDIR}"/${PN}-0.8.3-json-c-0.14.patch
-	"${FILESDIR}"/${PN}-0.8.4-parallel_make_fix.patch
+	"${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
 )
 
 get_systemd_pv() {
@@ -83,10 +80,12 @@ src_install() {
 	newinitd "${FILESDIR}"/multipath.rc multipath
 
 	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
 }
 
 pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "If you need multipath on your system, you must"
 		elog "add 'multipath' into your boot runlevel!"
 	fi
diff --git a/sys-fs/progsreiserfs/Manifest b/sys-fs/progsreiserfs/Manifest
index 351f0afc5638..dc82dffa6a50 100644
--- a/sys-fs/progsreiserfs/Manifest
+++ b/sys-fs/progsreiserfs/Manifest
@@ -1,4 +1,4 @@
 AUX progsreiserfs-0.3.1_rc8-autotools.patch 271 BLAKE2B 5c07213defa727f9e588615483961aa5db5a533ea035d4d1dd898d2316531f357e2129daa2398449d3d4d2355b8b654295e37e470b66766c55f5413c86763af5 SHA512 5db538c3bdcd4463879fc267288f76e50603d8693fa8009ef33247be7d1b89f9cd526a73e47e717f92e1217795a215690263400755ae13de2f636111f67d075f
 DIST progsreiserfs-0.3.1-rc8.tar.gz 399279 BLAKE2B 536d18ce186c9a3b796c01cdad5f622befdffcc975a82ad24d0f2dbbc3b3bac8530231bd51d460033f9ab0bf1577d533faf17f4ea5548b175a708ddc924c50f0 SHA512 65266ab5a598b2073e6893da6554bdfe43796be3bd608eb7c4f687c3ef6ed395ce67def49b62d2b3705dfdeb38bd5f5d1c91fec6ad7323788d490058b015c26d
-EBUILD progsreiserfs-0.3.1_rc8.ebuild 1292 BLAKE2B 516401576e1b924825733bd0ceb4d1ee536627007a2a83cde7e9f1e25f429be4523b506cc364777a8bc862a7353cf49785d739363654d1955701da47da4a1670 SHA512 d189a22f40363659b939638b20140ea0e566c29ad0245f4e52cfcd2b9131d003dbf96c3166d33f395325b6f5c835e9fe93db40b4f26700c40ce311c657dc3d99
+EBUILD progsreiserfs-0.3.1_rc8.ebuild 1292 BLAKE2B 7493fbfc4bc00298fa24311fda7ea0373a1fe8b8fbb0a4954d1214a96ca3257aae655f2f9db21a5aea00fed2932f446c7039989be696de716089db8796296a72 SHA512 22a0de9390ff0eef0431d236c765203e699f1a0bf21516776eb07862b22233fc039bcee6f6ee19ece88df4fdc59014a08104e251439963ec63ef7878a934a8c8
 MISC metadata.xml 425 BLAKE2B b96ad015f772cf4af772ccbf06e6db5b4ded3c7b5ddc7ac7c8446eabf9325422c649f49ae94fd95f33252aee4f64e1502afb4d5bd16d0591be1624169f9cf6fd SHA512 55c54a7c00dc1440503494b4f5332d2c82e9775ad652f3d3f5a950368fcfb55dc2e00cc6a5a999e8bcdf5ddd2c1c30567934f74be0b82533caed15ccb87ca017
diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
index 4d7551d17106..86acd4a58411 100644
--- a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
+++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils flag-o-matic libtool ltprune
+inherit epatch flag-o-matic libtool ltprune
 
 MY_P=${PN}-${PV/_/-}
 
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index a58ad3b0a9bd..5955fd5e9e92 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -2,7 +2,7 @@ AUX reiser4progs-1.0.7-readline-6.3.patch 472 BLAKE2B 88f0489b88691e72a881314542
 DIST reiser4progs-1.2.1.tar.gz 980203 BLAKE2B 8c9cb77458c083c50f34c17bddf4747b755b52b911a63835152ad584494c2738a5317c28e5b3f1e6bfdc49416f3715ca4fbbd9c8a428b5b484b54f8f4a861a58 SHA512 2caac5a98d672d68910c6df3e694a42365fa6273ae367c26126778c1fbe956aa502dac236d36c3302a5bf109468ad3447e645a6eab89c83f122dd1afe2aeda21
 DIST reiser4progs-2.0.4.tar.gz 997361 BLAKE2B 3d083c2c702f6c469403447bd2bb59257c22a6f87e062b83227c97147c37e69f93f1ffb6a1ea2c9f23f94a5ac8fcb834da475893c9bd268fc8902e6af2af4c10 SHA512 222eaa69f89fa1cfad2b5791af028560fb6e57e44fbb5e025122c25b50dd4aea28a8fd362818a884fa6b3d6164e5b0c78ab63f0649e2e65780f1aee2c0d26375
 DIST reiser4progs-2.0.5.tar.gz 997516 BLAKE2B 38799bd2161ac3ad631b3f11f4f01f647fa8210786fa4aeb290a84dac95080cdf979be1cb4526abf08567e88f25aad54a3d776be85900e702a7325e674ddd0e1 SHA512 1e1f263828bd5f44837bcbdde072a94b2cc5a099dbf52d3e0f7f6851812fb2e8b77a3edcf5448f678304e23240c63919547a9671d36b816f97f989b17b494d27
-EBUILD reiser4progs-1.2.1.ebuild 1295 BLAKE2B 8ef4781ad4a121a92f6c732ba92eb8d6adb51f918eb975eb7cb97969135d1380e41bb1b010788ebd970805d29d8ca7267387ed3da75943922ac0fad729066ef1 SHA512 81f2db7655fe926394e628cacc97ef1d1749a4387393a7c04575cff245268f42b8e9fa58c974a5a8647b9d34f9e73b4f9b596dc70bf512f53b90fd3022af9fdd
+EBUILD reiser4progs-1.2.1.ebuild 1288 BLAKE2B 0b7ca382987ce89c562872041157c2cd3eeffee56efb8fb7ee0cb1ba895caeb0e9421e4e071f10dd46f453fefe0a1be21661bc13ea3e5e28d9d26d87b1e8b575 SHA512 425f5935fae4b159a56717e611df6bb2abcab657058ed96326d7858370554aafe37bc1c4b0744e7dd368aaa6423b1e2f481917d6bf5735b5a7adabb1cd7d4975
 EBUILD reiser4progs-2.0.4.ebuild 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246
 EBUILD reiser4progs-2.0.5.ebuild 1348 BLAKE2B 0cc2709ae7e786fc83c57d3b48fe6afa644851068318b6d569be48fa98a4f14e5ca98662c7eb213dbb6be9d806096a27ba76a550d9d30caa21595eeea0e47885 SHA512 463266de436ad30c3eca89b4b109be2b8f3f1fdf8508a47e4442c8ed38381ab4ba2c510dbced86792038818b7b7a722747ff89b72d1c9acc0311e20dfc8508c9
-MISC metadata.xml 327 BLAKE2B dcc63f48d652f59288d08c38c2f0e430bc15f4224e2b5cf8b690e4e2cb1bcbd7ff97151d2e13f7482f21c1e9a92f45b867beef2aded7bb090f9011532c401e93 SHA512 f578c1f4305a1e24c06dfc53231a053cffde7ddebdbd7f61dd0fd58b650dadc8bc1cefa48213ca9734e081d30436bb7e5a093682eccc1a4a1a9e5bf707d61846
+MISC metadata.xml 240 BLAKE2B 0d7e3f2595807ed2a0e8708c7769497a8cd181b9256b3d5c15e41fef923bb9748d799325a038679fe78867ec4ae788c95a02d7ff178d8f5c095b866122b4acd5 SHA512 59f5b3dfcd9b7df8447be8b098b57a611e1e29e3fe023f531585f157c5f89508ec6e185dbb4e856aca651f88070f99c3c9c581ec3a1368ee4a9ae35af1aed43d
diff --git a/sys-fs/reiser4progs/metadata.xml b/sys-fs/reiser4progs/metadata.xml
index beb7d59cfa8e..5d4273ddb35c 100644
--- a/sys-fs/reiser4progs/metadata.xml
+++ b/sys-fs/reiser4progs/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="sourceforge">reiser4</remote-id>
 </upstream>
diff --git a/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild b/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild
index 77fd55138b22..4488c628a154 100644
--- a/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit multilib eutils toolchain-funcs usr-ldscript
+inherit multilib toolchain-funcs usr-ldscript
 
 DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
 HOMEPAGE="https://sourceforge.net/projects/reiser4/"
diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index 7f155b389092..d733cc1379f6 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -2,6 +2,6 @@ AUX reiserfsprogs-3.6.25-no_acl.patch 274 BLAKE2B 1b49c0c98d935c1bfcb0191882a7e8
 AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc299fdd3a4529bc29370ffa8129499ac9d6e1f0a7ed66c93fefa1a647a304ae77309dc87deeeb8b29961398e509f30d0cb27 SHA512 74332f8acd84a3d0374d6ff9803e63bc78ceb18ec130fef213bf326a6b146b8e4951ac8aee5b7349239716627889febd1c832862ae058a822cc71b0a75333d2f
 DIST reiserfsprogs-3.6.25.tar.xz 448984 BLAKE2B d9f032e51f70497cf84f5877172b68e8acacf8fecb3fee7d7c3d82c98cbd5c70f870baa96471b02f092345a86bb02501bd53156cc8e7e3230660a7a6865c2421 SHA512 247ca392d227680fb24e94cd490319e77e82d00d7d357516690d2cab6f0bbe8b35879f8a25ed5046bd3a7a3e1f2b140a8a82404043aa0e7f6f60f57d069857ae
 DIST reiserfsprogs-3.6.27.tar.xz 449176 BLAKE2B cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341 SHA512 bc524aa1ad7f8502238761fd185bfb8473048947bd579e2803c73371928c6b245e0d90bd9d458f4bebcbf163892dbc9f4bae65aec68ebbaa436be7451c13f50c
-EBUILD reiserfsprogs-3.6.25.ebuild 1196 BLAKE2B a604d14eb3a004e8306bbac4c75e89647faa0c9440f241ccb8361d7dfa1bb1d525045c4a2c663d4adb18cf4ddf0741a09571a38a2de6884fcc6fe2262227ec53 SHA512 86a4f031a2ea1dd03899d6caac2355bc544a0714fbfa9fe2856216adbac9b8d1b7b6de4b8263728d265d1d27a097a03641d8e35e164d2cfa4793e0cc16cccf94
+EBUILD reiserfsprogs-3.6.25.ebuild 1196 BLAKE2B 29c7ee0a6755b04b1538744601805955a5fdad1d8905cee14820c9d31624757c1cccca55622fd491ce17d77c0211c78691054fb931ea4edc4549a336a80a0c5b SHA512 badcd5a731adb562abf86dd2b9a79d80fc7b1ed23f2131b571efa44683287de19314c490faa61d0c100cff7f771203088f19bdb40230e70f6251eadd12d0905a
 EBUILD reiserfsprogs-3.6.27.ebuild 1255 BLAKE2B 733ae69b51cc97a7a18f48e5add6ec854bd48b75232c7242b9839b415e12cc0d08c416efd88b7c6636be0fa8d7b67283c897c584dea94186a422de57d07a106c SHA512 cf818ae77e507987175cc9553252070178a9e288cafaa13b279976acf4e63a92be0b46952693fbe02b6f5a51e4a913c703aa7909c21f1d4cf8ff66d94149877f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
index fd206ba0d7b1..558d74239bf3 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils flag-o-matic usr-ldscript
+inherit epatch flag-o-matic usr-ldscript
 
 DESCRIPTION="Reiserfs Utilities"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/reiserfs/"
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index e7561ca250fb..2335a4558d51 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,6 +1,8 @@
 DIST squashfs-tools-ng-1.0.3.tar.xz 1101820 BLAKE2B f21cef44d5dc3cae01733bb720ba472d02777d2b69a3e428dbf4d0f64ad46a18131dae807a9ef719e29698b06ff04a82de1906876c40aef336aa57a75eb3fde3 SHA512 32e0084b1343de07b450e5337398618475a57c91c6f351c73bb7aa3dd6b5dc83aeca924f3d624ce802c9e1d600389a76cbca7b841104259d32f3ef2c7f13db67
 DIST squashfs-tools-ng-1.0.4.tar.xz 1103996 BLAKE2B c56b02932cdb4116fcec582f674771f27f67cbec51ca8d31beb1fbccef72fd06a82ee5981fb2dd5f6e7297180d1774d856c24ae447e95687f6f7b970357b807c SHA512 c0a24be6b07739713213fc5936506ea7c1f62fa461f60955986ac4dda6958203e74336418abe615ecc85c62deb085039ca375891538ae01c21672d4911091614
+DIST squashfs-tools-ng-1.1.0.tar.xz 1169556 BLAKE2B 87222e87176a69aef39130af9e6d9b23d9e2f81e10680eb26236260ebe50dedcfbba33785d739a98a152825e535d0d166f7ce08262157341a6ef48d1d2ef33e0 SHA512 06b76fb8bb4295ac451bc98cbe757b272ac831c2ec146803b4813b9792486372691864fcaaa1a3cac6628608ac62cf081f1aa331c0802ea1a9858461fef33923
 EBUILD squashfs-tools-ng-1.0.3.ebuild 1122 BLAKE2B d7dd3c7314464d58d15f6229a52ee3336d853fae9f3238459202f385dbf253906b6a94fd4ea4469ccfd756abe4c504a3a40ad6c1f4442dd41b7b0448d29fde9e SHA512 d4c951eeb931881b710cdddafb381492b1698ac9b86506a73a73b346ace42f4048420bd035fff53a5bfa08bbd7ffcd958f254a4eef24316326c86fb92ae5214a
 EBUILD squashfs-tools-ng-1.0.4.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
+EBUILD squashfs-tools-ng-1.1.0.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
 EBUILD squashfs-tools-ng-9999.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
 MISC metadata.xml 556 BLAKE2B fcff50b7024c1743fb7d7e677c04865bba266c011305d701b4a27b1ce813eb492b6becb64b5f1d4d52a3efd5a80d3369ac88ac65c2665cb0121c6b59d592b966 SHA512 cd1de16571ec7651bf353e804c8f44cbe6a919c21577a832782d8213e7e956b5af1769889eb1631f1a97c44b89018d484122fee59bedef4409363901101df6e3
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.0.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.0.ebuild
new file mode 100644
index 000000000000..22a2dbc93b62
--- /dev/null
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A new set of tools for working with SquashFS images"
+HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
+if [[ ${PV} = 9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
+fi
+
+LICENSE="LGPL-3+ tools? ( GPL-3+ )"
+SLOT="0"
+IUSE="lz4 lzo selinux +tools +xz zstd"
+
+DEPEND="
+	sys-libs/zlib:=
+	lz4?     ( app-arch/lz4:= )
+	lzo?     ( dev-libs/lzo:= )
+	xz?      ( app-arch/xz-utils:= )
+	selinux? ( sys-libs/libselinux:= )
+	zstd?    ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_with lz4)
+		$(use_with lzo)
+		$(use_with selinux)
+		$(use_with tools)
+		$(use_with xz)
+		$(use_with zstd)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index d4eeb2287a1b..d60c4ccf33f4 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST squashfs-tools-4.4-git.1.tar.gz 241963 BLAKE2B 7a80c353efbbca851b2eb44e742f20b4cf59e91058b53b77c74d879dc18d882e3bb6de8a010a4469c0a53384ccf2968bba4cd1d6f10cfcede70fe07eebbf2409 SHA512 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0
-EBUILD squashfs-tools-4.4_p1.ebuild 1314 BLAKE2B 6dc4f62605de8c1a4cbec46bf85288c92f5f44285186028c3e7e2dec5a6b23dd90f93cd3c160eba160e3336a5783f9906df43792c0fbb60d6107249b421189ad SHA512 1d0a38dc2be5460960245f5ed789fbef18a1a382792d274b2abba8db0e05959a1ca5ac9733d9741ee26d47cdcf655f40b81d38a6233bc10de8030c1a3339bf97
+EBUILD squashfs-tools-4.4_p1.ebuild 1315 BLAKE2B 5b64d6ab302b07973be65fc4d93219f32e93d348f2c4db4122ba87f47b589d70966ba511fd14de6ae3eb4f34296d4a0c610dbee28b0f5c7086543f3f8d79aa35 SHA512 1e299fcd3c0f6e9920b4f28549bc42dc7900e62b82adcbd57428edf22f65a449e4f4821fe223d4af2310746159635a3fbcda0b7bfcecf451c9c64500597cb1cd
 MISC metadata.xml 325 BLAKE2B 69746d14350ab40f297e7944dd2ffa3af61c6b7890012856fa7a8c8971246591844a078f3ca79cbc579bbd1d8d5fad5e6c8338766a80d4a2d068219ac303e77d SHA512 452fd4de6f1a2ab284e8dd388c18caaf75bba2c07bbf3eb5d990259d92ed6af0f7a2174a85998214f17a09f087f796dae7550e09ebfaad15c6a8ca514335afe4
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
index 21394c8c9e94..f3ca8774fcad 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="debug lz4 lzma lzo xattr zstd"
 
 RDEPEND="
diff --git a/sys-fs/static-dev/Manifest b/sys-fs/static-dev/Manifest
index f7b851c4f0e3..443f25e88ece 100644
--- a/sys-fs/static-dev/Manifest
+++ b/sys-fs/static-dev/Manifest
@@ -1,2 +1,2 @@
-EBUILD static-dev-0.1.ebuild 1143 BLAKE2B a7365f211de8110c0965b1ffbc14d243844322da1ad4eb694e2bac7409d10f53a2bcbcaf331448a98fb1f0019702df17797b7d905f2ecb145e6dadcfa2c745bc SHA512 a1ee6c6714d0abc225bed3067b2a0cdf1b51eb96d36260055fb52c17a94d374fc10eec78923beedf243480657562c999cab1a93bb43dbff40c009332c7aa471a
+EBUILD static-dev-0.1.ebuild 1144 BLAKE2B 82122b25e84a1a130b3b00afa45350d4d32b7dd2cc6211b7878dfe147ba00bc3e9cd3fccc75d4c2d881ba572fd4f51c8ae434e052fba869f788e3b020e1a4da7 SHA512 ae26f2c302bea959dbae7ff59bd3e30931f7b871e130aff0f40111a829a7fe972dfb91d4ad810ffa96c1dcaad404af202cc1cc309b92f50fe10c0ce7bf130dcf
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/static-dev/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1.ebuild
index 9140ba94e4b3..c1a62712d168 100644
--- a/sys-fs/static-dev/static-dev-0.1.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="sys-apps/makedev"
diff --git a/sys-fs/sysfsutils/Manifest b/sys-fs/sysfsutils/Manifest
index 3595525bc01f..f01679bb705f 100644
--- a/sys-fs/sysfsutils/Manifest
+++ b/sys-fs/sysfsutils/Manifest
@@ -1,5 +1,5 @@
 DIST sysfsutils-2.1.0.tar.gz 788885 BLAKE2B faaeba9d156e48b98ecc50c28711205dd7b99da4966206493f2b63d8a7a3e730b6564a1dac9304c8af56c516e5a13d6d9cf1ebd8773563617c3acc2387059a09 SHA512 485902d98b41a69343cb037883d0c0a1de8a1a4aed657cd4528fe10bc845ac51629657dff01deef042e57c9bd9243095e23fc931d06d74db31b03c5f0a18cf07
 DIST sysfsutils-2.1.1.tar.gz 78823 BLAKE2B 2249a9b7b95bd63be14d60fc3f38d569ee40624885d04391e1fd1d3927abc0695977f456d76214efacaa5149fd860ae1bf4ed0de8d33ea2aa047b446904195bd SHA512 7e1c8535be3c29dec8e23e8b6e8d3ec794bbdc696f161fa38731844c82cc1d37ff04f94c8b0ec0cf8da7147fc696dad0086262641984fa67378ffd2f162dc358
-EBUILD sysfsutils-2.1.0.ebuild 963 BLAKE2B cef3f293bdfdb117dda03f184f1cc699a9a0b4d55b5830674558232e1fe32c7cb6372b18537cadd7255902c75b129705060000cc323f2505701d363e5f744c20 SHA512 46de2b7ca69bab0771b97d247d531167e03f449c13161dbdd93721c0c42994bf35071deccef4f757d16cba1a1125a0cf5e25616769f8d21bcec8a12fa11308fe
+EBUILD sysfsutils-2.1.0.ebuild 964 BLAKE2B 6a3caf2de37840bfbd18463398699f11c92ae313de22a5b88251ef2751a86d694c91535b87e06b164c2d744e8c56f29856dfb86ec73a11eb785a1e21fb8a8c55 SHA512 9e0f572a3bafcc362f31b9408905d668dbe9aeb05854d150c800470f6c20abdcd4733b9fe762b44ed05eeb96eff987f73face0a6f5ef63dfc5c625ff9cc05901
 EBUILD sysfsutils-2.1.1.ebuild 972 BLAKE2B 75f45a89e9ec862ae8612e279b32265e16e4942d3c17727c456efbcb3a07a02fd2de087b054cc0d07549d4603760265fe0397585e07070150808e964b508a4a4 SHA512 e58520f7da7f734c14f44462083a9a73c6a0fb54a54ff10228d4f2304c9a796658227e13760cc2f1a58b2a48f10856952626f63997013a1b51c63a885afeadab
 MISC metadata.xml 330 BLAKE2B 704f504eef71b56802b1d24554ea1e4887cbaa3bc859021c9decede47242997906e1e87cf18a9a0a7668000a629c5a48699d09b7ebc4532cb304899d61a5091e SHA512 16dbfcfa75389172827d78272e473ea69b20ac564ae8c17de031599ccbb5166ffdb7e42208b52e6ba53cc5bda75075c980c7954516646cc0fce4fb56e431070c
diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
index 6f67ecfa8829..fb7858589804 100644
--- a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
+++ b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index 7329ad58f83c..5abdd42b8523 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,6 +1,6 @@
 DIST udev-init-scripts-33.tar.gz 3698 BLAKE2B fc79b3f6984131180324919f7be4309715976309ee582147662634bb020b8162b293e7fd0e675a9cc7a3b1630ce0fc49b29c899e393c7748d47cf924b1ca2809 SHA512 2119aace937da02f47a5adc9af720587d25c2852cf70a9bcb04138e3ee511308c8f30cf0301fbec58cf0432b7fd6672ae6a02d1740c774703959197b3511fbcc
 DIST udev-init-scripts-34.tar.gz 3660 BLAKE2B 954b003c78b31649fef69213a5424098f40e17e7ed11f4ec1443247950ea60db8536f37ca603caa06e5c9f8bab07b5ac3cb8c9435144532a97ff04836c24da49 SHA512 ed48bcd0815e235b2b3fa38f857cd97f164aac7c6ea805be87890eb06a0d52064bd733da240c6e2a34c8c73e10fd047b5e53096de06f17bc81d8266d70c0cc9d
-EBUILD udev-init-scripts-33.ebuild 1494 BLAKE2B 1acf9890fb8edb06696a0987da6c1d669466b93151098c4e8a8ef87f60fc90deab921dfdd2e2e3791e992009479d0b02117d7ddf57c25092c9e97a7473e24830 SHA512 cb0d39a1a39b2b98502a43d7f13d55b2e793c85eadaea67cdc0c78df6998116141feafde95213b29cbb4a546170b64b0c840bfbc0006165af5c49f8dd83e06c5
-EBUILD udev-init-scripts-34.ebuild 1494 BLAKE2B 1acf9890fb8edb06696a0987da6c1d669466b93151098c4e8a8ef87f60fc90deab921dfdd2e2e3791e992009479d0b02117d7ddf57c25092c9e97a7473e24830 SHA512 cb0d39a1a39b2b98502a43d7f13d55b2e793c85eadaea67cdc0c78df6998116141feafde95213b29cbb4a546170b64b0c840bfbc0006165af5c49f8dd83e06c5
-EBUILD udev-init-scripts-9999.ebuild 1502 BLAKE2B 37464301789e4136261003f133a06b7f0f692ca30fa1a6509e621d4a7ab0dc4a300a9718e5c9dc4e9adf6818fac510729f381864b9d9d2453c095fa293cac187 SHA512 352ad2bbb4407cb664897de841345946856cad1adcb05a7c360cf52c98706d488c5ce1eaedad3e68304d04c2980c7a07b54227e50b6c33e5176cc9d84234b24b
+EBUILD udev-init-scripts-33.ebuild 1495 BLAKE2B 0f17a5bb8b9fe6d0f1655a4434d110e13c9a2d0fb70295bc01fc63aac4ccb8ea062dee1a170220f04bc96f0ea677bd2d0611afe542dbead741a85e5f25093607 SHA512 1441b5f3de48aa861ad7e106d15e7ef334ea4d0d284bb9226b8121e6ba7722f05f67b405500319ea494a7c89c944d9f512277b7125d15d89b0d57494db114fba
+EBUILD udev-init-scripts-34.ebuild 1495 BLAKE2B 0f17a5bb8b9fe6d0f1655a4434d110e13c9a2d0fb70295bc01fc63aac4ccb8ea062dee1a170220f04bc96f0ea677bd2d0611afe542dbead741a85e5f25093607 SHA512 1441b5f3de48aa861ad7e106d15e7ef334ea4d0d284bb9226b8121e6ba7722f05f67b405500319ea494a7c89c944d9f512277b7125d15d89b0d57494db114fba
+EBUILD udev-init-scripts-9999.ebuild 1503 BLAKE2B 40a3434e8a5f3cc00fbd05b90a1fd4f0d0695f5d7a8145717c30645521dfb36b07b3c7ce2f7f55ce7a463b5839919d23e8eab6226c54aeff94fb87af6a318782 SHA512 207fa982f43e11862aa4ed3e8be3d79bece4150ca606adcdc702ed25ac215e54324f50311cba8b8d6a6ef6451789afd6e6b291f40e070ff754c12109a09a518b
 MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
index 4dc6675505f4..26fa347f726f 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.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 @@ if [ "${PV}" = "9999" ]; then
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${OLD_P}"
-	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="udev startup scripts for openrc"
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
index 4dc6675505f4..26fa347f726f 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-34.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 @@ if [ "${PV}" = "9999" ]; then
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${OLD_P}"
-	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="udev startup scripts for openrc"
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 6086fa54d5fe..ad1b32f6671d 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${OLD_P}"
-	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="udev startup scripts for openrc"
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b351480885f9..b6df20212d42 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,11 +1,13 @@
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
+DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af SHA512 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
 DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
-EBUILD udev-243-r2.ebuild 9823 BLAKE2B 4eb1fc3edd8f76e556c526828018a16f8c461ecd305abb5a7816296fc4338af724b8063deeb6e85e2d8d168f25f44294cd0a15a1c71db42e6ac76d4ddbed493d SHA512 1c1d0fcc4c12f09b6b4345fdfc29a482ea75c61ddf2e23f996848d89aef4d9cd463dbafcfc69b4ea090d438dd60ddfc4343da2a6a4d4c63b79398332dbfb2126
-EBUILD udev-245.5-r1.ebuild 5927 BLAKE2B 6415e0eb60ed92214b8b4f64f66084c9f2ef80dafc5f2340ba20277a696124511d6f2eee40d4975004e538da17189a824e689611af21dd11d4071a9591077b4d SHA512 9d6017fd5495cca410cd3fbf42e0062439734d4d1262c9bbbd9c83c6c0dfefe36eb06e4cca784fd6da728b325cfff5b62f9b782dcbdd58fcdb9d3dd1aa6a7e96
+EBUILD udev-243-r2.ebuild 9824 BLAKE2B fdebd81581f0f7de50739c6c27c9e4ed780ee4c0a4fb7ecae0f46a7ac70e14b411682f26d84d703986d407806709084ff0d3e05febf039ccce40f20875fae802 SHA512 06b3e9d5dba4aa35579f37e897f6eb992b80dee7a79b28376ba269f82bb97d925538fb349af5cf4837b9bc4594884f3a09a4c5d98f4654a31c3867822d5ce754
+EBUILD udev-245.5-r1.ebuild 5928 BLAKE2B 5fc1655db3633cd1a7459bc05d2065a0878a43e8cf48ac6a5957a71b662f9ddce8dd18c906de8707fdf411378ffe82e71b6217f2d6e8ea0136830718af125af3 SHA512 4450cd68fcebc939de12f641f4404570e48b6cb623a4ccc8536dad9d3ca92534d5d2b44b68fa723baf24446b034193788ca4e32ade975f2e4c7413cea3f99092
 EBUILD udev-246-r1.ebuild 5927 BLAKE2B a8830dbfefdb6c12fa7e8d6034bcb9c94b0eb81eee871655e8f57bb3732d693b345588ab6e3f1c211695fdd15e7402bea08ac097c7721998f9625a77ca725430 SHA512 a113458cf68bff8881e0b1c7ff80bc4ff4dbe715dcec7f4f83b264e8f5f0f4c0153a6365ce3e1105d1dbbe8144016d94c1c530397e3ae768f9bc2bb3030428a9
 EBUILD udev-247.2.ebuild 5648 BLAKE2B c99ee7449eecca95e92f2178a2b7e0b38fc9d2211b171539af45d28fd407c31012ab0ca4b877392f39d7e42828686661abfff2ca72efe01ca8f0bdf64b6018fb SHA512 98f3bcc0e3a6277685e52e570e4a6f3d279329ad3fbe6dc0bbb33a0ee7fa7491b422878afde0eeab00223567de3126c331df1de83fa30350919f56d1e7bfa75a
-EBUILD udev-9999.ebuild 5648 BLAKE2B c99ee7449eecca95e92f2178a2b7e0b38fc9d2211b171539af45d28fd407c31012ab0ca4b877392f39d7e42828686661abfff2ca72efe01ca8f0bdf64b6018fb SHA512 98f3bcc0e3a6277685e52e570e4a6f3d279329ad3fbe6dc0bbb33a0ee7fa7491b422878afde0eeab00223567de3126c331df1de83fa30350919f56d1e7bfa75a
+EBUILD udev-248.ebuild 5626 BLAKE2B a01e3a54a543dfb4767f20d7ee66b1366b8360d8ed7addd4aec1905ad917d86bdf28eb7d37f146ea552a163d0a395741868df55aaeece9a86f467f4658c803bb SHA512 b9173e54339135bb0150dbf721d22a157478f3e3cdc81b1d6d608f215275e4a718da019fe780c0a876a1e150bbe76ed6487d76c7577b128ead7ac88b950b31cf
+EBUILD udev-9999.ebuild 5626 BLAKE2B a01e3a54a543dfb4767f20d7ee66b1366b8360d8ed7addd4aec1905ad917d86bdf28eb7d37f146ea552a163d0a395741868df55aaeece9a86f467f4658c803bb SHA512 b9173e54339135bb0150dbf721d22a157478f3e3cdc81b1d6d608f215275e4a718da019fe780c0a876a1e150bbe76ed6487d76c7577b128ead7ac88b950b31cf
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-243-r2.ebuild b/sys-fs/udev/udev-243-r2.ebuild
index c294a693ef17..17bba8fefb42 100644
--- a/sys-fs/udev/udev-243-r2.ebuild
+++ b/sys-fs/udev/udev-243-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 	MY_P=systemd-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/udev-245.5-r1.ebuild b/sys-fs/udev/udev-245.5-r1.ebuild
index cd11295946d5..aa7adfc82320 100644
--- a/sys-fs/udev/udev-245.5-r1.ebuild
+++ b/sys-fs/udev/udev-245.5-r1.ebuild
@@ -19,7 +19,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/udev-248.ebuild b/sys-fs/udev/udev-248.ebuild
new file mode 100644
index 000000000000..177412dc751e
--- /dev/null
+++ b/sys-fs/udev/udev-248.ebuild
@@ -0,0 +1,235 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript
+
+if [[ ${PV} = 9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]] ; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV="${PV/_/-}"
+	MY_P="${MY_PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux static-libs"
+
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	virtual/pkgconfig
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+"
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl )
+	kmod? ( >=sys-apps/kmod-15 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.9
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/kmem
+	acct-group/tty
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/lp
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-34"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]] ; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ } ; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7 ; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+	)
+
+	default
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1" ; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dacl=$(meson_multilib_native_use acl)
+		-Defi=false
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Dlink-udev-shared=false
+		-Dsplit-usr=true
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dstatic-libudev=$(usex static-libs true false)
+
+		# Prevent automagic deps
+		-Dgcrypt=false
+		-Dlibcryptsetup=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dp11kit=false
+		-Dseccomp=false
+		-Dlz4=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	python_setup
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	# meson creates this link
+	local libudev=$(readlink libudev.so.1)
+
+	local targets=(
+		${libudev}
+	)
+	if use static-libs; then
+		targets+=( src/udev/libudev.a )
+	fi
+	if multilib_is_native_abi; then
+		targets+=(
+			udevadm
+			src/udev/ata_id
+			src/udev/cdrom_id
+			src/udev/fido_id
+			src/udev/mtd_probe
+			src/udev/scsi_id
+			src/udev/v4l_id
+			man/udev.conf.5
+			man/systemd.link.5
+			man/hwdb.7
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+	fi
+	eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+	local libudev=$(readlink libudev.so.1)
+
+	dolib.so {${libudev},libudev.so.1,libudev.so}
+	gen_usr_ldscript -a udev
+	use static-libs && dolib.a src/udev/libudev.a
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins src/libudev/libudev.pc
+
+	if multilib_is_native_abi ; then
+		into /
+		dobin udevadm
+
+		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+
+		exeinto /lib/udev
+		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+		rm rules.d/99-systemd.rules || die
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+
+		insinto /usr/share/pkgconfig
+		doins src/udev/udev.pc
+
+		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+		rm man/systemd-udevd-{control,kernel}.socket.8 || die
+		doman man/*.[0-9]
+	fi
+}
+
+multilib_src_install_all() {
+	doheader src/libudev/libudev.h
+
+	insinto /etc/udev
+	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
+
+	insinto /lib/systemd/network
+	doins network/99-default.link
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+	doins "${S}"/rules.d/*.rules
+
+	dobashcomp shell-completion/bash/udevadm
+
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/zsh/_udevadm
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]' ; then
+		udevadm hwdb --update --root="${ROOT}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 276bd37716fe..177412dc751e 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -6,18 +6,18 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript
 
-if [[ ${PV} = 9999* ]]; then
+if [[ ${PV} = 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
-	if [[ ${PV} == *.* ]]; then
+	if [[ ${PV} == *.* ]] ; then
 		MY_PN=systemd-stable
 	else
 		MY_PN=systemd
 	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
+	MY_PV="${PV/_/-}"
+	MY_P="${MY_PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
@@ -72,19 +72,19 @@ PDEPEND=">=sys-apps/hwids-20140304[udev]
 	>=sys-fs/udev-init-scripts-34"
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
+	if [[ ${MERGE_TYPE} != buildonly ]] ; then
 		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
 		linux-info_pkg_setup
 
 		# CONFIG_FHANDLE was introduced by 2.6.39
 		local MINKV=2.6.39
 
-		if kernel_is -lt ${MINKV//./ }; then
+		if kernel_is -lt ${MINKV//./ } ; then
 			eerror "Your running kernel is too old to run this version of ${P}"
 			eerror "You need to upgrade kernel at least to ${MINKV}"
 		fi
 
-		if kernel_is -lt 3 7; then
+		if kernel_is -lt 3 7 ; then
 			ewarn "Your running kernel is too old to have firmware loader and"
 			ewarn "this version of ${P} doesn't have userspace firmware loader"
 			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
@@ -100,7 +100,7 @@ src_prepare() {
 }
 
 meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
+	if multilib_is_native_abi && use "$1" ; then
 		echo true
 	else
 		echo false
@@ -141,10 +141,10 @@ src_configure() {
 
 multilib_src_compile() {
 	# meson creates this link
-	local libudev=$(readlink src/udev/libudev.so.1)
+	local libudev=$(readlink libudev.so.1)
 
 	local targets=(
-		src/udev/${libudev}
+		${libudev}
 	)
 	if use static-libs; then
 		targets+=( src/udev/libudev.a )
@@ -170,16 +170,16 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	local libudev=$(readlink src/udev/libudev.so.1)
+	local libudev=$(readlink libudev.so.1)
 
-	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+	dolib.so {${libudev},libudev.so.1,libudev.so}
 	gen_usr_ldscript -a udev
 	use static-libs && dolib.a src/udev/libudev.a
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
 
-	if multilib_is_native_abi; then
+	if multilib_is_native_abi ; then
 		into /
 		dobin udevadm
 
@@ -226,7 +226,7 @@ multilib_src_install_all() {
 
 pkg_postinst() {
 	# Update hwdb database in case the format is changed by udev version.
-	if has_version 'sys-apps/hwids[udev]'; then
+	if has_version 'sys-apps/hwids[udev]' ; then
 		udevadm hwdb --update --root="${ROOT}"
 		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
 		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 5761d6854019..fb44dbc3d009 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,5 +1,3 @@
-DIST udiskie-2.3.2.tar.gz 92377 BLAKE2B 9351aa4d4b5becce1cf99c49d6906f3b84f5ae559ea0d8d456ad035cdcd85bd752fb02aebe3ef74287b14c668e192d0cd7b9b5a348daba379eabcad32cbe3408 SHA512 f4baa3d48cc9480d0d6c7a24090d6661a36bf9eaf0d2e7797c65318358a593fd88f9d289a89f9f5e14a4b5a67407ae8dc739184359bf533882ad24189c1756fe
 DIST udiskie-2.3.3.tar.gz 92133 BLAKE2B 515673182297f02761f8c354ab9450b04b4533b8165035322c104cbc9aa41da83898dc7e2c371da47dcc8c5dc7ef6adbe5b05f913d77b395d5d8457f9260e845 SHA512 0b0b37dba437fd4af45d0344f36b36ccf0626d18fc29e020270cd567d4912fe1362182a28b55f3dfe1a23922d416cc8d952555e350c7b2d90fb49702dc497ebb
-EBUILD udiskie-2.3.2.ebuild 1003 BLAKE2B 025bf87e0e856e135cc21b078fcf83226c935ae95e855fdcd82bbab75e5cece01fe495ddf338b724ccf22390fec0f4f79d4824a633ce87ed81dcd7418f707550 SHA512 5e9ab3c79b78afa2f6c3143f1df0bfd4138696ae6f49208675d8ae1ff3097cb88895efe174fac0827bffa20d56e3073046a715c0197b823359ca589153370091
-EBUILD udiskie-2.3.3.ebuild 1005 BLAKE2B 7f2e1c0083cdb534db439f7f981d0571163802c42482c30c1ac875f66ab472801cc82714cb3ceef819bd3149ef337b9c42aa23570cc5d6ba7b747be84af08f9e SHA512 032997d18db21a3ea5e9badbfebecb00c480adf7289e19f49a785eb41dba216c77bff7556b6d05f1646cb9930bc33e520e569a1ad636d1fe5146dc459e6c282e
+EBUILD udiskie-2.3.3.ebuild 1003 BLAKE2B 025bf87e0e856e135cc21b078fcf83226c935ae95e855fdcd82bbab75e5cece01fe495ddf338b724ccf22390fec0f4f79d4824a633ce87ed81dcd7418f707550 SHA512 5e9ab3c79b78afa2f6c3143f1df0bfd4138696ae6f49208675d8ae1ff3097cb88895efe174fac0827bffa20d56e3073046a715c0197b823359ca589153370091
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-2.3.2.ebuild b/sys-fs/udiskie/udiskie-2.3.2.ebuild
deleted file mode 100644
index 4d0eaef9ab3e..000000000000
--- a/sys-fs/udiskie/udiskie-2.3.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="An automatic disk mounting service using udisks"
-HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	sys-fs/udisks:2"
-DEPEND="app-text/asciidoc
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
-	default
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C doc
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/${PN}.8
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sys-fs/udiskie/udiskie-2.3.3.ebuild b/sys-fs/udiskie/udiskie-2.3.3.ebuild
index 55fa66a15c5a..4d0eaef9ab3e 100644
--- a/sys-fs/udiskie/udiskie-2.3.3.ebuild
+++ b/sys-fs/udiskie/udiskie-2.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index d9c586292776..62233e17e224 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,3 +1,5 @@
 DIST vhba-module-20200106.tar.bz2 15632 BLAKE2B 9b2db6cab2388fb5b84f2735d41a093af212434de2784f112d212cfc6193b1267ccf0afb222765bc32b0fc455d16bd1f0e98ddf60212735473853ec29ab27b97 SHA512 fc320e1f8f05247b7c2feded1335dce0fcc9a1257127d8d4086db48bd1e082d81b8a88089c04d0b8624ae584f1c0d049544f6f0018ec7dcea20ccfb136cd1bf0
-EBUILD vhba-20200106-r1.ebuild 1092 BLAKE2B fc19695ee2c9635179d71dcde7aca178ca6b6bac3258c534bb1410d107ff98cba005de3e60e3c7a8bc5fd3fa3b67d2886c1ce9550188fa15f602eb79d3b00a8d SHA512 121eecbcc463c064384aaa5a83907482fddf0cd9e3c7c687dceab7a39f982c1af431c7562aec549fe31ab8cb76bd18cb55fb754465da0d8bb16db8e7d5f0f6ac
+DIST vhba-module-20210418.tar.xz 16112 BLAKE2B 89b81e747f10fea4294c79a19b33b7e11e2747b48180a98bebe3a4a46b15ebbd7b7307c37801d4fd56b0d1440c14bc4e7b800846b2788e1a433edd0aee680501 SHA512 f5841f56974faae8317d84100a9e3d3ec80f6b980e7452047852c79b17e963e75f85d6712c64588ce57abbdbb4a8a2b9b10cf752102b145e1667f26bf260b1f0
+EBUILD vhba-20200106-r1.ebuild 1085 BLAKE2B 2ffe6e523bc4397b5cb1efc192075c3ee2ba01b5f099028bcc97e4ff6efbcc9761eed4eb37510e25e5192f5b53520c1fe88a4f8d6a7f7932e42b68f244764f02 SHA512 84929f69863c2cd8ab9ea689a1ebaeeff27fbb2269d2acc9fc1a858419262236bfa8e1697b34867f5f2681d74346d1de1c488ace525f4c8b581a8ae080267902
+EBUILD vhba-20210418.ebuild 1087 BLAKE2B dfb152749f95783d44e0e83757dab6ef703103d148b8cb583ebbddc24e453e8a147b94f4d7b1199be451154d8a8e0ef7de62b8f85924f967718b5e1b331ecfe1 SHA512 09fa9bfe73beb92ee0fcee18a61983db0b168b60beeadd69dc44cb89904b256ea6f49e9912e0a90fc2b1cc4984f6c6e587114ede1065f8307d65c6b24378328e
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20200106-r1.ebuild b/sys-fs/vhba/vhba-20200106-r1.ebuild
index 72b25e972731..c8222ceac977 100644
--- a/sys-fs/vhba/vhba-20200106-r1.ebuild
+++ b/sys-fs/vhba/vhba-20200106-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils linux-mod udev
+inherit linux-mod udev
 
 MY_P=vhba-module-${PV}
 DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
diff --git a/sys-fs/vhba/vhba-20210418.ebuild b/sys-fs/vhba/vhba-20210418.ebuild
new file mode 100644
index 000000000000..458a74bf9381
--- /dev/null
+++ b/sys-fs/vhba/vhba-20210418.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod udev
+
+MY_P=vhba-module-${PV}
+DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
+HOMEPAGE="https://cdemu.sourceforge.io/"
+SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.xz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MODULE_NAMES="vhba(block:${S})"
+BUILD_TARGETS=modules
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
+	check_extra_config
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	# Avoid -Werror problems
+	sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed"
+
+	eapply_user
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README
+	linux-mod_src_install
+
+	einfo "Generating udev rules ..."
+	udev_newrules - 69-vhba.rules <<-EOF
+		# do not edit this file, it will be overwritten on update
+		#
+		KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
+	EOF
+}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 48ae0a54d1c3..1f0946960d66 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,6 +2,6 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
 DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd
 DIST xfsprogs-5.11.0.tar.xz 1297180 BLAKE2B 0ae0c2eccdf124b9fc2f9a4ef71073324f3645bc9a4f2959978fa06ee4dae4ecaf4eee40e6b130b65eb390d8af0f9d1485aeac073a8ac5e30fce46eef9cdb7a4 SHA512 7a77f938a54176652ce0b53cab13509754aab560c02d74ab03a9fcebf2728d703f89ad9d281ef00fcc0dbabb5497cab2b2b656bbe7598037a16fff70126e5d66
-EBUILD xfsprogs-5.10.0-r1.ebuild 2203 BLAKE2B a86d710a998e5731cdc93d48b96ccfc35cc5dd10810d14983d3f64d5e12d4f6c72775d180b981b2d902ef2e20c0e942146a01979f7f35c90336587fe8365eb95 SHA512 64fe3f8d7418ee31e6129fa4d4b0bbdf779b6ff4237d7232612a22e2b513ed968ef2ce3daf47013c48233e8e8d7488b43eb55062d5e2bd32ea65099972690a15
+EBUILD xfsprogs-5.10.0-r1.ebuild 2204 BLAKE2B 7c672ff92985feddd92d9d67135a7c665120a2ce46754c4713286418d963deec23d88e8899479ce07221d4f22e8f12574a5c594f00c461f6ff5797ec48e4cf9d SHA512 1b5e565644800b066a2d84af8d8a2b20148cfa0639172b56f4ead8ecbe9613ad0ea617371692c1179b5e3f626d2824fc39d57d2d2be89fa832d846852e214f91
 EBUILD xfsprogs-5.11.0.ebuild 2211 BLAKE2B f2480a90f8cfa63d45501eda4dbaee60b23de004cb5423a12d31a2f09c2f8894d5cc8b2360bfe76af2c5357b08cbdf8cac10f6e3d78ea7eff9724a9db46d37a2 SHA512 369452f76c744a1b2a0bc0c96e0829bffc0d37778100f77d1058330740c6fc565b82bdfc6e9f44091c563b27c77b26f8cae490420fba806e6d114c189168e6cb
 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
index 2e7069b810eb..19dbee6bd0e0 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="icu libedit nls"
 
 RDEPEND=">=sys-apps/util-linux-2.17.2
diff --git a/sys-fs/xwmfs/Manifest b/sys-fs/xwmfs/Manifest
index a43ea8178be1..6821ff04a2fe 100644
--- a/sys-fs/xwmfs/Manifest
+++ b/sys-fs/xwmfs/Manifest
@@ -1,3 +1,3 @@
-DIST xwmfs-0.86.tar.gz 195544 BLAKE2B 7dc5eb4d7acd585be70c43142b1a093aefecd69d8c51f6dee1741e88ab0c592d195678df107c28426d4eab18ae3d33b292cb0b8ab9c5ab557e1c81d3e557c492 SHA512 2f053c8e7322af39f46c85c46c11c5d215b7797d0ccb8340ba143371f3a5b171cac324936a0559fc3bd1cad0aed31c02576ad71b269052e3d01fb7b896bd1a81
-EBUILD xwmfs-0.86.ebuild 616 BLAKE2B 29b3d25a10982a3116e28734feb7f4ef6df9ccd685871b9aace6b265ed962e617457dd31eb338677c2aa02400426c6065688328d8052971763e0def24617abd8 SHA512 a52877db9724c4d4e7da50b7f61e3981f5e53be7bdbe5a2dca1da730ec51386be25e9b92644efb73457bfe67d826e4f5d41d221a774d35a7e13034b99afc70b0
+DIST xwmfs-0.90.tar.gz 199555 BLAKE2B b2223edb1befad1055d103c03ba8092ea6319eb7299ec9e74338567aef9e45071f056ebfaddd41bcca3722f2ad96122d5009890847b6a485ea700e1e43d2893b SHA512 70805bc509cd8ab11d75b0f9b303f76c6e7c0af7664eca4f9f1dc14c6d59d34a1bcf3e1ffde427b7f11740f1b52e7838c44a28de44fd96ca0bacb45c8b160a67
+EBUILD xwmfs-0.90.ebuild 616 BLAKE2B f630310a717239884218f3157011f36a7c6401f1d2ef14548beeb26973f07da4f4b37d35a8018cd1ee195d3e7bb08ca97f6a6933d4d669e1c35490802cfaf60a SHA512 6d453074bdfac44ee5127aeb94eb7f66ad2b56f1c508a493306b6b6ea50f5814163da255593562dc97cdeae7a2b0c64264825404eb482b944f21da0d7a797ea3
 MISC metadata.xml 1423 BLAKE2B d3ec03ae8d330d0687a312e7eae7a122bdbe258e972590e19b7e73e3d5bee752ca41865944f129ee01a4464c44eadf12718bdbfde25dca185d1734c54b4d5c6a SHA512 9d82209a72e6e8983c92986d51b9b4e0a03dd78b5d535ce9e70887f1d83d7fc2354dad1e6ec0c56c9c15dbd38ad40e1b70ecc87083306ec7da956b134e5761dd
diff --git a/sys-fs/xwmfs/xwmfs-0.86.ebuild b/sys-fs/xwmfs/xwmfs-0.90.ebuild
index 1f23a8953190..6f9d03e0f508 100644
--- a/sys-fs/xwmfs/xwmfs-0.86.ebuild
+++ b/sys-fs/xwmfs/xwmfs-0.90.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-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest
index 2ceece85892f..d721a84da0f8 100644
--- a/sys-fs/zerofree/Manifest
+++ b/sys-fs/zerofree/Manifest
@@ -1,4 +1,4 @@
 AUX zerofree-include-sys_types.patch 284 BLAKE2B 45b375568b6bfc767a65d5d1082f44db4030ae687edb4d528f0000d1fc8dc78c10f98cd6bf57eaa9b9dd2d0ce96aee408ecddc1126ddd59faa737f7dcd236d7d SHA512 0cf3833271195c2f1da591af625928d8207d6bb39702cdc9f8ade0e7e773096e4f55860438863f06639f205283c0cccbaaf8b4d9ee98e3850a5075e38d06a187
 DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c
-EBUILD zerofree-1.1.1.ebuild 950 BLAKE2B e2346293c8f9d1a4b32eb649fd73b34b70024993b188e1d777ee79d70a5290e381326d158cc8d9961f4a8eafab39157130aa8e91b327243c296b27c52cc33762 SHA512 c9ba7479c84b4971c78dea878c40dc820b8537419526d7be57785529088e0a4f64af30715fe3b7b2e6a1fe4c196c9674fdbe2fec7e9828c8cf2e7a937d971390
+EBUILD zerofree-1.1.1.ebuild 943 BLAKE2B 09eb32f53c0c7150dd69b36b57de1d21aa370f6bf79e1e5dd83f63de65c0437438c4b866e9e84a08018fb0d1f7433f71d5cb141fc7d3bc9cc695219a1f62b959 SHA512 8da90c7c2cc5a15fcba7111afd56e8778801b53ee74df99437b6c9a75900073d8b647e767f7d0ae25ac4a8b70d54be71cf5b965bd62c7df74f1c389729f09335
 MISC metadata.xml 433 BLAKE2B aa623f9df641917cb34f2a028d4db98e33b241e89b94ac424045fb053bbe16b124f62329394d30cb6163689f8716a1eef4697115648f06f9834ee41c2914ae26 SHA512 c454915a2972c289341df97d9d8cb9bf26ea2f4c00ba4555a2d14e69e8f48f7bc8fc33c404ad19c175ff7e96900f3cead4dbaf32b0c36981c8a4926212a017e8
diff --git a/sys-fs/zerofree/zerofree-1.1.1.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild
index de639dd5c0d8..e66624c7230a 100644
--- a/sys-fs/zerofree/zerofree-1.1.1.ebuild
+++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Zeroes out all free space on a filesystem"
 HOMEPAGE="http://frippery.org/uml/index.html"
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index b20f4df54968..d43442524d2f 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,8 +2,11 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
 DIST zfs-2.0.3.tar.gz 13114404 BLAKE2B 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 SHA512 8b2a6e0edfb3c85441076b2c6163ad3d7d239e11db128ab74d60bf8dc802d67b7f5b8d1cc7227316a7dc3917f14e9ac072ebf1583957f2a45c1b8438e4068200
 DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b
+DIST zfs-2.1.0-rc4.tar.gz 34806338 BLAKE2B b15b641ad322b7a50a5942500ef7c26f85074ef2672747f7391fcc785c3564c23fa5d49d51a146d284309905b4f1e1f96bb1e48f5cd1aeaebe6c55bc74a1f46f SHA512 1739798ea4fa552300004cbcb16ab0d3b02bba7cbd3bb31f9282af2dab9606478754abb49b8f170b0dfedfc4e2484e16cc8c160d02fa72a9b6720660c663e7bc
+DIST zfs-2.1.0-rc4.tar.gz.asc 195 BLAKE2B 99fd0599ed81838a1c416dbfbaa1bace607576544d5a49918d98c1c8ddf879be694f8c3213c5f5d28f7806a99bc08027ab45d46d55eed3b0e3952ec51af204ae SHA512 ed331cc7db67590d62c19fb37babd0303fddf8255d93d0742659c98af26da31d45685770ec86b086e2ba4468d48bb2c3faba1763e4b00d0c5624a308ee751527
 EBUILD zfs-kmod-0.8.6.ebuild 4761 BLAKE2B 03ae7e6c75b1e0b2032758272eeef7ac5ceccb367ba9180aee173bbe322580ca9757915eaa13dcd88781d738341748e338f25c41eec95f6293a066850dfe286b SHA512 9991249746e2f912c6978eb8f771d2f25cb082a31b26c9bd5167985a6f8c11dcbae4851e965053dccfa7fcad323e973d150b0a4963f47be39c6513d614097d0e
 EBUILD zfs-kmod-2.0.3.ebuild 4445 BLAKE2B 34792791c3efbd2a83c023bf5d333a3d2827dde23f892e7826c109b07c5a9138d755fc2026fdebc9ad4dc669b0292548ff8bbf7921b6f6044b4319bafcd78361 SHA512 07482c1f513078e5aa0dffc0ffc98938eccb954da558182e600926175fa0d1f4c5dbf6fd010c557248eb726dbbfa3199188102de5d0859db665969465940b769
 EBUILD zfs-kmod-2.0.4.ebuild 4445 BLAKE2B 34792791c3efbd2a83c023bf5d333a3d2827dde23f892e7826c109b07c5a9138d755fc2026fdebc9ad4dc669b0292548ff8bbf7921b6f6044b4319bafcd78361 SHA512 07482c1f513078e5aa0dffc0ffc98938eccb954da558182e600926175fa0d1f4c5dbf6fd010c557248eb726dbbfa3199188102de5d0859db665969465940b769
-EBUILD zfs-kmod-9999.ebuild 4445 BLAKE2B 34792791c3efbd2a83c023bf5d333a3d2827dde23f892e7826c109b07c5a9138d755fc2026fdebc9ad4dc669b0292548ff8bbf7921b6f6044b4319bafcd78361 SHA512 07482c1f513078e5aa0dffc0ffc98938eccb954da558182e600926175fa0d1f4c5dbf6fd010c557248eb726dbbfa3199188102de5d0859db665969465940b769
+EBUILD zfs-kmod-2.1.0_rc4.ebuild 4770 BLAKE2B 5140b93cd549185414ae36ba19eeed9d967d768dc63e214e9fd98fbded127d92e85dfb931e354bb399d16647c8ab0a3041af0b9b4f67c2184eb6aef3fe072e0a SHA512 675a344f48a6759553a87327c350e5aba67780dde6858c95edd386a17601968cbc8d7fae00db7206ec3ac36aa46ef3cb56b5d1da20b2482b0365110713a696b4
+EBUILD zfs-kmod-9999.ebuild 4770 BLAKE2B 5140b93cd549185414ae36ba19eeed9d967d768dc63e214e9fd98fbded127d92e85dfb931e354bb399d16647c8ab0a3041af0b9b4f67c2184eb6aef3fe072e0a SHA512 675a344f48a6759553a87327c350e5aba67780dde6858c95edd386a17601968cbc8d7fae00db7206ec3ac36aa46ef3cb56b5d1da20b2482b0365110713a696b4
 MISC metadata.xml 548 BLAKE2B 0245ac0b73ed129ce2df41358814d46749fab0463a03fceb643010629cd522460e84c5b8c0247f499adf4ed2e781e0d6f6857a3c6be4f4fb206eeabba158e86c SHA512 2b98b289369d875c5ff89825590a98c9764a1b716df1b79c852dbb833f4f02d5c66782f43084a1acde11a0ba2cb9ef2956b35c10881f77ec92d6749566276e6b
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc4.ebuild
new file mode 100644
index 000000000000..f72fc5b216bc
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc4.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_PV="${PV/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
+	S="${WORKDIR}/zfs-${PV%_rc?}"
+	ZFS_KERNEL_COMPAT="5.11"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64"
+	fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}
+	!sys-kernel/spl
+"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/awk
+"
+
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
+fi
+
+RESTRICT="debug? ( strip ) test"
+
+DOCS=( AUTHORS COPYRIGHT META README.md )
+
+pkg_setup() {
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!TRIM_UNUSED_KSYMS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
+
+	if [[ ${PV} != "9999" ]]; then
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+
+	fi
+
+	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
+
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set module revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+}
+
+src_configure() {
+	set_arch_to_kernel
+
+	use custom-cflags || strip-flags
+
+	filter-ldflags -Wl,*
+
+	local myconf=(
+		CROSS_COMPILE="${CHOST}-"
+		HOSTCC="$(tc-getBUILD_CC)"
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	myemakeargs=(
+		CROSS_COMPILE="${CHOST}-"
+		HOSTCC="$(tc-getBUILD_CC)"
+		V=1
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	myemakeargs+=(
+		DEPMOD="/bin/true"
+		DESTDIR="${D}"
+		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
+		ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
+		ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
+	fi
+
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use x86 || use arm; then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	ewarn "This version of OpenZFS includes support for new feature flags"
+	ewarn "that are incompatible with previous versions. GRUB2 support for"
+	ewarn "/boot with the new feature flags is not yet available."
+	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+	ewarn "Any new pools will be created with the new feature flags by default"
+	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+	ewarn "create a newpool that is backward compatible wih GRUB2, use "
+	ewarn
+	ewarn "zpool create -d -o feature@async_destroy=enabled "
+	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+	ewarn "	-o feature@spacemap_histogram=enabled"
+	ewarn "	-o feature@enabled_txg=enabled "
+	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+	ewarn "	..."
+	ewarn
+	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+	ewarn "developers do a tag or the Gentoo developers find time to backport"
+	ewarn "support from GRUB2 HEAD."
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index b4fc7559ba13..f72fc5b216bc 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -12,19 +12,24 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
 	MY_PV="${PV/_rc/-rc}"
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
 	ZFS_KERNEL_COMPAT="5.11"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64"
+	fi
 fi
 
 LICENSE="CDDL MIT debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 
-DEPEND=""
-
 RDEPEND="${DEPEND}
 	!sys-kernel/spl
 "
@@ -34,6 +39,10 @@ BDEPEND="
 	virtual/awk
 "
 
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
+fi
+
 RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index e08d696d1bfd..649df5082fc2 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -2,8 +2,11 @@ AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e069
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
 DIST zfs-2.0.3.tar.gz 13114404 BLAKE2B 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 SHA512 8b2a6e0edfb3c85441076b2c6163ad3d7d239e11db128ab74d60bf8dc802d67b7f5b8d1cc7227316a7dc3917f14e9ac072ebf1583957f2a45c1b8438e4068200
 DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b
+DIST zfs-2.1.0-rc4.tar.gz 34806338 BLAKE2B b15b641ad322b7a50a5942500ef7c26f85074ef2672747f7391fcc785c3564c23fa5d49d51a146d284309905b4f1e1f96bb1e48f5cd1aeaebe6c55bc74a1f46f SHA512 1739798ea4fa552300004cbcb16ab0d3b02bba7cbd3bb31f9282af2dab9606478754abb49b8f170b0dfedfc4e2484e16cc8c160d02fa72a9b6720660c663e7bc
+DIST zfs-2.1.0-rc4.tar.gz.asc 195 BLAKE2B 99fd0599ed81838a1c416dbfbaa1bace607576544d5a49918d98c1c8ddf879be694f8c3213c5f5d28f7806a99bc08027ab45d46d55eed3b0e3952ec51af204ae SHA512 ed331cc7db67590d62c19fb37babd0303fddf8255d93d0742659c98af26da31d45685770ec86b086e2ba4468d48bb2c3faba1763e4b00d0c5624a308ee751527
 EBUILD zfs-0.8.6.ebuild 5695 BLAKE2B 1512678bd01715aaabb552739c4a5fdfc2251af572032b8aa4b4402828b18c2b6543d742f41c975f97b3be4c3019f0354f97ca62613dfcb4e79cd54565d090a6 SHA512 d3cc8513012eca1ef0d121e97a9347223278c3f0b6bbaebdbdd70403ddad53c508ee614f682a2280d781d777a74b953f90a9d777edbd744c0a3c45addd20f882
 EBUILD zfs-2.0.3.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705
 EBUILD zfs-2.0.4.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705
-EBUILD zfs-9999.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705
+EBUILD zfs-2.1.0_rc4.ebuild 6354 BLAKE2B 056e16f6c5d8302260f8a37261989cb87752347547e23e031eb6c9788228eda2720440c84a2bb886df7839a5af9291481d0b60846910e0e54b9d7a4bf5c92514 SHA512 fc993bd13db9ea71eb88a9ef36ef361c970ca3ae06905d89f7b9f0a4bd204a9085347948396f7b1c4f43b7047c7e6de0b66e21b4ce652e5d4359fa6aa9ead341
+EBUILD zfs-9999.ebuild 6354 BLAKE2B 056e16f6c5d8302260f8a37261989cb87752347547e23e031eb6c9788228eda2720440c84a2bb886df7839a5af9291481d0b60846910e0e54b9d7a4bf5c92514 SHA512 fc993bd13db9ea71eb88a9ef36ef361c970ca3ae06905d89f7b9f0a4bd204a9085347948396f7b1c4f43b7047c7e6de0b66e21b4ce652e5d4359fa6aa9ead341
 MISC metadata.xml 1000 BLAKE2B 1f3e75ef73d5680d5863f0fda415931a6af19ab1a535c9795c417526ccce2a826ede05abee88ff27c2ec99f1f23aa06cce02cd3cb6d49b2952e90eb94ab95a6b SHA512 f8b30ce788d80c8f65db738f251fe5ebdc4d3ec7206dc78e0b9e53c2cf92153b90e20f6799b2a36bf8e616147b28f9660421bbc2ad17e7dbd804d47f430f6e40
diff --git a/sys-fs/zfs/zfs-2.1.0_rc4.ebuild b/sys-fs/zfs/zfs-2.1.0_rc4.ebuild
new file mode 100644
index 000000000000..d4e6a719e7dc
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.1.0_rc4.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3 linux-mod
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+	S="${WORKDIR}/${P%_rc?}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64"
+	fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+SLOT="0/5"
+IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
+
+DEPEND="
+	net-libs/libtirpc[static-libs?]
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/libudev[static-libs(-)?]
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="virtual/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	virtual/awk
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-kernel/genkernel-3.5.1.1
+	)
+	test-suite? (
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
+"
+
+REQUIRED_USE="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+
+		if ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-systemd
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		--with-vendor=gentoo
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		$(use_enable static-libs static)
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
+			elog "  sys-kernel/dracut"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 1d1a3c6ccc7c..d4e6a719e7dc 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -11,27 +11,33 @@ inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam sy
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
 	MY_P="${P/_rc/-rc}"
 	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
 	S="${WORKDIR}/${P%_rc?}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64"
+	fi
 fi
 
 LICENSE="BSD-2 CDDL MIT"
 # just libzfs soname major for now.
 # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
-SLOT="0/4"
+SLOT="0/5"
 IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
 
 DEPEND="
 	net-libs/libtirpc[static-libs?]
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
 	virtual/libudev[static-libs(-)?]
 	libressl? ( dev-libs/libressl:0=[static-libs?] )
 	!libressl? ( dev-libs/openssl:0=[static-libs?] )
@@ -50,10 +56,16 @@ BDEPEND="virtual/awk
 	)
 "
 
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
 RDEPEND="${DEPEND}
 	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
+	virtual/awk
 	rootfs? (
 		app-arch/cpio
 		app-misc/pax-utils
@@ -78,13 +90,11 @@ REQUIRED_USE="
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
-
 pkg_setup() {
 	if use kernel_linux && use test-suite; then
 		linux-info_pkg_setup
 
-		if  ! linux_config_exists; then
+		if ! linux_config_exists; then
 			ewarn "Cannot check the linux kernel configuration."
 		else
 			if use test-suite; then
@@ -174,7 +184,7 @@ src_install() {
 	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
 
 	if ! use static-libs; then
-		find "${ED}/" -name '*.la' -delete || die
+		find "${ED}" -name '*.la' -delete || die
 	fi
 
 	dobashcomp contrib/bash_completion.d/zfs
@@ -196,14 +206,14 @@ src_install() {
 pkg_postinst() {
 	if use rootfs; then
 		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "root on zfs requires initramfs to boot"
-			elog "the following packages known to provide one and tested on regular basis:"
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
 			elog "  sys-kernel/dracut"
 			elog "  sys-kernel/genkernel"
 		fi
 	fi
 
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
 		einfo "Adding ${P} to the module database to ensure that the"
 		einfo "kernel modules and userland utilities stay in sync."
 		update_moduledb
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-fs
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)