gentoo resync : 03.09.2021

18 files changed, 102 insertions, 18 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 949ce991900c..58aeabb031ba 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest
index 1fa6b1bdc3ef..4687e0460f08 100644
--- a/sys-fs/cryptmount/Manifest
+++ b/sys-fs/cryptmount/Manifest
@@ -1,3 +1,3 @@
 DIST cryptmount-5.3.3.tar.gz 545925 BLAKE2B 7a20d3a3b5805b1fe9ed84aafe6aaebeab4c62652dc8f53ecd70a7e0a0aa993ab5a03d54967910b94e6d8bde28f7ee7bb90a115a2bf101c9d4f4177fee26f90d SHA512 9945630316feee513a64e11dffa61ece77d0dff43a7b611d91fcb0a7c902402effb30ba15266d52c2f5381aa3ab7290a9a0999ca391c3c15cbdb83debe7dcca0
-EBUILD cryptmount-5.3.3.ebuild 1702 BLAKE2B cedbee5b53bb7fb20dec89a652f3ab6ada56c13d1ec0bdaac9c9bb385b07a240a5b931cf77a0adf9b68fe6724badc603de809361f419766efab15030ce0f08aa SHA512 094f252903e8ead2397963fd0341e844582a7fcba1b5177c64cbf9031a8f65407062416a78d63f883511ce1401be7ba7f41e342b66a320b72a760ad581a727b2
+EBUILD cryptmount-5.3.3.ebuild 1694 BLAKE2B 4ce5a3cbebfa6ad314127c4a9d2b2a13925422f4621a4f9381a2f25d2bf0dbe83a7dc3db555a32dd9882c4ba79b34ff64a83a67d330ce0a1b71bac691cee179b SHA512 99793b49877de5e1ec96748988a506cac6966b84062ab49150949af9c69bba20b4bc5991dc2cfb3865149d9a955deb50b160a2fc81d60b3d9ae78e642b07f638
 MISC metadata.xml 2145 BLAKE2B 6249f6be21900ffb75bb15d01232626fa43a92894208af23c8e9e50b771fe7f259dfb607a96907c70606da90b35c515d67436a50b83c2627b01aecb8bd07dd41 SHA512 e84164de214f81cf728615e7a68d8c9ac9daf707b585240d2a3c16212cbc0b0fe47f0096d35e6d98ccd8e3f1e984af4e5d820c7508b91625b6d4e356ca9cbde4
diff --git a/sys-fs/cryptmount/cryptmount-5.3.3.ebuild b/sys-fs/cryptmount/cryptmount-5.3.3.ebuild
index f93c199dc0f2..51ac0e120a86 100644
--- a/sys-fs/cryptmount/cryptmount-5.3.3.ebuild
+++ b/sys-fs/cryptmount/cryptmount-5.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info systemd
+inherit linux-info
 
 DESCRIPTION="A utility for management and user-mode mounting of encrypted filesystems"
 HOMEPAGE="http://cryptmount.sourceforge.net/"
diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index a8a7e24f8274..2510b2c26c3d 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -1,3 +1,3 @@
 DIST lsscsi-0.32.tgz 195376 BLAKE2B 8ca0eecd5e0a0a60b9871d955daa05a92e33a8c0c799a0293c58c7882a5c0d9ba06df070ffac8bbce4183e0e5081087cd4b39a6e3c51ff30faac58d0aae67f94 SHA512 96cb87be53eae9fa3a7defa0065f4dee8ccc23805a9ed1dc93d101c5e0610b78765b61449bf6ce58c13de8aae8400e4ac6a60ad64f840d092b9d7293106c5145
