gentoo resync : 08.10.2021

31 files changed, 272 insertions, 201 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 580634af0b56..5384b477f059 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 055afb88e642..b85c1ce6d01d 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -4,10 +4,9 @@ AUX 2.4.0-dmcrypt.confd 4009 BLAKE2B efaf826fc78b60068aeddb6d5fbd9665bcf85e66c5f
 AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f66ba4be5df1a0d29da7c1dadd0e2379a5f4ef35a9b17d4cb11fe2419cce6cad2df63546370b6a1975b SHA512 7f32bd09e22405deb4a7cd8233da0262764233562421a8fb49bd625be591f1dc27154c2204462df480668ab2f1a81aab5a992f426603a8a4fd86cd15a27a6a97
 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
 AUX cryptsetup-2.4.1-external-tokens.patch 1015 BLAKE2B ca7b5940caf000cc97742dfcbf8ee38e9fec049a4a3788737b283851dc3fd340664d332aff507f8d9d5962bca66b56a232419902114ac08ace5df76825cccd1a SHA512 23dff40a535ac1d4ccae41cc7a24e0ca53b412e0f6c0fc3e4a8ef7b7255ed28d8010a5684aa5029ec1d5d534196c4fbb83bc2a1ab5794cc6197b19f1a0696bab
+AUX cryptsetup-2.4.1-fix-static-pwquality-build.patch 5226 BLAKE2B 1dfd8b001e8284d5efd5afe0d67a401d334e9588baf6d0f18f533694dd4a22a782066ee43f22fe5bfaea51fc09beac127e91c77b07fc9a63778b55b25e0d2ebf SHA512 71a3f63b86de72ccfa49c9294db433da7f1fd6366e328f7311051edfd980f630ca3435ef8c5e92c55083eb3b25a3b2bbafa75282de1bf65be6820655b7556f2f
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
-DIST cryptsetup-2.4.0.tar.xz 11162168 BLAKE2B a2074d1607ff3c136818b14ea3939fde3a528430b50ebd4d483d1e164ede6a62432c27e0d7d8b29b89ad6bce69dae30fc6bdf5ce458b3c6faa5178f6218519e6 SHA512 9c868b1dee7145f91092160cf977d3ada57a14634b5312d54477e111250975b6f077a92c417373bb7de07244b01ab19553bcce5030ee456ca2c38030e3067186
 DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada SHA512 17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7
 EBUILD cryptsetup-2.3.6-r2.ebuild 3908 BLAKE2B f2b709398da106f2d2b89365d67eee7298703035b1c94960fc0819b00dc48231692a6df2bf13322778e3704003bc0637a14d8198343053010b74fd21b1f52050 SHA512 6a9ee5bdd788a51944af30311ec84698d0fcaf19fe5845be4e0758dc89367ba9786c47b861595dfa691e3b9a82e11a239e54b1166fddd4848ec3bf37d5ceb195
