gentoo resync : 31.05.2021

32 files changed, 255 insertions, 425 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index c3d2adea8746..b869a1ca0291 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 0569b7f6714c..fb49a8fb0fb3 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,6 +3,8 @@ AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2
 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
 DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae SHA512 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf
+DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
 EBUILD cryptsetup-2.3.4-r1.ebuild 3853 BLAKE2B d66f995f69cac742d0d1e6c22bccda546c49c74fc495fd43dad6469cb948214923f85119eae86f8d87989a6f689d20113048427d6238f2ee75910274a1fe3512 SHA512 ad6cd0dc0f2ca709ee380046c2d5b5b23f198fd2fff59197f052138b765752ee018b24e76de3ad929ca15fae14d736b25b643f7055f682cc02b61de4083976b6
 EBUILD cryptsetup-2.3.5-r1.ebuild 3861 BLAKE2B ed75ff27bee5a82bf54418413b62a291ed1d62ef41d3dab5830a6c5388f784dfebb42a45967fb5e7e676f3ec1b818dc5e63cfd741ea51d9069b01b6a2d7fefa1 SHA512 d12da1446da7911ee11ec5fc89c406f07890eb6913479fe3cfb0150f3da412dc09e95f1896501181d4e7b68335c41e07822e3d296e616284a455f0dd9d06a589
+EBUILD cryptsetup-2.3.6.ebuild 3861 BLAKE2B ed75ff27bee5a82bf54418413b62a291ed1d62ef41d3dab5830a6c5388f784dfebb42a45967fb5e7e676f3ec1b818dc5e63cfd741ea51d9069b01b6a2d7fefa1 SHA512 d12da1446da7911ee11ec5fc89c406f07890eb6913479fe3cfb0150f3da412dc09e95f1896501181d4e7b68335c41e07822e3d296e616284a455f0dd9d06a589
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
new file mode 100644
index 000000000000..72a0baf8cb90
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="
+	dev-libs/json-c:=[static-libs(+)]
+	dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
+	argon2? ( app-crypt/argon2:=[static-libs(+)] )
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(-)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	local myeconfargs=(
+		--disable-internal-argon2
+		--enable-shared
+		--sbindir=/sbin
+		# for later use
+		--with-default-luks-format=LUKS2
+		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+		$(use_enable argon2 libargon2)
+		$(use_enable nls)
+		$(use_enable pwquality)
+		$(use_enable reencrypt cryptsetup-reencrypt)
+		$(use_enable static static-cryptsetup)
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable !urandom dev-random)
+		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+
+	default
+}
+
+src_install() {
+	default
+
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		if use reencrypt ; then
+			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
+		fi
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc docs/v*ReleaseNotes
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
diff --git a/sys-fs/e2tools/Manifest b/sys-fs/e2tools/Manifest
index 0a6d9bfa3a91..fbcb098e9d0d 100644
--- a/sys-fs/e2tools/Manifest
+++ b/sys-fs/e2tools/Manifest
@@ -1,5 +1,3 @@
-DIST e2tools-0.0.16.4.tar.gz 70444 BLAKE2B 3db75ca2ecca27bfbd65890f595c9523f373555e771f21113ca1c3bd1f08d74f5e1d70db39bbe0ac215a1766e702a37c2c2752f671320d45f3bfa56b39fd8296 SHA512 35bda0005d0ba4d9541eabf45bd9bed0e7e85144dce88c3bd8afd8eb5ed5db610bc5654aee82978b2a4955d363fd5af4ff40667fa8001955267c96cb84e6792b
 DIST e2tools-0.1.0.tar.gz 243245 BLAKE2B 62a1e478b71e9105274ba8b815f1f4765ecc05593de481c4ef384ff9463a0be811efe5f37bd3509393dfd3bdfb0103625e192ebcce52cbf896a6f7758cb50884 SHA512 5fde992727946d253acd46987944bdf49615d2ab45bbea715c86b304d117c6900dd70fcffb093f3d564247e27978b78b4710e7fea7ffd28375e804955fe4d5c9
-EBUILD e2tools-0.0.16.4.ebuild 640 BLAKE2B 166fae0012433e143891089b28161581a526f95e4f53851261cdd3c4796d54e1e2482d1ad54145cbfa1ca86cc0678d9f89b7a9bd0db43e7c2dbeb85e05415d8d SHA512 859e8640438d0e28a7e89c9157a13cc00232d99479fcefebb2ce134ee93fb9708f1cd6c91a11cdb0eec999d2cd36983b18345bb8f7e5a96e4e5f24e332a9d49d
 EBUILD e2tools-0.1.0.ebuild 524 BLAKE2B da2302234f1ae877978a066c8d6b44f53a7f8f182ca6f205c8ae6b3406461f51ce6683dd18ac13de8a17e9bb09eace8102e24b007acd2d15ea32c54279eb0563 SHA512 b3ea7164f7462b70287f9964335b23a2c871f72b5cce7af59eccf3c6b9c6e6ae3f0d940cf7570fa13c467267ed2f4db77cf050ade2e2ff4a45bba54f3a3712b3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/e2tools/e2tools-0.0.16.4.ebuild b/sys-fs/e2tools/e2tools-0.0.16.4.ebuild
deleted file mode 100644
index 538223db686f..000000000000
--- a/sys-fs/e2tools/e2tools-0.0.16.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="utilities to read, write, and manipulate files in an ext2/ext3 filesystem"
-HOMEPAGE="https://github.com/ndim/e2tools"
-SRC_URI="https://github.com/ndim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs
-	sys-libs/e2fsprogs-libs"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# The configure script is ancient.
-	#export CONFIG_SHELL="/bin/bash"
-	tc-export CC
-	default
-}
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index f8394534beae..2d90f6d6cd64 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,7 +1,5 @@
-DIST exfatprogs-1.1.0.tar.xz 259716 BLAKE2B 56ead392bc5311352155b03eefcec4f74d333464f6d2d20491c9c9f7dd10abeeaff4bbd1a86808e5af5ad9a5d5423ff82d5e5762d75ef2b19ea1eb3f6213c87e SHA512 6266c10585250d4d4818719f22b7876eec1ba1f8424e966875d207d87d1870a91e05eb066962ab0ad9b750f087db39d9ed7578ec2f1c0e4d03a1b62f01ac6386
 DIST exfatprogs-1.1.1.tar.xz 261632 BLAKE2B 92d05cf94b5d7a65cef2b5fd97a25401f130a9e649246ed3c1f2240f33a586787ad17ebc41f476eb1ea1e3441c66ffd53408f4024f397fc2de14d76bf94b3f2b SHA512 faeed51a8292d17e71e2f5061dbc530dced75048380d6ca835f19a4e3845de86a9970598222670c38e452cfd6952f3963d8f84086c79172d3c0058957a549755
 DIST exfatprogs-1.1.2.tar.xz 261572 BLAKE2B 1475086d6fdc79dd128d08ba863e6c3fc58a432929400b0a740f57db492a08fb3779a0a1a7a555efd373a3e796d2066e37575c5003cbd16f829964cfa414a1d0 SHA512 b3589225f3bc4137c49d828923ab43e155f476fccd227b16168d11302e1c150485eb7f61b6463dc9126648fd4a52960657976ebd9f731366c64966c58fb9276e