-EBUILD lsscsi-0.32.ebuild 337 BLAKE2B 5d9bc16d60a7e7a919f09e4fad84d3f9e817d99c6b6fd77163003883dbf0daf84062989ed9e789376ac3ab961ed43f22b1ef9fd41413e00d1cbc887d777ce5ba SHA512 637059ba47e7a3c10d40eb94e859005ea7a7e96f7710388621cb741bda85103bb0b3c3065ff14fb28ee67b07cf76be6587d9c9ba3603375876278e02038c91b4
+EBUILD lsscsi-0.32.ebuild 344 BLAKE2B 485bc831bab9fa314332d3c5eceb1a7eb4e9df294ea762997a69a371f5b83b550409c5378b112c0bf8e1365a249ad511d9ada1ad81661e30d027482574ee11c3 SHA512 ef6f1cad2f0df955fe8d9141ec4d543cb47d8569f3cda317e396c42303c0c7f0c3d2d2e97588060307d99bb2fa498eccff22f1e8d32842bed6fbd84fab3e7048
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/lsscsi/lsscsi-0.32.ebuild b/sys-fs/lsscsi/lsscsi-0.32.ebuild
index a356a24dda48..1c2edaae5096 100644
--- a/sys-fs/lsscsi/lsscsi-0.32.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.32.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 ~riscv sparc x86"
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 40c5b42ddcf6..b1837dfc035f 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,3 +1,5 @@
 DIST ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz 1278315 BLAKE2B d4f84bf744b12fec7faff82bd3d3048282a3cbcde2ca75e5d3a295206585c4cee68e25dff5fb20b034f516a3f2cd95c489105d9df810f8a9378024ef065b67d3 SHA512 8534970ba9f07999c5ff433144ad3a59640fb9a28fb30b37b5d736101e19f9fec1c222152338be382c894f972fce2b2a83680b85a28cf147cb5500b40a0a25cc
+DIST ntfs-3g_ntfsprogs-2021.8.22.tgz 1317499 BLAKE2B 403036c68a37ba83873b5faadbb2088deb25e0ff31deb1958d4f869a198d830caa44edea879492a7894f5e7a5ad6205a6fda57bf8de722ce49bf3187239ad993 SHA512 e0544df78a6c352999e1206d7b5d71c56e39396b7a0936a261d728c2ac9d61c6b95ef297f8529ac2a5146f31c1c9e43066d3e281064d4f5d781a04eba51f536d
 EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2063 BLAKE2B d70e46fe59628db9440f4d6516781fad6d9d10873f98b06364acd4c8afbc6b609f78fca688fbb1c4486ae6cd7a0089a6c3674b8555fec8af4360b6c7e4ac54b1 SHA512 fbf424b708a4e15fabdffb1046dd49854ed21335bf953fe39eb8993541178cfd3ffe482121d29c56b5dd5802c373d8aaaa70e0ae9dc6526f091baa886950bf36
+EBUILD ntfs3g-2021.8.22.ebuild 2094 BLAKE2B 27766b0410ed323c997bbcfdd5d1e302aefdfa985b2d38a1ec60a1b34ba90da4c0fbe5ea657bcf3c7461cdc5b10637b7d83eef3644c39523d0cf7401974b5346 SHA512 93848999d1b2a48950b2178c56dccbefbb384a63f936871fc2877052f738f50403655f8e3b909b32ece9b1b988930fde0554d35fbcf9d6314e7bafec2e300c66
 MISC metadata.xml 1071 BLAKE2B 745a88ce8a93612a3658b149ed33acad8bc30e66d65694c8096203a054482d9972798f0bdb7cc707fc35acb33303da37dac2bfcdcc3537ab0e61a307ff0cd152 SHA512 0d8df4e5d4b5e0ed52dc0a35b2fe81355859dfa01ff65b8b63a767bff87d5a4ea1741fd6f1243dc32f9f2d83566967d6aa4bee0b0f3d95997d8873833fc7ac31
diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
new file mode 100644
index 000000000000..ab40a1ab9931
--- /dev/null
+++ b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit linux-info toolchain-funcs
+
+MY_P="ntfs-3g_ntfsprogs-${PV}"
+
+DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
+HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
+HOMEPAGE="https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html"
+SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
+#SRC_URI="https://jp-andre.pagesperso-orange.fr/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+# The subslot matches the SONAME major #.
+SLOT="0/89"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr"
+
+RDEPEND="
+	sys-apps/util-linux:0=
+	sys-fs/fuse:0
+	ntfsdecrypt? (
+		>=dev-libs/libgcrypt-1.2.2:0
+		>=net-libs/gnutls-1.4.4
+	)
+"
+DEPEND="${RDEPEND}
+	sys-apps/attr
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~FUSE_FS"
+	FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	tc-ld-disable-gold
+
+	local myconf=(
+		# passing --exec-prefix is needed as the build system is trying to be clever
+		# and install itself into / instead of /usr in order to be compatible with
+		# separate-/usr setups (which we don't support without an initrd).
+		--exec-prefix="${EPREFIX}"/usr
+
+		--disable-ldconfig
+		--enable-extras
+		$(use_enable debug)
+		$(use_enable acl posix-acls)
+		$(use_enable xattr xattr-mappings)
+		$(use_enable ntfsdecrypt crypto)
+		$(use_enable ntfsprogs)
+		$(use_enable ntfsprogs quarantined)
+		$(use_enable static-libs static)
+
+		--with-uuid
+
+		# disable hd library until we have the right library in the tree and
+		# don't links to hwinfo one causing issues like bug #602360
+		--without-hd
+
+		--with-fuse=external
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	use suid && fperms u+s /usr/bin/ntfs-3g
+	dosym mount.ntfs-3g /sbin/mount.ntfs
+	find "${ED}" -name '*.la' -type f -delete || die
+	# https://bugs.gentoo.org/760780
+	keepdir "/usr/$(get_libdir)/ntfs-3g"
+}
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 195b9c983db8..92099ff71fbf 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,5 +1,5 @@
 DIST squashfs-tools-4.4-git.1.tar.gz 241963 BLAKE2B 7a80c353efbbca851b2eb44e742f20b4cf59e91058b53b77c74d879dc18d882e3bb6de8a010a4469c0a53384ccf2968bba4cd1d6f10cfcede70fe07eebbf2409 SHA512 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0
 DIST squashfs-tools-4.5.tar.gz 250471 BLAKE2B 2fc8ab9bb6565b97656afd63b76bfd7449d96b83697286e88b55a8cd82957b395df17a707ee93e8a99ed19dc5ba73966ce33530ef6c35797924dad4e3f16ed3b SHA512 e00610487d24eed9e5dadcf84014a3d7faa9815d8ce00fd4660e6c8ce394dccf185ed9f387f4fa1313b9812fe770f802bdcbaef87887f2bcefacf234594a72e0
 EBUILD squashfs-tools-4.4_p1.ebuild 1315 BLAKE2B 5b64d6ab302b07973be65fc4d93219f32e93d348f2c4db4122ba87f47b589d70966ba511fd14de6ae3eb4f34296d4a0c610dbee28b0f5c7086543f3f8d79aa35 SHA512 1e299fcd3c0f6e9920b4f28549bc42dc7900e62b82adcbd57428edf22f65a449e4f4821fe223d4af2310746159635a3fbcda0b7bfcecf451c9c64500597cb1cd
-EBUILD squashfs-tools-4.5.ebuild 1317 BLAKE2B 06a1a7df61a1c46994a4b057d7b594b54d2315d56781aba3d54d4b956572d089d79ad6e3aaca0ba4ff493f2338122f178a2806b2fc634edd135d62bd76f8c60f SHA512 d3f4560b1718a3b551c6bb3d295918dbeaceb33d2dddec48c587e2fbb78a44d4b00d95e640cf579fad0bc38cfa7f8623f654c7479378e65fc4cb43f9d4687d89
+EBUILD squashfs-tools-4.5.ebuild 1316 BLAKE2B 6c8a80f89d2c3a9c6117b51c9cbd703d96605a30b9c10f95195845d66f630f2bfec13863303886f08c85e38e89c2f9eddb1d600fa03b70e0084aa2cd6a31190d SHA512 5dd616417008ddbc2ab6e3eee14c8259dffae6f96a092acb2be26eccd83a99f9918b4503c435652b168ac71501ace9361a117f2f7aa1ba8df2d744c7f014742f
 MISC metadata.xml 325 BLAKE2B 69746d14350ab40f297e7944dd2ffa3af61c6b7890012856fa7a8c8971246591844a078f3ca79cbc579bbd1d8d5fad5e6c8338766a80d4a2d068219ac303e77d SHA512 452fd4de6f1a2ab284e8dd388c18caaf75bba2c07bbf3eb5d990259d92ed6af0f7a2174a85998214f17a09f087f796dae7550e09ebfaad15c6a8ca514335afe4
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild
index be14232a82ff..e623dd7063c6 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.5.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/udev/Manifest b/sys-fs/udev/Manifest
index 0b47335877b2..849cd1b75fe2 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -5,6 +5,6 @@ DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1
 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
 DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a
 EBUILD udev-248-r1.ebuild 5468 BLAKE2B 65d07077600d16deb4970920dd728698f3d4b8c58f457e8df7167a2fe3c31ae4b8ad2a45b4d3fac4480c1a3a90e4376c22996d94909463df018543af09333fef SHA512 f73fefbcca00081271756322c19fe959cf2548a4e4a27af88e5b6eece368e0760b98465659106c884f8c16cba3f7a337e7b8c22c82ff575eebd7a6c38f5e0ab9