-EBUILD cryptsetup-2.4.0-r1.ebuild 4118 BLAKE2B 87d307168f52ba2476fa3acfbe4a9203a6a720ea957bc5be45acec3264311e2648270878cfbf4ba82b8935cbd8fa49dc32843617bc5f70b54c0c222b6b693d83 SHA512 eb71c347d866fd91f9ed940ce32daa117204259f55eed0e65e99f12c2756e5dcd857ff954171c861aa8eacead09fb714e2133169544766300c22dcec68273920
-EBUILD cryptsetup-2.4.1-r1.ebuild 4134 BLAKE2B 057b3f0f264a35155971feb860c83ac7fba48f963973aa626543f7aa0172f2284f1f0d6ea4469e144a0f12dc202b5f0278d4221865fc5ed942ca822d2e221865 SHA512 512df86889fdbd000b2c17f36c1cee96976be1a92c1c3421ed4f320bf822ff2026159d708b0cdd50c69b72ab682312aad0bdbd569849a68a9f6f7930f4ab315d
+EBUILD cryptsetup-2.4.1-r1.ebuild 4283 BLAKE2B 599590bf68883aad5e64b6a5affc0a464df4339abd11fe9088ea980fc400ba5bc6e7a5fbbd4792a73f735351ea348d1ade9ed42fb9480c991be5e48753799f3c SHA512 bf6ed2dd41144874931c56c4fb697ae4c3df696fefa11373352921729e9e4b9db4f8cd0f4094ba170ebe7a5e8a61c76673b0bc554857090b61f9e0b6ad61f51e
 MISC metadata.xml 1076 BLAKE2B 132b07201bfa3a7d8889d0b2558c15f35829bfa021b31cd5a9cf2cb21de822ceb89fae177b014590f46411cd609b4e44b20165b07c7676483a547987fffcbb9d SHA512 b06b884e0e369022cea4b3634d9df3c7d62d854754969d0c7848a3baf3a3ea69cce2131527539600424c72c539e502378b0627ba7c4fdcbc74e6f7a58b5800a8
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
deleted file mode 100644
index 09141d7320f9..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles
-
-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 ssh static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt !udev )" #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(+)] )
-	ssh? ( net-libs/libssh[static-libs(+)] )
-	sys-fs/lvm2[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\([+-]\)\]}
-	udev? ( virtual/libudev:= )"
-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)
-		$(use_enable ssh ssh-token)
-		$(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
-		mv "${ED}"/sbin/integritysetup{.static,} || die
-		if use ssh ; then
-			mv "${ED}"/sbin/cryptsetup-ssh{.static,} || die
-		fi
-		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}"/2.4.0-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/2.4.0-dmcrypt.rc dmcrypt
-}
-
-pkg_postinst() {
-	tmpfiles_process cryptsetup.conf
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
index cd60372120e6..928f589b9606 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info tmpfiles
+inherit autotools linux-info tmpfiles
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
@@ -50,6 +50,9 @@ S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
 	"${FILESDIR}"/cryptsetup-2.4.1-external-tokens.patch
+
+	# Remove autotools/eautoreconf when this patch is dropped.
+	"${FILESDIR}"/cryptsetup-2.4.1-fix-static-pwquality-build.patch
 )
 
 pkg_setup() {
@@ -64,6 +67,7 @@ pkg_setup() {
 src_prepare() {
 	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
 	default
+	eautoreconf
 }
 
 src_configure() {
diff --git a/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc b/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc
index cdd20ba929d4..cdd20ba929d4 100644..100755
--- a/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc
+++ b/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc
diff --git a/sys-fs/cryptsetup/files/cryptsetup-2.4.1-fix-static-pwquality-build.patch b/sys-fs/cryptsetup/files/cryptsetup-2.4.1-fix-static-pwquality-build.patch
new file mode 100644
index 000000000000..f39e88507ffd
--- /dev/null
+++ b/sys-fs/cryptsetup/files/cryptsetup-2.4.1-fix-static-pwquality-build.patch
@@ -0,0 +1,225 @@
+From 26cc1644b489578c76ec6f576614ca885c00a35d Mon Sep 17 00:00:00 2001
+From: Milan Broz <gmazyland@gmail.com>
+Date: Wed, 6 Oct 2021 12:27:25 +0200
+Subject: [PATCH 1/2] Do not link integritysetup and veritysetup with
+ pwquality.
+
+These tools do not read passphrases, no need to link to these libraries.
+
+Just move the helper code that introduced this dependence as a side-effect.
+
+Fixes: #677
+---
+ src/Makemodule.am    |  6 -----
+ src/utils_password.c | 56 --------------------------------------------
+ src/utils_tools.c    | 56 ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 56 insertions(+), 62 deletions(-)
+
+diff --git a/src/Makemodule.am b/src/Makemodule.am
+index a6dc50cf..f2b896bf 100644
+--- a/src/Makemodule.am
++++ b/src/Makemodule.am
+@@ -52,7 +52,6 @@ veritysetup_SOURCES =		\
+ 	src/utils_arg_names.h	\
+ 	src/utils_arg_macros.h	\
+ 	src/utils_tools.c	\
+-	src/utils_password.c	\
+ 	src/veritysetup.c	\
+ 	src/veritysetup_args.h	\
+ 	src/veritysetup_arg_list.h	\
+@@ -61,8 +60,6 @@ veritysetup_SOURCES =		\
+ veritysetup_LDADD = $(LDADD)	\
+ 	libcryptsetup.la	\
+ 	@POPT_LIBS@		\
+-	@PWQUALITY_LIBS@	\
+-	@PASSWDQC_LIBS@		\
+ 	@BLKID_LIBS@
+ 
+ sbin_PROGRAMS += veritysetup
+@@ -91,7 +88,6 @@ integritysetup_SOURCES =	\
+ 	src/utils_arg_names.h	\
+ 	src/utils_arg_macros.h	\
+ 	src/utils_tools.c	\
+-	src/utils_password.c	\
+ 	src/utils_blockdev.c	\
+ 	src/integritysetup.c	\
+ 	src/integritysetup_args.h \
+@@ -101,8 +97,6 @@ integritysetup_SOURCES =	\
+ integritysetup_LDADD = $(LDADD)	\
+ 	libcryptsetup.la	\
+ 	@POPT_LIBS@		\
+-	@PWQUALITY_LIBS@	\
+-	@PASSWDQC_LIBS@		\
+ 	@UUID_LIBS@		\
+ 	@BLKID_LIBS@
+ 
+diff --git a/src/utils_password.c b/src/utils_password.c
+index 58f3a7b3..65618b9c 100644
+--- a/src/utils_password.c
++++ b/src/utils_password.c
+@@ -318,59 +318,3 @@ void tools_passphrase_msg(int r)
+ 	else if (r == -ENOENT)
+ 		log_err(_("No usable keyslot is available."));
+ }
+-
+-int tools_read_mk(const char *file, char **key, int keysize)
+-{
+-	int fd = -1, r = -EINVAL;
+-
+-	if (keysize <= 0 || !key)
+-		return -EINVAL;
+-
+-	*key = crypt_safe_alloc(keysize);
+-	if (!*key)
+-		return -ENOMEM;
+-
+-	fd = open(file, O_RDONLY);
+-	if (fd == -1) {
+-		log_err(_("Cannot read keyfile %s."), file);
+-		goto out;
+-	}
+-
+-	if (read_buffer(fd, *key, keysize) != keysize) {
+-		log_err(_("Cannot read %d bytes from keyfile %s."), keysize, file);
+-		goto out;
+-	}
+-	r = 0;
+-out:
+-	if (fd != -1)
+-		close(fd);
+-
+-	if (r) {
+-		crypt_safe_free(*key);
+-		*key = NULL;
+-	}
+-
+-	return r;
+-}
+-
+-int tools_write_mk(const char *file, const char *key, int keysize)
+-{
+-	int fd, r = -EINVAL;
+-
+-	if (keysize <= 0 || !key)
+-		return -EINVAL;
+-
+-	fd = open(file, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR);
+-	if (fd < 0) {
+-		log_err(_("Cannot open keyfile %s for write."), file);
+-		return r;
+-	}
+-
+-	if (write_buffer(fd, key, keysize) == keysize)
+-		r = 0;
+-	else
+-		log_err(_("Cannot write to keyfile %s."), file);
+-
+-	close(fd);
+-	return r;
+-}
+diff --git a/src/utils_tools.c b/src/utils_tools.c
+index dbd83695..cf66e4c4 100644
+--- a/src/utils_tools.c
++++ b/src/utils_tools.c
+@@ -493,3 +493,59 @@ int tools_reencrypt_progress(uint64_t size, uint64_t offset, void *usrptr)
+ 
+ 	return r;
+ }
++
++int tools_read_mk(const char *file, char **key, int keysize)
++{
++	int fd = -1, r = -EINVAL;
++
++	if (keysize <= 0 || !key)
++		return -EINVAL;
++
++	*key = crypt_safe_alloc(keysize);
++	if (!*key)
++		return -ENOMEM;
++
++	fd = open(file, O_RDONLY);
++	if (fd == -1) {
++		log_err(_("Cannot read keyfile %s."), file);
++		goto out;
++	}
++
++	if (read_buffer(fd, *key, keysize) != keysize) {
++		log_err(_("Cannot read %d bytes from keyfile %s."), keysize, file);
++		goto out;
++	}
++	r = 0;
++out:
++	if (fd != -1)
++		close(fd);
++
++	if (r) {
++		crypt_safe_free(*key);
++		*key = NULL;
++	}
++
++	return r;
++}
++
++int tools_write_mk(const char *file, const char *key, int keysize)
++{
++	int fd, r = -EINVAL;
++
++	if (keysize <= 0 || !key)
++		return -EINVAL;
++
++	fd = open(file, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR);
++	if (fd < 0) {
++		log_err(_("Cannot open keyfile %s for write."), file);
++		return r;
++	}
++
++	if (write_buffer(fd, key, keysize) == keysize)
++		r = 0;
++	else
++		log_err(_("Cannot write to keyfile %s."), file);
++
++	close(fd);
++	return r;
++}
+-- 
+GitLab
+
+
+From d20beacba060f34e3ab0d71d191f59434031e98f Mon Sep 17 00:00:00 2001
+From: Milan Broz <gmazyland@gmail.com>
+Date: Wed, 6 Oct 2021 12:45:20 +0200
+Subject: [PATCH 2/2] Remove redundant link to uuid lib for static build.
+
+Veritysetup does not need to link this library at all, for others
+we have link already in flags.
+---
+ src/Makemodule.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makemodule.am b/src/Makemodule.am
+index f2b896bf..49e0c5aa 100644
+--- a/src/Makemodule.am
++++ b/src/Makemodule.am
+@@ -71,8 +71,7 @@ veritysetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static
+ veritysetup_static_LDADD =	\
+ 	$(veritysetup_LDADD)	\
+ 	@CRYPTO_STATIC_LIBS@	\
+-	@DEVMAPPER_STATIC_LIBS@	\
+-	@UUID_LIBS@
++	@DEVMAPPER_STATIC_LIBS@
+ endif
+ endif
+ 
+@@ -109,8 +108,7 @@ integritysetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static
+ integritysetup_static_LDADD =	\
+ 	$(integritysetup_LDADD)	\
+ 	@CRYPTO_STATIC_LIBS@	\
+-	@DEVMAPPER_STATIC_LIBS@	\
+-	@UUID_LIBS@
++	@DEVMAPPER_STATIC_LIBS@
+ endif
+ endif
+ 
+-- 
+GitLab
+
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 9a6e9e694c65..620a90cd6e5c 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -2,6 +2,6 @@ DIST dislocker-0.7.1-fix-find-ruby.patch 25942 BLAKE2B bd9d93c5eddcbade0039c1787
 DIST dislocker-0.7.1.tar.gz 103194 BLAKE2B 05421b0d3e7686480e40a41e67086017c454b76e0852fef78a7b5d10134cf388b4bf7b9669d87b867418f4c074cc023ea9b0260dbdbc837322d04f217aa40b28 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226
 DIST dislocker-0.7.3.tar.gz 111257 BLAKE2B ba8403facfef04f5194a22421d2010d472b073d6dce03c9f457d7661de11bb818782cc66bfee8cd88fe72af7ac127bbbcbe1a01c5c35f0cf054f282b3208c3ea SHA512 c62241d70d51f6445a2f6d0f08e099bbc1a4257ca98232471fc43ec63e69d62ae5f702c995ec00b7e1db7d33f4bb3a31ea05bc13862bf3b539feb301a0e034ff
 EBUILD dislocker-0.7.1-r3.ebuild 1668 BLAKE2B d409322717e5e4ee21b7d6a5dfd1493281bb49fce85f72c520d155fca17f2dee394179e37be226dbb34039c5de8f92f98bae75c52a315b4d733640b352b97249 SHA512 627b3097f121bc8990eb0fdfb42f225f2beba3ca6b152bf3159e1a87280c8e5e3f1ad6250f8efe7ae9f879b0478fb7064adc57708b1ee7e7c372f8543463b5d6
-EBUILD dislocker-0.7.3.ebuild 1532 BLAKE2B d43c31d4ceff4cef7a10afdd746d59a3915228ed8c005412b51050258491a459254883f7dcdb86ccf0f63882a3cf234f0184ddca259462695197bff45a377e8a SHA512 ee8a7308c0e79355f70b1cce4603056e19390b0c27c7945fcf6f20a2d2de67a6fa00c98f934a010ee1a35461a8a8c9f1a37efe08e100e82e8aaf3918b9708c99
-EBUILD dislocker-9999.ebuild 1532 BLAKE2B d43c31d4ceff4cef7a10afdd746d59a3915228ed8c005412b51050258491a459254883f7dcdb86ccf0f63882a3cf234f0184ddca259462695197bff45a377e8a SHA512 ee8a7308c0e79355f70b1cce4603056e19390b0c27c7945fcf6f20a2d2de67a6fa00c98f934a010ee1a35461a8a8c9f1a37efe08e100e82e8aaf3918b9708c99
+EBUILD dislocker-0.7.3.ebuild 1531 BLAKE2B 0b6dc0fe94f551235283852e79a767f0f1ba75d262cae1440b59f683529d19c5bbaeb90f54eef71df91d641dedc7c0f11a45cad420c1f8c4df88d9e100fe6b9c SHA512 a0afe4d31a538b1f4fc1c6e7055cc148ee7bd27864c60e42344fe1e756454a33232402ee3dab5639c299cfb9375e10315ec70fc4ade7791efdb513dc890f6e0a
+EBUILD dislocker-9999.ebuild 1531 BLAKE2B 0b6dc0fe94f551235283852e79a767f0f1ba75d262cae1440b59f683529d19c5bbaeb90f54eef71df91d641dedc7c0f11a45cad420c1f8c4df88d9e100fe6b9c SHA512 a0afe4d31a538b1f4fc1c6e7055cc148ee7bd27864c60e42344fe1e756454a33232402ee3dab5639c299cfb9375e10315ec70fc4ade7791efdb513dc890f6e0a
 MISC metadata.xml 344 BLAKE2B fee12c30fc5c9d8114cac43943adcb3e8db8b2a978a300c64810c3027f7b9ccc53c4cad9ec8562f7a58618fca5c93f94d0693f65d2b0a3d0987aa2aa8ebc3480 SHA512 65969f086534ddfa44b7c82de50e012d0c2e9453e153d5b693f8e3a4f533149340c4b0ea5caf133b59395bd780641323d7e4f1b63fd0d3cb57355abb46789c24
diff --git a/sys-fs/dislocker/dislocker-0.7.3.ebuild b/sys-fs/dislocker/dislocker-0.7.3.ebuild
index 59b0eed661e0..645e524dff46 100644
--- a/sys-fs/dislocker/dislocker-0.7.3.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
 inherit cmake flag-o-matic
 
 DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions"
@@ -27,8 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
-
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 59b0eed661e0..645e524dff46 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
 inherit cmake flag-o-matic
 
 DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions"
@@ -27,8 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
-
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 903f85136dba..f87be2f380b0 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -11,5 +11,5 @@ DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc19
 EBUILD e2fsprogs-1.45.7.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
 EBUILD e2fsprogs-1.46.2.ebuild 4015 BLAKE2B 6aabd166fce82e441e6214fcc911033c3b58ac114870b221c29e4d55978adf8819d8dfa09d0b8549ca6fbd5e964fa2bb3de5afe8a1006e31c92fa4785949ace0 SHA512 6faff94db1cff5d1ae4c726afb9c8e5a31cb2f435f009af4b66668d65ffc88375d98ed4a187c744abb368d1804db6c193bceef7a76057d94df94cb4ad9bb61b5
 EBUILD e2fsprogs-1.46.3.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
-EBUILD e2fsprogs-1.46.4.ebuild 4012 BLAKE2B 5e466745b9bd6535ecd6df07130084f0d78f0077ae6d021fbcd7f480693a3a26bab4f7f5b8727a1240a7ca7d5abf1ee8f58252da5aa45ed2fb2aa98da35bc45a SHA512 a2dbd3e5c3a9afcef08180fbe3729bb6c383f19d305325d9656179841d65456c2c74e62a4957beaffe69adac21721e53fe9120cbc03aa4573d3e28dbf1f7b857
+EBUILD e2fsprogs-1.46.4.ebuild 4011 BLAKE2B ed9e1b1ff7116c4a07c650978b42aa43801daaa530c191c2e3ed095d5a0f2938a2c4795b78ecddb577325ca3b125bbf6bcb08fbe4e957bf1bfb30cfcb34e4171 SHA512 26ef3f4a84c8fcb2b7a57b5f1377761cb137ad4c6f491de4579709987a1489ebd9f35d9bc00a2f10514483b3c0b0b605150bd6d836322b1c183cab771a7a3005
 MISC metadata.xml 704 BLAKE2B a3986eb376f5e2416b1588bba5de134c62c45f0f0d952973f8a6adafbdfac19e81111f0b558592c914c71b072d1e51a6d98dd89f2488f9abbd5b81ebdf3906db SHA512 3059a0e8fd73db411e44749af435e061eda76fe908cbde14ce6e1ed3cc316f5f3e895632e92f789ced0b96766124eecf61885444755615ced25e137b32e9f7e7
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
index 31c0a571616d..3c09748eee75 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/eudev/files/udev-postmount b/sys-fs/eudev/files/udev-postmount
index f1f94f48902a..f1f94f48902a 100644..100755
--- a/sys-fs/eudev/files/udev-postmount
+++ b/sys-fs/eudev/files/udev-postmount
diff --git a/sys-fs/genext2fs/Manifest b/sys-fs/genext2fs/Manifest
index b3e770d1cbef..3444faa85a5a 100644
--- a/sys-fs/genext2fs/Manifest
+++ b/sys-fs/genext2fs/Manifest
@@ -1,3 +1,5 @@
 DIST genext2fs-1.4.1.tar.gz 103283 BLAKE2B cacb6e5e5e69f9fbb8550e2b9d79e41d4dd58e2bcc5516a79476918203e5b8ebee0d12a6a6463ff4ec659249a6647881b2728a8d6936fadc298a1e0e68833bdc SHA512 1b9ec7044014423345ae6b09862ba6903f5b3e0f68fb8bbcf97daf2705471cc1633a9fdbc5e00afe1b191e1af7bed87bde2e538bc7365469218f2a00b062845c
+DIST genext2fs-1.5.0.tar.gz 47848 BLAKE2B 63d65033166356e561bb2ba1a2ff2d10feaab8397bff8d081271b0cdd4c1955949e84c856ff92e7cc3c09f8c913ed6d3672c08a2e07dfa1b71b359ae41abf6a6 SHA512 628994f4f5f6d534a42e16db5322e36addb227d0e0ee589ebebbbb6beda9c53774186a932d04fcb978fde1cbe534b8335fdbfea256aecd2d873c03bc5892a8ce
 EBUILD genext2fs-1.4.1.ebuild 337 BLAKE2B 96ca8d9974d5a81f2b960db36fce577d14f1c425e0841ea12b797628cfb1f34572361d4716e718f1cc9dc99bd79ced370212872fa0eecd7322833eb1bf59cb22 SHA512 1aea73e08ac5550e1ccd80a8b271e3bfc05878f70ae0f6091623a89892f71c1e68feda6843dfb8cf8a219322a7f3453894571434540d361a597b94ecbbfe1b55
+EBUILD genext2fs-1.5.0.ebuild 443 BLAKE2B 906f213dba5be161e59192dc3ff17e8a7d6a83f7ea9f7b61e540a7b831040d12d657acae131a25d69af4a1dc2085442423bfed0093b3e801e67e00b890734945 SHA512 e1f722ac20bfd1885ee12dccb22a64b2d3f435ff7756da22d6a3e57b1be9110c2714c69b04577081fb7ed38c609564cbfdc81a8962a46a690c5f5f230ce11f54
 MISC metadata.xml 331 BLAKE2B 2b5ea4a09d867d0d1244932233f1b5060fe617e47957ac4a70558e79369637ef1446665ca7125989dd7c77dea3f9ef891b6ca41f0459aae5bc85f72f6ac8e7bf SHA512 b68c435320cf57d257d654fd9fb31a32ead79a2f235269e2279764fde9866a901f2f6f53029bef5e429b23fe06111e3612d73bd9176d67bf4fa791e9ae7f0887
diff --git a/sys-fs/genext2fs/genext2fs-1.5.0.ebuild b/sys-fs/genext2fs/genext2fs-1.5.0.ebuild
new file mode 100644
index 000000000000..bf1148c1fae0
--- /dev/null
+++ b/sys-fs/genext2fs/genext2fs-1.5.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="generate ext2 file systems"
+HOMEPAGE="https://github.com/bestouff/genext2fs"
+SRC_URI="https://github.com/bestouff/genext2fs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/iprutils/files/iprdump-r1 b/sys-fs/iprutils/files/iprdump-r1
index ffa87333475a..ffa87333475a 100644..100755
--- a/sys-fs/iprutils/files/iprdump-r1
+++ b/sys-fs/iprutils/files/iprdump-r1
diff --git a/sys-fs/iprutils/files/iprinit-r1 b/sys-fs/iprutils/files/iprinit-r1
index ef68305dbba3..ef68305dbba3 100644..100755
--- a/sys-fs/iprutils/files/iprinit-r1
+++ b/sys-fs/iprutils/files/iprinit-r1
diff --git a/sys-fs/iprutils/files/iprupdate-r1 b/sys-fs/iprutils/files/iprupdate-r1
index 65a1db2418d5..65a1db2418d5 100644..100755
--- a/sys-fs/iprutils/files/iprupdate-r1
+++ b/sys-fs/iprutils/files/iprupdate-r1
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 9d4dfc05e81f..0271e335bb6f 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -3,5 +3,5 @@ AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061de
 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
 DIST lxcfs-4.0.9.tar.gz 453383 BLAKE2B 06694218d45d93baa9041aeae39e52d827ca1b53d616284d0ee04ddfe98436a15b3cf900c7b58f14e506a0726f30679b0a04e6b5047087201ad2a9c35f0cc09e SHA512 c8d02cefb42dee82ea9467631e8e59243a6cb06d4ea53f0ce8da0a9bbc9018480bb0f12723091da672446a75ba200cca044b84c2f13388009dde9e5ad0ca3ebe
 DIST lxcfs-4.0.9.tar.gz.asc 833 BLAKE2B fa71f7a6a7a35fbc7613ec2d7549197fe0d33c9584aea86fe3db959848eeb1b0e69a75ca2d596578f3c7f3a9deca5cec1badce428b4aa52e6f112cf3fe544b3b SHA512 fd9feac31469db7785c8b486ddc4f5c0431ab2aa52aed715e853fcab322e8c6ee755aa87d9bdee7a969a8030be1956863662f8b2db09bfe4b8ba69ef8f2fbb3e
-EBUILD lxcfs-4.0.9.ebuild 1453 BLAKE2B 54fe1e2941c705f198e943b6dc02928ff837133534fb220e896ae0accbd463aacafc928a5e4e9166fb9817a141fb4d6aa41576b6e2a7dbc3be2f48e343e52753 SHA512 7b8a11da167e5c4ef5ce53afc2e7f9be88fff47631346cf70b65f037765e3936ac1c591820ce3b7bdebf534c8018034fd40363ba25fdf582c7cfbf0596fce37f
+EBUILD lxcfs-4.0.9.ebuild 1458 BLAKE2B 6e83b342590504b06cbb32ffeee63fdcbd5d0fd4b5d07ddb3d7d8ea87a87079562f97bee473a37ecd6275440553e0b2a23f639d02040a9d7f414460c56581c34 SHA512 99ce5beb37b0698bb8cbbf9cc733a8b2dab157480d0f13efeaa8e9f2e984e6eddef014eb4042378ca8ba5e5c56580cd7c64614193d015e78dcf11d6367e59953
 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab
diff --git a/sys-fs/lxcfs/lxcfs-4.0.9.ebuild b/sys-fs/lxcfs/lxcfs-4.0.9.ebuild
index d867092788e5..92a99fe69f2a 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.9.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="dev-libs/glib:2
 	sys-fs/fuse:3"
diff --git a/sys-fs/mdadm/files/mdadm.rc b/sys-fs/mdadm/files/mdadm.rc
index c5bd38b13a14..c5bd38b13a14 100644..100755
--- a/sys-fs/mdadm/files/mdadm.rc
+++ b/sys-fs/mdadm/files/mdadm.rc
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 722cca38ce16..272f528ec6ee 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,5 +1,3 @@
-DIST mtools-4.0.31.tar.bz2 446527 BLAKE2B 4b954362d0c177c5a2f7b098065f841ca075092b8c49230ca4098a1a34fe64bce32d31df1aae702f12b174a8176026687de9dea5344f3878c1acdba4a8a0c753 SHA512 6c50eadcd32563b593b58984fd6426faabab208283c0b81c7df194cc27fb7d6bf873916b152c74c4800374f0b70f7dd41c768d823d9efc78cab6efbb6ee37df5
 DIST mtools-4.0.35.tar.bz2 455988 BLAKE2B 9c1ac7f3ad3f9f13a572d0e1ea3c3a9d79bd08f0ae963c7357a19a687b74536cd8442eb167a9e50f7d22398c56736753b0d98bccdaa4c7d8427d1c09e1dd786c SHA512 ef563b3319285667993c82d819e08cb819a6bcd71c466fc252568996b4218cfb3731107ffcd6150ba33c0837e012e02057def41e2b011f751eaf550bfa366a10
-EBUILD mtools-4.0.31.ebuild 1051 BLAKE2B bbfb5be0365c8e98d06fb0c0e96b775c38b346dacb93c9a7cd467930d6ae7a4212b20b92095629ddc3dd33c9acbd16bbd05bf9e259b3660ec63f67a24dfd6cb5 SHA512 f754225dfa3a840325d80127123b4095a8dd25f76db0c7fb067805ac06e11f25918f55549aae4fcf7ea26d29a66f01c3a5d2dfecc0bf8a9a14ad569f269324cc
-EBUILD mtools-4.0.35.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a
+EBUILD mtools-4.0.35.ebuild 1051 BLAKE2B bbfb5be0365c8e98d06fb0c0e96b775c38b346dacb93c9a7cd467930d6ae7a4212b20b92095629ddc3dd33c9acbd16bbd05bf9e259b3660ec63f67a24dfd6cb5 SHA512 f754225dfa3a840325d80127123b4095a8dd25f76db0c7fb067805ac06e11f25918f55549aae4fcf7ea26d29a66f01c3a5d2dfecc0bf8a9a14ad569f269324cc
 MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316
diff --git a/sys-fs/mtools/mtools-4.0.31.ebuild b/sys-fs/mtools/mtools-4.0.31.ebuild
deleted file mode 100644
index 11b85109c45f..000000000000
--- a/sys-fs/mtools/mtools-4.0.31.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
-IUSE="X elibc_glibc"
-
-RDEPEND="
-	!elibc_glibc? ( virtual/libiconv )
-	X? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/mtools
-		$(use_with X x)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local -a DOCS=( README* Release.notes )
-	default
-
-	insinto /etc/mtools
-	doins mtools.conf
-
-	# default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/mtools/mtools-4.0.35.ebuild b/sys-fs/mtools/mtools-4.0.35.ebuild
index eba20aaf2121..11b85109c45f 100644
--- a/sys-fs/mtools/mtools-4.0.35.ebuild
+++ b/sys-fs/mtools/mtools-4.0.35.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/multipath-tools/files/multipath.rc b/sys-fs/multipath-tools/files/multipath.rc
index 576026ace683..576026ace683 100644..100755
--- a/sys-fs/multipath-tools/files/multipath.rc
+++ b/sys-fs/multipath-tools/files/multipath.rc
diff --git a/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl b/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl
index 41c74d919d37..41c74d919d37 100644..100755
--- a/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl
+++ b/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl
diff --git a/sys-fs/quota/files/ldap-scripts/edquota_editor b/sys-fs/quota/files/ldap-scripts/edquota_editor
index fdebd09e35a4..fdebd09e35a4 100644..100755
--- a/sys-fs/quota/files/ldap-scripts/edquota_editor
+++ b/sys-fs/quota/files/ldap-scripts/edquota_editor
diff --git a/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl b/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl
index 90ab1e8076c9..90ab1e8076c9 100644..100755
--- a/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl
+++ b/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl
diff --git a/sys-fs/treesize/Manifest b/sys-fs/treesize/Manifest
index fc908cef51eb..811b37309ba7 100644
--- a/sys-fs/treesize/Manifest
+++ b/sys-fs/treesize/Manifest
@@ -1,5 +1,5 @@
 AUX 0.54.1-amd64.patch 214 BLAKE2B b7fc27441ee03b0757cd876f8bcb3629c23227a0271cf1cb3329956bddae6f71e803c4f96a2c98fc42ecd481fd0c8a9bb6849a8c8001bff69ed97617f59625e0 SHA512 c4040242cd5d58eaf2f142a271ee7f4f7e80ff5c2e516953bd9e62027b78087b0a234cee269e37f447e4888634f6ca1b0769404663470cef686be436a477400c
 AUX 0.54.1-fno-common.patch 214 BLAKE2B a6b467f62ef1ab201897a303fc1afbee99dd3c7bb5333b70d2925302a1485c37299300724a88473a0ea3608fc5e1a0f6a304116ab3f919b3c6a72bfaa99f2ea2 SHA512 6516e8557a9f15d99b080a25d77757bb3ce68f90f72de9f5715e6166ba75839bf1a168cf4f0a860f3270589dc41df0573eff366b8a3f64bcc28ad3a9a3d916ee
 DIST treesize-0.54.1-src.tbz2 296047 BLAKE2B a00cdadc225976bc2cecb8e0e26509650c1a2707eaaa14b6edbbb5ee88871eaa5e56f164aa7285efa369aad77ec6414e9d025de31d1aef16c5910d9142fb07dc SHA512 461e3f6aa01127afd11b98395d65911f441012fcdaa3741ef35789d51fdb491731cfc62b5616150d74bbcbb8c2742561a387aef8ec4f9a493e9ce6683fb5fcae
-EBUILD treesize-0.54.1-r1.ebuild 495 BLAKE2B 9c511427040bc3602baf5078067e708861639675af02c3f026c8379b2c8e3f0ac7a3ba7ef63028c34f54266b1713a115daa0ea1525bfe07ca848384587518f74 SHA512 965f8802f7c29f17c850c656570e307f6e7167da6b96c6a305b0ba72d56aefed820bc6811580312bd0d4eb076fe1be7bc3f2ea4d8659fb3bc63720b8274411c4
+EBUILD treesize-0.54.1-r1.ebuild 599 BLAKE2B 5760c6f1385eb8db5fba7b4b2cb564d916bdd21f56b2edf2437633c8557c3fb426411c85a767ca54741a62c522f3bd197a8ee39200e7cc2fb8e7f7b0651d4666 SHA512 c35b128f7c72d3ff2ae89f6828c4888741762f54ca776130af1c353e031ab418f680f89c0d0906c3c9401b70cc2236287026faccf1f59e67f61f34b5fad59835
 MISC metadata.xml 246 BLAKE2B d04fa93ec365763a6bbb73457974d28a4b8df70ce73a0b3cbe940e41483bde4722841ea21af90d07f87aac82e5592b383d8e51cfb0298f2a9f3f0cadc5040cad SHA512 3398e0cd1300309a35202aa830d5abee9547c1ea8dd051d3dd08497b446b5be77457848588cb38c61c630f90f9995394c633bd607b1801bbf7dc93f549f570ae
diff --git a/sys-fs/treesize/treesize-0.54.1-r1.ebuild b/sys-fs/treesize/treesize-0.54.1-r1.ebuild
index 90940c262473..16fa356e1b88 100644
--- a/sys-fs/treesize/treesize-0.54.1-r1.ebuild
+++ b/sys-fs/treesize/treesize-0.54.1-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
@@ -23,5 +23,10 @@ PATCHES=(
 
 src_prepare() {
 	default
+
+	# Bogus shipped symlinks to a fixed version of automake
+	# bug #760498
+	rm config.{guess,sub} || die
+
 	eautoreconf
 }
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 1a36f1a56379..10403340c068 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -7,5 +7,5 @@ DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5a
 EBUILD zfs-kmod-0.8.6.ebuild 5481 BLAKE2B a367b1cec0374f6c9266bf599944ef5493eae21a91704572f806ec2486707a6d3cae876f52f97d527744c66596204b2dcdb435b2beb7cd182ca524cb991f8915 SHA512 014332fa562aae19d65c3f31ba1179e0c623dc3293e45e51323bb2b279641ee6926ac9d8cca3aba8407b44a2787be19abbaa3945f48e6e40f9aa27b1458e647a
 EBUILD zfs-kmod-2.0.6.ebuild 5524 BLAKE2B 92a1d66c9d994129b54957858eb2235f018df88e4a564a7dcfbe0a7d0d558dbbb81661a48fa0d6bc8a745cfff08b2d5f01a1263d2ef7a6b509d4ea4439d06e39 SHA512 37ca8be74fa3dbca773c76ddd60dcb9ce790e92174d400c4abb0837e6bce6dee24a3cdfa0366fa5e6bb196691ac9a17c976ee272516b2a918b872741f7c9fd23
 EBUILD zfs-kmod-2.1.1.ebuild 4740 BLAKE2B 8706911cc8e55df54477c0c00c6a36e0c1444154be4ef3c0a0e6bd53790550aa54fe70ed3719fa5a09f1fc0bf1d165ac821f756cccbc3c5cdeda5029d2056b97 SHA512 58f44cd588e4b4afdcf2f7d1d102b42a7b1767dd196f6d85cd2daf1d084ebf2586ade44f3c66ce56613fa0bad09a21c44c529584cbc630ec9f7e28c890a09e04
-EBUILD zfs-kmod-9999.ebuild 4740 BLAKE2B 8706911cc8e55df54477c0c00c6a36e0c1444154be4ef3c0a0e6bd53790550aa54fe70ed3719fa5a09f1fc0bf1d165ac821f756cccbc3c5cdeda5029d2056b97 SHA512 58f44cd588e4b4afdcf2f7d1d102b42a7b1767dd196f6d85cd2daf1d084ebf2586ade44f3c66ce56613fa0bad09a21c44c529584cbc630ec9f7e28c890a09e04
+EBUILD zfs-kmod-9999.ebuild 4722 BLAKE2B 559e7c1574b6f22a8e251fbad495cbd4341f58a496bf0cfb6c6f188ec5cb8091fa8514e485ae327f83ad1e80bff8a3e67b9cb55a4f5fb8e96a66205b9c1c17e7 SHA512 3e9ee32d5906dd3a0fa9f630309a89ecb5ea095f96e3ec1feec3db0faf02c23cfba37e472ada753f1f7e46186d9ec33ea86e6f9b30cf3e7a3dc995217c9458bc
 MISC metadata.xml 549 BLAKE2B ae860684a4cf82c277fe91d11e0bcf283103a08442e78584c9962b1571efed7e6ee0e215f3341263f809978e63e01d70275a80fa4996b8265569539e0b2ffe34 SHA512 7a97c7965147549da470c9d5d3a541284964c5ec276d005a2f7aa1a4550c915cce32b2593257e5ad373c84955e3bf74b235297d540364ee4a17cf9e1e705b650
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 996dd40ebdcb..255ef48a0b4b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -156,8 +156,8 @@ src_install() {
 
 	myemakeargs+=(
 		DEPMOD=:
+		# INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile
 		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
 	)
 
 	emake "${myemakeargs[@]}" install