Updating liguros repo21.1.2

author: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-01-17 23:35:33 +0000
committer: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-01-17 23:35:33 +0000
commit: 8e8120eabdd28020aa69c7a60505cce2edd20adc (patch)
tree: 061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /sys-fs
parent: c16790af2c9b4cbc38e565d4311252193ff85484 (diff)
download: baldeagleos-repo-21.1.2.tar.gz
baldeagleos-repo-21.1.2.tar.xz
baldeagleos-repo-21.1.2.zip
104 files changed, 894 insertions, 1393 deletions
diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest
index 2a27a32ca976..50d40215513d 100644
--- a/sys-fs/android-file-transfer-linux/Manifest
+++ b/sys-fs/android-file-transfer-linux/Manifest
@@ -1,3 +1,3 @@
 DIST android-file-transfer-linux-3.9.tar.gz 781268 BLAKE2B 63032a39b39cf31b8d051c0069c0357f0b6ed5bd9e592ee5ce1f5e95438ff27571ec7d58789eb865a1896097c3cebf0ec30a89526b62c93694d71ca29e95d415 SHA512 7468ff19d2b4ae0f768eea70ec45246da11c4e541d07a9548d057c080adbbc905f76dcdff18c4c8478cd19aee6992d02beaf8b4275d7302997652e25351ab5c8
-DIST android-file-transfer-linux-4.0.tar.gz 820094 BLAKE2B 1cb7150647e09a9f3dbe30cdf8ff01e122c9bab5a450c9bbe58fc8e3c8b48de0e2b6d571c8e7fa71de25fff28b803ef60aed7f8a77129919bdf9f482fff975ee SHA512 31083d3f7adb06ba0b5e79738825f5a10f3f4ce7e5b24498f7255224c11a9d978b814749c4b5fd60a5ec2b4c7d06bc85ad4b0cfb6cbcf6b3ff3f7e331c6c03f1
 DIST android-file-transfer-linux-4.1.tar.gz 820290 BLAKE2B 598a4ae25cc5110c38534d1b2b49c034f3dee3f8ab9e47835b4543acecf80521c102e0b8cdf89a19801b178a8fdbbd09e866b957b3ab5886700a26e6c00f8a1b SHA512 76151089dcce304fb688a54a4f94ea605fa3d048765119c631a2ff2c8d107678062ed4d485a983dfb0b337c9b4d3639e3f76640b6bcc73e3e6449764e99298ab
+DIST android-file-transfer-linux-4.2.tar.gz 823609 BLAKE2B dfd9b6ef4a92b1bc7851fd160837366b97fa95db5a998b9df156dd8543be554e07d02aae9be9f27b1cd9ee96aacc2003e06e4c7670c49b478e07779c92829817 SHA512 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild
index e5da047c2999..6945a53401a3 100644
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ "${PV}" = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git"
 else
 	SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.0.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild
index e5da047c2999..132ce6faf593 100644
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.0.ebuild
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
index dd0529c5e331..885a2afcc819 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
@@ -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/atari-fdisk-0.7.1.5.4.ebuild b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild
index 6e783ebbc07c..f5c41bab0e90 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,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index 3b889a6b3435..64d304a77722 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -1 +1,2 @@
 DIST avfs-1.1.1.tar.bz2 606819 BLAKE2B 240bb342dc9f993ac8deb60941411b1419c190f9909b5b1bde65777b82f622e121f44f238d2bd8ddc303c86ef376950d4af773c8fae79848b466ec3a3c5aafc1 SHA512 0707f8e746d8d3633755b1a1efb944a400c095b517a7befd75de4d25e2fad1a1b5132b9cf94285b05ad1344bfc138ec75e9cb5f8a5d7775a69595b9b35266f92
