gentoo resync : 03.03.2021

27 files changed, 228 insertions, 195 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e430e1108ca9..5182e3a9db8f 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index 150ad753a9b6..ca93fd9a15e1 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -1,5 +1,7 @@
 DIST bindfs-1.14.9.tar.gz 410344 BLAKE2B 3875c436e7f52a59c0b7aeb2d7fbcfa7d4edfc3f8397bf7d2a920a260f857ec16df64b78655175f9b0929b93788fb6af46c2844f30ee59c30b6ef9fb5beb4cf7 SHA512 e8c454b4edd65faa64255c7706c195aa1cab6436a0d3481e434a5e535a3c24df1b13342b72ed3da097e68e9d94582237d682dbb675734061d115e863d5767ffd
 DIST bindfs-1.15.0.tar.gz 415596 BLAKE2B e80bf7e233668ceddb6f57b7b939a68c918f3a6635d99bdc0efdacd67d74fdea66aa3d03ced6cfeddfc1a402e9866d27d83bcbe39dc6c25c50247c6b42739d9a SHA512 4f11dcb29321daa950bc8d778c7cc0269f200535367534c5ebb1e85f2f9e0e37359ebaa0d033fefc2140f07915d6ad7e884d185ac168db31c32e2e52175d0bfa
+DIST bindfs-1.15.1.tar.gz 415676 BLAKE2B 1d18d7a51e60e5ef304cdd13e908ebf5ca3e684b640f6c21678be685c3ff15ed43a20edcecfd6ef13d631974b11c5c7145e4365bf52f7e9280a53772f1377b84 SHA512 da9003f141b7aa2c23651b3b836b1d979bf1b19915f307c05e40ae6906aab738036cc8b5df6caeec158e4fa6b7bca71489ea7884ff1607c6fea72a603a048d59
 EBUILD bindfs-1.14.9.ebuild 478 BLAKE2B 2be2fd62b6507cbaf1a5e57a0582f87278bb6f568f000ef805f159bc4e655104d2f18ac9b1f9d164155b7706d6779f13abdb63979fb3e9200be837dd8e715d12 SHA512 c006e5f23ffd417f5a8c77b417f20ca083ba2a4669189806217a73685a8b62ede8bab826bd6ae713af35dda4bce2eee800f5e12e4866d0f3b6cb1dc53e1434b3
 EBUILD bindfs-1.15.0.ebuild 494 BLAKE2B 1c12cfd2b776d5847e5d74517db43081e3bcd915c82e76dda412ff5d278c216543a9c7066470235b2b55ac12e4a6d1c70df8a3ffd2f0ce374dccab8f5f96f201 SHA512 e02feecc34a1b2f43f27f9124a35810609aa047c49642985dbedf693538dc9d778fdca5af9cb16c2fb8012323fea2899aa4df4e4931bc54f2880b2a97f2d04e6
+EBUILD bindfs-1.15.1.ebuild 494 BLAKE2B 1c12cfd2b776d5847e5d74517db43081e3bcd915c82e76dda412ff5d278c216543a9c7066470235b2b55ac12e4a6d1c70df8a3ffd2f0ce374dccab8f5f96f201 SHA512 e02feecc34a1b2f43f27f9124a35810609aa047c49642985dbedf693538dc9d778fdca5af9cb16c2fb8012323fea2899aa4df4e4931bc54f2880b2a97f2d04e6
 MISC metadata.xml 325 BLAKE2B aa0a376311bff962fc56dfcfdf9f0d7eab54cde65ad9518ef24e38651e57bccc1514e444657e1dfc4c9a5c7f651e700b5b7122dedca39ac24029b6b7e990c493 SHA512 466c2a77d115de2a7b8110a3076d58b604e0f53a9de46842ffcb0fb2c913e0cc6e0393035432a101327a780163453ff973044f0b473584eb2be65a53a181e83c