-EBUILD exfatprogs-1.1.0.ebuild 605 BLAKE2B cd769a5353114714ccb85af96d6b10cfb0cdae507e2e44cf2fec60e6f4829979bc41b843ce60458010f60ce1e0babce2a20e243f28d6dbdcbb759262d78d5b60 SHA512 bffa94490b25ea092392caef07a55a486ea0d47443dbb5449ff40ffe2e803ea792dcd52e45332c9812b0cf85132c3b0f4afcaf8649e1715d149945730ef129cc
 EBUILD exfatprogs-1.1.1.ebuild 605 BLAKE2B cd769a5353114714ccb85af96d6b10cfb0cdae507e2e44cf2fec60e6f4829979bc41b843ce60458010f60ce1e0babce2a20e243f28d6dbdcbb759262d78d5b60 SHA512 bffa94490b25ea092392caef07a55a486ea0d47443dbb5449ff40ffe2e803ea792dcd52e45332c9812b0cf85132c3b0f4afcaf8649e1715d149945730ef129cc
 EBUILD exfatprogs-1.1.2.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
 EBUILD exfatprogs-9999.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.0.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.0.ebuild
deleted file mode 100644
index 06c03ff968f6..000000000000
--- a/sys-fs/exfatprogs/exfatprogs-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)"
-HOMEPAGE="https://github.com/exfatprogs/exfatprogs"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ppc64 x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-RDEPEND="!sys-fs/exfat-utils"
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 81f46c110979..f5052390fb78 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,5 +1,5 @@
-DIST mtools-4.0.26.tar.bz2 420648 BLAKE2B 02f75722e8569c75d09fbee8667b24d8fd5c685940b235de33e268b8a349a49798f50db22470200e9fa30244768c07a568bfe124969f2a34f652c157ddb37e89 SHA512 32303ea16314ca00f33aee103451958f13c71ab1f3975e9a1dd9236c8e775286985ee776c38c64a1f8f5f8d0a66cbf84643182913e4e2c2dcaff384a9acd8633
 DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302155cf119db426cfc7a24b3d5195b560b8810613f571eed77584d47bb5125007cdcb8551b303db62ce264853776 SHA512 21072e1b6d22ea00913dbc856c5fbe1ecfbfc0207432c7632f0026ae2d9555743eb0710c86e8939a6b3183a03693b8d1297121df9d5702dd5bf6121ad240572c