+DIST avfs-1.1.3.tar.bz2 609901 BLAKE2B 2eea31365533372fc5ea252d57da97a8e0d362b6db5f0a6e10af9255105ccdcadbd7f5157aafd63244da2c7a53dcbc6781d0c4ba5ca231ce2937855d400ea4e5 SHA512 8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005
diff --git a/sys-fs/avfs/avfs-1.1.3.ebuild b/sys-fs/avfs/avfs-1.1.3.ebuild
new file mode 100644
index 000000000000..a9d5071514cd
--- /dev/null
+++ b/sys-fs/avfs/avfs-1.1.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files"
+HOMEPAGE="https://sourceforge.net/projects/avf/"
+SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+lzma webdav +zstd"
+
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-arch/bzip2:=
+	>=sys-fs/fuse-2.4:0
+	sys-libs/zlib
+	lzma? ( app-arch/xz-utils )
+	webdav? ( net-libs/neon:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--enable-fuse \
+		--enable-library \
+		--enable-shared \
+		--with-system-zlib \
+		--with-system-bzlib \
+		--disable-static \
+		$(use_enable webdav dav) \
+		$(use_with lzma xz) \
+		$(use_with zstd)
+}
+
+src_install() {
+	default
+
+	# remove cruft
+	rm "${ED}"/usr/bin/{davpass,ftppass} || die
+
+	# install docs
+	dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse}
+	dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
+
+	docinto scripts
+	dodoc scripts/*pass
+
+	find "${ED}" -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		einfo "This version of AVFS includes FUSE support. It is user-based."
+		einfo "To execute:"
+		einfo "1) as user, mkdir ~/.avfs"
+		einfo "2) make sure fuse is either compiled into the kernel OR"
+		einfo "   modprobe fuse or add to startup."
+		einfo "3) run mountavfs"
+		einfo "To unload daemon, type umountavfs"
+		einfo
+		einfo "READ the documentation! Enjoy :)"
+	fi
+}
diff --git a/sys-fs/avfs/metadata.xml b/sys-fs/avfs/metadata.xml
index ebde900afbd6..9b682ff37d57 100644
--- a/sys-fs/avfs/metadata.xml
+++ b/sys-fs/avfs/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<use>
+		<flag name="webdav">Allow mounting WebDAV shares via <pkg>net-libs/neon</pkg></flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">avf</remote-id>
+		<changelog>https://sourceforge.net/p/avf/git/ci/master/tree/NEWS</changelog>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index e8d393d0f838..ebf679a12743 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1 +1 @@
-DIST bees-0.6.1.tar.gz 124411 BLAKE2B fd6c875334cb610da94a4633351b7edc5a4ecf4ff467bb93c8559a1698fd29667d43955e0031498401ceeb3d8db13b5aeb80d2f16cd61e4d5a6607e432082c79 SHA512 cd44d21959d3ab4dda255f0a4a57bd3aeecfb9fee6ea26d68a1b5f84d407f75bd0b442ecf4fefc5ac856dcd9af035f44ceeff77a8926b164f97a15350efcee33
+DIST bees-0.6.4.tar.gz 126064 BLAKE2B 562f0cfd63d15978a26f859548eb36cea0bf1be8e363c7ee5d2294e3c6407b4a93d865ffe2d15fabaeb2b3e136ad2d48cab3210c00e5fe39432985186ad62c55 SHA512 ce0eb66ac0770838e13ba6007fd765c02aea3f5eefc09e2834118d420e71693c37b8aa8511cfc9577ca09ab82d37787a1854edbed090c059759b29c70d834672
diff --git a/sys-fs/bees/bees-0.6.1-r2.ebuild b/sys-fs/bees/bees-0.6.4.ebuild
index 70bf39d08a69..6c38f7b9c91e 100644
--- a/sys-fs/bees/bees-0.6.1-r2.ebuild
+++ b/sys-fs/bees/bees-0.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,9 +8,9 @@ inherit linux-info systemd
 DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
 HOMEPAGE="https://github.com/Zygo/bees"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
 else
 	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64"
@@ -29,21 +29,11 @@ RDEPEND="${DEPEND}"
 CONFIG_CHECK="~BTRFS_FS"
 ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
 
-PATCHES=(
-	"${FILESDIR}/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch"
-	"${FILESDIR}/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch"
-	"${FILESDIR}/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch"
-	"${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch"
-)
+PATCHES=( "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" )
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt 4 4 3; then
-			ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
-			ewarn "properly operate, so it won't work. It's recommended to run at least"
-			ewarn "kernel version 4.11 for best performance and reliability."
-			ewarn
-		elif kernel_is -lt 4 11; then
+		if kernel_is -lt 4 11; then
 			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
 			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
 			ewarn "running, it's recommended to run at least kernel 4.11."
@@ -55,7 +45,14 @@ pkg_pretend() {
 			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
 			ewarn
 		fi
-
+		if kernel_is -lt 5 1 0; then
+			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
 		if kernel_is -lt 5 3 4; then
 			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
 			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
@@ -66,20 +63,16 @@ pkg_pretend() {
 			ewarn
 		fi
 
-		if kernel_is -lt 5 0 4; then
-			ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption"
-			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
-			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
-			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
-			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
-			ewarn
-		fi
-
 		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."
 	fi
 }
 
+src_prepare() {
+	default
+	sed -i 's/ -Werror//' makeflags || die
+}
+
 src_configure() {
 	cat >localconf <<-EOF || die
 		LIBEXEC_PREFIX=/usr/libexec
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 0bfb2654d893..6c38f7b9c91e 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit linux-info
+inherit linux-info systemd
 
 DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
 HOMEPAGE="https://github.com/Zygo/bees"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
 else
 	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="GPL-3"
@@ -29,14 +29,11 @@ RDEPEND="${DEPEND}"
 CONFIG_CHECK="~BTRFS_FS"
 ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
 
+PATCHES=( "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" )
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt 4 4 3; then
-			ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
-			ewarn "properly operate, so it won't work. It's recommended to run at least"
-			ewarn "kernel version 4.11 for best performance and reliability."
-			ewarn
-		elif kernel_is -lt 4 11; then
+		if kernel_is -lt 4 11; then
 			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
 			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
 			ewarn "running, it's recommended to run at least kernel 4.11."
@@ -48,7 +45,14 @@ pkg_pretend() {
 			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
 			ewarn
 		fi
-
+		if kernel_is -lt 5 1 0; then
+			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
 		if kernel_is -lt 5 3 4; then
 			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
 			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
@@ -59,25 +63,22 @@ pkg_pretend() {
 			ewarn
 		fi
 
-		if kernel_is -lt 5 0 4; then
-			ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption"
-			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
-			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
-			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
-			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
-			ewarn
-		fi
-
 		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."
 	fi
 }
 
+src_prepare() {
+	default
+	sed -i 's/ -Werror//' makeflags || die
+}
+
 src_configure() {
 	cat >localconf <<-EOF || die
 		LIBEXEC_PREFIX=/usr/libexec
 		PREFIX=/usr
-		LIBDIR=$(get_libdir)
+		LIBDIR="$(get_libdir)"
+		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
 		DEFAULT_MAKE_TARGET=all
 	EOF
 	if [[ ${PV} != "9999" ]] ; then
diff --git a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch b/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch
deleted file mode 100644
index 60ab748eb2b6..000000000000
--- a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 566df54a3f7458559b75455a95b1991b515ba6bf Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <zblaxell@thirteen.furryterror.org>
-Date: Wed, 12 Jun 2019 21:27:50 -0400
-Subject: [PATCH 1/2] lib: fix non-local lambda expression cannot have a
- capture-default
-
-We got away with this because GCC 4.8 (and apparently every GCC prior
-to 9) didn't notice or care, and because there is nothing referenced
-inside the lambda function body that isn't accessible from any other
-kind of function body (i.e. the capture wasn't needed at all).
-
-GCC 9 now enforces what the C++ standard said all along:  there is
-no need to allow capture-default in this case, so it is not.
-
-Fix by removing the offending capture-default.
-
-Fixes: https://github.com/Zygo/bees/issues/112
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- lib/error.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/error.cc b/lib/error.cc
-index f2a6db0..1d16a0a 100644
---- a/lib/error.cc
-+++ b/lib/error.cc
-@@ -32,7 +32,7 @@ namespace crucible {
- 
- 	// FIXME:  could probably avoid some of these levels of indirection
- 	static
--	function<void(string s)> current_catch_explainer = [&](string s) {
-+	function<void(string s)> current_catch_explainer = [](string s) {
- 		cerr << s << endl;
- 	};
- 
--- 
-2.23.0
-
diff --git a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch b/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch
deleted file mode 100644
index 6d8d2ea530d5..000000000000
--- a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From f731ea8016c570243c783adef96681b535d9c927 Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <bees@furryterror.org>
-Date: Tue, 19 Nov 2019 16:01:31 -0500
-Subject: [PATCH 2/2] context: workaround to prevent LOGICAL_INO and btrfs
- balance from running concurrently
-
-This avoids some kernel bugs.  One of them is fixed in 5.3.4 and later:
-
-	efad8a853a "Btrfs: fix use-after-free when using the tree modification log"
-
-There are apparently others in current kernels, so for now just put bees
-on pause until the balance is done.
-
-At some point we may want to provide an option to disable this
-workaround; however, running bees and balance at the same time makes
-neither particularly fast, so maybe we'll just leave it this way.
-
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- src/bees-context.cc | 31 +++++++++++++++++++++++++++++++
- src/bees.h          |  4 ++++
- 2 files changed, 35 insertions(+)
-
-diff --git a/src/bees-context.cc b/src/bees-context.cc
-index 4e0a43e..0665019 100644
---- a/src/bees-context.cc
-+++ b/src/bees-context.cc
-@@ -760,11 +760,42 @@ BeesResolveAddrResult::BeesResolveAddrResult()
- {
- }
- 
-+void
-+BeesContext::wait_for_balance()
-+{
-+	Timer balance_timer;
-+	BEESNOTE("WORKAROUND: waiting for balance to stop");
-+	while (true) {
-+		btrfs_ioctl_balance_args args;
-+		memset_zero<btrfs_ioctl_balance_args>(&args);
-+		const int ret = ioctl(root_fd(), BTRFS_IOC_BALANCE_PROGRESS, &args);
-+		if (ret < 0) {
-+			// Either can't get balance status or not running, exit either way
-+			break;
-+		}
-+
-+		if (!(args.state & BTRFS_BALANCE_STATE_RUNNING)) {
-+			// Balance not running, doesn't matter if paused or cancelled
-+			break;
-+		}
-+
-+		BEESLOGDEBUG("WORKAROUND: Waiting " << balance_timer << "s for balance to stop");
-+		sleep(BEES_BALANCE_POLL_INTERVAL);
-+	}
-+}
-+
- BeesResolveAddrResult
- BeesContext::resolve_addr_uncached(BeesAddress addr)
- {
- 	THROW_CHECK1(invalid_argument, addr, !addr.is_magic());
- 	THROW_CHECK0(invalid_argument, !!root_fd());
-+
-+	// Is there a bug where resolve and balance cause a crash (BUG_ON at fs/btrfs/ctree.c:1227)?
-+	// Apparently yes, and more than one.
-+	// Wait for the balance to finish before we run LOGICAL_INO
-+	wait_for_balance();
-+
-+	// Time how long this takes
- 	Timer resolve_timer;
- 
- 	// There is no performance benefit if we restrict the buffer size.
-diff --git a/src/bees.h b/src/bees.h
-index da87d88..5c9375c 100644
---- a/src/bees.h
-+++ b/src/bees.h
-@@ -114,6 +114,9 @@ const size_t BEES_TRANSID_FACTOR = 10;
- // The actual limit in LOGICAL_INO seems to be 2730, but let's leave a little headroom
- const size_t BEES_MAX_EXTENT_REF_COUNT = 2560;
- 
-+// Wait this long for a balance to stop
-+const double BEES_BALANCE_POLL_INTERVAL = 60.0;
-+
- // Flags
- const int FLAGS_OPEN_COMMON   = O_NOFOLLOW | O_NONBLOCK | O_CLOEXEC | O_NOATIME | O_LARGEFILE | O_NOCTTY;
- const int FLAGS_OPEN_DIR      = FLAGS_OPEN_COMMON | O_RDONLY | O_DIRECTORY;
-@@ -708,6 +711,7 @@ class BeesContext : public enable_shared_from_this<BeesContext> {
- 	void set_root_fd(Fd fd);
- 
- 	BeesResolveAddrResult resolve_addr_uncached(BeesAddress addr);
-+	void wait_for_balance();
- 
- 	BeesFileRange scan_one_extent(const BeesFileRange &bfr, const Extent &e);
- 	void rewrite_file_range(const BeesFileRange &bfr);
--- 
-2.23.0
-
diff --git a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch b/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
deleted file mode 100644
index 9f53e5b37da3..000000000000
--- a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 0b7cf9c0f11722c7cb8a816e9118602b43d9a3f5 Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <bees@furryterror.org>
-Date: Tue, 29 Oct 2019 23:34:36 -0400
-Subject: [PATCH 3/3] process: Fix gettid() ambiguity with glibc >= 2.30
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In version 2.30 glibc added it's own gettid() function. This resulted in
-"error: call of overloaded ‘gettid()’ is ambiguous" because gettid()
-now exists in both namespace crucible and std.
-
-For now, use explicit references to namespace crucible.  This continues
-to work with new and old libc without having to test specific library
-versions.
-
-At some point, glibc gettid() will be deployed widely enough that we can
-remove the crucible version entirely.
-
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- include/crucible/lockset.h | 4 ++--
- lib/chatter.cc             | 4 ++--
- src/bees.cc                | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/include/crucible/lockset.h b/include/crucible/lockset.h
-index 856c55e..99500b7 100644
---- a/include/crucible/lockset.h
-+++ b/include/crucible/lockset.h
-@@ -117,7 +117,7 @@ namespace crucible {
- 		while (full() || locked(name)) {
- 			m_condvar.wait(lock);
- 		}
--		auto rv = m_set.insert(make_pair(name, gettid()));
-+		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
- 		THROW_CHECK0(runtime_error, rv.second);
- 	}
- 
-@@ -129,7 +129,7 @@ namespace crucible {
- 		if (full() || locked(name)) {
- 			return false;
- 		}
--		auto rv = m_set.insert(make_pair(name, gettid()));
-+		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
- 		THROW_CHECK1(runtime_error, name, rv.second);
- 		return true;
- 	}
-diff --git a/lib/chatter.cc b/lib/chatter.cc
-index cbd5adb..e5a24f9 100644
---- a/lib/chatter.cc
-+++ b/lib/chatter.cc
-@@ -69,14 +69,14 @@ namespace crucible {
- 			DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ltm));
- 
- 			header_stream << buf;
--			header_stream << " " << getpid() << "." << gettid() << "<" << m_loglevel << ">";
-+			header_stream << " " << getpid() << "." << crucible::gettid() << "<" << m_loglevel << ">";
- 			if (!m_name.empty()) {
- 				header_stream << " " << m_name;
- 			}
- 		} else {
- 			header_stream << "<" << m_loglevel << ">";
- 			header_stream << (m_name.empty() ? "thread" : m_name);
--			header_stream << "[" << gettid() << "]";
-+			header_stream << "[" << crucible::gettid() << "]";
- 		}
- 
- 		header_stream << ": ";
-diff --git a/src/bees.cc b/src/bees.cc
-index 08c3fd7..aa55af0 100644
---- a/src/bees.cc
-+++ b/src/bees.cc
-@@ -115,9 +115,9 @@ BeesNote::~BeesNote()
- 	tl_next = m_prev;
- 	unique_lock<mutex> lock(s_mutex);
- 	if (tl_next) {
--		s_status[gettid()] = tl_next;
-+		s_status[crucible::gettid()] = tl_next;
- 	} else {
--		s_status.erase(gettid());
-+		s_status.erase(crucible::gettid());
- 	}
- }
- 
-@@ -128,7 +128,7 @@ BeesNote::BeesNote(function<void(ostream &os)> f) :
- 	m_prev = tl_next;
- 	tl_next = this;
- 	unique_lock<mutex> lock(s_mutex);
--	s_status[gettid()] = tl_next;
-+	s_status[crucible::gettid()] = tl_next;
- }
- 
- void
--- 
-2.23.0
-
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 760be27a79c8..57f02eca17a1 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,4 +1,3 @@
-DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
+DIST btrfs-progs-v5.10-rc1.tar.xz 2203156 BLAKE2B 55f63cd5fecc06f1004848f0bec4ba6dea3476a2b8b0a133d32e13b895ce305af1f9125126a937675649541c4f93fdd64689dfa2660764027216aa0e048116fa SHA512 50fe512beaf3459c520ca76896f1c12958a59e7837538e8bcad09acea9b92495baa435d321fa272e55f21a06c1799e0240747091abd44ae3bc717052c59cae82
 DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f
-DIST btrfs-progs-v5.7.tar.xz 2182728 BLAKE2B 47573baa26cde058003b402dadba28f278b4b3ffd270d002ab8fd72d94ee41d3fdfb3d36c0c579e24ea6afae4b2dea2ca704d9dd809fcd10fbc146d63d48980c SHA512 72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16
 DIST btrfs-progs-v5.9.tar.xz 2189724 BLAKE2B 3692e058e5e52c2a3684548d0b0ca94a9101a66dc8951266a49a71b6848b7f0cce8ade0e914ae8b71345021750e7d20742af13aec69aef7d52e3030fca289529 SHA512 38db047198ab0467d3fe235f7e8e1fd14ade00dd0b182588220c5f5e4b598efbdcd30a3d5d56cf0a0ed8a902d2374af0927eb7f3720cd761172c7291a2a65c94
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
deleted file mode 100644
index eef3a39b1721..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-be-bswap.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.7.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.10_rc1.ebuild
index aa5953745b08..a41d4690e34d 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.7.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.10_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index c8a1c94d71e1..a41d4690e34d 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ libbtrfs_soname=0
 if [[ ${PV} != 9999 ]]; then
 	MY_PV="v${PV/_/-}"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 else
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch
deleted file mode 100644
index b91b32040855..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix build failure on big-endian platforms.
-
-Reported-by: ernsteiswuerfel
-Bug: https://bugs.gentoo.org/670741
---- a/kernel-lib/bitops.h
-+++ b/kernel-lib/bitops.h
-@@ -180,5 +180,5 @@ static inline unsigned long ext2_swab(const unsigned long y)
- #if BITS_PER_LONG == 64
--	return (unsigned long) bswap64((u64) y);
-+	return (unsigned long) bswap_64((u64) y);
- #elif BITS_PER_LONG == 32
--	return (unsigned long) bswap32((u32) y);
-+	return (unsigned long) bswap_32((u32) y);
- #else
-@@ -220,3 +220,3 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1,
- 
--unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
-+static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
- 		unsigned long offset)
-@@ -227,3 +227,3 @@ unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
- 
--unsigned long find_next_bit_le(const void *addr, unsigned long size,
-+static inline unsigned long find_next_bit_le(const void *addr, unsigned long size,
- 		unsigned long offset)
diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest
index 3b432492b8ec..a59d3072e054 100644
--- a/sys-fs/cryptmount/Manifest
+++ b/sys-fs/cryptmount/Manifest
@@ -1 +1 @@
-DIST cryptmount-5.3.2.tar.gz 545190 BLAKE2B 708c6ba33060c0698361de7bcdc5e0a5932e063c9178c0a6b9cfb1cba9ec236337dbda0664e8755cc017113ee8ef0149c47fc85019a57ac84bf240790d5d798c SHA512 972c7fefadb86bb82cdeb96b185f45bec08ac07d39474a4c7e2a473bc2453624ffcc387b6836a02260dcd0d1176a5a743c45bdf3d7e78d2f519f02a48c62a6b8
+DIST cryptmount-5.3.3.tar.gz 545925 BLAKE2B 7a20d3a3b5805b1fe9ed84aafe6aaebeab4c62652dc8f53ecd70a7e0a0aa993ab5a03d54967910b94e6d8bde28f7ee7bb90a115a2bf101c9d4f4177fee26f90d SHA512 9945630316feee513a64e11dffa61ece77d0dff43a7b611d91fcb0a7c902402effb30ba15266d52c2f5381aa3ab7290a9a0999ca391c3c15cbdb83debe7dcca0
diff --git a/sys-fs/cryptmount/cryptmount-5.3.2.ebuild b/sys-fs/cryptmount/cryptmount-5.3.3.ebuild
index 6d232e9ad024..165593594236 100644
--- a/sys-fs/cryptmount/cryptmount-5.3.2.ebuild
+++ b/sys-fs/cryptmount/cryptmount-5.3.3.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="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev"
 REQUIRED_USE="
 	luks? ( gcrypt )
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
index 6d34c8c0b6d5..a79a00db92d3 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-AR.patch
 	"${FILESDIR}"/${P}-no-sysctl.patch
 	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-musl.patch
 )
 
 src_compile() {
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch
new file mode 100644
index 000000000000..7e7c3d1d310e
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch
@@ -0,0 +1,79 @@
+Port to musl.
+
+Patch-by: ernsteiswuerfel
+Bug: https://bugs.gentoo.org/715862
+--- a/fsck_hfs.tproj/dfalib/CatalogCheck.c
++++ b/fsck_hfs.tproj/dfalib/CatalogCheck.c
+@@ -23,6 +23,7 @@
+ #include "Scavenger.h"
+ #include "DecompDataEnums.h"
+ #include "DecompData.h"
++#include <sys/types.h>
+ 
+ /*
+  * information collected when visiting catalog records
+--- a/fsck_hfs.tproj/dfalib/SRepair.c
++++ b/fsck_hfs.tproj/dfalib/SRepair.c
+@@ -35,6 +35,7 @@
+ #include "Scavenger.h"
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include "../cache.h"
+ 
+--- a/fsck_hfs.tproj/dfalib/Scavenger.h
++++ b/fsck_hfs.tproj/dfalib/Scavenger.h
+@@ -44,7 +44,7 @@
+ #include <sys/kauth.h>
+ #include <sys/syslimits.h>
+ #endif
+-#include <sys/errno.h>
++#include <errno.h>
+ 
+ #ifdef __cplusplus
+ extern	"C" {
+--- a/fsck_hfs.tproj/fsck_hfs.h
++++ b/fsck_hfs.tproj/fsck_hfs.h
+@@ -24,6 +24,9 @@
+ 
+ #include "cache.h"
+ 
++#ifndef __P
++#define __P(args)       args
++#endif
+ 
+ const extern char	*cdevname;		/* name of device being checked */
+ extern char	*progname;
+--- a/newfs_hfs.tproj/makehfs.c
++++ b/newfs_hfs.tproj/makehfs.c
+@@ -35,7 +35,6 @@
+ #include <time.h>
+ #include "missing.h"
+ #endif
+-#include <sys/errno.h>
+ #include <sys/stat.h>
+ #if !LINUX
+ #include <sys/sysctl.h>
+@@ -69,6 +68,9 @@ extern Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *b
+ #include "newfs_hfs.h"
+ #include "readme.h"
+ 
++#ifndef __P
++#define __P(args)       args
++#endif
+ 
+ #define HFS_BOOT_DATA	"/usr/share/hfsprogs/hfsbootdata"
+ 
+--- a/newfs_hfs.tproj/newfs_hfs.c
++++ b/newfs_hfs.tproj/newfs_hfs.c
+@@ -54,6 +54,9 @@
+ #else
+ #include <varargs.h>
+ #endif
++#ifndef __P
++#define __P(args)       args
++#endif
+ 
+ #define	NOVAL       (-1)
+ #define UMASK       (0755)
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index 1309df2a8afd..123303adec5b 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.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 test +udev"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index c176fd3124cd..1ca6438a0737 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,2 +1 @@
-DIST duperemove-0.11.1.tar.gz 115740 BLAKE2B 7804f1c98cdeb349ae12425636575c9b2468613dfe908d8c9f1d9fb74aefb412142002a0fc899b8448ed1b255257569555264b9d9c172899f856a919d02dd1a8 SHA512 3c344b00b8fb58a259840aea977ba2e5123b651bb58ec84177bdfd8337a377361984b85c6325271b7d3e4ea216017fa6fda793136c83e9837a13ec041df326b9
 DIST duperemove-0.11.2.tar.gz 158001 BLAKE2B 743f59319424f7fcd400bc24de056fb79fddcb2600a707446c2f1c13c26cdae2ae24e1a91d9edadef55aaafb01b7ca217defc4c939053981bddaca12fcc230e9 SHA512 d2b24c912a3ae4a5b9730ba1369b6174cc6fe252710dc7dae2971816e931558ea68d664bf4c9497630dd9002a71fccc26848ad848831fa45d7a7715ba65378e5