-EBUILD udev-249-r2.ebuild 7585 BLAKE2B 6a712f1047d91050a198049b02dc8259c62eacdfe351374c42ca2e9edca55fa5cbc57783456b7ec35df8974f8f61dfd3fb1fed9e3a23853c5b3d2f57467b3272 SHA512 485092a46d655dbf47ffa22d01f8d2a4af87a04b7e82fcd91740bc240565b59dc04508b2fe2f78cb8d86cf1fb0acd3ebc9429b21b87e52f6cf95a60d395f9e69
+EBUILD udev-249-r2.ebuild 7584 BLAKE2B 92555269d3507dfc6686eac0eef3a7d92e1fdfdcd76049561ab4ec34b8d0476900899dd8ca596f4f7074b88e43ccae577ebb4245461d97e71909dff785e8890d SHA512 7ec4d4018544c9826c66c89685fb6534481698cbc6b4f5bc68baa0d65a9f2a5f0ac8fd15321602441fbd9851b59d2bc781ed1aef4e08ffb129366b650d4fc0d8
 EBUILD udev-9999.ebuild 7460 BLAKE2B 404739190a89c5011d11227ea42f068d4031b245f9afdd5f4e2f7ef606dc7a6553c60e4f4afe3653c2964e4eb3e8ce257b17d68386ac202ab91ca7f848b32787 SHA512 d8bf83a672516d1f12536952c178c72713c9945d62cfe520cc3688a35e7a2a8556917df28c9b07de1572e9e730baa781d4a23cce1d4b1b182096231ca6b3858a
 MISC metadata.xml 474 BLAKE2B b657acb428f66f11e028db59d50ff5c52c8f14d092c6f2a66307fca668e300823a9727ab33d02f3337953988b600dbc257019fd333a8c34ff3d5039fea6b0ee3 SHA512 b8610952420e4cc28a58402da8ef9e1c0a9c409eff47c92253ad745f2a2121eaf68380cd3122113b792332e23aa9f7bcae4ccebb1ad6ffb26a38d266cb47b060
diff --git a/sys-fs/udev/udev-249-r2.ebuild b/sys-fs/udev/udev-249-r2.ebuild
index d4a8800599fe..e12322d2e414 100644
--- a/sys-fs/udev/udev-249-r2.ebuild
+++ b/sys-fs/udev/udev-249-r2.ebuild
@@ -29,7 +29,7 @@ else
 		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz
 	)"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index b09bd1f818cf..881617b4b823 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -5,5 +5,5 @@ DIST xfsprogs-5.12.0.tar.xz 1299332 BLAKE2B 96e8831ca83d362792853188939017b53343
 DIST xfsprogs-5.13.0.tar.xz 1301112 BLAKE2B 49e2b8535ef778362e68d45b1fb6f01be354dbee48d346c018e75ca1a5bc8761f47e65199bb62ffc4962faf8e185f3579e34e0562fab346d9839810727110665 SHA512 8e21bc43fb5cd49dccd6415b86f9e146d29c265a5d908f6898673290d6a2ac4a00bd25440fd7fab5ba080237d4bd54f56855ae64cdb32e59edae100b96155ca8
 EBUILD xfsprogs-5.10.0-r1.ebuild 2204 BLAKE2B 7c672ff92985feddd92d9d67135a7c665120a2ce46754c4713286418d963deec23d88e8899479ce07221d4f22e8f12574a5c594f00c461f6ff5797ec48e4cf9d SHA512 1b5e565644800b066a2d84af8d8a2b20148cfa0639172b56f4ead8ecbe9613ad0ea617371692c1179b5e3f626d2824fc39d57d2d2be89fa832d846852e214f91
 EBUILD xfsprogs-5.12.0.ebuild 2211 BLAKE2B f2480a90f8cfa63d45501eda4dbaee60b23de004cb5423a12d31a2f09c2f8894d5cc8b2360bfe76af2c5357b08cbdf8cac10f6e3d78ea7eff9724a9db46d37a2 SHA512 369452f76c744a1b2a0bc0c96e0829bffc0d37778100f77d1058330740c6fc565b82bdfc6e9f44091c563b27c77b26f8cae490420fba806e6d114c189168e6cb