diff --git a/sys-fs/bindfs/bindfs-1.15.1.ebuild b/sys-fs/bindfs/bindfs-1.15.1.ebuild
new file mode 100644
index 000000000000..fc99a2e749ba
--- /dev/null
+++ b/sys-fs/bindfs/bindfs-1.15.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
+HOMEPAGE="https://bindfs.org/"
+SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-fs/fuse-3.10.2:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+src_configure() {
+	econf $(use_enable debug debug-output) --with-fuse3
+}
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 3c6b1f5b0e60..028d3e03d432 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,7 +1,10 @@
 AUX dd-rescue-1.99.8-sysrandom.patch 1204 BLAKE2B 4ef909c294a9299c93fb0ca793e5815fa6f98a9860de1886d9f8da8584a16c0320d56c6ecb6894cbe7f62be62e290f36b76319ed714ccc085c59f952a03cacc6 SHA512 14020e023ea7cf5b56d78776149933241f7424fb22076686a9541737f2fe887406b94e584c5cf650d754e9ead9bf6f2f96c390a2c1fba49f961955df49445a06
 AUX dd-rescue-1.99.8-testhole.patch 1267 BLAKE2B 137961d607cd93ad758c7cf6b8f8ab4b2e54017f43585e277563a5050e9c32ee52567de08af83a048e7e59b2ed05753fc67286d640d3c7998504bd11e9a1286c SHA512 f6a6649a4bce486a07f2eac382db609a47585361ad24ce03bad49da284c0b5485e35fcaec95445c46b74f6dfa5fe09d28c45a33a1b319a03c8cbb15c03a4ee8d
 AUX dd-rescue-1.99.8-xattr.patch 9308 BLAKE2B 0874806f5394759edacdc4d937619b4ab568cfa501b14f1b56a48f80f7e9777e8be439fe0f1edbe9eb6232344e850360b504dc81ffd1052067c1f68b2152d78e SHA512 b9a2a0c3c035b89c9ef45f52b48d247bcb56f250e86e39bce905826c83823eb855407aeaeadefbf878c946ac019b4f7ec58a46930f0b3450b191b62bd524690a
+AUX dd-rescue-1.99.9-musl-r2.patch 1558 BLAKE2B ddaed89adbf48b2946285b906dbe59a9baafc6f0a5aa4ba01332af5801f83119f4ad5ac4864d0ace44c57a0f94b68816b3aa4fdbf3d53adefded5835b51fb2c4 SHA512 94cddb0a1eca0bf6343a06570708a72c4970cd92ccba891b1098199670ea00f91105c0b55ceec72d40bdbf013a35cb0d2f20c504c0723de4ac393e75fff3d404
 AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27dc60f9b3da007969b77d66df599b9c4b9fb02cb2799017c7fb6a0a0f1e8b785c88fb741fb478b6a8f256d0e461bf78 SHA512 a0fe42686852cbdd4ce5a4c55c9dc77cff7165109f3c7d4dfaaec527fa116a17f602ad4fab22410991f05aac6aa8f5b57bb711c05e08f146d532aaa807dbfd66
 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
+DIST dd_rescue-1.99.9.tar.bz2 176015 BLAKE2B b0955182eaa9fff967e77278de8a5582b3ad75861f1279cf8aea47a5c50925692f2223408444f6c73a38b67bee9738df0ce2cf60b262e86d5d32c26d59aab97d SHA512 f181f33b80637da09f8c47efe2961b0c272540bb9df932a1e6714d3e3018b1ec251f9bca8473b04bb84673812fe68a4f12fd9cc72d2340b5246a7ac25b7f8238
 EBUILD dd-rescue-1.99.8-r1.ebuild 2502 BLAKE2B 8d7f487f02b8c6cbb1ecab1d9226f646a8a6118eb4d90b25128538b1d4a3430d99a1eb2d17f8e70600346e2f3b987e3cf86276c360bc127d90f15dde0c60a099 SHA512 7df6dceb92cdb93f43002cf33f138cdee775ab431e761663cbb6ea4b15c2bec73d73dabb11347d2a3e6cbbb04a2e1feee8f3bff128bdc9c3cc5b6891e00aacd3