diff --git a/sys-fs/duperemove/duperemove-0.11.1.ebuild b/sys-fs/duperemove/duperemove-0.11.1.ebuild
deleted file mode 100644
index 2491a42a58ac..000000000000
--- a/sys-fs/duperemove/duperemove-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Btrfs and xfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> ${P/_/.}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/_/.}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.11.2.ebuild b/sys-fs/duperemove/duperemove-0.11.2.ebuild
index 245dba098bcb..62cb077c58ad 100644
--- a/sys-fs/duperemove/duperemove-0.11.2.ebuild
+++ b/sys-fs/duperemove/duperemove-0.11.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
index ba3c9ef00f31..fecff6d4d2e4 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.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 ~m68k-mint"
+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.45.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
index 317e54a2a64e..c4e165103a2e 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="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 ~m68k-mint"
+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/encfs/encfs-1.9.5-r1.ebuild b/sys-fs/encfs/encfs-1.9.5-r1.ebuild
new file mode 100644
index 000000000000..4bbb57d57e46
--- /dev/null
+++ b/sys-fs/encfs/encfs-1.9.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE"
+HOMEPAGE="https://vgough.github.io/encfs/"
+SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="libressl nls"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/tinyxml2:0=
+	sys-fs/fuse:0=
+	sys-libs/zlib"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+# Build dir is hardcoded in test suite, but we restrict them
+# because they can lead to false negatives, bug #630486
+RESTRICT="test"
+BUILD_DIR="${S}/build"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NLS="$(usex nls)"
+		-DUSE_INTERNAL_TINYXML=OFF
+		-DBUILD_UNIT_TESTS=OFF
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index bfcf9af0cb24..697e11f2dedd 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.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 ~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 0488d8e41a06..5d106dc8f46c 100644
--- a/sys-fs/eudev/eudev-3.2.9.ebuild
+++ b/sys-fs/eudev/eudev-3.2.9.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-common/Manifest b/sys-fs/fuse-common/Manifest
index 7f62c84c9b6c..1788fd1e5302 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -1,3 +1,4 @@
+DIST fuse-3.10.1.tar.xz 1898800 BLAKE2B ddccf4dc697547edb6ed48ca76b4379a5f94884fd19118926d82b82316d4b83fa80b9f4bda7edc51eb80ec72c06763fd766ab1216767456db8d6238c725f838b SHA512 7cf16c41060a8aaee2f815f271b4dd410c2e072e7629e55b92faca9b2b47544592704736c7da11a598f18ad4a537f0ba76964fa76e3f1a23b4facfe5c6053302
 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
 DIST fuse-3.9.2.tar.xz 1674292 BLAKE2B 42d796802d3ce2e072120153b695d1e64d160695714c58ffba7859281bfa2c1ff3d9f95b92a38c1a5443abe5a8468f0d9d285845b97a444ae1b64bf750e234ae SHA512 47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