-EBUILD xfsprogs-5.13.0.ebuild 2211 BLAKE2B f2480a90f8cfa63d45501eda4dbaee60b23de004cb5423a12d31a2f09c2f8894d5cc8b2360bfe76af2c5357b08cbdf8cac10f6e3d78ea7eff9724a9db46d37a2 SHA512 369452f76c744a1b2a0bc0c96e0829bffc0d37778100f77d1058330740c6fc565b82bdfc6e9f44091c563b27c77b26f8cae490420fba806e6d114c189168e6cb
+EBUILD xfsprogs-5.13.0.ebuild 2218 BLAKE2B 1a5b59e6b2d044d70757b9c94c15499b9aa55b73ea60d71ef4f218c83de982cb1f0f360e23257e66d194651b125df05abceaca044c14f7a39895768beb213485 SHA512 69a10464151996b387eee4d2812df2ce3622a9127508db857aee41c33b334f172dde04194fa58abdbcb8389668b8d38420958afe80f553a64d759d4aea4a0fd8
 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/xfsprogs-5.13.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.13.0.ebuild
index 030c8acbec7d..545c377884f7 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.13.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.13.0.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 ~riscv ~s390 ~sparc ~x86"
 IUSE="icu libedit nls"
 
 RDEPEND=">=sys-apps/util-linux-2.17.2
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 88ce734d26d6..81d53511b638 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -5,8 +5,8 @@ DIST zfs-2.0.5.tar.gz 13166149 BLAKE2B 4505c43a3b9a6c2b925383d00bbd9f17505290ded
 DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa99bb6e43f0145bb30a0446a1ba5695b8207b085435da289fa0058643201ef2f8827e12b0803ab20b0df305 SHA512 91e73a8da45e4f49113fc1af684143902a23c9cf5e59f8cd2f3a1214aeff57af63a7fa05dbe3fa0465f002521b89a43d6086d765d03209d83a41761d56b358aa
 DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
 DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a