-EBUILD mtools-4.0.26.ebuild 1052 BLAKE2B 2fd0aaf115222aa0cea9858638a4270119c4633b7c7e53078385376bd69fecba2a3c6e9dca624499149cc671542106456a2c7c245f13a982ada70d761c25fdff SHA512 6a76fdf80fcde205b627410939d878db4a5e2b660a7587f6e24f94bcc5b1c4fbb39c5d0fa6a1d66abbae11ccc53b3cfb158cad502ae6ac73f80ce07976062cc1
-EBUILD mtools-4.0.27.ebuild 1053 BLAKE2B ca0e9907199aa28b83b9875a55653ec3a1ab8a9710e016420e509da94d17472a020b9db5370e2fbd0a1a2bebec50047d50a3e62dbcdc5507dfe0d4d5ed5570f6 SHA512 280c393839198ee02476906bb2a038ac2b26794c3fa9e58c2f01886f010d5b76a6b02bc5b35c1be38b925d10fa3f03132346571646ed11b377d76a48d6e97669
+DIST mtools-4.0.28.tar.bz2 435433 BLAKE2B e837aaccbd733ec7d8f305fc9748533168e25c7bd9c6fe0a0fe46c30f8bac95bdaf28d3799e4f83618aa0c302fb230a6e3e6734ed469c80b087e9006dd3a0642 SHA512 732aee8f83a7af0fdc4c2af75053f559357caa56eb73d46f7a2c8b13b8366d3521aff9a49c89f5896502267d96bb9176de05043934c0bf4a6bb8d46a5722571a
+EBUILD mtools-4.0.27.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a
+EBUILD mtools-4.0.28.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.27.ebuild b/sys-fs/mtools/mtools-4.0.27.ebuild
index b9882d255aca..eba20aaf2121 100644
--- a/sys-fs/mtools/mtools-4.0.27.ebuild
+++ b/sys-fs/mtools/mtools-4.0.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
diff --git a/sys-fs/mtools/mtools-4.0.26.ebuild b/sys-fs/mtools/mtools-4.0.28.ebuild
index 7bf0144b20ff..3ebdd3b6df91 100644
--- a/sys-fs/mtools/mtools-4.0.26.ebuild
+++ b/sys-fs/mtools/mtools-4.0.28.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
@@ -26,8 +26,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	# 447688
-	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
+	use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
 	local myeconfargs=(
 		--sysconfdir="${EPREFIX}"/etc/mtools
 		$(use_with X x)
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 12cb8a11203a..025af351052b 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,12 +1,6 @@
-AUX multipath-tools-0.7.5-respect-flags.patch 660 BLAKE2B 1efc793d9741b1a732895cbd7cfb4fbf04026db24f834a5bec25c33413132b39e0afe46f8851a6dfd6bd05fe88bfc15fd8cc24f03df435f75c209c401bd68b6a SHA512 58a44988a5c9a82affa3fdc969eaac87b5672a743434f2c8cab269b0b526f1c150bc10655bccccc1e8a26e3237350d4824b0497bb29c925cd42a084f84268fcf
-AUX multipath-tools-0.8.3-fix-gcc-10-compatibility.patch 434 BLAKE2B 2ebda2c60d3f2dd1152a1a6291d2ef476ad7e2ec96aa05a31353dedd22be7383e93f792498e7d73a017f1a66856caab582946b27df7bcdc50485816c97090710 SHA512 97bba4b041bac4cfa934148136cdd4795a09136d3671ba9c508f1e08516dc7515e3d7ff5ec5c79187f530afc22c46c8a7817449a763b200062f821c168fcb352
-AUX multipath-tools-0.8.3-json-c-0.14.patch 1125 BLAKE2B 70d5d1eb8b96e92f9bd2ec637b460784759e9a68970400d3007a21fcdd4e9ea4d27a9b2ced6c14d6a02d6331f38bce35ca13e5ca13284077f04d701c021b5b69 SHA512 d743ee4f31949ca8c65c536e379781394ab5de79e47e59b0ccef92d5581243edde0de641756ca28c902f6cba0d3c0fd0d51029e0fe3985fb3a353f7e3cf10c77
-AUX multipath-tools-0.8.3-no-gziped-docs.patch 6302 BLAKE2B 4d571d856d47cbb7cf6cf421a142fdb5d93fb891ae3c0c15abe8d74e6aeb35b02cbb70a80cede18f1dbd615581744f4144c0b03791aa6268c10e8bc08922bbeb SHA512 126245660ba589635437be32c7a7e72636e0bdcd72c177a6252b8e0c71e90426d12e78c10314d878d2e5a5b37b51db488c5fab8c1aae4f655650539ef1d1cd83
 AUX multipath-tools-0.8.5-respect-flags.patch 542 BLAKE2B b60dda770d8441bfd4026bb4b0dbcea6590e71b8d3da0d5645983a6e8e4ef5c00c0283682f9de335b029d3817786e6512c852ae411efe0cdd40416eb970f33e0 SHA512 89d9b9ec971a7afd5f80e19d9b8b691763c3f8a093e99a229a09307e44e5661b4952eed86e732279c0820f15b8f4c48b803823cf27830d03ca7213f9a7364c47
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
-DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
-EBUILD multipath-tools-0.8.3-r2.ebuild 2198 BLAKE2B a3fecefa7f8f07cb631b281a46bb918af85d5e6981b4244aadedf4e3e3ea18136248a462691e5e05998b56d4acc1b935500aa42859da78e8fb4c80fecfb0d8b7 SHA512 48bd320edd11c0e7fa71883bf9f72d05ea1144fdc9c79dbb1edeb0717c5eb51de408e421707fa80a1b3542ec41dec12b07e20999dbf950a3a7d6c0c9c6f8b11a
-EBUILD multipath-tools-0.8.6.ebuild 2083 BLAKE2B 81d32b95ee8a89ad5cd2aa5d11d25490c1c66cd14f03ae9bf156b72e96a6da9cec4acf4f794fd20eed76903bf5b5d6163b26141688188088d0b3a21c4698d0f5 SHA512 0b42a0a299c5008ceefb04c6fa8bb52c90b9aadd32cea0df09928ccbd8bf233583f08ea145228098a17c2ccab4762dd8ab3bb4703471bd89d21192839d3a1b34
+EBUILD multipath-tools-0.8.6.ebuild 2078 BLAKE2B 185d6508999de14cb02f9db69823b561cc62d9dbe596828421cd2381c656301874bb3f43052042b5a3179ca8de469914557acc7369109cdd5ef9c267b5493059 SHA512 c591a02efae279dce30f20f6ba5647eeec4d353e29f38f07a4677c0a683b07ad24a7471e7316e8e4063df43c4bca0833bbdef653ffa8e833566a9bb7fdb14c2a
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch
deleted file mode 100644
index fef55ce31e91..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- multipath-tools-0.7.5/Makefile.inc
-+++ multipath-tools-0.7.5/Makefile.inc
-@@ -91,12 +91,13 @@
- 		  -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \
- 		  --param=ssp-buffer-size=4
- 
--CFLAGS		:= $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
--		   -MMD -MP $(CFLAGS)
-+CFLAGS		?= $(OPTFLAGS)
-+CFLAGS		+= -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
-+		   -MMD -MP
- BIN_CFLAGS	= -fPIE -DPIE
- LIB_CFLAGS	= -fPIC
- SHARED_FLAGS	= -shared
--LDFLAGS		= -Wl,-z,relro -Wl,-z,now
-+LDFLAGS		+= -Wl,-z,relro -Wl,-z,now
- BIN_LDFLAGS	= -pie
- 
- # Check whether a function with name $1 has been declared in header file $2.
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
deleted file mode 100644
index 18ed8d65e0f9..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libmultipath/structs.h
-+++ b/libmultipath/structs.h
-@@ -106,7 +106,7 @@ enum yes_no_undef_states {
-  * _FIND_MULTIPATHS_F must have the same value as YNU_YES.
-  * Generate a compile time error if that isn't the case.
-  */
--char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
-+extern char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
- 
- #define find_multipaths_on(conf) \
- 	(!!((conf)->find_multipaths & _FIND_MULTIPATHS_F))
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
deleted file mode 100644
index 34d02f7b5d7f..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8438a9cd8d7ed88645fa8e6a8f19c0fd9ae872a7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
-Date: Mon, 13 Apr 2020 19:22:02 +0200
-Subject: [PATCH] Add support for upcoming json-c 0.14.0.
-
-TRUE/FALSE are not defined anymore.  1 and 0 are used instead.
-This is backwards compatible, as earlier versions of json-c are
-using the same integer values in their present definitions.
----
- libdmmp/libdmmp_private.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
-index ac85b63f..4378962b 100644
---- a/libdmmp/libdmmp_private.h
-+++ b/libdmmp/libdmmp_private.h
-@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \
- do { \
- 	json_type j_type = json_type_null; \
- 	json_object *j_obj_tmp = NULL; \
--	if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \
-+	if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \
- 		_error(ctx, "Invalid JSON output from multipathd IPC: " \
- 		       "key '%s' not found", key); \
- 		rc = DMMP_ERR_IPC_ERROR; \
--- 
-2.26.0
-
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
deleted file mode 100644
index 534a8d33df82..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Do not gzip docs
-
---- a/kpartx/Makefile
-+++ b/kpartx/Makefile
-@@ -21,7 +21,6 @@ all: $(EXEC)
- 
- $(EXEC): $(OBJS)
- 	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 
- install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
- 	$(INSTALL_PROGRAM) -m 644 del-part-nodes.rules $(DESTDIR)$(libudevdir)/rules.d/68-del-part-nodes.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
- 	$(RM) $(DESTDIR)$(libudevdir)/kpartx_id
- 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/11-dm-parts.rules
- 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
---- a/libdmmp/Makefile
-+++ b/libdmmp/Makefile
-@@ -40,7 +40,7 @@ install:
- 		$(DESTDIR)$(pkgconfdir)/$(PKGFILE)
- 	perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
- 		$(DESTDIR)$(pkgconfdir)/$(PKGFILE)
--	@for file in docs/man/*.3.gz; do \
-+	@for file in docs/man/*.3; do \
- 		$(INSTALL_PROGRAM) -m 644 -D \
- 			$$file \
- 			$(DESTDIR)$(man3dir)/ || exit $?; \
-@@ -69,11 +69,11 @@ check: all
- speed_test: all
- 	$(MAKE) -C test speed_test
- 
--doc: docs/man/$(EXTRA_MAN_FILES).gz
-+doc: docs/man/$(EXTRA_MAN_FILES)
- 
- TEMPFILE := $(shell mktemp)
- 
--docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
-+docs/man/$(EXTRA_MAN_FILES): $(HEADERS)
- 	@for file in $(EXTRA_MAN_FILES); do \
- 		$(INSTALL_PROGRAM) -v -m 644 -D docs/$$file docs/man/$$file; \
- 	done
-@@ -82,10 +82,7 @@ docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
- 	perl docs/kernel-doc -man "$(TEMPFILE)" | \
- 	    perl docs/split-man.pl docs/man
- 	-rm -f "$(TEMPFILE)"
--	@for file in docs/man/*.3; do \
--		gzip -f $$file; \
--	done
--	find docs/man -type f -name \*[0-9].gz
-+	find docs/man -type f -name \*.[0-9]
- 
- dep_clean:
- 	$(RM) $(OBJS:.o=.d)
---- a/libmpathpersist/Makefile
-+++ b/libmpathpersist/Makefile
-@@ -16,8 +16,6 @@ all: $(LIBS)
- $(LIBS): $(OBJS)
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ -o $@ $(OBJS)
- 	$(LN) $(LIBS) $(DEVLIB)
--	$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
--	$(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz
- 
- install: $(LIBS)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
-@@ -26,14 +24,14 @@ install: $(LIBS)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(includedir)
- 	$(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
--	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
--	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
- 	$(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(includedir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
--	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz
--	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz
-+	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3
-+	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3
- 	$(RM) $(DESTDIR)$(includedir)/mpath_persist.h
- 	$(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
- 
---- a/mpathpersist/Makefile
-+++ b/mpathpersist/Makefile
-@@ -14,13 +14,12 @@ all: $(EXEC)
- 
- $(EXEC): $(OBJS)
- 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 
- clean: dep_clean
- 	$(RM) core *.o $(EXEC) *.gz
-@@ -29,7 +28,7 @@ include $(wildcard $(OBJS:.o=.d))
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
- 
- dep_clean:
- 	$(RM) $(OBJS:.o=.d)
---- a/multipath/Makefile
-+++ b/multipath/Makefile
-@@ -16,8 +16,6 @@ all: $(EXEC)
- 
- $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
- 	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
--	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -26,16 +24,16 @@ install:
- 	$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
- 	$(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
- 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
--	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
-+	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
- 
- clean: dep_clean
- 	$(RM) core *.o $(EXEC) *.gz
---- a/multipathd/Makefile
-+++ b/multipathd/Makefile
-@@ -34,7 +34,6 @@ all : $(EXEC)
- 
- $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
- 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -45,11 +44,11 @@ ifdef SYSTEMD
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
- endif
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
- 	$(RM) $(DESTDIR)$(unitdir)/$(EXEC).service
- 	$(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket
- 
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
deleted file mode 100644
index 2949cba6cbb6..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
-IUSE="systemd rbd"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	>=sys-fs/lvm2-2.02.45
-	>=virtual/libudev-232-r3
-	sys-libs/readline:0=
-	rbd? ( sys-cluster/ceph )
-	systemd? ( sys-apps/systemd )
-"
-
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.5-respect-flags.patch
-	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
-	"${FILESDIR}"/${PN}-0.8.3-json-c-0.14.patch
-	"${FILESDIR}"/${PN}-0.8.3-fix-gcc-10-compatibility.patch
-)
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-src_prepare() {
-	default
-
-	# The upstream lacks any way to configure the build at present
-	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proper configure system
-	if ! use rbd ; then
-		sed \
-			-e "s/libcheckrbd.so/# libcheckrbd.so/" \
-			-e "s/-lrados//" \
-			-i libmultipath/checkers/Makefile \
-			|| die
-	fi
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		RUN=run \
-		SYSTEMD=$(get_systemd_pv) \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir='${prefix}'/"$(get_udevdir)" \
-		pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
-		install
-
-	newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
index ba7a9c7725ff..490dda93c853 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 98a580a200e1..7b2a72c3467c 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,5 @@
 DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3
 DIST udisks-2.9.2.tar.bz2 1701377 BLAKE2B 402cf2354907acee13230d035c8b22634a70efab0e61939d8ff260391c80a0d166de67f57cc4b78025da027df16deb07c5620ab546d37181681d824ea84d0e8c SHA512 73a162bbb0fd6ec1e6a79af2a01185672712d7e94eacdc1a913f559a87fc620a095fe4c8b4dacbaa12bc816f565fc966d28c2f9299104da18581d4879321aee9
 EBUILD udisks-2.9.1-r1.ebuild 3446 BLAKE2B d42d0f9cdffdcec6f22ee1d03ed7a6d8b69075586e38adc316e794b67daaadc3fd48da317a813d5c5a02cae6a5f0f1c4399a3caad73175ef178e44380f21badb SHA512 d5a5e129d0f8ffe1a1c7e3e7208f2392d5d5bf9913ae19bb8a2aa5fa413cec96f450041ca54c83e8483279e41d9091d8d4733e67ad37c118d955eef69c744bf4
-EBUILD udisks-2.9.2-r1.ebuild 3561 BLAKE2B 37a385f84760acebaa28fe348c4bb82250a08d11824655ea496681e46670ac5cb4676fa2f7121ad6fd3f3f5138e1794fa67556440c1d1970981c1a07edd74738 SHA512 70b5ad06781be612fe2979a490947b7e41d699d977d6eea37568cdfe0fffb4fe9a2ebaba7ea1b5adbce2d727fd487e0a0ecd82fed9b3176d4765e9fd36cbc0f3
+EBUILD udisks-2.9.2-r1.ebuild 3568 BLAKE2B a2e34c2603f70bbe9eed4d8aadadbb966fcafb6e55fa11032e9a04090d06c889dc551c39d621e29b3300807d0f3a6516203be73ce9ea350172d437f20200f748 SHA512 d0cebbe4f56339110685a6227c3e05a9d8c21226ed0254aa950ea5bd4e85694b156d7e37e9d8e9bca5e32aa86c8ef5fda83b00a9c770a3d35a9a74b1054ce7d7
 MISC metadata.xml 728 BLAKE2B 4a540e1378d04b04e2b75a531e9df8c13faee4870c8bc3778e9e08dc742eb9e28e2b1134448302e43cbb8815432fa0bbbb402f22722267fa4869fe0c04775c8b SHA512 9f057eb51f5924b53cecf5e495b02bb6fad41e9b23c197b1f24a972e8a25504506e73329a93295e9eb30e62863f7c4454909fba10fdea696be23caa7cf50d8cb
diff --git a/sys-fs/udisks/udisks-2.9.2-r1.ebuild b/sys-fs/udisks/udisks-2.9.2-r1.ebuild
index 97ae6e37c1e9..47fbecee3c8c 100644
--- a/sys-fs/udisks/udisks-2.9.2-r1.ebuild
+++ b/sys-fs/udisks/udisks-2.9.2-r1.ebuild
@@ -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 ~riscv ~sparc ~x86"
 IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
 
 REQUIRED_USE="
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index 62233e17e224..8e634b0d800f 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,5 +1,5 @@
 DIST vhba-module-20200106.tar.bz2 15632 BLAKE2B 9b2db6cab2388fb5b84f2735d41a093af212434de2784f112d212cfc6193b1267ccf0afb222765bc32b0fc455d16bd1f0e98ddf60212735473853ec29ab27b97 SHA512 fc320e1f8f05247b7c2feded1335dce0fcc9a1257127d8d4086db48bd1e082d81b8a88089c04d0b8624ae584f1c0d049544f6f0018ec7dcea20ccfb136cd1bf0
 DIST vhba-module-20210418.tar.xz 16112 BLAKE2B 89b81e747f10fea4294c79a19b33b7e11e2747b48180a98bebe3a4a46b15ebbd7b7307c37801d4fd56b0d1440c14bc4e7b800846b2788e1a433edd0aee680501 SHA512 f5841f56974faae8317d84100a9e3d3ec80f6b980e7452047852c79b17e963e75f85d6712c64588ce57abbdbb4a8a2b9b10cf752102b145e1667f26bf260b1f0
 EBUILD vhba-20200106-r1.ebuild 1085 BLAKE2B 2ffe6e523bc4397b5cb1efc192075c3ee2ba01b5f099028bcc97e4ff6efbcc9761eed4eb37510e25e5192f5b53520c1fe88a4f8d6a7f7932e42b68f244764f02 SHA512 84929f69863c2cd8ab9ea689a1ebaeeff27fbb2269d2acc9fc1a858419262236bfa8e1697b34867f5f2681d74346d1de1c488ace525f4c8b581a8ae080267902
-EBUILD vhba-20210418.ebuild 1087 BLAKE2B dfb152749f95783d44e0e83757dab6ef703103d148b8cb583ebbddc24e453e8a147b94f4d7b1199be451154d8a8e0ef7de62b8f85924f967718b5e1b331ecfe1 SHA512 09fa9bfe73beb92ee0fcee18a61983db0b168b60beeadd69dc44cb89904b256ea6f49e9912e0a90fc2b1cc4984f6c6e587114ede1065f8307d65c6b24378328e
+EBUILD vhba-20210418.ebuild 1085 BLAKE2B d340728beb02725c1cc7c70c6abf61457cb63e53e07b1c0b7c6fea2d03dbb5467777e3dd0e0dcf73e8d4d90a00a86c1afd6efd0382e21ac9aa518885f46a76e6 SHA512 18d9b3e6bd8fb2e2869936e6cbecee30220af174258284db217899c31a090c559643d5751dba69941b1a570a7d6beb4dce90e32e1b0bd4e6fc5655d203d9fe7a
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20210418.ebuild b/sys-fs/vhba/vhba-20210418.ebuild
index 458a74bf9381..d9e0c2610800 100644
--- a/sys-fs/vhba/vhba-20210418.ebuild
+++ b/sys-fs/vhba/vhba-20210418.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="virtual/udev"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 1f0946960d66..0784e5199046 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,6 +2,8 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
 DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd
 DIST xfsprogs-5.11.0.tar.xz 1297180 BLAKE2B 0ae0c2eccdf124b9fc2f9a4ef71073324f3645bc9a4f2959978fa06ee4dae4ecaf4eee40e6b130b65eb390d8af0f9d1485aeac073a8ac5e30fce46eef9cdb7a4 SHA512 7a77f938a54176652ce0b53cab13509754aab560c02d74ab03a9fcebf2728d703f89ad9d281ef00fcc0dbabb5497cab2b2b656bbe7598037a16fff70126e5d66
+DIST xfsprogs-5.12.0.tar.xz 1299332 BLAKE2B 96e8831ca83d362792853188939017b53343232c99ed514fda50ea9afa828ea8f8ecc753249b211037c2635b45bfbcc849f90fe277102e4745e6b4f13fc6fc20 SHA512 d31263529cd5e0aad2b4414aca91f352c6df9de9a241655e43b5592a3ca120efdcfcd8cf84401ebd1b3fcf67027f0923fecc6f961bdaf12fb00c3ac67abd5fe7
 EBUILD xfsprogs-5.10.0-r1.ebuild 2204 BLAKE2B 7c672ff92985feddd92d9d67135a7c665120a2ce46754c4713286418d963deec23d88e8899479ce07221d4f22e8f12574a5c594f00c461f6ff5797ec48e4cf9d SHA512 1b5e565644800b066a2d84af8d8a2b20148cfa0639172b56f4ead8ecbe9613ad0ea617371692c1179b5e3f626d2824fc39d57d2d2be89fa832d846852e214f91
 EBUILD xfsprogs-5.11.0.ebuild 2211 BLAKE2B f2480a90f8cfa63d45501eda4dbaee60b23de004cb5423a12d31a2f09c2f8894d5cc8b2360bfe76af2c5357b08cbdf8cac10f6e3d78ea7eff9724a9db46d37a2 SHA512 369452f76c744a1b2a0bc0c96e0829bffc0d37778100f77d1058330740c6fc565b82bdfc6e9f44091c563b27c77b26f8cae490420fba806e6d114c189168e6cb
+EBUILD xfsprogs-5.12.0.ebuild 2211 BLAKE2B f2480a90f8cfa63d45501eda4dbaee60b23de004cb5423a12d31a2f09c2f8894d5cc8b2360bfe76af2c5357b08cbdf8cac10f6e3d78ea7eff9724a9db46d37a2 SHA512 369452f76c744a1b2a0bc0c96e0829bffc0d37778100f77d1058330740c6fc565b82bdfc6e9f44091c563b27c77b26f8cae490420fba806e6d114c189168e6cb
 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/xfsprogs-5.12.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.12.0.ebuild
new file mode 100644
index 000000000000..030c8acbec7d
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.12.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs systemd usr-ldscript
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+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"
+IUSE="icu libedit nls"
+
+RDEPEND=">=sys-apps/util-linux-2.17.2
+	dev-libs/inih
+	icu? ( dev-libs/icu:= )
+	libedit? ( dev-libs/libedit )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	unset PLATFORM # if set in user env, this breaks configure
+
+	# Avoid automagic on libdevmapper, #709694
+	export ac_cv_search_dm_task_create=no
+
+	# Build fails with -O3 (bug #712698)
+	replace-flags -O3 -O2
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable libedit editline)
+	)
+
+	if is-flagq -flto ; then
+		myconf+=( --enable-lto )
+	else
+		myconf+=( --disable-lto )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	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/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 57b8a80a8078..cf8f2d2cf26c 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,10 +1,10 @@
 AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
 DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b
-DIST zfs-2.1.0-rc5.tar.gz 34811108 BLAKE2B fd785dd9a77a55b734fd96526e5805cd8e90a517cef48bed95fccc4849f7be45210b3cc6f6bdfb30f3ee3a9a9814308eb1599c4df143aca46b23f968dc088a54 SHA512 37dd4f40a8ab8265a4f8c1d67d1a4327b1376bbd2d53b166261d501ffc01521deaa03f8bcce992158d50482def184b840d2596df6d9291697b1fc1938731d6d8
-DIST zfs-2.1.0-rc5.tar.gz.asc 195 BLAKE2B 452c211af7ad3b5f7e2b7bc96985305dabcedde0f70825353b18d45e569f2bbd39b717d7e7b790794735295ec5dcc4ed751f5256fffa7b892627056191f02b79 SHA512 85908fbb2cb49965ce015d20182aef035fbd76195a1a72aa36a48af05bd355a95998087ec3b6c73b6de6eebd66e578bef28db6ecbf679274ce6aade303b66cae
-EBUILD zfs-kmod-0.8.6.ebuild 4783 BLAKE2B 585765ace5ea6182bb804dd4f7113e1cdac1d6bc9ba092e083645064a0bc38f6d7747afb2fcd290ecc4f0d7957da9c609d4d29288784f6f45327016b19c3f48f SHA512 64a119691b0f5d1c5109e128f2a0802e9f4315f001c013f36f162771df0c51b524494cb7aaf71aabc829ca7ed63374a8ced5cfeec196056c02e712654e07656d
-EBUILD zfs-kmod-2.0.4.ebuild 4467 BLAKE2B ae4c86ac369b171e59a698a134eefb0fcef7019e7b3ca0225de3d444bce88226d1d777480ed06020d6933f3c0155979f9d56210fcb7443a70dd19994d027a94a SHA512 26c4b8beb017f142169f92a1d9475d807bba0dd170ac66976edc9902ffe76b682b9ef57f60caf24bc30c88e5fdad8c9b7017dd7182009c42a10f5bb1fba2fa7d
-EBUILD zfs-kmod-2.1.0_rc5.ebuild 4790 BLAKE2B f4a7c5121e623a0947b2984ffe6c0d042d8689b38738e7dda3afb148d0cab411c234b7da6d49091fedd93c30cc95ada5d6a24f20b8440d54931da2c23ce0d67f SHA512 21a389b30173d8a8e57ad7ad52309a5fa8e5057bc5f0e1cd9ff935bfd777c6d1e31cd6822d7d6fbe6b6e5668482f060f2a5083ff61ee1c7ac534c7d905ea72cb
-EBUILD zfs-kmod-9999.ebuild 4790 BLAKE2B f4a7c5121e623a0947b2984ffe6c0d042d8689b38738e7dda3afb148d0cab411c234b7da6d49091fedd93c30cc95ada5d6a24f20b8440d54931da2c23ce0d67f SHA512 21a389b30173d8a8e57ad7ad52309a5fa8e5057bc5f0e1cd9ff935bfd777c6d1e31cd6822d7d6fbe6b6e5668482f060f2a5083ff61ee1c7ac534c7d905ea72cb
+DIST zfs-2.1.0-rc6.tar.gz 34777294 BLAKE2B 0080b03a9cf9717ae2bc7674e340dffafd923467368d8941df9be5a21f081e88745297e1a8b2ac5059e9f346949bbeb759a5fc8bcdb60c3be49b0645389ec8b1 SHA512 696d525c1c738a508d04366f8ffd0142aebe4498efbf129c9d38fa7c67dbec83554f55a2c4a5d7647a03ca0df173c2720fe85edbc859195f4ca19e04d2adf143
+DIST zfs-2.1.0-rc6.tar.gz.asc 195 BLAKE2B a1267b8faffc75ac70082e261c6053b2070cbad014c92051ebc82af56b21bbe2e72e01e44c0701ed255a3201330bb56b5e1a72e12c1ae9f15f72883b53c17ec6 SHA512 afc0eb839de6b0b21b3d781dd74dce9f6f668b7b9fc079ea764666e28d4d3228b8a80641b6d0084851bffedfc3406dc0f829242f6b4247d192f554ba45ce3a4c
+EBUILD zfs-kmod-0.8.6.ebuild 4796 BLAKE2B ddb58b4223966078cd38b461d9dcc48f485a240ffc4b154abc58805f1c2f5d750d07854da9e1f736c103142cab13e2667b1d526c98782b821208a93815b4b368 SHA512 7dd5cba7330973fd1afc588d2673e958aabeaa9af80e8df09eca35283cae4fda228d32d7a300ec8732e30a32ad6bf5fb6867f34bcad9c7975290d8014fdfcfdf
+EBUILD zfs-kmod-2.0.4.ebuild 4480 BLAKE2B 3351d47b9fe97cbe8de7e12f86d0ee8a66c83094ffc66fe9d551f2bbd83a5a935580f8bdf3a55811b7e554d3a24b9c60f798bdd528ecf25321137fd5b62ef981 SHA512 dd42188466bfbec8af4ac9a968cb15f82b691bb1d5ea09bcd1cc9e86d6b7eed1ff6e1cd8fdc6c121c5be488efc1cb225cb024e3b2b701e7dc7325f888554755f
+EBUILD zfs-kmod-2.1.0_rc6.ebuild 4803 BLAKE2B 9a43d72668c6dd3093baa138f5c9d76f0fb891fe80b0523898be43cbb102790a0e779cf84cd1dd19ba65a31ed39113e2fdc795d86d927d93b9153905cc16fb00 SHA512 410f7ff768cbafb95bef27ef8d5c8f31daa6c8c37bb990978dbf49406be8a4273e1492af5afca1aa579ae4fe4c76144dd5d9a22ad3d158713816e9685b84b32f
+EBUILD zfs-kmod-9999.ebuild 4803 BLAKE2B 9a43d72668c6dd3093baa138f5c9d76f0fb891fe80b0523898be43cbb102790a0e779cf84cd1dd19ba65a31ed39113e2fdc795d86d927d93b9153905cc16fb00 SHA512 410f7ff768cbafb95bef27ef8d5c8f31daa6c8c37bb990978dbf49406be8a4273e1492af5afca1aa579ae4fe4c76144dd5d9a22ad3d158713816e9685b84b32f
 MISC metadata.xml 548 BLAKE2B 0245ac0b73ed129ce2df41358814d46749fab0463a03fceb643010629cd522460e84c5b8c0247f499adf4ed2e781e0d6f6857a3c6be4f4fb206eeabba158e86c SHA512 2b98b289369d875c5ff89825590a98c9764a1b716df1b79c852dbb833f4f02d5c66782f43084a1acde11a0ba2cb9ef2956b35c10881f77ec92d6749566276e6b
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 aa5c9b935f06..f63c737f2af0 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
@@ -136,9 +136,9 @@ src_install() {
 	set_arch_to_kernel
 
 	myemakeargs+=(
-		DEPMOD="/bin/true"
+		DEPMOD=:
 		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+		INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
 	)
 
 	emake "${myemakeargs[@]}" install
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild
index 02c14548586c..32715c6f6a94 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.4.ebuild
@@ -127,9 +127,9 @@ src_install() {
 	set_arch_to_kernel
 
 	myemakeargs+=(
-		DEPMOD="/bin/true"
+		DEPMOD=:
 		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+		INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
 	)
 
 	emake "${myemakeargs[@]}" install
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc6.ebuild
index 430fa43eaadb..f57ff9699ac8 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc6.ebuild
@@ -136,9 +136,9 @@ src_install() {
 	set_arch_to_kernel
 
 	myemakeargs+=(
-		DEPMOD="/bin/true"
+		DEPMOD=:
 		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+		INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
 	)
 
 	emake "${myemakeargs[@]}" install
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 430fa43eaadb..f57ff9699ac8 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -136,9 +136,9 @@ src_install() {
 	set_arch_to_kernel
 
 	myemakeargs+=(
-		DEPMOD="/bin/true"
+		DEPMOD=:
 		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+		INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
 	)
 
 	emake "${myemakeargs[@]}" install
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index fec207e8c5f1..a6cc74d5c66d 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,10 +1,10 @@
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
 DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b
-DIST zfs-2.1.0-rc5.tar.gz 34811108 BLAKE2B fd785dd9a77a55b734fd96526e5805cd8e90a517cef48bed95fccc4849f7be45210b3cc6f6bdfb30f3ee3a9a9814308eb1599c4df143aca46b23f968dc088a54 SHA512 37dd4f40a8ab8265a4f8c1d67d1a4327b1376bbd2d53b166261d501ffc01521deaa03f8bcce992158d50482def184b840d2596df6d9291697b1fc1938731d6d8
-DIST zfs-2.1.0-rc5.tar.gz.asc 195 BLAKE2B 452c211af7ad3b5f7e2b7bc96985305dabcedde0f70825353b18d45e569f2bbd39b717d7e7b790794735295ec5dcc4ed751f5256fffa7b892627056191f02b79 SHA512 85908fbb2cb49965ce015d20182aef035fbd76195a1a72aa36a48af05bd355a95998087ec3b6c73b6de6eebd66e578bef28db6ecbf679274ce6aade303b66cae
-EBUILD zfs-0.8.6.ebuild 5621 BLAKE2B 7b20cae30bb08f7f718013198aebbd668cbca240871fd1a97e2c3057b4993af2db7e29b7c8d3e71b441e627b97738d7c856204488f39456bb66f68955da8d1f4 SHA512 0289ce2e5c37d3534856ef19e688298a677a9ff78bc8aa22a5150e2c146ffca4b9c3b138d007acf8292bced0389d434f0d752feba83105729c413b9c81396540
-EBUILD zfs-2.0.4.ebuild 5943 BLAKE2B d8bdc64194b8e63d324eb1359f5d4e75981711cb77a6e5313fc40383f6f97ccb54769a20dcd4f84554c51a44026d935b0c1fb695857d017ada2dcc3167053311 SHA512 c47f7cb65c7cb780cc64a6e8b73f60d20b2cfbc4b7d30960d41e3408e8ad1c7d9227264e241b54ecd6d77568a9b868afe119cc4aa2bf2ef847773842e6bcbdb7
-EBUILD zfs-2.1.0_rc5.ebuild 7259 BLAKE2B 411c348dd7dffbc27453b76eb5b7a378f4181f3f5ed6d50ab27f5e62e822536185afa6e39930ab7837608c28b6c48e29061b8826237aecc6ccea852e58b1cac5 SHA512 b470cf358316366de94d7f4555702459847739b225527b99a77fbde65303ab2874a34feb0c2d00fe8eb24e246e63fe68303cc274ba8c4e60883d9fd6b4b4efbe
+DIST zfs-2.1.0-rc6.tar.gz 34777294 BLAKE2B 0080b03a9cf9717ae2bc7674e340dffafd923467368d8941df9be5a21f081e88745297e1a8b2ac5059e9f346949bbeb759a5fc8bcdb60c3be49b0645389ec8b1 SHA512 696d525c1c738a508d04366f8ffd0142aebe4498efbf129c9d38fa7c67dbec83554f55a2c4a5d7647a03ca0df173c2720fe85edbc859195f4ca19e04d2adf143
+DIST zfs-2.1.0-rc6.tar.gz.asc 195 BLAKE2B a1267b8faffc75ac70082e261c6053b2070cbad014c92051ebc82af56b21bbe2e72e01e44c0701ed255a3201330bb56b5e1a72e12c1ae9f15f72883b53c17ec6 SHA512 afc0eb839de6b0b21b3d781dd74dce9f6f668b7b9fc079ea764666e28d4d3228b8a80641b6d0084851bffedfc3406dc0f829242f6b4247d192f554ba45ce3a4c
+EBUILD zfs-0.8.6.ebuild 5653 BLAKE2B 38774df7573b4aa50fa6aae5bba143514b6e48d018d8e1a5b112181d7ef2f8048b044ad234b00bd44a8b2f311f72e3ae57a55765c25239779ef618ce65a05290 SHA512 8a49d24c53bff99af55ee3581ec935875fa050aded7b8efc8bc7ecd9f73a342023d23f498e9e0c8730b6b516e2aa510fb64d7680d49aa30a6d4e385ede733f0f
+EBUILD zfs-2.0.4.ebuild 5975 BLAKE2B 9f1a03496e6b18542a85778a02b625ccfa8c9de9dc15c45100c921100f0b9da34884a56ff9117ef014c5364ef96de538f5416f335c10be611f114d323354b53f SHA512 6c9e3cd0717465d4cbc49a53d63f8e4e4d91e97cb5fe2154f83592f41b7b777cb8a13fa81936f9265d8c577c01a8a4715b37f82149a1826f13511dd506d83150
+EBUILD zfs-2.1.0_rc6.ebuild 7259 BLAKE2B 411c348dd7dffbc27453b76eb5b7a378f4181f3f5ed6d50ab27f5e62e822536185afa6e39930ab7837608c28b6c48e29061b8826237aecc6ccea852e58b1cac5 SHA512 b470cf358316366de94d7f4555702459847739b225527b99a77fbde65303ab2874a34feb0c2d00fe8eb24e246e63fe68303cc274ba8c4e60883d9fd6b4b4efbe
 EBUILD zfs-9999.ebuild 7259 BLAKE2B 411c348dd7dffbc27453b76eb5b7a378f4181f3f5ed6d50ab27f5e62e822536185afa6e39930ab7837608c28b6c48e29061b8826237aecc6ccea852e58b1cac5 SHA512 b470cf358316366de94d7f4555702459847739b225527b99a77fbde65303ab2874a34feb0c2d00fe8eb24e246e63fe68303cc274ba8c4e60883d9fd6b4b4efbe
 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 bc79776fedf3..fbe500b2f8d9 100644
--- a/sys-fs/zfs/zfs-0.8.6.ebuild
+++ b/sys-fs/zfs/zfs-0.8.6.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript
diff --git a/sys-fs/zfs/zfs-2.0.4.ebuild b/sys-fs/zfs/zfs-2.0.4.ebuild
index 70d6c1c91893..597374f40d48 100644
--- a/sys-fs/zfs/zfs-2.0.4.ebuild
+++ b/sys-fs/zfs/zfs-2.0.4.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
diff --git a/sys-fs/zfs/zfs-2.1.0_rc5.ebuild b/sys-fs/zfs/zfs-2.1.0_rc6.ebuild
index 621ef35d32be..621ef35d32be 100644
--- a/sys-fs/zfs/zfs-2.1.0_rc5.ebuild
+++ b/sys-fs/zfs/zfs-2.1.0_rc6.ebuild