diff --git a/sys-fs/fuse-common/fuse-common-3.10.1.ebuild b/sys-fs/fuse-common/fuse-common-3.10.1.ebuild
new file mode 100644
index 000000000000..1562ff02eb90
--- /dev/null
+++ b/sys-fs/fuse-common/fuse-common-3.10.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
+
+S=${WORKDIR}/fuse-${PV}
+
+src_install() {
+	udev_newrules util/udev.rules 99-fuse.rules
+
+	if use kernel_linux ; then
+		newinitd "${FILESDIR}"/fuse.init fuse
+	elif use kernel_FreeBSD ; then
+		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
+	else
+		die "We don't know what init code install for your kernel, please file a bug."
+	fi
+
+	insinto /etc
+	doins util/fuse.conf
+}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 729884e1a3af..7aacd30814d2 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,5 +1,6 @@
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.10.0.tar.xz 1899596 BLAKE2B 39f7c7caf3d7cd2807381ee968a6fd704b29e1171a811d918fe70b9fdf6891d553d97a70ac7b217e01c4776e3d8576c60bef0bd3f7b520685d7d0e4ee3b78bf9 SHA512 a59d430f46ad59d51848ab9a07a02940f167fd5552232067dbcc442717a444a2ab30b1743282a7839ae79c0a74949742cd54d09472449c90b5fcc89adc7eff35
+DIST fuse-3.10.1.tar.xz 1898800 BLAKE2B ddccf4dc697547edb6ed48ca76b4379a5f94884fd19118926d82b82316d4b83fa80b9f4bda7edc51eb80ec72c06763fd766ab1216767456db8d6238c725f838b SHA512 7cf16c41060a8aaee2f815f271b4dd410c2e072e7629e55b92faca9b2b47544592704736c7da11a598f18ad4a537f0ba76964fa76e3f1a23b4facfe5c6053302
 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
 DIST fuse-3.9.2.tar.xz 1674292 BLAKE2B 42d796802d3ce2e072120153b695d1e64d160695714c58ffba7859281bfa2c1ff3d9f95b92a38c1a5443abe5a8468f0d9d285845b97a444ae1b64bf750e234ae SHA512 47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
diff --git a/sys-fs/fuse/fuse-3.10.1.ebuild b/sys-fs/fuse/fuse-3.10.1.ebuild
new file mode 100644
index 000000000000..e78322fbb81b
--- /dev/null
+++ b/sys-fs/fuse/fuse-3.10.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit meson multilib-minimal flag-o-matic udev python-any-r1
+
+DESCRIPTION="An interface for filesystems implemented in userspace"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+suid test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
+
+DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
+
+python_check_deps() {
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dexamples=$(usex test true false)
+		-Duseroot=false
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		ewarn "Running as non-root user, skipping tests"
+	elif has sandbox ${FEATURES}; then
+		ewarn "Sandbox enabled, skipping tests"
+	else
+		multilib-minimal_src_test
+	fi
+}
+
+multilib_src_test() {
+	${EPYTHON} -m pytest test || die
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# installed via fuse-common
+	rm -r "${ED}"/{etc,$(get_udevdir)} || die
+
+	# useroot=false prevents the build system from doing this.
+	use suid && fperms u+s /usr/bin/fusermount3
+
+	# manually install man pages to respect compression
+	rm -r "${ED}"/usr/share/man || die
+	doman doc/{fusermount3.1,mount.fuse3.8}
+}
diff --git a/sys-fs/genext2fs/genext2fs-1.4.1.ebuild b/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
index 5276161cb27a..1007f0c45237 100644
--- a/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
+++ b/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
@@ -9,4 +9,4 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc sparc x86"
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
index 34e25a33f645..8874ede472d9 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rvoicilas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
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 e3ff5f5c7d04..8eff88206893 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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index a26c0a0a0d2a..99301e147982 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -1,3 +1 @@
-DIST iprutils-2.4.17.1.tar.gz 524770 BLAKE2B eb3864a431193ce342810449bde2ac6a4e7a9c352611077b70f93fd3b3ca69c47cbaf7a55ef45b38f99135acc27ebba34b7fbeb8d7f704587ce96e0a8e1f29bb SHA512 d9b257a1e86350ef26e6491d5030ac864a244283697a4ca588af7ee21c2518c631a2bcfc9913783f973025d186feab8ed045b1d4674621a08b401823e9c52d3d
 DIST iprutils-2.4.18.1.tar.gz 524809 BLAKE2B c32b01ada70e67748653b8e346cdecae35f3ac240a7eaa8be0ff70590bc68b8be770bffe2f3131cbd6cbbe75812f12524c0817aa02674cd4643e846724be2891 SHA512 42da77c0fde0a2650368b2f0605d63762389ab394f755f4e4144704e155333a2ad8133731244b8383e9a334517aca45f62487229a27a2e90cf22a10c760aab3d
-DIST iprutils-2.4.7.tar.gz 467671 BLAKE2B 8ca3e77f927dcb3cd45b78e1b5e15d7edc67b3fbc8762383e0e9e84ebd42ce74927909aae926762d6bf0378d3b8d8f77cece65bb3ace746f889fbebb7fdcbf43 SHA512 9e6fd37cb72ce1d092b02f1cdfeb9e97962007327f92f4d9dd2a755489dab3a5d51a459d2f256d8453de74935a5cee8f25f71a820d82347ae67aa72a89043a91
diff --git a/sys-fs/iprutils/iprutils-2.4.17.1.ebuild b/sys-fs/iprutils/iprutils-2.4.17.1.ebuild
deleted file mode 100644
index b01907f61432..000000000000
--- a/sys-fs/iprutils/iprutils-2.4.17.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils ltprune toolchain-funcs
-
-DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
-SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/iprdd/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE="static-libs"
-
-IPRUTILS_DEPEND="
-	>=sys-libs/ncurses-5.4-r5:=
-	>=sys-apps/pciutils-2.1.11-r1
-"
-RDEPEND="
-	${IPRUTILS_DEPEND}
-	virtual/logger
-	virtual/udev
-"
-DEPEND="
-	${IPRUTILS_DEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
-		"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		bashcompdir=$(get_bashcompdir) install
-
-	newinitd "${FILESDIR}"/iprinit-r1 iprinit
-	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
-	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
-}
diff --git a/sys-fs/iprutils/iprutils-2.4.18.1.ebuild b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
index b1595889fdb3..abd37a998769 100644
--- a/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
+++ b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools bash-completion-r1 eutils ltprune toolchain-funcs
+EAPI=7
+inherit autotools bash-completion-r1
 
 DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
 SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/iprdd/"
 SLOT="0"
 LICENSE="IBM"
 KEYWORDS="ppc ppc64"
-IUSE="static-libs"
+IUSE=""
 
 IPRUTILS_DEPEND="
 	>=sys-libs/ncurses-5.4-r5:=