+EBUILD dd-rescue-1.99.9.ebuild 2373 BLAKE2B 2ac2d90a48c4d530d9b3d6031c2d4c8dec127ceecdceff6b378c173857066b5782f14c106e1955866dd13a5a3ec26bad1aad547479a2f15dd042ed13642faf0e SHA512 57109a1bae93a8c5a14311e337bf3ee742c8e0036f8c0c11e4cabba47e833b687b970ce4f65b3a1f046ba8bc9cf32035724745c97d7e14dac14c5e4a1f1a1ffe
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild
new file mode 100644
index 000000000000..04a8edd74593
--- /dev/null
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib toolchain-funcs
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Similar to dd but can copy from source with errors"
+HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
+SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
+
+RDEPEND="lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.9-musl-r2.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:-ldl:$(LDFLAGS) -ldl:' \
+		-e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
+		Makefile || die
+
+	if ! use cpu_flags_x86_sse4_2; then
+		sed -i \
+			-e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \
+			configure.in || die
+	fi
+
+	if ! use cpu_flags_x86_avx2; then
+		sed -i \
+			-e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \
+			configure.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# OpenSSL is only used by a random helper tool we don't install.
+	ac_cv_header_attr_xattr_h=$(usex xattr) \
+	ac_cv_header_openssl_evp_h=no \
+	ac_cv_lib_crypto_EVP_aes_192_ctr=no \
+	ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
+	ac_cv_header_lzo_lzo1x_h=$(usex lzo) \
+	econf
+}
+
+_emake() {
+	local arch
+	case ${ARCH} in
+	x86)   arch=i386;;
+	amd64) arch=x86_64;;
+	arm)   arch=arm;;
+	arm64) arch=aarch64;;
+	esac
+
+	local os=$(usex kernel_linux Linux IDK)
+
+	# The Makefile is a mess.  Override a few vars rather than patch it.
+	emake \
+		MACH="${arch}" \
+		OS="${os}" \
+		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
+		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
+		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
+		CFLAGS_OPT='$(CFLAGS)' \
+		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
+		CC="$(tc-getCC)" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	append-cflags -fcommon # bug 707796
+	_emake check
+}
+
+src_install() {
+	# easier to install by hand than trying to make sense of the Makefile.
+	dobin dd_rescue
+	dodir /usr/$(get_libdir)/${PN}
+	cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die
+	dodoc README.dd_rescue
+	doman dd_rescue.1
+	use lzo && doman ddr_lzo.1
+}
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch
new file mode 100644
index 000000000000..1089a63f06c7
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch
@@ -0,0 +1,30 @@
+From 28818d18cfc7a459675ac388e5cf7b50bdd9ad89 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 13 Dec 2017 01:02:12 +0100
+Subject: [PATCH] loff_t and __WORDSIZE includes for MUSL
+
+Rewrite of Justin Keogh's patch [Link 1] to fix build problems
+on ARM.
+
+Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f
+Fixes: https://bugs.gentoo.org/616364
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 813accf..5a8246c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -6,7 +6,7 @@ AC_C_INLINE
+ AC_HEADER_STDC
+ #AC_PROG_INSTALL
+ #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+-AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h attr/xattr.h sys/acl.h sys/ioctl.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h])
++AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h])
+ AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports getrlimit])
+ AC_CHECK_LIB(dl,dlsym)
+ AC_CHECK_LIB(fallocate,linux_fallocate64)
+-- 
+2.31.0.rc0
+
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index bb3d3711c9af..013dc8aee095 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.2.ebuild 964 BLAKE2B f32f6ae1fcd08b2f37d6b6c5d0571722bac6475a3b3c8e9eb4f9a089068320bb3d7423c34d922c7e7311108aac47e76a044decf8bb07fb12369801894d12d523 SHA512 e7b3708d2c79ece0dd5d8c0c3b467bb0250d08a94bb01f5de08ff51fe8d4d941767f444dee41ef9c941eeefa17d3e945f4ac79626fe839fdf0746c64f7f3843a
+EBUILD dosfstools-4.2.ebuild 960 BLAKE2B f80b8390d56fe61c4cd7739307df323401747606db973952fe914a97ff58fb55a0fbce3f206080f797d44a0c5120c5579f23b2e4e5f1c4af6cfc25494a5b56dc SHA512 98795690290434a828be92b7d7936eebb764c0d076bb90cbc2968ba0b5946570ba56f16a445f7874a35a17ea01cced636142bb13bea9f8031b577b5c8d737a86
 MISC metadata.xml 496 BLAKE2B 32b7ed76d0385441b8a40fff8ca15d6848fce7cf1ae511a6905d3c12b8a7593bbc11494f7ca720c465f61175d8d84cd9e6d41f084a140fce88513c6b95965615 SHA512 40b886dc36d892d733a6a6528eed5dec3977eecb71a22b5cee2ea6c0417401951b966509c3816ed5a2761eae4b8c5def7ef5e99d9aedab2e09000a3f3de6b354
diff --git a/sys-fs/dosfstools/dosfstools-4.2.ebuild b/sys-fs/dosfstools/dosfstools-4.2.ebuild
index c6c4bfbe5915..782bccc10650 100644
--- a/sys-fs/dosfstools/dosfstools-4.2.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.2.ebuild
@@ -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 +iconv test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 43e3c64a25c8..ea50185e7863 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,16 +1,15 @@
 AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e8304f5958b034697ac52f4c40b0225c9c404ca7b9fe5bd3f130d9ebf8faf38815050d945524d3c SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef
 AUX e2fsprogs-1.40-fbsd.patch 352 BLAKE2B efef09c11bdf6ebeb89819dfefec241919afa17ddee65610332bcd3edbacad4fa501def1d224de39fd6a9979a35e63699b0a2d5e9a2242517122339b68edf6af SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146
 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507