-EBUILD zfs-0.8.6.ebuild 6466 BLAKE2B 1826a984e3bcafa84585869df35eb86d77e713f6f909ae5bdef3a3bce10e78fbf3aaa9ace7d3e0d096ddfd926f75b164020f570864c868224551f2c16eece2ca SHA512 f9241fb89ecef5ba2ecd118dc6ac856614a9afd2b247e87c71a67a136736d77e79d28ad2dab0a019beeb241238424c9e58958704f9435de320e9b97e26f26a62
-EBUILD zfs-2.0.5.ebuild 8186 BLAKE2B 75107653cabb6c2dd2ddb7ae3b404a41c11ce3289e5d48dd0dd93d915bdcecfe6ead6633a2af28ec91121657bd9c827b68b8f3a114ee2a71fa21bccedd4b2893 SHA512 30dfc53c514287c073281007c98ba939361bec955b4f1d7727d19a97743d1526b3bbf216c2d55bc47b899bf5962cf0e153dfda120aca1c3ddb2a417c0d013be6
-EBUILD zfs-2.1.0.ebuild 8146 BLAKE2B 70a69fab198c6e031f706270e3dfbb3ad3bf2ed4137d4000592413c370142067271a2c7a5f1eee39f8dc6eef38d2ccee066345fbf2dafc2049fa3389dfcf425f SHA512 7901a471ddf8f6186cff822e9aedf3d6100d78b6cc84a790fd3d8820df832a440f4d3541c3e6fef6d98575a02ce31720bf815e6dcb8c8b2cb4fd928bba49de22
-EBUILD zfs-9999.ebuild 8187 BLAKE2B 9de4cebaf3a9bca728e5e2320bd8575c2b98f3ff2471a822103941f38a4c0f3df3375f49f5276f08138f6954c8e45a49bb55132499788e89cf99eb8dc180f3de SHA512 21aaa4d13cd3bd249754b066380acfa9a8fb5ea427f72f1c387dcc4d03d49ccc3fa6f425dcd72ac37fbf838841c32904a7774b4285a7e120cd331b5f301a4377
+EBUILD zfs-0.8.6.ebuild 6450 BLAKE2B 05ad21e2c5fb3877d1cbd8067f7f5ad25ad777da2cf26158a42812f084c6f4c95ad1000fd443f290b9ffc3174f3ed08e72438dab748ad3e46fb19eff15b66bcd SHA512 6d4864aeadfca743966b6d73d168d9a1e663dc3232b6215838a91cd72d25e7939c273ebb1f084530bdbd7d414c3ca4a03a0f0febaadeb7c1c0a946864c538708
+EBUILD zfs-2.0.5.ebuild 8170 BLAKE2B 69ab49691a8cf84bb4e66a8b56a23bbae7c6af4fd906fcdd368455e62512fdfec7cb0ffdee4d95f93c6436e7bc1dd6858bdcf51e4c932e78a005105ed72b2ced SHA512 435fb1d0b41e1a1cf7d93e45fe41153afc075fdf01a017fa29c63ca1c1010f0d0fdb9a632c49387328c841e9d4c985eeb64d60c2923b819e88c02f2666e2c43a
+EBUILD zfs-2.1.0.ebuild 8130 BLAKE2B 9c3216a59d4c669f4eb5eaee58d596ec1958f3516fbb24663fba1021dd4993ed15be2008c06c6b3004ef71bd5c2862f4ffc882636d4d7b48a208f2e7ef247383 SHA512 e2ec59460b3c43006c7e0a9d9c777c212ae4f000f9ca137bc411503b84baa003c1704aad64ec2396b66de6ad6e16fb8a7b9174c4a4d5a047bdf60f1a30f1563a
+EBUILD zfs-9999.ebuild 8171 BLAKE2B 1b2a68ca8e66600850a347ffba66df82379dfb1e9be7a78c40e666067dcdcdee525a0d4a32d54008fbe106d0605149c025989e7d4548094e80a94eb793723ff8 SHA512 f85f82370be258da0ad8a98da1900a144c51a64a53ff1d3dbe23d14b32d5480597cba2a0b18157c9c9bdafd13d432dc9242b4f07dc71bfbdd10c0425509d1b55
 MISC metadata.xml 1000 BLAKE2B 1f3e75ef73d5680d5863f0fda415931a6af19ab1a535c9795c417526ccce2a826ede05abee88ff27c2ec99f1f23aa06cce02cd3cb6d49b2952e90eb94ab95a6b SHA512 f8b30ce788d80c8f65db738f251fe5ebdc4d3ec7206dc78e0b9e53c2cf92153b90e20f6799b2a36bf8e616147b28f9660421bbc2ad17e7dbd804d47f430f6e40
diff --git a/sys-fs/zfs/zfs-0.8.6.ebuild b/sys-fs/zfs/zfs-0.8.6.ebuild
index 54845ae75568..b3237b143306 100644
--- a/sys-fs/zfs/zfs-0.8.6.ebuild
+++ b/sys-fs/zfs/zfs-0.8.6.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info systemd toolchain-funcs udev usr-ldscript
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info systemd udev usr-ldscript
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"
diff --git a/sys-fs/zfs/zfs-2.0.5.ebuild b/sys-fs/zfs/zfs-2.0.5.ebuild
index 7a80202ba47e..67d297759f10 100644
--- a/sys-fs/zfs/zfs-2.0.5.ebuild
+++ b/sys-fs/zfs/zfs-2.0.5.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"
diff --git a/sys-fs/zfs/zfs-2.1.0.ebuild b/sys-fs/zfs/zfs-2.1.0.ebuild
index 5f76d5686bf4..81159a7d8e25 100644
--- a/sys-fs/zfs/zfs-2.1.0.ebuild
+++ b/sys-fs/zfs/zfs-2.1.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 6d147415a2c0..22e4286a8654 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"