@@ -27,8 +27,8 @@ DEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
-		"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
-		"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
+	"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
+	"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
 )
 
 src_prepare() {
@@ -37,10 +37,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	emake \
 		DESTDIR="${D}" \
@@ -52,6 +48,4 @@ src_install() {
 	newinitd "${FILESDIR}"/iprinit-r1 iprinit
 	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
 	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
 }
diff --git a/sys-fs/iprutils/iprutils-2.4.7.ebuild b/sys-fs/iprutils/iprutils-2.4.7.ebuild
deleted file mode 100644
index 7cacccbe3a5c..000000000000
--- a/sys-fs/iprutils/iprutils-2.4.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune toolchain-funcs
-
-DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
-SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/iprdd/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="ppc ppc64"
-IUSE="static-libs"
-
-DEPEND="
-	>=sys-libs/ncurses-5.4-r5
-	>=sys-apps/pciutils-2.1.11-r1
-	virtual/udev
-"
-RDEPEND="
-	${DEPEND}
-	virtual/logger
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.7-tinfo.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/iprinit-r1 iprinit
-	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
-	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
-}
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
index 5c666de36405..639a122f4e7e 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@@ -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/lde/files/lde-2.6.1-fno-common.patch b/sys-fs/lde/files/lde-2.6.1-fno-common.patch
new file mode 100644
index 000000000000..8e246aea95ac
--- /dev/null
+++ b/sys-fs/lde/files/lde-2.6.1-fno-common.patch
@@ -0,0 +1,32 @@
+--- a/src/lde.h
++++ b/src/lde.h
+@@ -211,7 +211,7 @@ struct fs_constants {
+ };
+ 
+ /* File system specific commands */
+-struct {
++struct _FS_cmd {
+   /* Check if inode is marked in use */
+   int (*inode_in_use)(unsigned long n);
+   /* Check if data zone/block is marked in use */
+@@ -231,7 +231,9 @@ struct {
+   unsigned long (*map_inode)(unsigned long n);
+   /* Map block number in file chain to physical block on disk */
+   int (*map_block)(unsigned long zone_index[], unsigned long blknr, unsigned long *mapped_block);
+-} FS_cmd;
++};
++
++extern struct _FS_cmd FS_cmd;
+ 
+ /* Flags */
+ struct _lde_flags {
+--- a/src/main_lde.c
++++ b/src/main_lde.c
+@@ -90,6 +90,7 @@ int  (*mgetch)(void) = tty_mgetch;
+ 
+ struct _lde_typedata lde_typedata[] = LDE_ALLTYPES;
+ 
++struct _FS_cmd FS_cmd;
+ 
+ /* Check if device is mounted, return 1 if is mounted else 0 */
+ static int check_mount(char *device_name)
diff --git a/sys-fs/lde/files/lde-2.6.1-respect-ar.patch b/sys-fs/lde/files/lde-2.6.1-respect-ar.patch
new file mode 100644
index 000000000000..104aaf45b774
--- /dev/null
+++ b/sys-fs/lde/files/lde-2.6.1-respect-ar.patch
@@ -0,0 +1,11 @@
+--- a/macros/configure.in
++++ b/macros/configure.in
+@@ -30,7 +30,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PATH_PROG(RM, rm, rm)
+-AC_PATH_PROG(AR, ar, ar)
++AM_PROG_AR
+ 
+ AC_CHECK_PROG(system,uname,`uname`,unknown)
+ 
diff --git a/sys-fs/lde/files/lde-2.6.1-tinfo.patch b/sys-fs/lde/files/lde-2.6.1-tinfo.patch
new file mode 100644
index 000000000000..bb4c6c2386c4
--- /dev/null
+++ b/sys-fs/lde/files/lde-2.6.1-tinfo.patch
@@ -0,0 +1,22 @@
+--- a/macros/configure.in
++++ b/macros/configure.in
+@@ -14,7 +14,6 @@ AC_SUBST(STATIC_LDFLAGS)
+ AC_DEFINE(_GNU_SOURCE)
+ 
+ dnl Must use builtin() as it is overridden by some AC_ macros
+-builtin(include,./curses.m4)
+ builtin(include,./misctests.m4)
+ 
+ dnl Search for ncurses by default
+@@ -187,7 +186,10 @@ AC_ARG_WITH(gpm,
+ dnl ------------------------------------------------------------------
+ dnl  Search for some version of curses
+ dnl ------------------------------------------------------------------
+-AC_CHECK_CURSES
++has_curses=false
++AC_SUBST(CURSES_INCLUDEDIR)
++AC_SUBST(CURSES_LIBS)
++PKG_CHECK_MODULES(ncurses, ncurses, [CURSES_LIBS="$ncurses_LIBS" CURSES_INCLUDEDIR="$ncurses_CFLAGS" has_curses=true])
+ if test "$has_curses" = true
+ then
+ 	AC_DEFINE(LDE_CURSES)
diff --git a/sys-fs/lde/lde-2.6.1-r1.ebuild b/sys-fs/lde/lde-2.6.1-r1.ebuild
index e1e59dff10ad..d3511d5897c7 100644
--- a/sys-fs/lde/lde-2.6.1-r1.ebuild
+++ b/sys-fs/lde/lde-2.6.1-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="ext2fs and minix disk editor for linux"
 HOMEPAGE="https://sourceforge.net/projects/lde/"
@@ -12,20 +14,33 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="
-	${RDEPEND}
-	dev-util/yacc"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
 
 S="${WORKDIR}/${PN}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-no-shadowing.patch"
+	"${FILESDIR}/${P}-fno-common.patch"
+	"${FILESDIR}/${P}-tinfo.patch"
+	"${FILESDIR}/${P}-respect-ar.patch"
 )
 
 DOCS=( WARNING README TODO COPYING )
 
 RESTRICT="test"
 
+src_prepare() {
+	default
+
+	cd macros || die
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
 src_install() {
 	dosbin "${PN}"
 	newman "doc/${PN}.man" "${PN}.8"
diff --git a/sys-fs/lsscsi/lsscsi-0.31.ebuild b/sys-fs/lsscsi/lsscsi-0.31.ebuild
index fc290928a6ed..d0e6dec2b7b5 100644
--- a/sys-fs/lsscsi/lsscsi-0.31.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.31.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 8dd209d0b7ca..b1dd586e846b 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,2 +1,2 @@
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
-DIST LVM2.2.03.10.tgz 2510568 BLAKE2B 1b4e9d09ef948b79a2e6e70fa8f8c9cd38ec8d8d1462eefb059f93020f65664538cee9bab41b81aaaf719ca428a9e824a2b181f40ebe261c5dd0fc6551ebcbb3 SHA512 8678ae2f99739ccad0250f6f4b4b8e84520f2053835985a1ea9c80196a64df31a48858aebf983170c3dfcafecea83f2c6aa630ef73fd31dd84cf1627a1b421e4
+DIST LVM2.2.03.11.tgz 2528527 BLAKE2B 4c02e630e033f9bfed44468b5b8dff4af52c943cb9d6385bfe568ba50463dfc97cd968d79c34eb2528d66930d6c2895de17fe546a34d80fd17a5892560bcb670 SHA512 50f21337e397fc5b4692bb08e5d48409b907b96b39168343bab2d40bb74fd84ff466e15f3d664305bc044f3f6be4369fa7378399d5a838793632e74706f17653
diff --git a/sys-fs/lvm2/lvm2-2.03.10.ebuild b/sys-fs/lvm2/lvm2-2.03.11.ebuild
index 7009b7723550..47f9c06d38dd 100644
--- a/sys-fs/lvm2/lvm2-2.03.10.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.11.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="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 ~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/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
index 9aad93609658..0eda9d8fbc1f 100644
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index f32ab21fce21..c31cdc59b53c 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -3,3 +3,4 @@ DIST mergerfs-2.29.0.tar.gz 302391 BLAKE2B a7d051c63b12a95af2868d8b3be9b32aa1be3
 DIST mergerfs-2.30.0.tar.gz 316560 BLAKE2B 7e6be39cfa5f085aabbc928e1da9c0bf1f6442be1de4ccef1868832c852d138901071129cf7feff19b13dd5939c5fff56520c5292473b92c71a85430818ab25c SHA512 6914c5efa783d66293ebcce0a6a493267eedfa45ac058cd24b2024aea15a866b997f4474363e4ababa4af59d302466c5f8c6b9f07ee42f7661b335d4701315b4
 DIST mergerfs-2.31.0.tar.gz 314286 BLAKE2B 595dd05e7bd4e6b2fbc2b1901a0d752710c6efea9957c400b394594e5586607a88899bf9966a9406ca0a57e0059af214ce30b06d87db5871aa42b5443a872cdb SHA512 c4504a8f585ffc7f58b11df441755db821611d9754a630ec211aaf611657df82c72120737ba2a2480e1ebebcb0af05adef2e4b8c463b97f4fd98ab5630890253
 DIST mergerfs-2.32.0.tar.gz 314388 BLAKE2B 8f009d8328702c48ec134e2dc80e65c88aa684dac541b9c09d0adaf81f3a013848d826e809fca9fed9d0b68917300f3dd65c5ba687f349006e950c7935b6adab SHA512 a25d075afcd0afb589ebf0306fb25bf8d170ab293047e1501128dcda1941abdce84b5513d9725c06aea3cb003f8abb4573826e81d11cfe90e4a2825ef75887ca
+DIST mergerfs-2.32.1.tar.gz 314392 BLAKE2B 8024dd835af3380fc53ed7255e720c2475da229b2cb3cea68c7bb64edf2b56de903f82c22f65459ea40f08ff724a60fa474a20fbd1e964686a9b1f0df5c5a05d SHA512 2e09ae48d9b06c5a6b7cc577b458a9ec402fcd8243c023f9c03d0b37a35c28722586c738e76f7291559deae84aa69f52bcc76a9042947f984b24b85d84276807
diff --git a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
index 5d1e3ec0e4cf..1a8305d70486 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.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
@@ -9,7 +9,7 @@ DESCRIPTION="A featureful union filesystem"
 HOMEPAGE="https://github.com/trapexit/mergerfs"
 
 SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"
diff --git a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
new file mode 100644
index 000000000000..5d1e3ec0e4cf
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A featureful union filesystem"
+HOMEPAGE="https://github.com/trapexit/mergerfs"
+
+SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+# Vendorized libfuse that's bundled is under LGPL-2.1.
+LICENSE="ISC LGPL-2.1"
+SLOT="0"
+IUSE="+xattr"
+
+DEPEND="
+	xattr? ( sys-apps/attr )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	default
+
+	# Hand made build system at it's finest.
+	echo -e "#!/bin/sh\ntrue" >tools/update-version || die
+	echo "#pragma once" >src/version.hpp || die
+	echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die
+
+	if ! use xattr; then
+		sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
+	fi
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/725978
+	tc-export AR
+
+	default
+}
+
+src_install() {
+	dobin build/mergerfs
+	dosym mergerfs /usr/bin/mount.mergerfs
+	dodoc README.md
+	doman man/mergerfs.1
+}
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
index 1f1be65f3bd0..f19c174a451a 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+lzo xattr +zstd"
 
 DEPEND="!sys-fs/mtd
diff --git a/sys-fs/ncdu/ncdu-1.15.1.ebuild b/sys-fs/ncdu/ncdu-1.15.1.ebuild
index a63123a3d82a..b0e05454504a 100644
--- a/sys-fs/ncdu/ncdu-1.15.1.ebuild
+++ b/sys-fs/ncdu/ncdu-1.15.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
index 5068d520464f..b34d1c8b101d 100644
--- a/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
+++ b/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nilfs.sourceforge.net/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/e2fsprogs-libs
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
index 3278c8125c93..a4bb51261d6c 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit linux-info udev toolchain-funcs libtool
+inherit linux-info toolchain-funcs
 
 MY_P="ntfs-3g_ntfsprogs-${PV%.*}AR.${PV##*.}"
 
@@ -74,4 +74,6 @@ src_install() {
 	use suid && fperms u+s /usr/bin/ntfs-3g
 	dosym mount.ntfs-3g /sbin/mount.ntfs
 	find "${D}" -name '*.la' -type f -delete || die
+	# https://bugs.gentoo.org/760780
+	keepdir "/usr/$(get_libdir)/ntfs-3g"
 }
diff --git a/sys-fs/quota/quota-4.05-r1.ebuild b/sys-fs/quota/quota-4.05-r1.ebuild
index 6751a1a13189..25220c8565b6 100644
--- a/sys-fs/quota/quota-4.05-r1.ebuild
+++ b/sys-fs/quota/quota-4.05-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="
diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest
index d0b0302813e2..4c49e1fc5464 100644
--- a/sys-fs/rar2fs/Manifest
+++ b/sys-fs/rar2fs/Manifest
@@ -1,3 +1 @@
-DIST rar2fs-1.28.0.tar.gz 264753 BLAKE2B 7f1462fae6e869e64a8c75d85c50df2794f4bfd0b057e5c213eb28a8aa48da53961026c5b9fb752090052c25a02ef9bb2a90bc57cfd8c4097b4c3136f20e7fb1 SHA512 e50313d1dae57387f60520ed3ff1d610f4c8448fcff101a9735a4ac1471dc5aa6ac67d0ba5200310caf439cf60ab1e1b8328a7048904970c292f35f700ef5c03
-DIST rar2fs-1.29.0.tar.gz 267351 BLAKE2B cc71c038b32fcc5584234df60dae829486885485e78702bacf6e6da21377b399b65a8b4986a076e84915c65f4f03ff0084678854188b6cef261a66547d8417c1 SHA512 199767cf22a11a7afd53318d471138ed1d82b92dc6d4e0d20094262a2f2d8f9c03ac6b47ceff8318923e01228b33f12684b1664e4b1c28bf43fb0d81f3d044c5
-DIST rar2fs-1.29.1.tar.gz 267860 BLAKE2B 2129dcfb860e56ea91dcea9d5af5e9a5c4513b7153673e366bfe3259ad12e1750507ffdd422ee6bad79afda950e5b08ee91a27012126d16c244dc146aee15a36 SHA512 c0cb4cca59e6adb450350a9730500bf9c569bb9ad835af0726ff05876a7a02c43e905293cc5582239b7a2564bf46bd02e6122934e0ad8c1785c326dbeff9c096
+DIST rar2fs-1.29.3.tar.gz 267415 BLAKE2B 269ad7f301595e6c17899fccd926589f883ab14ae43af9d6a024e6e381b2bf64786eba314431b32a1f6c8add315afdef259a1bc24da9ae93378d2ac38d3f3cce SHA512 75def71f088df0d9c9a62009178d0c1682f1ff75708c7b273dd669ecb1406795e53ff8ad0f6323d275f13cb580bebfaf1ca5b5c76026bb9b83360aed2f26935e
diff --git a/sys-fs/rar2fs/files/rar2fs-1.29.1-no-compress-man.patch b/sys-fs/rar2fs/files/rar2fs-1.29.1-no-compress-man.patch
deleted file mode 100644
index dac49db0e0fd..000000000000
--- a/sys-fs/rar2fs/files/rar2fs-1.29.1-no-compress-man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/m4/m4_ac_prog_gzip.m4 b/m4/m4_ac_prog_gzip.m4
-index 32ffc37..f5589bc 100644
---- a/m4/m4_ac_prog_gzip.m4
-+++ b/m4/m4_ac_prog_gzip.m4
-@@ -1,5 +1,5 @@
- AC_DEFUN([AC_PROG_GZIP],[
--AC_CHECK_PROGS(gzip,[gzip],no)
-+gzip="no"
- export gzip;
- AM_CONDITIONAL([HAVE_GZIP], [test x$gzip != xno])
- AC_SUBST(gzip)
diff --git a/sys-fs/rar2fs/rar2fs-1.28.0.ebuild b/sys-fs/rar2fs/rar2fs-1.28.0.ebuild
deleted file mode 100644
index d7d5e5f041b8..000000000000
--- a/sys-fs/rar2fs/rar2fs-1.28.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)"
-HOMEPAGE="https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs"
-SRC_URI="https://github.com/hasse69/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# Note that upstream unrar sometimes breaks ABI without updating the SONAME
-# version so try rebuilding rar2fs if it doesn't work following an unrar
-# upgrade.
-RDEPEND=">=app-arch/unrar-5:=
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	export USER_CFLAGS="${CFLAGS}"
-
-	econf \
-		--with-unrar="${ESYSROOT}"/usr/include/libunrar \
-		--disable-static-unrar \
-		$(use_enable debug)
-}
diff --git a/sys-fs/rar2fs/rar2fs-1.29.0.ebuild b/sys-fs/rar2fs/rar2fs-1.29.0.ebuild
deleted file mode 100644
index e7b7be74efd1..000000000000
--- a/sys-fs/rar2fs/rar2fs-1.29.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)"
-HOMEPAGE="https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs"
-SRC_URI="https://github.com/hasse69/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# Note that upstream unrar sometimes breaks ABI without updating the SONAME
-# version so try rebuilding rar2fs if it doesn't work following an unrar
-# upgrade.
-RDEPEND=">=app-arch/unrar-5:=
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	export USER_CFLAGS="${CFLAGS}"
-
-	econf \
-		--with-unrar="${ESYSROOT}"/usr/include/libunrar \
-		--disable-static-unrar \
-		$(use_enable debug)
-}
diff --git a/sys-fs/rar2fs/rar2fs-1.29.1.ebuild b/sys-fs/rar2fs/rar2fs-1.29.3.ebuild
index cc417da24599..88a18a26d4e7 100644
--- a/sys-fs/rar2fs/rar2fs-1.29.1.ebuild
+++ b/sys-fs/rar2fs/rar2fs-1.29.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,10 +21,6 @@ RDEPEND=">=app-arch/unrar-5:=
 	sys-fs/fuse:0"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.29.1-no-compress-man.patch"
-)
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index e169494bd077..026e6cbab414 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,3 +1,3 @@
 DIST reiser4progs-1.2.1.tar.gz 980203 BLAKE2B 8c9cb77458c083c50f34c17bddf4747b755b52b911a63835152ad584494c2738a5317c28e5b3f1e6bfdc49416f3715ca4fbbd9c8a428b5b484b54f8f4a861a58 SHA512 2caac5a98d672d68910c6df3e694a42365fa6273ae367c26126778c1fbe956aa502dac236d36c3302a5bf109468ad3447e645a6eab89c83f122dd1afe2aeda21