-AUX e2fsprogs-1.46.0-pthreads_build.patch 2490 BLAKE2B 024da604a77924896a2dffee7fb03a655533b86f87964384cada117b281a2094720fbf7c9ded2c200fd19e27693c6da10a6f8e3f53fe44e2c6e02eac3ae0ea7e SHA512 557fc9d331654a3d8a0210ba25d0ecc5a8114ae2058ccfbee121f0a12d71259a65210fbb5b36f996455202ffc0254eb9f1d6f588817616b92e373b2c5dc46810
 AUX fsck_ext2fs.8 3802 BLAKE2B 379ef7974e29c654e4a69caa64c3703eecf375d63557915bdbfe23c8c0ca67cc9a13792988ba8c0b18bb4ae0819d220102f034499200fd20951e004d34273311 SHA512 639af16c7881bdfca55a9cd39623d3eeb9ae0ca93f8e65321c69ab1b2591cb17cdd0cfc21d27c20b8cc65bd295cccf23e47f740fffb91f4cf17e32959bb166d0
 AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa0722a0a3163885561bf06f0fdb73b4cf8c9cfc5bd0dc0c6ee0a7fb340a2416ce34555eff22f71a4 SHA512 1cac2963c0e85dd6a111bfe2a00f2b4f65c17a05bf0039cec073d4109ad4b0efee8905cff1a25098e0693f367db300054d92598a85dfbe8e5db7ff6419534af6
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
-DIST e2fsprogs-1.46.0.tar.xz 7007144 BLAKE2B d902028a0e538a62428e18e3c2a0a917a73351afc7d8eec804ddac459a1b8c2e11d104201235fb64170acc78942d2c9d5a45039f770cf5ce537cdba18cd559e6 SHA512 c865360e532da42264200934229aa9cfc88c3342fc4e206e82d1fe2a908b0fd3b58f2e9a4796f2ecdeafe1ace9f9ee444ea5b2e3efd488cb934f9a22af6a8f7e
 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 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
-EBUILD e2fsprogs-1.45.7.ebuild 3985 BLAKE2B d7aed9912b3b1debc59c09ed47283fefb5dac60d23c5ce609b0a9ebeba7792a168c56c465c31cf6632c2fcb4c9aaf09816517ede38431a246cc93363021553f6 SHA512 95db486d2735f237c708748e7067beb4793f46b9191f24662797ca78298deda1cd8eb9580191523fc4f013fbb71f7331d3dcfa92b8eb05794157d544a323c944
-EBUILD e2fsprogs-1.46.0.ebuild 4060 BLAKE2B cbc8e97a47a9792d36cfaa2c9e7237df110a8900443d093ce7873ba1c38a53498f6bd745d885b4778f5d72d193cda7adc03c66c3d2e42727413f07c08298a89e SHA512 296dbe871c4d71cde4ae1522c41929f454df6bc2e97b0137a5c1b670b820adc3462bf9e65f9d17158e2fa24d3924b53d716333e0547a7e87c602e4d7def8ee6d
+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
 MISC metadata.xml 634 BLAKE2B 57204ec7bc4afb2ec4eac7c7b3ed2b417863bf36be9e7c32c50464d3406de8e0af92af03d9a6947e688bd6c7477029ae68358bdbf8f4a49c54ffe1a9905bfb81 SHA512 bd65352e175b8e2e5f11d175b91f369b509e8dfc83f84d3d80e23c2d5cbbb474b057821e7835cb1f3cefafc9af926c3fa5960bcdff1286ff3842b914615771df
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild
index 301a34b1b5a1..9325951632f0 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.7.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.7.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/e2fsprogs/e2fsprogs-1.46.0.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
index 7a9dd3fa1afc..963bf42ad0c5 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
@@ -32,7 +32,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
 
 	# Upstream patches (can usually removed with next version bump)