-DIST reiser4progs-2.0.2.tar.gz 994469 BLAKE2B ac680b901807c22b246ea5601b89d51fdd8ea12636bdacbddcdb191455c4ede50b116edd0d8d7398f99d6fb26ea9f44c5ffc561296ab3ee1c3ae0b5eade2e1ec SHA512 b7473c6ab4e3f3249b60081ac31e92c267a1408c32f82dc6d27e92297ac4e90263c129ef748891ca4c7cf31035ac723867f9bed649bae9ea1b73525278fdfdb3
 DIST reiser4progs-2.0.3.tar.gz 995921 BLAKE2B fa38c8998603ca0c26a17c75240d07afec6c46da1b437e5a733ce3a5a865329591d4343b52d7fd5dc56bb6afe34f4f7685e7dc258ed075dfe4a70a7ad420324a SHA512 59bcd6d73a220fd0e71cc4213489801f45597ebfcf0be55f150e929ef391e0a461a94ab99ee9698e1fb1eb58840497277ece6a2ea57e88d54573347a8854da87
+DIST reiser4progs-2.0.4.tar.gz 997361 BLAKE2B 3d083c2c702f6c469403447bd2bb59257c22a6f87e062b83227c97147c37e69f93f1ffb6a1ea2c9f23f94a5ac8fcb834da475893c9bd268fc8902e6af2af4c10 SHA512 222eaa69f89fa1cfad2b5791af028560fb6e57e44fbb5e025122c25b50dd4aea28a8fd362818a884fa6b3d6164e5b0c78ab63f0649e2e65780f1aee2c0d26375
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.2.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.4.ebuild
index fa83088da8fb..45ddbfaabf1c 100644
--- a/sys-fs/reiser4progs/reiser4progs-2.0.2.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
 IUSE="debug readline static static-libs"
 
 LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)]
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
index 5df0b1836175..fd206ba0d7b1 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/reiserfs/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
index 1889e0c146d4..998ee9006da1 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/reiserfs/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 952f1f088a00..5df865b6a20e 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,2 +1 @@
 DIST squashfs-tools-4.4-git.1.tar.gz 241963 BLAKE2B 7a80c353efbbca851b2eb44e742f20b4cf59e91058b53b77c74d879dc18d882e3bb6de8a010a4469c0a53384ccf2968bba4cd1d6f10cfcede70fe07eebbf2409 SHA512 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0