-	"${FILESDIR}/${P}-pthreads_build.patch"
 )
 
 src_prepare() {
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.46.0-pthreads_build.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.46.0-pthreads_build.patch
deleted file mode 100644
index 9d251d2f0b37..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.46.0-pthreads_build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 24487a7fa64bfa92bea21be3ca8c155e5de7438f Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Fri, 29 Jan 2021 22:28:31 -0500
-Subject: configure.ac: fix build failure on systems with pthreads && !fuse
- support
-
-The configure script checks for pthread.h as part of double-checking
-that the FUSE support works correctly, which implicitly defined
-HAVE_PHREAD_H.  If the FUSE libraries are not present (or fuse support
-is explicitly disabled), this check doesn't happen and so
-HAVE_PTHREAD_H is not defined, and this causes a build failure.
-
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- configure    | 2 +-
- configure.ac | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 9d41d069..6b8b7f4b 100755
---- a/configure
-+++ b/configure
-@@ -10448,7 +10448,7 @@ fi
- done
- 
- fi
--for ac_header in  	dirent.h 	errno.h 	execinfo.h 	getopt.h 	malloc.h 	mntent.h 	paths.h 	semaphore.h 	setjmp.h 	signal.h 	stdarg.h 	stdint.h 	stdlib.h 	termios.h 	termio.h 	unistd.h 	utime.h 	attr/xattr.h 	linux/falloc.h 	linux/fd.h 	linux/fsmap.h 	linux/major.h 	linux/loop.h 	linux/types.h 	net/if_dl.h 	netinet/in.h 	sys/acl.h 	sys/disklabel.h 	sys/disk.h 	sys/file.h 	sys/ioctl.h 	sys/key.h 	sys/mkdev.h 	sys/mman.h 	sys/mount.h 	sys/prctl.h 	sys/resource.h 	sys/select.h 	sys/socket.h 	sys/sockio.h 	sys/stat.h 	sys/syscall.h 	sys/sysmacros.h 	sys/time.h 	sys/types.h 	sys/un.h 	sys/wait.h 	sys/xattr.h
-+for ac_header in  	dirent.h 	errno.h 	execinfo.h 	getopt.h 	malloc.h 	mntent.h 	paths.h 	pthread.h 	semaphore.h 	setjmp.h 	signal.h 	stdarg.h 	stdint.h 	stdlib.h 	termios.h 	termio.h 	unistd.h 	utime.h 	attr/xattr.h 	linux/falloc.h 	linux/fd.h 	linux/fsmap.h 	linux/major.h 	linux/loop.h 	linux/types.h 	net/if_dl.h 	netinet/in.h 	sys/acl.h 	sys/disklabel.h 	sys/disk.h 	sys/file.h 	sys/ioctl.h 	sys/key.h 	sys/mkdev.h 	sys/mman.h 	sys/mount.h 	sys/prctl.h 	sys/resource.h 	sys/select.h 	sys/socket.h 	sys/sockio.h 	sys/stat.h 	sys/syscall.h 	sys/sysmacros.h 	sys/time.h 	sys/types.h 	sys/un.h 	sys/wait.h 	sys/xattr.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-diff --git a/configure.ac b/configure.ac
-index 141c4d9c..42b6f486 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -975,6 +975,7 @@ AC_CHECK_HEADERS(m4_flatten([
- 	malloc.h
- 	mntent.h
- 	paths.h
-+	pthread.h
- 	semaphore.h
- 	setjmp.h
- 	signal.h
--- 
-cgit 1.2.3-1.el7
-
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 8c79d168a742..1dc2dffa0f21 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -5,7 +5,7 @@ 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 6980 BLAKE2B 79651327abd3cf9feae72bbb9de1ba72287346d093ae3e51bc27d5c6e74d1f5731cd3b30402d9b83879c8919a07b36d514b413fca98079c298bf057832a868c9 SHA512 5b498c710f309ca1af95bda7a862a4bdda47742b6a8f4720fc86b7dc408cbaddc48bae9bcde5b26105ea18971af98fdbd240737783e406c4eaba15b0716a71e7
+EBUILD eudev-3.2.10.ebuild 6979 BLAKE2B e23d90cd49b2029bc53c434a05d6c9cb40b7a62b1a66e45b123ac09862bf4ced60f6ec7686c07c5e5a5f0594d94845506e78aad5377ffe439a15f118ebcebf8b SHA512 c159306e61f1e8d4fe43ef0a655041260c48ef5c145c45fe23606f9f7587c841379adc6a306be2b77d1fd911fdc7ab25c1adc57a463f911b8aae78b94f7a91e5
 EBUILD eudev-3.2.5.ebuild 6812 BLAKE2B 0fdbb319de304026fb2c3f036f759cb47abdf33585062ecb3ea2491b68182b7fc29af8a50761ecf5642d5c4e5c587951db4e8e8bc6cd8cc807c4ab44fde24290 SHA512 6444a8d845287d76f8c20add841d1e2cca7ce398647c694b34d4388c9a29ee03e1c640e2ec7cdb9fb8265a5c812dce04d4536684f7ae67f04e3e39778f8d3bee
 EBUILD eudev-3.2.7-r2.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
 EBUILD eudev-3.2.8.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
diff --git a/sys-fs/eudev/eudev-3.2.10.ebuild b/sys-fs/eudev/eudev-3.2.10.ebuild
index cfd51e2da06e..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/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index 00f00972f7db..d0d38fcd4091 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,7 +1,5 @@
-DIST fuse-overlayfs-1.1.2.tar.gz 98055 BLAKE2B 04cee8052671431604031ddd3d0ebc254de0ba00a527b4a7caa24bf4a0b74be81c9d0f2c02e5eb583c3f6a61b540762b52617531f266341878cb54f40e087331 SHA512 41bb7ed21d0408af61820b9aebefb08ee6add0c9a15ff1cafd8abc7ff6fcc46afd53740c946c6835bbba8c58ee8bfcc8351cd2a1fe81d749dad81934ce44032b
-DIST fuse-overlayfs-1.2.0.tar.gz 101375 BLAKE2B ff71ae8ad58396a8365fd65574145b45ae9632f407e2246096822cca12eb17d7a7ef9f5cc3546c83573b7af56b96d8800d6f390477cff2fe88c2858ed198740c SHA512 55aa7c92f964ab18b886607de705b98510c7f25cc0d90e4712fb8493a4baab9ea722d8966a9b7e8f8fd8e5d2163a54993e9e45dfa2699db6cec8b447bdc5399b
 DIST fuse-overlayfs-1.3.0.tar.gz 102059 BLAKE2B 30564f9a06ed04f7716170ee864bffeb899f8fc6b411cc95dbe920632dcb2ea2d9d7a9472b35fa33ddca86570978913f8651c35e3544bd650a95c52ca0d4d3ff SHA512 c374b5dd4d369ab0134f66ff021c8efbc35f173a2d53a7212d5ec459c5083cd0fb5fc93b68696db5903891aa33c719be7eb3beedcaab043459f8b506d7cf5c0d
-EBUILD fuse-overlayfs-1.1.2.ebuild 564 BLAKE2B 1932eec0743d4360b15f3f487e337271b4b6befcb9365869dee089e31145926dc4be46c67c81caf3ed18ffafd26cd799f3126d62e8427abb8f6573fb083aeefa SHA512 d94880968425bf4c54aa40fae97744d72b8ac41427f7216f399e796ab771fb850bf72c7b890a80e69b3ab9e5c5b2d55d2086bfbf8e7442be877fbac4054a117d
-EBUILD fuse-overlayfs-1.2.0.ebuild 564 BLAKE2B 1932eec0743d4360b15f3f487e337271b4b6befcb9365869dee089e31145926dc4be46c67c81caf3ed18ffafd26cd799f3126d62e8427abb8f6573fb083aeefa SHA512 d94880968425bf4c54aa40fae97744d72b8ac41427f7216f399e796ab771fb850bf72c7b890a80e69b3ab9e5c5b2d55d2086bfbf8e7442be877fbac4054a117d
+DIST fuse-overlayfs-1.4.0.tar.gz 102363 BLAKE2B cc614173b5f06b761c31ceb538b6322071dadc2328f92899988c6ff26549cfabd7e4a4bb18207bc4564f2bc26d3cd4b01dfed991f92a8b1f5afa4fc756e6517f SHA512 8ee42e0b11540c40200102b066a4a3009af81d5a5c120449b9f3291034a679602e476f42486c039215085eef0291d2b9390888e97f213d8399a5e8762d3fcd17
 EBUILD fuse-overlayfs-1.3.0.ebuild 565 BLAKE2B 6cad51a1921aa1c48f25baa727c28c51c5876c83944be93529c8639bfa75f90adfed39c7247768b0beef5cbd612e4087485078c9a4508a1ddd8d982fb9797c9b SHA512 60da39f950d584bac0c032f2ecdd8a479875916816459083c7fb21888fd912d6cf4b78c4419a8f30f909473a52818aa60cd75d140cc771352677c30b88ddb65d
+EBUILD fuse-overlayfs-1.4.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.2.0.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.2.0.ebuild
deleted file mode 100644
index f8b399d715d2..000000000000
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2020 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"
-IUSE=""
-
-RDEPEND=">=sys-fs/fuse-3:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.4.0.ebuild
index f8b399d715d2..1f39c42d5751 100644
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,11 +13,10 @@ SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE=""
 
 RDEPEND=">=sys-fs/fuse-3:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
 
diff --git a/sys-fs/sysfsutils/Manifest b/sys-fs/sysfsutils/Manifest
index 9c86ba4a1705..3595525bc01f 100644
--- a/sys-fs/sysfsutils/Manifest
+++ b/sys-fs/sysfsutils/Manifest
@@ -1,3 +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.1.ebuild 972 BLAKE2B 75f45a89e9ec862ae8612e279b32265e16e4942d3c17727c456efbcb3a07a02fd2de087b054cc0d07549d4603760265fe0397585e07070150808e964b508a4a4 SHA512 e58520f7da7f734c14f44462083a9a73c6a0fb54a54ff10228d4f2304c9a796658227e13760cc2f1a58b2a48f10856952626f63997013a1b51c63a885afeadab
 MISC metadata.xml 330 BLAKE2B 704f504eef71b56802b1d24554ea1e4887cbaa3bc859021c9decede47242997906e1e87cf18a9a0a7668000a629c5a48699d09b7ebc4532cb304899d61a5091e SHA512 16dbfcfa75389172827d78272e473ea69b20ac564ae8c17de031599ccbb5166ffdb7e42208b52e6ba53cc5bda75075c980c7954516646cc0fce4fb56e431070c
diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild
new file mode 100644
index 000000000000..fbfcd243e92c
--- /dev/null
+++ b/sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs usr-ldscript
+
+DESCRIPTION="System Utilities Based on Sysfs"
+HOMEPAGE="http://linux-diag.sourceforge.net/Sysfsutils.html https://github.com/linux-ras/sysfsutils"
+SRC_URI="https://github.com/linux-ras/${PN}/archive/v${PV}.tar.gz -> ${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"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+
+	# workaround maintainer mode
+	AT_M4DIR=m4 eautoreconf
+
+	# with eautoreconf you get "Useless epunt_cxx usage"
+	# without you don't
+	#epunt_cxx
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dodoc docs/libsysfs.txt
+	gen_usr_ldscript -a sysfs
+
+	# We do not distribute this
+	rm -f "${ED}"/usr/bin/dlist_test "${ED}"/usr/lib*/libsysfs.la || die
+}
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 4da476449ca6..e1f5b3c4b2f3 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,7 +1,3 @@
-DIST udiskie-2.2.0.tar.gz 88232 BLAKE2B ba037b0828b7bf42b00be481ecec807bc9ed591ad3990cb6b6f0db21b4894c184ff2fcb5410272a55f3f78caae999458cb159cd450ede540606138e5e9dab1af SHA512 7c6c096eeb52458a2e30415c1489a640ca679489a34729f5502ae35f178f810476111a17f082a092d61d6d08022cfd208cb1f71ab34d6b88ea7f1f4e4a1ae49c
-DIST udiskie-2.3.0.tar.gz 89954 BLAKE2B ece40590aee684325a8df4b793a5407a0f15ba07c3d8a0df72d72afe5af2f1d3bb6c072fa33fbe61b647a3ed3b0d5b9f6881be4db3943fdc0208e14ced4acec2 SHA512 4b2d97ac458a70bbb6458fdf2386b5847c1ab590d4f8ae420d4c799871be732f793d31c3c6a51558caea266797da10647de437790237f01cc313e08f74524148
 DIST udiskie-2.3.2.tar.gz 92377 BLAKE2B 9351aa4d4b5becce1cf99c49d6906f3b84f5ae559ea0d8d456ad035cdcd85bd752fb02aebe3ef74287b14c668e192d0cd7b9b5a348daba379eabcad32cbe3408 SHA512 f4baa3d48cc9480d0d6c7a24090d6661a36bf9eaf0d2e7797c65318358a593fd88f9d289a89f9f5e14a4b5a67407ae8dc739184359bf533882ad24189c1756fe
-EBUILD udiskie-2.2.0.ebuild 1003 BLAKE2B 20fdd6665401685ff2c97f82b989e916f08060e0085a87a1c327c3fef469a00f8c085456b8d5f5a9cf3a098fb752143fea68b98a99038fe20a1098f29d76555e SHA512 b6283de8d33f593580a566572912750f294544a960ea810c5003aedc2cdb8747848f9893047d91c8ac335efeda5aaf84b0586f500e422abff26e00a90713d39b
-EBUILD udiskie-2.3.0.ebuild 1005 BLAKE2B 7f2e1c0083cdb534db439f7f981d0571163802c42482c30c1ac875f66ab472801cc82714cb3ceef819bd3149ef337b9c42aa23570cc5d6ba7b747be84af08f9e SHA512 032997d18db21a3ea5e9badbfebecb00c480adf7289e19f49a785eb41dba216c77bff7556b6d05f1646cb9930bc33e520e569a1ad636d1fe5146dc459e6c282e
-EBUILD udiskie-2.3.2.ebuild 1005 BLAKE2B 7f2e1c0083cdb534db439f7f981d0571163802c42482c30c1ac875f66ab472801cc82714cb3ceef819bd3149ef337b9c42aa23570cc5d6ba7b747be84af08f9e SHA512 032997d18db21a3ea5e9badbfebecb00c480adf7289e19f49a785eb41dba216c77bff7556b6d05f1646cb9930bc33e520e569a1ad636d1fe5146dc459e6c282e
+EBUILD udiskie-2.3.2.ebuild 1003 BLAKE2B 025bf87e0e856e135cc21b078fcf83226c935ae95e855fdcd82bbab75e5cece01fe495ddf338b724ccf22390fec0f4f79d4824a633ce87ed81dcd7418f707550 SHA512 5e9ab3c79b78afa2f6c3143f1df0bfd4138696ae6f49208675d8ae1ff3097cb88895efe174fac0827bffa20d56e3073046a715c0197b823359ca589153370091
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-2.2.0.ebuild b/sys-fs/udiskie/udiskie-2.2.0.ebuild
deleted file mode 100644
index b8889d66bdf6..000000000000
--- a/sys-fs/udiskie/udiskie-2.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 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.0.ebuild b/sys-fs/udiskie/udiskie-2.3.0.ebuild
deleted file mode 100644
index 55fa66a15c5a..000000000000
--- a/sys-fs/udiskie/udiskie-2.3.0.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.2.ebuild b/sys-fs/udiskie/udiskie-2.3.2.ebuild
index 55fa66a15c5a..4d0eaef9ab3e 100644
--- a/sys-fs/udiskie/udiskie-2.3.2.ebuild
+++ b/sys-fs/udiskie/udiskie-2.3.2.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/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 7c86801821c6..28d64b7fce96 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,4 +6,4 @@ EBUILD zfs-kmod-0.8.6.ebuild 4761 BLAKE2B 03ae7e6c75b1e0b2032758272eeef7ac5ceccb
 EBUILD zfs-kmod-2.0.2.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41
 EBUILD zfs-kmod-2.0.3.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41
 EBUILD zfs-kmod-9999.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41
-MISC metadata.xml 448 BLAKE2B 4a3c4f00039257710b1afa9fceba0480ea53df29d5c7a7eb0037fe326e9cc19f2dca572fa1122d769b6c432b4f6bbf6864d78cc9d0dd3fa797831d7c497ab8b4 SHA512 09d8c75b14b0934d134e10456074f51feeb35f77b59a089f7c6720ce9aa6c83819cdb7e72aa3879a71621310cdd24466ec2c9fd82e6e8040303547249c5464d5
+MISC metadata.xml 548 BLAKE2B 0245ac0b73ed129ce2df41358814d46749fab0463a03fceb643010629cd522460e84c5b8c0247f499adf4ed2e781e0d6f6857a3c6be4f4fb206eeabba158e86c SHA512 2b98b289369d875c5ff89825590a98c9764a1b716df1b79c852dbb833f4f02d5c66782f43084a1acde11a0ba2cb9ef2956b35c10881f77ec92d6749566276e6b
diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml
index 960c5042093c..1584e68c92f9 100644
--- a/sys-fs/zfs-kmod/metadata.xml
+++ b/sys-fs/zfs-kmod/metadata.xml
@@ -5,6 +5,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<use>
 		<flag name="rootfs">Install zfs-shutdown script to support exporting a pool containing rootfs</flag>
 	</use>
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 1a5186faf545..2f5af0e530e8 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,4 +6,4 @@ EBUILD zfs-0.8.6.ebuild 5695 BLAKE2B 1512678bd01715aaabb552739c4a5fdfc2251af5720
 EBUILD zfs-2.0.2.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705
 EBUILD zfs-2.0.3.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705
 EBUILD zfs-9999.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705
-MISC metadata.xml 900 BLAKE2B d51eb3a6b612d11f2687117c3e26960834de7b2a6071117bcefccd034f7c105f1158fda5263823ae90d20ebfb3e850a298333502d47566aefdb4ec0b871d570a SHA512 a746956ce9e80348503bd924bd592c3a4d8e11614732bcdf5f1ea824f2439141694654591fe7f744a2d08f3dfb7ec0c17476079d3490b0ab1838cbbb487dde0a
+MISC metadata.xml 1000 BLAKE2B 1f3e75ef73d5680d5863f0fda415931a6af19ab1a535c9795c417526ccce2a826ede05abee88ff27c2ec99f1f23aa06cce02cd3cb6d49b2952e90eb94ab95a6b SHA512 f8b30ce788d80c8f65db738f251fe5ebdc4d3ec7206dc78e0b9e53c2cf92153b90e20f6799b2a36bf8e616147b28f9660421bbc2ad17e7dbd804d47f430f6e40
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml
index 3bdb5e190ea9..2134ad6995a9 100644
--- a/sys-fs/zfs/metadata.xml
+++ b/sys-fs/zfs/metadata.xml
@@ -5,6 +5,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<use>
 		<flag name="kernel-builtin">Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree</flag>
 		<flag name="minimal">Don't install python scripts (arcstat, dbufstat etc) and avoid dependency on <pkg>dev-lang/python</pkg></flag>