-DIST squashfs-tools-4.4.tar.gz 241842 BLAKE2B 006e2d340bcf6e20873221fb51fa30e0808c4a4d9e1838ca71c11ddbff3bf472dffe730e9edf07c34f535650e6486a8a80a88f82d6c9ef7a7c19aa22098e9197 SHA512 133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch
deleted file mode 100644
index dfbf42abb34b..000000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/squashfs-tools/mksquashfs.h
-+++ b/squashfs-tools/mksquashfs.h
-@@ -143,7 +143,7 @@ struct append_file {
- #endif
- 
- extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
--struct cache *bwriter_buffer, *fwriter_buffer;
-+extern struct cache *bwriter_buffer, *fwriter_buffer;
- extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
- 	*to_frag, *locked_fragment, *to_process_frag;
- extern struct append_file **file_mapping;
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index d1a1dc069652..75bf2149bea0 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -5,12 +5,6 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
-	<use>
-		<flag name="xz">
-			Enable support for XZ ("LZMA2") compression using
-			<pkg>app-arch/xz-utils</pkg>
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">squashfs</remote-id>
 	</upstream>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild
deleted file mode 100644
index f330af3c97ac..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="https://github.com/plougher/squashfs-tools"
-SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug lz4 lzma lzo xattr zstd"
-
-RDEPEND="
-	sys-libs/zlib
-	lz4? ( app-arch/lz4 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/attr )
-	zstd? ( app-arch/zstd )
-"
-DEPEND=${RDEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4-fno-common.patch
-)
-
-use10() { usex "${1}" 1 0; }
-
-src_configure() {
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 lzma)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools
-}
-
-src_install() {
-	dobin squashfs-tools/{mksquashfs,unsquashfs}
-	dodoc ACKNOWLEDGEMENTS CHANGES README*
-	dodoc -r RELEASE-READMEs
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
deleted file mode 100644
index 26923c4c78e9..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="https://github.com/plougher/squashfs-tools"
-SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="debug lz4 lzma lzo static xattr +xz zstd"
-
-LIB_DEPEND="
-	sys-libs/zlib[static-libs(+)]
-	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
-	lz4? ( app-arch/lz4[static-libs(+)] )
-	lzma? ( app-arch/xz-utils[static-libs(+)] )
-	lzo? ( dev-libs/lzo[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xz? ( app-arch/xz-utils[static-libs(+)] )
-	zstd? ( app-arch/zstd[static-libs(+)] )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4-fno-common.patch
-)
-
-use10() { usex $1 1 0 ; }
-
-src_configure() {
-	# restore GNU89 inline semantics to
-	# emit function symbols, bug 595290
-	append-cflags -std=gnu89
-
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 xz)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}" -C ${PN}
-}
-
-src_install() {
-	dobin ${PN}/{mksquashfs,unsquashfs}
-	dodoc ACKNOWLEDGEMENTS CHANGES README*
-	dodoc -r RELEASE-READMEs
-}
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 01661bc54be2..21394c8c9e94 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
@@ -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/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1.ebuild
index 7a72fe7ad5e1..9140ba94e4b3 100644
--- a/sys-fs/static-dev/static-dev-0.1.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1.ebuild
@@ -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/sysfsutils-2.1.0.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
index 8be2ac1a9720..491308ab53c0 100644
--- a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
+++ b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
@@ -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/Manifest b/sys-fs/udev/Manifest
index 299515c5f114..cf4602fb43c5 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,4 +1,4 @@
-DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
+DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
diff --git a/sys-fs/udev/files/242-gcc-9.patch b/sys-fs/udev/files/242-gcc-9.patch
deleted file mode 100644
index e9f690a65be5..000000000000
--- a/sys-fs/udev/files/242-gcc-9.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 7 May 2019 13:46:55 +0200
-Subject: [PATCH] network: remove redunant link name in message
-
-Fixes #12454.
-
-gcc was complaining that the link->ifname argument is NULL. Adding
-assert(link->ifname) right before the call has no effect. It seems that
-gcc is confused by the fact that log_link_warning_errno() internally
-calls log_object(), with link->ifname passed as the object. log_object()
-is also a macro and is does a check whether the passed object is NULL.
-So we have a check if something is NULL right next an unconditional use
-of it where it cannot be NULL. I think it's a bug in gcc.
-
-Anyway, we don't need to use link->ifname here. log_object() already prepends
-the object name to the message.
----
- src/network/networkd-link.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 533193ac932..6fc82940033 100644
---- a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -338,8 +338,7 @@ static int link_enable_ipv6(Link *link) {
- 
-         r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled);
-         if (r < 0)
--                log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m",
--                                       enable_disable(!disabled), link->ifname);
-+                log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled));
-         else
-                 log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
- 
-From bcb846f30f9ca8f42e79d109706aee9f2032261b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 22 May 2019 10:31:01 -0400
-Subject: [PATCH] shared/machine-image: avoid passing NULL to log_debug_errno
-
-Fixes: https://github.com/systemd/systemd/issues/12534
----
- src/shared/machine-image.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
-index 6b9d8fb97a6..6a6d952b424 100644
---- a/src/shared/machine-image.c
-+++ b/src/shared/machine-image.c
-@@ -201,11 +201,13 @@ static int image_make(
-                 Image **ret) {
- 
-         _cleanup_free_ char *pretty_buffer = NULL;
-+        _cleanup_free_ char *cwd = NULL;
-         struct stat stbuf;
-         bool read_only;
-         int r;
- 
-         assert(dfd >= 0 || dfd == AT_FDCWD);
-+        assert(path || dfd == AT_FDCWD);
-         assert(filename);
- 
-         /* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block
-@@ -221,6 +223,9 @@ static int image_make(
-                 st = &stbuf;
-         }
- 
-+        if (!path)
-+                safe_getcwd(&cwd);
-+
-         read_only =
-                 (path && path_startswith(path, "/usr")) ||
-                 (faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS);
-@@ -359,7 +364,7 @@ static int image_make(
- 
-                 block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
-                 if (block_fd < 0)
--                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path, filename);
-+                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
-                 else {
-                         /* Refresh stat data after opening the node */
-                         if (fstat(block_fd, &stbuf) < 0)
-@@ -373,13 +378,13 @@ static int image_make(
-                                 int state = 0;
- 
-                                 if (ioctl(block_fd, BLKROGET, &state) < 0)
--                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path, filename);
-+                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
-                                 else if (state)
-                                         read_only = true;
-                         }
- 
-                         if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
--                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path, filename);
-+                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
- 
-                         block_fd = safe_close(block_fd);
-                 }
-From 2570578d908a8e010828fa1f88826b1c45d534ff Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 24 May 2019 10:54:09 +0200
-Subject: [PATCH] machine-image: openat() doesn't operate on the cwd if the
- first argument is specified
-
-A fix-up for bcb846f30f9ca8f42e79d109706aee9f2032261b.
----
- src/shared/machine-image.c | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
-index 6a6d952b424..55e5f08f91e 100644
---- a/src/shared/machine-image.c
-+++ b/src/shared/machine-image.c
-@@ -200,8 +200,7 @@ static int image_make(
-                 const struct stat *st,
-                 Image **ret) {
- 
--        _cleanup_free_ char *pretty_buffer = NULL;
--        _cleanup_free_ char *cwd = NULL;
-+        _cleanup_free_ char *pretty_buffer = NULL, *parent = NULL;
-         struct stat stbuf;
-         bool read_only;
-         int r;
-@@ -223,8 +222,12 @@ static int image_make(
-                 st = &stbuf;
-         }
- 
--        if (!path)
--                safe_getcwd(&cwd);
-+        if (!path) {
-+                if (dfd == AT_FDCWD)
-+                        (void) safe_getcwd(&parent);
-+                else
-+                        (void) fd_get_path(dfd, &parent);
-+        }
- 
-         read_only =
-                 (path && path_startswith(path, "/usr")) ||
-@@ -364,7 +367,7 @@ static int image_make(
- 
-                 block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
-                 if (block_fd < 0)
--                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
-+                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
-                 else {
-                         /* Refresh stat data after opening the node */
-                         if (fstat(block_fd, &stbuf) < 0)
-@@ -378,13 +381,13 @@ static int image_make(
-                                 int state = 0;
- 
-                                 if (ioctl(block_fd, BLKROGET, &state) < 0)
--                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
-+                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
-                                 else if (state)
-                                         read_only = true;
-                         }
- 
-                         if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
--                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
-+                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
- 
-                         block_fd = safe_close(block_fd);
-                 }
diff --git a/sys-fs/udev/files/40-gentoo.rules b/sys-fs/udev/files/40-gentoo.rules
new file mode 100644
index 000000000000..6b96bd07051e
--- /dev/null
+++ b/sys-fs/udev/files/40-gentoo.rules
@@ -0,0 +1,3 @@
+# Gentoo specific groups
+ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
diff --git a/sys-fs/udev/udev-242.ebuild b/sys-fs/udev/udev-242.ebuild
deleted file mode 100644
index 6c9973b9a66d..000000000000
--- a/sys-fs/udev/udev-242.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 2003-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_/-}
-	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"
-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"
-
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=dev-util/meson-0.40.0
-	dev-util/ninja
-	>=sys-apps/coreutils-8.16
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-kernel/linux-headers-3.9
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
-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-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10"
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-26"
-
-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() {
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific floppy and usb groups
-	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
-	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	EOF
-
-	if [[ -d "${WORKDIR}/patches" ]]; then
-		eapply "${WORKDIR}/patches"
-	fi
-
-	local PATCHES=(
-		"${FILESDIR}"/242-gcc-9.patch
-	)
-
-	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
-
-		# Prevent automagic deps
-		-Dgcrypt=false
-		-Dlibcryptsetup=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=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
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	# meson creates this link
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	local targets=(
-		src/udev/${libudev}
-	)
-	if multilib_is_native_abi; then
-		targets+=(
-			systemd-udevd
-			udevadm
-			src/udev/ata_id
-			src/udev/cdrom_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 src/udev/libudev.so.1)
-
-	into /
-	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins src/libudev/libudev.pc
-
-	if multilib_is_native_abi; then
-		into /
-		dobin udevadm
-
-		exeinto /lib/systemd
-		doexe systemd-udevd
-
-		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
-
-		rm rules/99-systemd.rules || die
-		insinto /lib/udev/rules.d
-		doins rules/*.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 "${T}"/40-gentoo.rules
-	doins "${S}"/rules/*.rules
-
-	dobashcomp shell-completion/bash/udevadm
-
-	insinto /usr/share/zsh/site-functions
-	doins shell-completion/zsh/_udevadm
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	mkdir -p "${ROOT%/}"/run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
-	if [[ -d ${ROOT%/}/dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
-	while read -r dev path fstype rest; do
-		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
-			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
-			ewarn "filesystem. Otherwise udev won't be able to boot."
-			ewarn "See, https://bugs.gentoo.org/453186"
-		fi
-	done < "${fstab}"
-
-	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
-		ewarn
-		ewarn "Please re-emerge all packages on your system which install"
-		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
-		ewarn "/lib/udev."
-		ewarn
-		ewarn "One way to do this is to run the following command:"
-		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
-		ewarn "Note that qfile can be found in app-portage/portage-utils"
-	fi
-
-	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
-	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
-	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
-		if [[ -f ${old_rules} ]]; then
-			ewarn
-			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
-			ewarn "rename it to something else starting with 70- to silence this deprecation"
-			ewarn "warning."
-		fi
-	done
-
-	elog
-	elog "Starting from version >= 197 the new predictable network interface names are"
-	elog "used by default, see:"
-	elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
-	elog
-	elog "Example command to get the information for the new interface name before booting"
-	elog "(replace <ifname> with, for example, eth0):"
-	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
-	elog
-	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
-	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
-	elog "to disable the feature."
-
-	if has_version 'sys-apps/biosdevname'; then
-		ewarn
-		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
-		ewarn "detected to be installed with the new predictable network interface names."
-	fi
-
-	ewarn
-	ewarn "You need to restart udev as soon as possible to make the upgrade go"
-	ewarn "into effect."
-	ewarn "The method you use to do this depends on your init system."
-	if has_version 'sys-apps/openrc'; then
-		ewarn "For sys-apps/openrc users it is:"
-		ewarn "# /etc/init.d/udev --nodeps restart"
-	fi
-
-	elog
-	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
-	elog "fixing known issues visit:"
-	elog "https://wiki.gentoo.org/wiki/Udev"
-	elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
-
-	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
-	# do the same for 80-net-setup-link.rules to keep the old behavior
-	local net_move=no
-	local net_name_slot_sym=no
-	local net_rules_path="${ROOT%/}"/etc/udev/rules.d
-	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
-	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
-	if [[ ! -e ${net_setup_link} ]]; then
-		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
-		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
-			net_move=yes
-			net_name_slot_sym=yes
-		fi
-	fi
-	if [[ ${net_move} == yes ]]; then
-		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
-
-		if [[ ${net_name_slot_sym} == yes ]]; then
-			ln -nfs /dev/null "${net_setup_link}"
-		else
-			cp "${net_name_slot}" "${net_setup_link}"
-		fi
-		eend $?
-	fi
-
-	# 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-243-r2.ebuild b/sys-fs/udev/udev-243-r2.ebuild
index 34e919e5c634..c294a693ef17 100644
--- a/sys-fs/udev/udev-243-r2.ebuild
+++ b/sys-fs/udev/udev-243-r2.ebuild
@@ -45,7 +45,8 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
+	dev-libs/libxslt
+	${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
 	acct-group/kmem
 	acct-group/tty
diff --git a/sys-fs/udev/udev-245.5-r1.ebuild b/sys-fs/udev/udev-245.5-r1.ebuild
index b5b2acbecf9a..79647512219d 100644
--- a/sys-fs/udev/udev-245.5-r1.ebuild
+++ b/sys-fs/udev/udev-245.5-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript
+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"
@@ -18,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)"
@@ -39,6 +40,7 @@ BDEPEND="
 	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}]
@@ -142,6 +144,7 @@ multilib_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
 }
 
diff --git a/sys-fs/udev/udev-246-r1.ebuild b/sys-fs/udev/udev-246-r1.ebuild
index cb14882292b2..946b40c81a16 100644
--- a/sys-fs/udev/udev-246-r1.ebuild
+++ b/sys-fs/udev/udev-246-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript
+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"
@@ -39,6 +40,7 @@ BDEPEND="
 	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}]
@@ -142,6 +144,7 @@ multilib_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
 }
 
diff --git a/sys-fs/udev/udev-247.2.ebuild b/sys-fs/udev/udev-247.2.ebuild
new file mode 100644
index 000000000000..baae0329542a
--- /dev/null
+++ b/sys-fs/udev/udev-247.2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+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
+		-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 src/udev/libudev.so.1)
+
+	local targets=(
+		src/udev/${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 src/udev/libudev.so.1)
+
+	dolib.so src/udev/{${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 cb14882292b2..baae0329542a 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript
+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"
@@ -39,6 +40,7 @@ BDEPEND="
 	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}]
@@ -91,16 +93,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific floppy and usb groups
-	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
-	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	EOF
-
-	if [[ -d "${WORKDIR}/patches" ]]; then
-		eapply "${WORKDIR}/patches"
-	fi
-
 	local PATCHES=(
 	)
 
@@ -142,6 +134,7 @@ multilib_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
 }
 
@@ -219,7 +212,7 @@ multilib_src_install_all() {
 
 	# see src_prepare() for content of 40-gentoo.rules
 	insinto /lib/udev/rules.d
-	doins "${T}"/40-gentoo.rules
+	doins "${FILESDIR}"/40-gentoo.rules
 	doins "${S}"/rules.d/*.rules
 
 	dobashcomp shell-completion/bash/udevadm
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index f6be76d5f32f..c99f0867ca42 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,2 +1,3 @@
 DIST udftools-2.1.tar.gz 555440 BLAKE2B 09ed67d67a5194aff1611ca40907465cf5d9b83a6a9c1771118c80599be29e8d68fc48c10b38d33a4aed4fa6e7e6dbf0399b5d04bd103153f42a705e17edcf6c SHA512 0bdb3f2e0595200dadb771af4f31ba513d0bf6a0fbd30bc3a1f8aba4ab5f487f61635e65dc155926d2f566cb6e2b2f3a57938071616058cf703692d529971a64
 DIST udftools-2.2.tar.gz 543515 BLAKE2B 8702959e9840415201668255272a7f5bb3b88d1e11a20ea6818c9c031d602ceba25a4892965f77961e265d55a687c6574a9aa7c657610d85e56549550a978d58 SHA512 1d6f7b725053ab8c2092ca07bce07fb075168ba48f7d2580076ee84b2652af3898622746c5a2f0bdb8c0d1d0e09d1f4a3cbaae4f998924652a56561b84690e2b
+DIST udftools-2.3.tar.gz 581756 BLAKE2B 48b3681509c755249cfabd29fae9a622bcf104aead15e03196acaaa64ad8cab77b928fec7c08be7b9f5753594e1de1c21c9a9c3e863bcf5388d6e2090d04e9a9 SHA512 17304264388ae53e348d6aa870f0d23c29477344fee848236b46886c086221941872073974f804c0735eafd0cf9f7acdac7988132f03c0a87dba37467b5bda95
diff --git a/sys-fs/udftools/udftools-2.2.ebuild b/sys-fs/udftools/udftools-2.2.ebuild
index a57b048c42ec..465de8928243 100644
--- a/sys-fs/udftools/udftools-2.2.ebuild
+++ b/sys-fs/udftools/udftools-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/udftools/udftools-2.3.ebuild b/sys-fs/udftools/udftools-2.3.ebuild
new file mode 100644
index 000000000000..df7278f2df9f
--- /dev/null
+++ b/sys-fs/udftools/udftools-2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
+HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/"
+SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	virtual/udev
+"
diff --git a/sys-fs/udisks/udisks-2.9.1.ebuild b/sys-fs/udisks/udisks-2.9.1.ebuild
index a85f499c4a42..213b314c256f 100644
--- a/sys-fs/udisks/udisks-2.9.1.ebuild
+++ b/sys-fs/udisks/udisks-2.9.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 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
 
 REQUIRED_USE="
diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
index 1661c39dc4e8..8ef46ee1bf89 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.10.0-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,17 +11,16 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="icu libedit nls"
 
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	icu? ( dev-libs/icu:=[static-libs(+)] )
-	libedit? ( dev-libs/libedit[static-libs(+)] )"
-RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
+RDEPEND=">=sys-apps/util-linux-2.17.2
+	dev-libs/inih
+	icu? ( dev-libs/icu:= )
+	libedit? ( dev-libs/libedit )
 	!<sys-fs/xfsdump-3"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-libs/inih
 	nls? ( sys-devel/gettext )
 "
 
@@ -88,8 +87,8 @@ src_compile() {
 }
 
 src_install() {
-	emake DIST_ROOT="${ED}" install
-	emake DIST_ROOT="${ED}" install-dev
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
 
 	gen_usr_ldscript -a handle
 }
diff --git a/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild
index 2da1241f7328..a17560e6bb88 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.4.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 readline"
 
 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
diff --git a/sys-fs/zerofree/zerofree-1.1.1.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild
index 0c9f15ccbf0a..b93c3ff9facf 100644
--- a/sys-fs/zerofree/zerofree-1.1.1.ebuild
+++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://frippery.org/uml/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+KEYWORDS="amd64 arm arm64 ~mips x86"
 IUSE=""
 
 DEPEND="sys-libs/e2fsprogs-libs"
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index e9efc723c3af..2235bb47828d 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,3 +1,3 @@
 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
-DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f
+DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94
diff --git a/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch
new file mode 100644
index 000000000000..2b1ef8582546
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch
@@ -0,0 +1,27 @@
+From 0ce99b43b339226d62362f624d37f80a921eb197 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 18 Dec 2020 11:35:07 -0800
+Subject: [PATCH] copy-builtin: handle missing .gitignore
+
+acfc4944d0d6db114db9f2bb5401251c5bd767b6 broke copy-builtin in
+release tarballs, because those do not contain .gitignore file.
+Adding -f to rm call will make it return 0 even if file does not exist.
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ copy-builtin | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/copy-builtin b/copy-builtin
+index 84f469fef02..6a6eb1f3695 100755
+--- a/copy-builtin
++++ b/copy-builtin
+@@ -36,7 +36,7 @@ rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs"
+ cp --recursive include "$KERNEL_DIR/include/zfs"
+ cp --recursive module "$KERNEL_DIR/fs/zfs"
+ cp zfs_config.h "$KERNEL_DIR/include/zfs/"
+-rm "$KERNEL_DIR/include/zfs/.gitignore"
++rm -f "$KERNEL_DIR/include/zfs/.gitignore"
+ 
+ for MODULE in "${MODULES[@]}"
+ do
diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml
index bd80c602402f..72ed9c5d4e59 100644
--- a/sys-fs/zfs-kmod/metadata.xml
+++ b/sys-fs/zfs-kmod/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ryao@gentoo.org</email>
-		<name>Richard Yao</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
index cc5f18c90673..6c07ba52c3ae 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.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 autotools flag-o-matic linux-mod toolchain-funcs
+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"
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 arm64 ppc64"
 	S="${WORKDIR}/zfs-${PV}"
 	ZFS_KERNEL_COMPAT="5.9"
 fi
@@ -37,6 +37,9 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+# https://github.com/openzfs/zfs/pull/11371
+PATCHES=( "${FILESDIR}/${PV}-copy-builtin.patch" )
+
 pkg_setup() {
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
@@ -94,10 +97,6 @@ src_prepare() {
 		# Set module revision number
 		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
 	fi
-
-	# undo https://github.com/openzfs/zfs/commit/acfc4944d0d6db114db9f2bb5401251c5bd767b6
-	# we use release tarballs with no gitignore files already
-	sed -i 's:rm "$KERNEL_DIR/include/zfs/.gitignore"::' copy-builtin || die
 }
 
 src_configure() {
@@ -159,6 +158,10 @@ pkg_postinst() {
 		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."
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild
index 81328da6d290..2fbfd85f7ccf 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.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
 
-inherit autotools flag-o-matic linux-mod toolchain-funcs
+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"
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="5.9"
+	ZFS_KERNEL_COMPAT="5.10"
 fi
 
 LICENSE="CDDL MIT debug? ( GPL-2+ )"
@@ -149,6 +149,10 @@ pkg_postinst() {
 		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."
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index e0bcf6bac5bb..2fbfd85f7ccf 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic linux-mod toolchain-funcs
+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"
@@ -149,6 +149,10 @@ pkg_postinst() {
 		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."
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index e9efc723c3af..2235bb47828d 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,3 +1,3 @@
 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
-DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f
+DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml
index d57f0278adb9..8d5fae67b3c2 100644
--- a/sys-fs/zfs/metadata.xml
+++ b/sys-fs/zfs/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ryao@gentoo.org</email>
-		<name>Richard Yao</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
diff --git a/sys-fs/zfs/zfs-0.8.6.ebuild b/sys-fs/zfs/zfs-0.8.6.ebuild
index 034b6bc99516..35e36183aef7 100644
--- a/sys-fs/zfs/zfs-0.8.6.ebuild
+++ b/sys-fs/zfs/zfs-0.8.6.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
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
 	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 arm64 ppc64"
 fi
 
 LICENSE="BSD-2 CDDL MIT"
diff --git a/sys-fs/zfs/zfs-2.0.0.ebuild b/sys-fs/zfs/zfs-2.0.1.ebuild
index 173d608ce068..3abc6cb72b07 100644
--- a/sys-fs/zfs/zfs-2.0.0.ebuild
+++ b/sys-fs/zfs/zfs-2.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=7
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 173d608ce068..3abc6cb72b07 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-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
author	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-01-17 23:35:33 +0000
committer	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-01-17 23:35:33 +0000
commit	8e8120eabdd28020aa69c7a60505cce2edd20adc (patch)
tree	061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /sys-fs
parent	c16790af2c9b4cbc38e565d4311252193ff85484 (diff)
download	baldeagleos-repo-21.1.2.tar.gz baldeagleos-repo-21.1.2.tar.xz baldeagleos-repo-21.1.2.zip