gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /sys-fs
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
85 files changed, 1334 insertions, 1749 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5f2415e9779f..10f5ebc9db1e 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 0cec5da59518..f1d453ce4bbd 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -5,11 +5,13 @@ DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e
 DIST btrfs-progs-v5.14.2.tar.xz 2252600 BLAKE2B 74ac21bc9bbc70a4034b6a439afbd0c0ab023ac7815c1cae1e7ac81c4239684d41be06bebe1d015dc2a0ba80cf0975e8f6da7e111b2825eb1a7814d1832914eb SHA512 dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c
 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
 DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90
+DIST btrfs-progs-v5.16.2.tar.xz 2334464 BLAKE2B a21809a840107c370f1598e19f8b07d8bdd704e8ff3ce4cb78431000e7560802e1047d8200c523a45a761d59a311f1ec384946bd585826a129b05a1a5fd0250e SHA512 c89a763e8b099e0e9d04ff239dfee156a15fc783c515bbd48597f5645f720c377dbb4f2dfe9065971a65d3ade9d8fcb24cf37d527811bf4204153a06f7c8c3a7
 DIST btrfs-progs-v5.16.tar.xz 2327376 BLAKE2B 3bb3b630d465068373bf39776389f733e734cb39801b389a4e94ba2bb325e9625e2cd767c783e4a05e1e18fed92c06190c5d3fbb476b57689a16482357c86b61 SHA512 3ba557134b19f1abb6c63bf3e2092852f92e988677c4bcf9421c824824b87565ae5cc0e5bca0370be81766a8c8fbda21dfb443dcd159f705f31e70b6bf19aa63
 EBUILD btrfs-progs-5.10.1-r1.ebuild 2981 BLAKE2B 0c1e13d87b5119c171447e3eebc0fe9439da77a7d05ae0b1130eb8904c24081716e6f15dcb39f700abbe68a0431331c78c18a9253cb631998e61a842bbbe9791 SHA512 715d72ae20791fa701e3116ae7540be89c6761cbee1b42589881482e3abab6d5f9621fcba2b22166ac858466fe821b1af32284a0eea0a25ec8d9b3f63518a7c7
 EBUILD btrfs-progs-5.14.2.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
 EBUILD btrfs-progs-5.15-r1.ebuild 3183 BLAKE2B fc00b7541d5f2e34cb7934e689ad07f6acc9a1543dfe9f236bb34e216f2afcb8cb38660ccf0804ffc9f2e558ab5a761945dbe16a9d2241f2941f5a38cfb39016 SHA512 523711eeec516e8d2c2e10b79c8cc2c10b5a06e730338e2a2176e0ac8de82c625dfbe19985c8cc81d8a0c46ae11425fb86082d826de9cb977d435795918c0705
 EBUILD btrfs-progs-5.15.1.ebuild 3019 BLAKE2B 2617d6d8b08f71e28b94243d75b6110a147edca8f73a097a01986c3e9b771a899bd94bef34d1037cd372fb18226e26e8d8a1587aa7dc44799cf19a4b4f1c0c21 SHA512 e2e75f4d2670faff35310a776cc375e64d1a967fb879bc0e37ecb48d13673be6e19da392855ba1d9c6c7ecbef30e887ad951705c986fb71eaf0c1abae6c4e922
+EBUILD btrfs-progs-5.16.2.ebuild 3067 BLAKE2B a90f38e3dbb10a1cf93810220d41a5892ac7d0438ed253257ecd454b566bdcad362cc3414efca938e44da1c0faf76531edcba9cef32c8ac3a4eaf7dbe952e021 SHA512 19b1c75abd55142c9eb367673af7b45b1d86fd0985951402e6cae66e5b482af2157e6a26d25e3ea2ba23bb2c5e8c58e1f7af416e7cdf8ce148824c468bb1cf3b
 EBUILD btrfs-progs-5.16.ebuild 3090 BLAKE2B 210cf293d434288818fcd88116ddc2ece4254ab6b6f0d027d0f7e5d777448ae01fe81dd5b1cb31a6690bd6909a29a763d573a49c5ebdca191ebbb7ea84bf986b SHA512 5d2b24a3b9878ac6b51d7f84f6630357f56e6b42f27ef8877df953778fef28ebd6aa693023bfdb1bbfbf1f3146dc13b3c52a9763612138e79140a3288bd0bbc9
-EBUILD btrfs-progs-9999.ebuild 3025 BLAKE2B b79d991e41133ea913d3528d06cdbcc4e4aa93a6f7b21a67442c120ee6fd08e574f0a6728a6b1d78e0547338156747daa5815cb1b67c289c4046823ee213833c SHA512 72c910f37f3d3d8446009af6017ddd70f328ac16ae8d3295af8270cf758598317dc0dc60682761045f2fe44374de8fd9b6e9de445191e82729d4965403cef370
+EBUILD btrfs-progs-9999.ebuild 3067 BLAKE2B a90f38e3dbb10a1cf93810220d41a5892ac7d0438ed253257ecd454b566bdcad362cc3414efca938e44da1c0faf76531edcba9cef32c8ac3a4eaf7dbe952e021 SHA512 19b1c75abd55142c9eb367673af7b45b1d86fd0985951402e6cae66e5b482af2157e6a26d25e3ea2ba23bb2c5e8c58e1f7af416e7cdf8ce148824c468bb1cf3b
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
new file mode 100644
index 000000000000..1b6912e602ee
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: change to sphinx for docs in 5.17
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 python-single-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert doc python reiserfs static static-libs +zstd"
+
+RESTRICT="test" # tries to mount repaired filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-5.10
+	convert? ( sys-apps/acl )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd:0[static-libs(+)] )
+	)
+"
+BDEPEND="
+	doc? (
+		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
+		app-text/docbook-xml-dtd:4.5
+		app-text/xmlto
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR=m4 eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable doc documentation)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(use_enable zstd)
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+
+	newbashcomp btrfs-completion btrfs
+
+	use python && python_optimize
+
+	# install prebuilt subset of manuals
+	use doc || doman Documentation/*.[58]
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index bfedcff31bd3..1b6912e602ee 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+# TODO: change to sphinx for docs in 5.17
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit bash-completion-r1 python-single-r1
@@ -45,7 +46,7 @@ RDEPEND="
 	zstd? ( app-arch/zstd:0= )
 "
 DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.11
+	>=sys-kernel/linux-headers-5.10
 	convert? ( sys-apps/acl )
 	python? (
 		$(python_gen_cond_dep '
diff --git a/sys-fs/cachefilesd/Manifest b/sys-fs/cachefilesd/Manifest
index ada32c77aa4e..01f725cf7733 100644
--- a/sys-fs/cachefilesd/Manifest
+++ b/sys-fs/cachefilesd/Manifest
@@ -4,6 +4,6 @@ AUX cachefilesd-tmpfiles.d 32 BLAKE2B 26527e8c3b8e821fc05c6bb1ddd0a6cf74857f8219
 AUX cachefilesd.conf 296 BLAKE2B fce58c6af2016c45c0545b86c4dd98ffba8f58193af0b163a8ba83c297c9a9af944ba6d8997da5f1ac44c8cb331fafe94f93ed0b5fb4d4b14c5025cf6436b46e SHA512 6b82563b27b3a202afa6922bf4059836c7d363c5350d2b348ecca6ae12de2ae31d903e65b00f427712e7df22c0401b181177e168715e5e375b290f6d247fd846
 DIST cachefilesd-0.10.10.tar.bz2 26694 BLAKE2B c527a6283617ba53818e0cad1859544b1e66af1107b05d1f83904669425d31c5374f3c032b892c9d95892d02d9256bbd9b180f1d0b6b430f0cfa70440406ef9f SHA512 d7d816b5ef1fffe1272cb8c2e9cbd18c1393438afca250436a36a446c6a37303e7784057725a56be839e0489101190b563c4fc015fc4ff11baa8003121e5183a
 DIST cachefilesd-0.10.9.tar.bz2 26555 BLAKE2B da5df1d2c6715a7cc304b32842f00e69d356359abfae865cfc1b63b89e1149bcb48762ddf84d13f5d18b727d8e0693257d424e599c3874bbe842da9aed4a0cfe SHA512 06ab444a7df8ec37c15bc03554510f4acbb453e0730277f036abc5d61f9e377d90d9387dd5237ea481b95b1bf097b5992adce90ce971fe29760cc4c0d3c9cf34
-EBUILD cachefilesd-0.10.10-r1.ebuild 1591 BLAKE2B a3d6ebd05893d4c76c6950ba663c0bb56032ea7afa588918a521cfb6fba2071336cfb06a892cfc4129a81e19ceea3199a9b5fe9a0c2dac8cb83b6d66943103e6 SHA512 131abc35e1a4ad7085d7510e0f0fe94ed1045ccb85c4c0bf902b630932d479d3c799f2967db63d94aa887c25340fb68e5cade54e8e4acf8c8c7dc6e301cae05e
-EBUILD cachefilesd-0.10.9.ebuild 1501 BLAKE2B 40541a5c37516de1694a7bf485debe1ea56cae9a091e2456b34947c5d1b169083289150809c2777447c1ddb949650751d5a1e37b1f3ad0ac3896c7b5fab723f3 SHA512 80a5038fe9cbf257e981f1d54ebeed81c49b7a69adb7cf55092478a474732ad0c9dab4667b50913873ae39c8cb3cae6556f55668d2d47c76cc39ff9aebe23e94
+EBUILD cachefilesd-0.10.10-r1.ebuild 1606 BLAKE2B 5149318f9a4157a1301af220cd0cefe0b46ad9c9034c91ac1b932ae528d8aefac9880068badac99bfc0e36f0587837d117e856a132d26e89a3c7e1b91801e655 SHA512 9504fc6f735481ada74dee2d63c6464a4edb9f19f1122d7ee85c3918725135a61bc229b010d8b25fdbdb6d24f9c2dbe252e43609cc80fffd0b83f9764785b05e
+EBUILD cachefilesd-0.10.9.ebuild 1516 BLAKE2B fa099e1029abe3a4109a9193b68bc5e0d85705ae1a1eac974381b11f38865f67237aeec42651d85420572468ec8b9aee658a4aa2ec9468a15ad7f4d500877ccc SHA512 63bee8836b9cf41e7b079bf837448261649a0ef920fb91ce733476f354ab9a2a882a817ff131c22edec009766b72823f91adbe6c07b4ebfd9a0fec150b8b315d
 MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
index 7b7c61767c29..94bbc2597dd0 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,8 +35,8 @@ src_install() {
 	default
 
 	if use selinux; then
-		insinto /usr/share/doc/${P}
-		doins -r selinux
+		dodoc -r selinux
+		docompress -x /usr/share/doc/${PF}/selinux
 	fi
 
 	dodoc howto.txt
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
index 849ad870b21d..3d5bb6f16587 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,8 +32,8 @@ src_install() {
 	default
 
 	if use selinux; then
-		insinto /usr/share/doc/${P}
-		doins -r selinux
+		dodoc -r selinux
+		docompress -x /usr/share/doc/${PF}/selinux
 	fi
 
 	dodoc howto.txt
diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest
index c88088ccfdf5..f011fbd8decb 100644
--- a/sys-fs/cryptmount/Manifest
+++ b/sys-fs/cryptmount/Manifest
@@ -1,3 +1,3 @@
 DIST cryptmount-5.3.3.tar.gz 545925 BLAKE2B 7a20d3a3b5805b1fe9ed84aafe6aaebeab4c62652dc8f53ecd70a7e0a0aa993ab5a03d54967910b94e6d8bde28f7ee7bb90a115a2bf101c9d4f4177fee26f90d SHA512 9945630316feee513a64e11dffa61ece77d0dff43a7b611d91fcb0a7c902402effb30ba15266d52c2f5381aa3ab7290a9a0999ca391c3c15cbdb83debe7dcca0
-EBUILD cryptmount-5.3.3.ebuild 1694 BLAKE2B 4ce5a3cbebfa6ad314127c4a9d2b2a13925422f4621a4f9381a2f25d2bf0dbe83a7dc3db555a32dd9882c4ba79b34ff64a83a67d330ce0a1b71bac691cee179b SHA512 99793b49877de5e1ec96748988a506cac6966b84062ab49150949af9c69bba20b4bc5991dc2cfb3865149d9a955deb50b160a2fc81d60b3d9ae78e642b07f638
+EBUILD cryptmount-5.3.3-r1.ebuild 1694 BLAKE2B 9312e96ef7b8a95370c7f778b9a1f0ef3bda48d155c65a06307f892cfc3ebf4067d98704021aedae14cf7d5677564152f911309ed3af842aff5dba9acddc9b51 SHA512 a2faad97dd586e35a6564fb389b621bc6638a7afede5ca0d570fdd610ecd1c0908b069caa7471098d42ac90afdcf22490d19babbd6af6eddca656b7afe9c46df
 MISC metadata.xml 2146 BLAKE2B 9547e66f62ddf51455e742a6c6f5b350eb8cb4ff62cc4f605607f8970714587758dff8e9437d355e1781a2ce2e25e38e184730de0c39cd5d191b8459bc540c3a SHA512 09d3385123051712f2a264f5c2793f1d99090ed095af17b4753ad925f73e0af85c355fc985966f7fc3cb8b8225dbb9fab23e254308d29633a73bcb6173dde029
diff --git a/sys-fs/cryptmount/cryptmount-5.3.3.ebuild b/sys-fs/cryptmount/cryptmount-5.3.3-r1.ebuild
index 51ac0e120a86..ceafbdd5eb6d 100644
--- a/sys-fs/cryptmount/cryptmount-5.3.3.ebuild
+++ b/sys-fs/cryptmount/cryptmount-5.3.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-info
 
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index faefe191be0e..776bfb4379e5 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,21 +1,8 @@
-AUX 1.6.7-dmcrypt.confd 3919 BLAKE2B 99e81cfe932dda45062966ada065da418500e58499af0f5ed18b7367cb6bc1b3fae1d4a0d4094ebf36c00292a4d4e2606026a65df66d5a96d01a0b9d5f6aa5e5 SHA512 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733
-AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2f41f74fe8640163ac272d44bfbbfeb0befb1af337f88d2711f27003575758d16c5f8104db0fabc2cb9 SHA512 fdbf44f7508ca10ab89e858c206fd9dc397a11d8a553045584ab95046c309a84dd6c7ab0c0ea63c66f7d52b31ed3a1ce46d5ce2ce2588f0d6593a1c4cc1c4194
 AUX 2.4.0-dmcrypt.confd 4009 BLAKE2B efaf826fc78b60068aeddb6d5fbd9665bcf85e66c5f0b48fa74316d8ad98fb5400ed89f674b6a93e30d76fa1adc3391a209a95936156fcd472b779cf5dbdd8b4 SHA512 131cee054019eed3f1939615386ba849bad2b02e31042075d5839e9a5943c8716431aae01aece25b2193645bcd706e14e6c947ee59f1fab4c2d7e0afc80228be
 AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f66ba4be5df1a0d29da7c1dadd0e2379a5f4ef35a9b17d4cb11fe2419cce6cad2df63546370b6a1975b SHA512 7f32bd09e22405deb4a7cd8233da0262764233562421a8fb49bd625be591f1dc27154c2204462df480668ab2f1a81aab5a992f426603a8a4fd86cd15a27a6a97
 AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a
 AUX 2.4.3-dmcrypt.rc 9693 BLAKE2B a426ad90c9e4540a82873cd3a1594def778063c97278b2f82cfefd79cedecda97f1b6038775ce34433ba25519e3fb565bc0b79eedb39b46080a2fec68d564a99 SHA512 9f2ff42e0ef1ab3046b545c550153e13ae7d2446560b4154c23e32ca2dd8c2871e68b07bf8cc273c18730ad6e13b50b07aadb91ae7f43077ab08bdce01db5323
-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.3.7.tar.xz 11203500 BLAKE2B 34f39e8f17c0fb44a186345d58e3ff1632fc4bd0e570bb1935181d2dfd43bc34c300f96eb70efbddb85168e6c16886b6675db2c86482b7ff7dba64c168b5920c SHA512 d209225c6f195f54c513904b71637bdadd47f3efc6227c61c15434a1467ddb76fe14123683a3d5e943ffa203ef33611f51b7c67bc1aed67d019a6aa552ea15ab
-DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada SHA512 17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7
-DIST cryptsetup-2.4.2.tar.xz 11173984 BLAKE2B 33a26ac2f38750171c74cdd827317cd4bba193a6b60cc7250dc52a5117c0feb1d2fca6b52b5ae7926725d77dc6c1ab9d13e85a1c59606e80003294b90578781d SHA512 9464f180f24dffa4566450041fc88c372baa3334c62724487ccee230c16e87572439dc604766d94144cc1fc13802a4322b378185eca0cc848892821653566848
 DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f SHA512 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e
-EBUILD cryptsetup-2.3.6-r2.ebuild 3908 BLAKE2B f2b709398da106f2d2b89365d67eee7298703035b1c94960fc0819b00dc48231692a6df2bf13322778e3704003bc0637a14d8198343053010b74fd21b1f52050 SHA512 6a9ee5bdd788a51944af30311ec84698d0fcaf19fe5845be4e0758dc89367ba9786c47b861595dfa691e3b9a82e11a239e54b1166fddd4848ec3bf37d5ceb195
-EBUILD cryptsetup-2.3.7.ebuild 3916 BLAKE2B 388637eba177bef5223c9177d9eb9b94d7f761a0a1bf36ce0a8e6ae93f13d772b28b0ac1c69a26ce47abece968a2c05c9ba514aba9c631053f9d4334b2c49690 SHA512 e5192bc51873547e8dae79f035b61c624ba3da3e64936ccae39359717f1e5a9ac5c3d5a7bacd38b994f556c81d15a0dc8bdc9aa1d99b66f976706da9095f8161
-EBUILD cryptsetup-2.4.1-r1.ebuild 4283 BLAKE2B 599590bf68883aad5e64b6a5affc0a464df4339abd11fe9088ea980fc400ba5bc6e7a5fbbd4792a73f735351ea348d1ade9ed42fb9480c991be5e48753799f3c SHA512 bf6ed2dd41144874931c56c4fb697ae4c3df696fefa11373352921729e9e4b9db4f8cd0f4094ba170ebe7a5e8a61c76673b0bc554857090b61f9e0b6ad61f51e
-EBUILD cryptsetup-2.4.2-r1.ebuild 4067 BLAKE2B 47d2c7ceb821587d2b5d3940504021a3310838c4fe5233f19c12def4e9a0799f6cb284539f665fc8f2c98457ffa9f72ea8ef4317cd4453d409ce68d208d5e412 SHA512 327ba8aac24198eaf4bbe7a4e8575132679d71f0809c1ede7156f2b89409a1901ce7057dbb9b61cd6237df153ba186c09bf6d98fd559a9f02bdd03fb633c3a31
-EBUILD cryptsetup-2.4.3-r1.ebuild 4166 BLAKE2B 2948d53179b21118c836517a331c3953ec841280184f45785007628279b1867690e2fc6f0a27b8a7b04bfe3bba9cbf6caf0f4c7f85a767ecee81bfbe409f4477 SHA512 154551b6479d77b92516f65fe2cec57e912763b4d12e658080f0284d59e935a2e6ae5580e3ce7ae9898e278c6089bcf3535692d8b7a195dc4d57e717e0adc30b
-EBUILD cryptsetup-2.4.3.ebuild 4158 BLAKE2B 5741edc9c554116fa4e8b97f0b32092d62a7c3b7eca8b80e41c536f804b0def495ff990bb47b6dc5ae12080b8d42bb0d8a900bf5a07a495a290a57a5de7bcecb SHA512 80e6086898dd01acb12070e4d116863c286298db125ae03a222591ae8bba854fae03d1da1746e8f55ec242e992a9cf6d0f56ab5a64348f9e680675d0d4bdfa5c
+EBUILD cryptsetup-2.4.3-r1.ebuild 4180 BLAKE2B 2552ca833cf04bdb890e3263aa7a857a4ca720f18a96ce946627766a249b0ed820ba0303f2fe7a14dea41fbb2f606cb1b0394995e3f5fe62e88128d097eef255 SHA512 e249a460e172161e6de87d8b0bc385baf94a34cc98270f19c48d9fef0d5a7735a9d51464611f832f2be85a4430d024365f0df0c683254416eda47eed64ec4a0c
+EBUILD cryptsetup-2.4.3.ebuild 4172 BLAKE2B 769f38ca8f374b8e08916ab3d7baa4a5bbb250d8fd4dc7f58b8f6a00a062b7def3e033a89781227f1edb15111da7b005dce2e5fe012d747f56d2e995f313baeb SHA512 d671d6d91158d2233b85b026f82fcfb79bf72d8bc0434bfe18cd803d974310c9962bcb4c98bd1bec23590fae7d073fea48bfbf2516322815a08a375679cec5fe
 MISC metadata.xml 1076 BLAKE2B 132b07201bfa3a7d8889d0b2558c15f35829bfa021b31cd5a9cf2cb21de822ceb89fae177b014590f46411cd609b4e44b20165b07c7676483a547987fffcbb9d SHA512 b06b884e0e369022cea4b3634d9df3c7d62d854754969d0c7848a3baf3a3ea69cce2131527539600424c72c539e502378b0627ba7c4fdcbc74e6f7a58b5800a8
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
deleted file mode 100644
index 205ef838d9bd..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6-r2.ebuild
+++ /dev/null
@@ -1,127 +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 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(+)] )
-	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)
-		$(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
-}
-
-pkg_postinst() {
-	tmpfiles_process cryptsetup.conf
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.7.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.7.ebuild
deleted file mode 100644
index f6ad133f9546..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.3.7.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 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 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(+)] )
-	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)
-		$(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
-}
-
-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
deleted file mode 100644
index 928f589b9606..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,141 +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/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(+)]
-		dev-libs/libgpg-error[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}"/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() {
-	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 external-tokens)
-		$(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.2-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.2-r1.ebuild
deleted file mode 100644
index 9bfa24d56c8d..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.4.2-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 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/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(+)]
-		dev-libs/libgpg-error[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/_/-}"
-
-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
-}
-
-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 external-tokens)
-		$(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.3-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
index 3337dfaa89a0..8287adbcacaf 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
@@ -19,7 +19,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static static-libs test +udev urandom"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt !udev )" #496612
+	static? ( !gcrypt !ssh !udev )" # 496612, 832711
 
 LIB_DEPEND="
 	dev-libs/json-c:=[static-libs(+)]
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
index f1679bbf84ec..79282c022d79 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
@@ -19,7 +19,7 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static static-libs test +udev urandom"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt !udev )" #496612
+	static? ( !gcrypt !ssh !udev )" # 496612, 832711
 
 LIB_DEPEND="
 	dev-libs/json-c:=[static-libs(+)]
diff --git a/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd b/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd
deleted file mode 100644
index 642ff087078b..000000000000
--- a/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd
+++ /dev/null
@@ -1,111 +0,0 @@
-# /etc/conf.d/dmcrypt
-
-# For people who run dmcrypt on top of some other layer (like raid),
-# use rc_need to specify that requirement.  See the runscript(8) man
-# page for more information.
-
-#--------------------
-# Instructions
-#--------------------
-
-# Note regarding the syntax of this file.  This file is *almost* bash,
-# but each line is evaluated separately.  Separate swaps/targets can be
-# specified.  The init-script which reads this file assumes that a
-# swap= or target= line starts a new section, similar to lilo or grub
-# configuration.
-
-# Note when using gpg keys and /usr on a separate partition, you will
-# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly
-# and ensure that gpg has been compiled statically.
-# See http://bugs.gentoo.org/90482 for more information.
-
-# Note that the init-script which reads this file detects whether your
-# partition is LUKS or not. No mkfs is run unless you specify a makefs
-# option.
-
-# Global options:
-#----------------
-
-# How long to wait for each timeout (in seconds).
-dmcrypt_key_timeout=1
-
-# Max number of checks to perform (see dmcrypt_key_timeout).
-#dmcrypt_max_timeout=300
-
-# Number of password retries.
-dmcrypt_retries=5
-
-# Arguments:
-#-----------
-# target=<name>                      == Mapping name for partition.
-# swap=<name>                        == Mapping name for swap partition.
-# source='<dev>'                     == Real device for partition.
-#                                    Note: You can (and should) specify a tag like UUID
-#                                    for blkid (see -t option).  This is safer than using
-#                                    the full path to the device.
-# key='</path/to/keyfile>[:<mode>]'  == Fullpath from / or from inside removable media.
-# remdev='<dev>'                     == Device that will be assigned to removable media.
-# gpg_options='<opts>'               == Default are --quiet --decrypt
-# options='<opts>'                   == cryptsetup, for LUKS you can only use --readonly
-# loop_file='<file>'                 == Loopback file.
-#                                    Note: If you omit $source, then a free loopback will
-#                                    be looked up automatically.
-# pre_mount='cmds'                   == commands to execute before mounting partition.
-# post_mount='cmds'                  == commands to execute after mounting partition.
-#-----------
-# Supported Modes
-# gpg					== decrypt and pipe key into cryptsetup.
-#						Note: new-line character must not be part of key.
-#						Command to erase \n char: 'cat key | tr -d '\n' > cleanKey'
-
-#--------------------
-# dm-crypt examples
-#--------------------
-
-## swap
-# Swap partitions. These should come first so that no keys make their
-# way into unencrypted swap.
-# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom
-# If no makefs is given then mkswap will be assumed
-#swap=crypt-swap
-#source='/dev/hda2'
-
-## /home with passphrase
-#target=crypt-home
-#source='/dev/hda5'
-
-## /home with regular keyfile
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey'
-
-## /home with gpg protected key
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey:gpg'
-
-## /home with regular keyfile on removable media(such as usb-stick)
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey'
-#remdev='/dev/sda1'
-
-## /home with gpg protected key on removable media(such as usb-stick)
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey:gpg'
-#remdev='/dev/sda1'
-
-## /tmp with regular keyfile
-#target=crypt-tmp
-#source='/dev/hda6'
-#key='/full/path/to/tmpkey'
-#pre_mount='/sbin/mkreiserfs -f -f ${dev}'
-#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}'
-
-## Loopback file example
-#target='crypt-loop-home'
-#source='/dev/loop0'
-#loop_file='/mnt/crypt/home'
-
-# The file must be terminated by a newline.  Or leave this comment last.
diff --git a/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc b/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc
deleted file mode 100644
index cdd20ba929d4..000000000000
--- a/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc
+++ /dev/null
@@ -1,339 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	before checkfs fsck
-
-	if grep -qs ^swap= "${conf_file}" ; then
-		before swap
-	fi
-}
-
-# We support multiple dmcrypt instances based on $SVCNAME
-conf_file="/etc/conf.d/${SVCNAME}"
-
-# Get splash helpers if available.
-if [ -e /sbin/splash-functions.sh ] ; then
-	. /sbin/splash-functions.sh
-fi
-
-# Setup mappings for an individual target/swap
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute() {
-	local dev ret mode foo
-
-	if [ -z "${target}" -a -z "${swap}" ] ; then
-		return
-	fi
-
-	# Set up default values.
-	: ${dmcrypt_key_timeout:=1}
-	: ${dmcrypt_max_timeout:=300}
-	: ${dmcrypt_retries:=5}
-
-	# Handle automatic look up of the source path.
-	if [ -z "${source}" -a -n "${loop_file}" ] ; then
-		source=$(losetup --show -f "${loop_file}")
-	fi
-	case ${source} in
-	*=*)
-		source=$(blkid -l -t "${source}" -o device)
-		;;
-	esac
-	if [ -z "${source}" ] || [ ! -e "${source}" ] ; then
-		ewarn "source \"${source}\" for ${target} missing, skipping..."
-		return
-	fi
-
-	if [ -n "${target}" ] ; then
-		# let user set options, otherwise leave empty
-		: ${options:=' '}
-	elif [ -n "${swap}" ] ; then
-		if cryptsetup isLuks ${source} 2>/dev/null ; then
-			ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
-			return
-		fi
-		target=${swap}
-		# swap contents do not need to be preserved between boots, luks not required.
-		# suspend2 users should have initramfs's init handling their swap partition either way.
-		: ${options:='-c aes -h sha1 -d /dev/urandom'}
-		: ${pre_mount:='mkswap ${dev}'}
-	fi
-
-	if [ -n "${loop_file}" ] ; then
-		dev="/dev/mapper/${target}"
-		ebegin "  Setting up loop device ${source}"
-		losetup ${source} ${loop_file}
-	fi
-
-	# cryptsetup:
-	# open   <device> <name>      # <device> is $source
-	# create <name>   <device>    # <name>   is $target
-	local arg1="create" arg2="${target}" arg3="${source}"
-	if cryptsetup isLuks ${source} 2>/dev/null ; then
-		arg1="open"
-		arg2="${source}"
-		arg3="${target}"
-	fi
-
-	# Older versions reported:
-	#	${target} is active:
-	# Newer versions report:
-	#	${target} is active[ and is in use.]
-	if cryptsetup status ${target} | egrep -q ' is active' ; then
-		einfo "dm-crypt mapping ${target} is already configured"
-		return
-	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
-
-	# Handle keys
-	if [ -n "${key}" ] ; then
-		read_abort() {
-			# some colors
-			local ans savetty resettty
-			[ -z "${NORMAL}" ] && eval $(eval_ecolors)
-			einfon "  $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
-			shift
-			# This is ugly as s**t.  But POSIX doesn't provide `read -t`, so
-			# we end up having to implement our own crap with stty/etc...
-			savetty=$(stty -g)
-			resettty='stty ${savetty}; trap - EXIT HUP INT TERM'
-			trap 'eval "${resettty}"' EXIT HUP INT TERM
-			stty -icanon
-			stty min 0 time "$(( $2 * 10 ))"
-			ans=$(dd count=1 bs=1 2>/dev/null) || ans=''
-			eval "${resettty}"
-			if [ -z "${ans}" ] ; then
-				printf '\r'
-			else
-				echo
-			fi
-			case ${ans} in
-				[yY]) return 0;;
-				*) return 1;;
-			esac
-		}
-
-		# Notes: sed not used to avoid case where /usr partition is encrypted.
-		mode=${key##*:} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
-		key=${key%:*}
-		case "${mode}" in
-		gpg|reg)
-			# handle key on removable device
-			if [ -n "${remdev}" ] ; then
-				# temp directory to mount removable device
-				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
-				if [ ! -d "${mntrem}" ] ; then
-					if ! mkdir -p "${mntrem}" ; then
-						ewarn "${source} will not be decrypted ..."
-						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
-						return
-					fi
-				fi
-				i=0
-				einfo "Please insert removable device for ${target}"
-				while [ ${i} -lt ${dmcrypt_max_timeout} ] ; do
-					foo=""
-					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
-						# keyfile exists?
-						if [ ! -e "${mntrem}${key}" ] ; then
-							umount -n "${mntrem}"
-							rmdir "${mntrem}"
-							einfo "Cannot find ${key} on removable media."
-							read_abort "Abort" ${dmcrypt_key_timeout} && return
-						else
-							key="${mntrem}${key}"
-							break
-						fi
-					else
-						[ -e "${remdev}" ] \
-							&& foo="mount failed" \
-							|| foo="mount source not found"
-					fi
-					: $((i += 1))
-					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
-				done
-			else    # keyfile ! on removable device
-				if [ ! -e "${key}" ] ; then
-					ewarn "${source} will not be decrypted ..."
-					einfo "Reason: keyfile ${key} does not exist."
-					return
-				fi
-			fi
-			;;
-		*)
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: mode ${mode} is invalid."
-			return
-			;;
-		esac
-	else
-		mode=none
-	fi
-	ebegin "  ${target} using: ${options} ${arg1} ${arg2} ${arg3}"
-	if [ "${mode}" = "gpg" ] ; then
-		: ${gpg_options:='-q -d'}
-		# gpg available ?
-		if command -v gpg >/dev/null ; then
-			i=0
-			while [ ${i} -lt ${dmcrypt_retries} ] ; do
-				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
-				# save stdin stdout stderr "values"
-				timeout ${dmcrypt_max_timeout} gpg ${gpg_options} ${key} 2>/dev/null | \
-					cryptsetup --key-file - ${options} ${arg1} ${arg2} ${arg3}
-				ret=$?
-				# The timeout command exits 124 when it times out.
-				[ ${ret} -eq 0 -o ${ret} -eq 124 ] && break
-				: $(( i += 1 ))
-			done
-			eend ${ret} "failure running cryptsetup"
-		else
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: cannot find gpg application."
-			einfo "You have to install app-crypt/gnupg first."
-			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
-		fi
-	else
-		if [ "${mode}" = "reg" ] ; then
-			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
-			ret=$?
-			eend ${ret} "failure running cryptsetup"
-		else
-			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-			ret=$?
-			eend ${ret} "failure running cryptsetup"
-		fi
-	fi
-	if [ -d "${mntrem}" ] ; then
-		umount -n ${mntrem} 2>/dev/null >/dev/null
-		rmdir ${mntrem} 2>/dev/null >/dev/null
-	fi
-	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
-
-	if [ ${ret} -ne 0 ] ; then
-		cryptfs_status=1
-	else
-		if [ -n "${pre_mount}" ] ; then
-			dev="/dev/mapper/${target}"
-			eval ebegin \""    pre_mount: ${pre_mount}"\"
-			eval "${pre_mount}" > /dev/null
-			ewend $? || cryptfs_status=1
-		fi
-	fi
-}
-
-# Lookup optional bootparams
-get_bootparam_val() {
-	# We're given something like:
-	#    foo=bar=cow
-	# Return the "bar=cow" part.
-	case $1 in
-	*=*)
-		echo "${1#*=}"
-		;;
-	esac
-}
-
-start() {
-	local header=true cryptfs_status=0
-	local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
-
-	local x
-	for x in $(cat /proc/cmdline) ; do
-		case "${x}" in
-		key_timeout=*)
-			dmcrypt_key_timeout=$(get_bootparam_val "${x}")
-			;;
-		esac
-	done
-
-	while read targetline <&3 ; do
-		case ${targetline} in
-		# skip comments and blank lines
-		""|"#"*) continue ;;
-		# skip service-specific openrc configs #377927
-		rc_*) continue ;;
-		esac
-
-		${header} && ebegin "Setting up dm-crypt mappings"
-		header=false
-
-		# check for the start of a new target/swap
-		case ${targetline} in
-		target=*|swap=*)
-			# If we have a target queued up, then execute it
-			dm_crypt_execute
-
-			# Prepare for the next target/swap by resetting variables
-			unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
-			;;
-
-		gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
-			if [ -z "${target}${swap}" ] ; then
-				ewarn "Ignoring setting outside target/swap section: ${targetline}"
-				continue
-			fi
-			;;
-
-		dmcrypt_*=*)
-			# ignore global options
-			continue
-			;;
-
-		*)
-			ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
-			;;
-		esac
-
-		# Queue this setting for the next call to dm_crypt_execute
-		eval "${targetline}"
-	done 3< ${conf_file}
-
-	# If we have a target queued up, then execute it
-	dm_crypt_execute
-
-	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
-}
-
-stop() {
-	local line header
-
-	# Break down all mappings
-	header=true
-	egrep "^(target|swap)=" ${conf_file} | \
-	while read line ; do
-		${header} && einfo "Removing dm-crypt mappings"
-		header=false
-
-		target= swap=
-		eval ${line}
-
-		[ -n "${swap}" ] && target=${swap}
-		if [ -z "${target}" ] ; then
-			ewarn "invalid line in ${conf_file}: ${line}"
-			continue
-		fi
-
-		ebegin "  ${target}"
-		cryptsetup remove ${target}
-		eend $?
-	done
-
-	# Break down loop devices
-	header=true
-	grep '^source=./dev/loop' ${conf_file} | \
-	while read line ; do
-		${header} && einfo "Detaching dm-crypt loop devices"
-		header=false
-
-		source=
-		eval ${line}
-
-		ebegin "  ${source}"
-		losetup -d "${source}"
-		eend $?
-	done
-
-	return 0
-}
diff --git a/sys-fs/cryptsetup/files/cryptsetup-2.0.4-fix-static-pwquality-build.patch b/sys-fs/cryptsetup/files/cryptsetup-2.0.4-fix-static-pwquality-build.patch
deleted file mode 100644
index 39524ec3114b..000000000000
--- a/sys-fs/cryptsetup/files/cryptsetup-2.0.4-fix-static-pwquality-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/Makemodule.am	2018-07-31 14:32:46.000000000 +0200
-+++ b/src/Makemodule.am	2018-08-12 17:13:26.000000000 +0200
-@@ -64,6 +64,7 @@
- 	$(veritysetup_LDADD)	\
- 	@CRYPTO_STATIC_LIBS@	\
- 	@DEVMAPPER_STATIC_LIBS@	\
-+	@PWQUALITY_STATIC_LIBS@ \
- 	@UUID_LIBS@
- endif
- endif
-@@ -93,6 +94,7 @@
- 	$(integritysetup_LDADD)	\
- 	@CRYPTO_STATIC_LIBS@	\
- 	@DEVMAPPER_STATIC_LIBS@	\
-+	@PWQUALITY_STATIC_LIBS@ \
- 	@UUID_LIBS@
- endif
- endif
diff --git a/sys-fs/cryptsetup/files/cryptsetup-2.4.1-external-tokens.patch b/sys-fs/cryptsetup/files/cryptsetup-2.4.1-external-tokens.patch
deleted file mode 100644
index 1777a02652ce..000000000000
--- a/sys-fs/cryptsetup/files/cryptsetup-2.4.1-external-tokens.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a1b577c085cc9ef6b95c4556ec8815070828ee6c Mon Sep 17 00:00:00 2001
-From: Hector Martin <marcan@marcan.st>
-Date: Fri, 17 Sep 2021 05:44:18 +0000
-Subject: [PATCH] Do not attempt to unload external tokens if
- USE_EXTERNAL_TOKENS is disabled.
-
-This allows building a static binary as long as --disable-external-tokens is used
----
- lib/luks2/luks2_token.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/luks2/luks2_token.c b/lib/luks2/luks2_token.c
-index d34cebf5..88d84418 100644
---- a/lib/luks2/luks2_token.c
-+++ b/lib/luks2/luks2_token.c
-@@ -245,6 +245,7 @@ int crypt_token_register(const crypt_token_handler *handler)
- 
- void crypt_token_unload_external_all(struct crypt_device *cd)
- {
-+#if USE_EXTERNAL_TOKENS
- 	int i;
- 
- 	for (i = LUKS2_TOKENS_MAX - 1; i >= 0; i--) {
-@@ -258,6 +259,7 @@ void crypt_token_unload_external_all(struct crypt_device *cd)
- 		if (dlclose(CONST_CAST(void *)token_handlers[i].u.v2.dlhandle))
- 			log_dbg(cd, "%s", dlerror());
- 	}
-+#endif
- }
- 
- static const void
--- 
-GitLab
-
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
deleted file mode 100644
index f39e88507ffd..000000000000
--- a/sys-fs/cryptsetup/files/cryptsetup-2.4.1-fix-static-pwquality-build.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-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/dfc/Manifest b/sys-fs/dfc/Manifest
index d94e0279ddaa..a07d6152e2e5 100644
--- a/sys-fs/dfc/Manifest
+++ b/sys-fs/dfc/Manifest
@@ -1,3 +1,3 @@
 DIST dfc-3.1.1.tar.gz 52709 BLAKE2B 543795af9c0f3309ee497bc0bdfe144bec3cac69b4772803204d794acb9513e7f7b2726ea16640492a6c477f5c3c7fa872284efd5b7c690bf1bfde4608f7281d SHA512 eac2c8d464d57626efe939f515889cf91510f7e6eb50382d045204d4f1d6b9b9f0af4b1d8974c9cbcff1eb5b8802157e421ec06e5a1e38dac74eba72f43f9701
-EBUILD dfc-3.1.1.ebuild 829 BLAKE2B 554e0e83ec8822be0754e0d7a77d135901fe5919ed5905b43d82784a89199ff29f7141ee9bff0da738f90ef1eb3e2b852b24d5c14620f03810488e84d690f4a8 SHA512 25db024d38a522934f04cab5641b3202dd1c5a682b062e95d1b3561461d421f83529b3733026fc4b0704d4050d3072fe8cb5d8bfe6dbc59f5fc2891b572f3650
+EBUILD dfc-3.1.1.ebuild 817 BLAKE2B d48a930ba8ecb873811390bbec0f17d121849c6f72b6476cfb21302a14417e04be2f4367408fb91a4d82f9f9550bd411a9617f0a2a36a7838fc7cc6d7bf2c547 SHA512 e7cc4c2e19e41ed9893c983194f9ab30675a6c860e4f95f45585d26c8cd8c7c6247d451946385f07e668ef76c5dc1f3f0af859e412293b0fd52cbfb3558eeb8f
 MISC metadata.xml 241 BLAKE2B ac22a6a72982cebf268e9d367947dc556420370c70b1f6e26531950f7f2c89734cd293fad93dfea0345fd020a97b8f9304c1362a2ccd6225b22aac1f7b674b17 SHA512 b59cc421f52bc545bc8667dcbf6b4891e29180ef1984596ccc20886071e5f080bed259026c2831c6418131802b93ad945137fe4406d042feb02d9bfdc14c431c
diff --git a/sys-fs/dfc/dfc-3.1.1.ebuild b/sys-fs/dfc/dfc-3.1.1.ebuild
index ec6877dbb2b0..6efb0e5b80cd 100644
--- a/sys-fs/dfc/dfc-3.1.1.ebuild
+++ b/sys-fs/dfc/dfc-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils
+EAPI=8
+inherit cmake
 
 DESCRIPTION="A simple CLI tool that display file system usage, with colors"
 HOMEPAGE="https://projects.gw-computing.net/projects/dfc"
@@ -30,5 +30,5 @@ src_configure() {
 		-DLFS_ENABLED=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index c3d8d548a4b2..a165b4354c9f 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,4 +1,4 @@
 AUX ecryptfs-utils-111-musl-fix.patch 655 BLAKE2B 36b58a963e3aa82b2eac0753f0177fc6293ea33dad78077f6c9735cbacc9f14064a4517747b72298191dd3ab8266bf15506b2947544fbe250ab1a96706aa47ae SHA512 3e69d642e650be5a94c3f1a47ee7094fd5c052d77d3298ebe96ababfe6f526963dd08d8260ca546eee271b799357ef57a51479565b646b2b428e7c8868ec469a
 DIST ecryptfs-utils-111_p20170609.tar.gz 1433722 BLAKE2B eeb8840e0b369d2eb420e7853629086cbf430daed2dbf3ed620f5c2489de711c9d8dc5c2b555db5d09b968df6d07da19b93ca46add3b7987d3ff1ad9f06adc69 SHA512 4788a35d68bbb6b769803754adad14d063564e6285edcec4d68df076e96c61550ab6487a1b84498e24e3f56f8c9fda6eb63a66d469d3e654834357c5e2b4c781
-EBUILD ecryptfs-utils-111_p20170609-r1.ebuild 1894 BLAKE2B 819bd32ec8104bb3483507fa17a3015afaf20954ed01ac16b06d4f789c98d2f0e5044f9a81423c3bec69a29037600b814da723efe087e332baffb645fdfaa6ae SHA512 6a26a4bb96dd4ae43874dc7ffbdeb7063990db46c5cabbe38becd9ab9686ef3e1949131c940574b7c79f41d4aff1a85dfabf5e451b26368261d164d9441d12ef
+EBUILD ecryptfs-utils-111_p20170609-r1.ebuild 1901 BLAKE2B 27ad4a0a24c65cdd7526a59c0d78509f4fb368544dfeeaf38ca204baaa882c1d9d97a031d8ebe21ac6f751f1f37cf09cdde5995c9ce9311ba18062375486acc1 SHA512 90bd167729dc369ba1a250e71d0a482f9fb44d07dd71c52df998bd03010b7a0a886f8edc1d26e6be19f313ee046585bef21e9e3081a2ce8d11fe2e8e17ed0726
 MISC metadata.xml 655 BLAKE2B d648668661013c7c93fdea80799554bbd62487eee5f05e52be27f6985753167918bbc435f081b5f95c7e1430c6c6814bc9d080f92705a251e08fa7f5077326e5 SHA512 2296f341d893709a35ec2150f68b8cfdd51b15e3ac3b999634ee4637f0c888bb2d3235a05b4cbd1f4efd702dc0d9dccd7adfbc88caee9516d772da53dc0a3d73
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild
index 711644620d7c..13befda463d2 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/~${MY_PN}/${MY_PN}/trunk/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc gpg gtk nls openssl pam pkcs11 suid tpm"
 
 BDEPEND="
diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest
index 8cf4fea5fa92..39108ea77cd7 100644
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -1,7 +1,6 @@
 AUX 1.4-dump-fix-de-nid-issues.patch 4849 BLAKE2B 48e29859955f5e7b13af7657a2411bad139de6cc373f17392bcd0b6cde55a83993795ff3f298f87fdfd950a0222c0f70714de161e02e9b2ad32b2afc513d8e4d SHA512 50d734ebbb7a7bd1c16bd90bae59e639213e607b2017cb16e65e1e3c653f604761136309564f77e80573196d7693e6ed90c30f9e35b9d3dafdb8365c38e1b0c3
 AUX 1.4-fsck-add-missing-include.patch 878 BLAKE2B e7d32eced8199a6c282d7398cea068cf560d9715caf035c67127f25fdf7055492fe25c56703e166a683f40cbb7d6ed6723c5d97467bec22f67418bb9b3bcfc5b SHA512 4cffb6faf7e1bb8150347ba8e47e0b05ad1b7d5dd4eb265330a33d6054dc6157e780a38b80a17cb61d3ab1fb2b41f36fcf65c39846f30003bc6013d23028c1fa
-DIST erofs-utils-1.3.tar.gz 66135 BLAKE2B 1051cf387d059d71b91e0a940c86b819593902606ae4665a7801e9597dd72987385bee997d2d63b186c493557ee22118aff23161e48e25ee8f4859f9f6e46f14 SHA512 6ddd8402dab80b0375b012ed51ff02b40cbeca9a4a1ba250b14ec6aeb97317ab575e315e9d4dc77ed1d7826c202396d9c0775917106ecbd7b4048168aca0fa6c
+AUX 1.4-werror.patch 2523 BLAKE2B e794e82eb2bbc2bdc76cefb054e37a8e07a3ce1abb3d94dcbcbf115189e719677fbe18b965f1d84353853b0963ab188638634f6ebc5c32d4790ebbf0850a94a1 SHA512 3856b297ba273389e5db9ce859291ee1bbdacbeda4cdf560250f1721af81fa2037a9e3b06d955ed4caab795fec15428397cc6b03d81e79269ae963dbd0e7d51a
 DIST erofs-utils-1.4.tar.gz 93979 BLAKE2B aef1dca8cb95e6104d73a84590319d3c55aba1a4ef5dbdbf470662cb86ee1b66a5707dc1c453470115ec6f2bf1246ee4b6b28aa1cb83b4cb9c8eed45e88668d4 SHA512 ab95d6a7b2d278ee443d1e378c62354db66ce7ab5ce03b3a8d9004cf498c4e43e3e8ced6524444d2ea4871c4db0195489f033180c8a2082c2cba69c46c09692f
-EBUILD erofs-utils-1.3-r1.ebuild 764 BLAKE2B 5cbead7514b99927f1240a32fbfab4450044cc4ad591350404f34fc675fb4f99f78f1cdb85e17410ebf7f308868bc810009baeda584d6662ef6552dacdaba776 SHA512 7cc5ab682b875e80233971ea3337759ed10311fe9161dd984dcaa5ab8b863856abe10fa0de5c06c41d68f1fb09aef399c58227a6dac1b5fd74f1cef373af3660
-EBUILD erofs-utils-1.4.ebuild 1071 BLAKE2B 23d2283c8dea2b66432dfaaa832c7eeb0767a6b5a60e140499f96aaddb9d826fe7628cce864c5fdf7185b65ca65c554f87e5a6774d00caf16c3f49cf8776f126 SHA512 c83b7acb8abb9a986e078d9713cd4f811fb64c9f6f60c65776b28b56c5c84e609185d8c9ae41913758aac357e71764d652d18ce50128d2eb6083c0247df63ffd
-MISC metadata.xml 572 BLAKE2B dcc6b6c78cac3161d2b2401f1da18787b5a201009da43978c7ce74c22cbd4141e1cfebd417118b90a34ee42e5290ebb5b5c5974ba770f9c3fd1f9da244a194f1 SHA512 756d65689fc5bdf12160429137b2012ea1dc934c3082b2737c5974006193858681e26d9b89b594bfb2b15176d947d3cf83b5800346365bbc4f45cb03aa57560c
+EBUILD erofs-utils-1.4.ebuild 1105 BLAKE2B 009f4ba623ae13fc62a6f7df85ec16c89997e3807be166641253f296d3a21d6905ee1cd53b12eb4cf6189fd2d52435d5cad699ffb9990137ea6195dc13b5231f SHA512 e461cac2cfebfd246566311949f4bd21179d390d6fda6a19555fd3d06871c06d52d61035163436e54a78c938e8e69bcf1e7b6dbd8ddb9dae48bbaecec2c14e93
+MISC metadata.xml 422 BLAKE2B 9c580f677db0b02904c12e023efd2c1abf0dca9d5dd84776ea55551e3997a968bf23c092b9bfa98e941f7d16009c6e56cdd0120a075872c8e3f84a77899ba556 SHA512 bb5def8dcfe0ecfdc8ce9e6fec61b7c707114abef8e79f2c0f27736341e9c3cca48c053b613d85db762c1632194e76d3ab33386bf0be7ba669a6aaee652b64c1
diff --git a/sys-fs/erofs-utils/erofs-utils-1.3-r1.ebuild b/sys-fs/erofs-utils/erofs-utils-1.3-r1.ebuild
deleted file mode 100644
index 749529d63343..000000000000
--- a/sys-fs/erofs-utils/erofs-utils-1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Userspace tools for EROFS"
-HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
-LICENSE="GPL-2+"
-
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapshot/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-SLOT="0"
-IUSE="fuse +lz4 selinux +uuid"
-
-RDEPEND="
-	fuse? ( sys-fs/fuse:0 )
-	lz4? ( app-arch/lz4:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	uuid? ( sys-apps/util-linux )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fuse) \
-		$(use_enable lz4) \
-		$(use_with selinux) \
-		$(use_with uuid)
-}
diff --git a/sys-fs/erofs-utils/erofs-utils-1.4.ebuild b/sys-fs/erofs-utils/erofs-utils-1.4.ebuild
index 158c90277a0b..69d61af36d5b 100644
--- a/sys-fs/erofs-utils/erofs-utils-1.4.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.4.ebuild
@@ -27,6 +27,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}/${PV}-dump-fix-de-nid-issues.patch"
 	"${FILESDIR}/${PV}-fsck-add-missing-include.patch"
+	"${FILESDIR}/${PV}-werror.patch"
 )
 
 src_prepare() {
diff --git a/sys-fs/erofs-utils/files/1.4-werror.patch b/sys-fs/erofs-utils/files/1.4-werror.patch
new file mode 100644
index 000000000000..21740d646c54
--- /dev/null
+++ b/sys-fs/erofs-utils/files/1.4-werror.patch
@@ -0,0 +1,63 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR([config.h.in])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_AUX_DIR(config)
+-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
++AM_INIT_AUTOMAKE([foreign -Wall])
+ 
+ # Checks for programs.
+ AM_PROG_AR
+--- a/dump/Makefile.am
++++ b/dump/Makefile.am
+@@ -5,6 +5,6 @@ AUTOMAKE_OPTIONS = foreign
+ bin_PROGRAMS     = dump.erofs
+ AM_CPPFLAGS = ${libuuid_CFLAGS}
+ dump_erofs_SOURCES = main.c
+-dump_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
++dump_erofs_CFLAGS = -Wall -I$(top_srcdir)/include
+ dump_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \
+ 	${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS}
+--- a/fsck/Makefile.am
++++ b/fsck/Makefile.am
+@@ -5,6 +5,6 @@ AUTOMAKE_OPTIONS = foreign
+ bin_PROGRAMS     = fsck.erofs
+ AM_CPPFLAGS = ${libuuid_CFLAGS}
+ fsck_erofs_SOURCES = main.c
+-fsck_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
++fsck_erofs_CFLAGS = -Wall -I$(top_srcdir)/include
+ fsck_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \
+ 	${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS}
+--- a/fuse/Makefile.am
++++ b/fuse/Makefile.am
+@@ -3,7 +3,7 @@
+ AUTOMAKE_OPTIONS = foreign
+ bin_PROGRAMS     = erofsfuse
+ erofsfuse_SOURCES = dir.c main.c
+-erofsfuse_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
++erofsfuse_CFLAGS = -Wall -I$(top_srcdir)/include
+ erofsfuse_CFLAGS += -DFUSE_USE_VERSION=26 ${libfuse_CFLAGS} ${libselinux_CFLAGS}
+ erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la ${libfuse_LIBS} ${liblz4_LIBS} \
+ 	${libselinux_LIBS} ${liblzma_LIBS}
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -27,7 +27,7 @@ noinst_HEADERS += compressor.h
+ liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \
+ 		      namei.c data.c compress.c compressor.c zmap.c decompress.c \
+ 		      compress_hints.c hashmap.c sha256.c blobchunk.c
+-liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
++liberofs_la_CFLAGS = -Wall -I$(top_srcdir)/include
+ if ENABLE_LZ4
+ liberofs_la_CFLAGS += ${LZ4_CFLAGS}
+ liberofs_la_SOURCES += compressor_lz4.c
+--- a/mkfs/Makefile.am
++++ b/mkfs/Makefile.am
+@@ -4,6 +4,6 @@ AUTOMAKE_OPTIONS = foreign
+ bin_PROGRAMS     = mkfs.erofs
+ AM_CPPFLAGS = ${libuuid_CFLAGS} ${libselinux_CFLAGS}
+ mkfs_erofs_SOURCES = main.c
+-mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include
++mkfs_erofs_CFLAGS = -Wall -I$(top_srcdir)/include
+ mkfs_erofs_LDADD = ${libuuid_LIBS} $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \
+ 	${liblz4_LIBS} ${liblzma_LIBS}
diff --git a/sys-fs/erofs-utils/metadata.xml b/sys-fs/erofs-utils/metadata.xml
index 8d82bd8bcd40..bcc4b30fe149 100644
--- a/sys-fs/erofs-utils/metadata.xml
+++ b/sys-fs/erofs-utils/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>i.gentoo@xen0n.name</email>
+	<maintainer type="person">
+		<email>xen0n@gentoo.org</email>
 		<name>WANG Xuerui</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="fuse">Builds erofsfuse (requires <pkg>sys-fs/fuse</pkg>).</flag>
 		<flag name="uuid">Enables UUID support via <pkg>sys-apps/util-linux</pkg>.</flag>
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index bcfcf8b8cf82..c0fae2687afd 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,6 +1,6 @@
 DIST exfatprogs-1.1.2.tar.xz 261572 BLAKE2B 1475086d6fdc79dd128d08ba863e6c3fc58a432929400b0a740f57db492a08fb3779a0a1a7a555efd373a3e796d2066e37575c5003cbd16f829964cfa414a1d0 SHA512 b3589225f3bc4137c49d828923ab43e155f476fccd227b16168d11302e1c150485eb7f61b6463dc9126648fd4a52960657976ebd9f731366c64966c58fb9276e
 DIST exfatprogs-1.1.3.tar.xz 261936 BLAKE2B 7d1e471eb24f408999efd7fd6e8e2b60f0ef4efbceca9780de5a52c0b0bcad18a25648b7e669e805a40f382541406c01ea75cd40b4660f44281848bf38f9d1c0 SHA512 d23bfe4d0233d944b0d5a484e1167746db77ea9b7fbacdbfac2dd4d37a8a1d747f2445b09baced9fd7b5d3dbfc7664bdc1efe16326d7e678d05294eee124efa3
 EBUILD exfatprogs-1.1.2.ebuild 617 BLAKE2B a1a86d9e39e1fd4dafb16f7a2c0ba0aa368d36ee343e10d39f0001de8cd2c5b8067835ea9da556b30ed8b9a414ef093d034f59e0b423910200bc1ae353308183 SHA512 a55c4bd6113876be8ab39330bd3e50736a69165728b941359b984853b1ae06f49ba93b0b872a2a6dde16a5997f0abf747154d4f41b2c0e9e53a95745f8e07ec5
-EBUILD exfatprogs-1.1.3.ebuild 620 BLAKE2B 50d59db1d0365445dc6a1bfff9905e6ccbd7947baaa8d9e6ed4b9587a85816a487ed90afaa3c205a5cf414b891dc9c64d3edb9929985c75d77c90acb5dd54211 SHA512 6afee5e9027be8cc0b9548218dea3c58ab7e674031c8c55a1039c60231510623242f1a379644e446cd36ca3983a7354d7e0d634c63113da4f6547aabb4db218c
+EBUILD exfatprogs-1.1.3.ebuild 617 BLAKE2B 07bace354da2f4e93593126df6b95a5ea0a87f349d7997cc435b2f01433afcef917bfc45d722c265fbf0e12539f83bc6fbc0af44d77344118fdc2d1bbda7da64 SHA512 90f77e5c5ff0beff72f28c5e772c1494ad08314497ae0e2c28988dcf785d048f9cbb10fe9b79e78037f90531bc7134a99c6f268794014a0f1165bf7ded5787a4
 EBUILD exfatprogs-9999.ebuild 620 BLAKE2B 50d59db1d0365445dc6a1bfff9905e6ccbd7947baaa8d9e6ed4b9587a85816a487ed90afaa3c205a5cf414b891dc9c64d3edb9929985c75d77c90acb5dd54211 SHA512 6afee5e9027be8cc0b9548218dea3c58ab7e674031c8c55a1039c60231510623242f1a379644e446cd36ca3983a7354d7e0d634c63113da4f6547aabb4db218c
 MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d
diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild
index bfc512380c67..56639025e6b4 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	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 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/fatcat/Manifest b/sys-fs/fatcat/Manifest
index 692ecefe8f39..d0e716db987d 100644
--- a/sys-fs/fatcat/Manifest
+++ b/sys-fs/fatcat/Manifest
@@ -1,6 +1,4 @@
 AUX fatcat-include-getopt.patch 268 BLAKE2B f197d14653e3c738bc096fe1f2865794e1cedffe87c49d62e769b542f6ff85caf2e8079cf17204010d4e5c5438c8df92c12aa780bfbdafb9bdbcd66b994c499b SHA512 71b6970aea57969099deba84bc1c7ad6aca025841140bdcb569d0e2b8f083618022eac84895522c33dc6f5e53bcccb0b21d380eed1ebb251928f17e08486315b
-DIST fatcat-1.1.0.tar.gz 57104 BLAKE2B 9ff69f576258a39b767db67e6934a35175af218a184516681300c646ce1ec508652cf1113bf61f9e2f628849de2b53152345ca12fe84e8a9a7f51799bb3e13a2 SHA512 f5bcffcb46b77e950241a9f957133083ea5d43f4e0f3e038c84310da926cc017048d22f85f3c8e90a2745ce26f513079997717c5b758649b7090694006be0078
 DIST fatcat-1.1.1.tar.gz 57213 BLAKE2B 095d69d828759860c182a9208e234a90b80656207f3c6ee217adc903f4c75e09f44b9d8a45a37404c904657e787edcc7b3c5969f175414bde2c03b52765b537c SHA512 eb3feca0ee330fc7d3a557ff2ecca96102351105799d89cef64ddfaeaa5bbb5d8815f5f109bbd8f2721538ddbb231bebf3f3515c5b33a6d4093f4c1389000f9e
-EBUILD fatcat-1.1.0-r2.ebuild 585 BLAKE2B dd97942c347548c64e3cc00d11204e56008a8cab5be81c2bd864cdbcbbcdb554e94c114f3bdd82092bb0c3556e22eb33c256feb0ca9e4b4ae41759b3914b767c SHA512 dec9e061f1130c7fe5bd1502b2f750272648dd27ddf83168624c19882e6eae3a37724f4508ca26d4d5fea49a450749106e9ebe274a9b57495a6424774a68f3ef
 EBUILD fatcat-1.1.1.ebuild 585 BLAKE2B 86a956842917f74db369e206965b21862aede6196dbf435fff88662aaeb752b6c3f5bbd679df01c3fe1a30b716657184a63e5fc6b60b7a2f2f8796ea17b65e36 SHA512 9be47bd3fbce7fbcd1e530028f9e06e691752e5f783ac9266323c55783189603de4fb427971b83eaa163d3a3bed1205a7d267ed391df6d315a9bfeee04b2ed01
 MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7
diff --git a/sys-fs/fatcat/fatcat-1.1.0-r2.ebuild b/sys-fs/fatcat/fatcat-1.1.0-r2.ebuild
deleted file mode 100644
index 1b785a18b115..000000000000
--- a/sys-fs/fatcat/fatcat-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="FAT filesystems explore, extract, repair, and forensic tool"
-HOMEPAGE="https://github.com/Gregwar/fatcat"
-SRC_URI="https://github.com/Gregwar/fatcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!elibc_glibc? ( sys-libs/argp-standalone )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/fatcat-include-getopt.patch )
-
-src_install() {
-	cmake_src_install
-	doman man/${PN}.1
-	dodoc docs/*.md
-}
diff --git a/sys-fs/fragview/Manifest b/sys-fs/fragview/Manifest
index 4769abbccf3d..ce6297ca2b63 100644
--- a/sys-fs/fragview/Manifest
+++ b/sys-fs/fragview/Manifest
@@ -1,5 +1,7 @@
 AUX fragview-0.1.1-fix-linking.patch 992 BLAKE2B 591efe5b13b37325f64092679df345036f23b47adea2b0b64ec1adccd9af9d3eb7123e55b4706433099d3a30463a3afb707dd61648cd0121015e332f76c44f58 SHA512 bc51bc882ffc457a371f6cbfa93ffd176ee07130e9ba1c455ade29e0d1557bfcab3b08342bf8b3bc83147817ce454b624eedd48cc18d91a2e715044b3b26f41f
 DIST fragview-0.1.1.tar.gz 20439 BLAKE2B 827275562fadcce5fc1dc210816ab5a2108863538dfb1892f677fb94e26ea348712f5c9534405d4d056435f1d5c38427eafce7de0af35839bc69da98dcedb9b5 SHA512 aa28f57e2ba5fbba48fd9d8d471ac8e90c056309b6f44cc1e320dbbaea2105c622a6803a04be23893b8e284cd53112f2d1fe73a97e7333937892b35742e5495f
-EBUILD fragview-0.1.1.ebuild 657 BLAKE2B 8c6c9ba2df76cf381611d76ce0cb1b385ac9cbd8ae8d9e08b5569969a625ab0ae422ac3f512eee6200ea16770a71f5f0d0f3bed5ddd775f7c96d4b66a596fe34 SHA512 6126408a46d0e83fa1b679f60047251b246312fc50066abd1985aef8a6e2aa06d0ebbaed4cbac2f9aa778f4be31b22373138429d808b172f6381443157a99ecc
-EBUILD fragview-9999.ebuild 607 BLAKE2B 5c1abfe036247b0d058ffade05b3eaa1b7e7f2eef316f4443e1cec9f4a70569ab06aeadea7d475e5ecd627a9b12957f888b4636c4677b0702ad1201ca9fa174e SHA512 986120f8792658b3fd8e8fd4b3f2d6beac46a4a100ea5e2f1922f6280a0c911caa12f55836c20d65faab7e0ca5baa30315b3d8cbe9746fe4148185655d803441
+DIST fragview-0.1.2.tar.gz 21253 BLAKE2B ea6301f074949e0e3cc0ece5f60fae9b59983e6827b384ce3ce6b95ce835a15e0fa2aac009fe2702c81a6a26d95e0fab32a324af0d0261b6744637d963d48ede SHA512 ec75fb65d9dd9d5ec5b4f3b31b6f0337f401e629ff49dc218eeb82c17a11699f87407ff0dc90c1f75b06d746bd982fb58d810a3f1136f8c3af787c6dc5439170
+EBUILD fragview-0.1.1-r1.ebuild 764 BLAKE2B 7152ce5814d141a38c1f8133ff953fa5a55a4b9824cb7f7b096c0beff682b97649983a4f6a267db8ad226af9586add5356148bab035b791e9c65497d5bd494c0 SHA512 55360176db585628973d26af3b47634bf7fcf7b3b5b809155d3dfdc4aa3c2fc083e8aeb9ec49f73923bf878a150c1f32b21daeedc22184f37767131afadcd7ac
+EBUILD fragview-0.1.2.ebuild 714 BLAKE2B 0eaece47745476f4e465cf86d58ad82e4a793b2e0d111d1ecbe2ba2319dbb0938dbfa053ca38145035e7b5dc39a76edfca31c15b31a0588de66413f0a841fb14 SHA512 7db5ee03f9ca815d22849b6e06fa55774463f2188c3aab739e06dce4d75a8c23b3fa1bd4809d28b1f89b79d45fcfb224b915fd6c3a20e20753b4b29170febe6f
+EBUILD fragview-9999.ebuild 714 BLAKE2B 0eaece47745476f4e465cf86d58ad82e4a793b2e0d111d1ecbe2ba2319dbb0938dbfa053ca38145035e7b5dc39a76edfca31c15b31a0588de66413f0a841fb14 SHA512 7db5ee03f9ca815d22849b6e06fa55774463f2188c3aab739e06dce4d75a8c23b3fa1bd4809d28b1f89b79d45fcfb224b915fd6c3a20e20753b4b29170febe6f
 MISC metadata.xml 476 BLAKE2B 0a17ff77fc52edcbcb4609bc11b3008e6f264a1885de3046a0bfb760869f87e67eb244bc73228279784e83d45c67d82643d6dad887c896b95135eae351e29dde SHA512 5697c3e951a379a545098ae6abc07854057cd5b765293bd1a365a237371f70b709fcc03993ab7046cb5878e9414c77166d4a234947bfdec0fe8e3e9a53a3725c
diff --git a/sys-fs/fragview/fragview-0.1.1.ebuild b/sys-fs/fragview/fragview-0.1.1-r1.ebuild
index 5e531deaaae0..5e579ec7c56e 100644
--- a/sys-fs/fragview/fragview-0.1.1.ebuild
+++ b/sys-fs/fragview/fragview-0.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -19,12 +19,19 @@ HOMEPAGE="https://github.com/i-rinat/fragview"
 LICENSE="MIT"
 SLOT="0"
 
-DEPEND="
+COMMON_DEPEND="
+	dev-cpp/atkmm:0
+	dev-cpp/cairomm:0
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-db/sqlite:3
-	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/boost
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-fix-linking.patch" )
diff --git a/sys-fs/fragview/fragview-0.1.2.ebuild b/sys-fs/fragview/fragview-0.1.2.ebuild
new file mode 100644
index 000000000000..1679ebd4e588
--- /dev/null
+++ b/sys-fs/fragview/fragview-0.1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/i-rinat/fragview.git"
+else
+	SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Disk fragmentation visualizer based on FIEMAP and FIBMAP ioctls"
+HOMEPAGE="https://github.com/i-rinat/fragview"
+
+LICENSE="MIT"
+SLOT="0"
+
+COMMON_DEPEND="
+	dev-cpp/atkmm:0
+	dev-cpp/cairomm:0
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}"
diff --git a/sys-fs/fragview/fragview-9999.ebuild b/sys-fs/fragview/fragview-9999.ebuild
index 679d6254f5ae..1679ebd4e588 100644
--- a/sys-fs/fragview/fragview-9999.ebuild
+++ b/sys-fs/fragview/fragview-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -19,10 +19,17 @@ HOMEPAGE="https://github.com/i-rinat/fragview"
 LICENSE="MIT"
 SLOT="0"
 
-DEPEND="
+COMMON_DEPEND="
+	dev-cpp/atkmm:0
+	dev-cpp/cairomm:0
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-db/sqlite:3
-	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/boost
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
diff --git a/sys-fs/fscrypt/Manifest b/sys-fs/fscrypt/Manifest
index 6324ec7eb861..0caf48abcf74 100644
--- a/sys-fs/fscrypt/Manifest
+++ b/sys-fs/fscrypt/Manifest
@@ -1,8 +1,6 @@
-AUX 0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch 1448 BLAKE2B ee8879bb777b6d63525489ab3ed051d4107b0f812ac7c65c5312dd81652e8d005300f2cdc036a2a85f4e9e0cd66a3a360b2cbe68bea0f2f2dc91f37243749a44 SHA512 e3f2805a038a82352903ee5449dd75ab3570b880fd6e34e3e2659e898f8c822641ed2519de0080a22f2b08d459a70aeda919cf19a2d3fad4da531a6b59385886
 AUX 0001-Remove-TestLoadSourceDevice.patch 1425 BLAKE2B d42b5923ea629fce22ef1954df2bb6314bc188e3852b0d1ac1574065e9372d223b70ccad562d9dbe34f420164472b686e87a2b465aff7d50c08ea4f17915b860 SHA512 a319fb63913c6e74436c8cfa20ef468983937478c73f5a2e6c31cd6cb39d2418fcd254a70a52201e0ab27566f68405ade4725b1572bded042b91a8032e7ae283
 AUX fscrypt.pam-config 182 BLAKE2B 891d42be956e64bb0e052af0acc8cb9e4f16664c58e79012529f3c0b19779f7f668b9f2d513f76ca1db1d3ca571d15d74e1fb38fde8d0b1b28395957a99515a4 SHA512 41746f7be43cd238abdeb171534e8c9ed3e21b71e2eeeb126abbb56454da1eb693d1b50a80ccc7fbf25ff2cc108792d294ed3c8977748fdfb6c3285b0498c410
-DIST fscrypt-0.3.0.tar.gz 148000 BLAKE2B c62446bfec0f73cb89be092cadb04d9842ec10d79fff4bd5a3b358b29012c03bba766738f6a0ad61502f3d14781bd36ba1bb0a1fa610570014e5c60bda017c59 SHA512 e0b16359a8883d99b2de4aabc0c810d152ce2d70975a785f7a711ac5d7c1abc1e796ad0f58cb8964e9197415062d216ffb7e19d011859d8f98154150349a2cca
-DIST fscrypt-0.3.1.tar.gz 152055 BLAKE2B 4f3d4c8341fcff055bfe91eaa5d8c1edd02f50e9bb9dacdc42bf707a5367bfe658637135b6e2ff828292ad3fa0054578480313d8ec5ddadf15058fea899520c4 SHA512 3b58638d840f32b998a1bd71b1fc815c966769bd054c55c5a63157b13fd5ebd5b2d36fd8cca709ba14507c2b3c60976be01185d405d52a26e3bb3eb665be5158
+DIST fscrypt-0.3.3.tar.gz 167020 BLAKE2B d271c397782bcb40cbb9d1d87463927080487898b590a83b301d98ba584fe9cb7c651c9b0c6eb905e55de42877f09367ca77593efcaca7c2441909d10190bf86 SHA512 d217212a15111bf036725f02b9530ae3716f3242e451ea5f9c8bd93cba113d9d21d1d970d9d0efaa75eb5f30a135cc6cdf18fceb8eb7d04a57363dabf4ed9fe9
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
@@ -34,9 +32,6 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.zip 1697094 BLAKE2B 72e52dab100cd79a22a5f8adaa1af24cf245d193dcdfbfa10c25b440d23eda9a1e0f3c1f2b9684b5fbc9159055f482ff8eae12732c40d9d4dbcdfbf5ae93ca88 SHA512 a981d025dbb8bc8d3b48cbe7327076531e614f9bb9662f24b5f89997d8f9612d750ac53b9191e7df42dc326a36913b29350acaf7fe2f4bf2f08b986a510e95da
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191127021746-63cb32ae39b2.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191127021746-63cb32ae39b2.zip 1905313 BLAKE2B 9bfae83246cb9f9a61848a556991c3bee3daae05ada33358219a76e1e732e72cbfe9b12153cfce5129645c95c7307904332a035e5a77bdf235ebaa7947a6d171 SHA512 0530022733dd878036652b0ee1de614b31b3c804347c9cb6be3dcdf0e8411dce878c23d9242885750057e4f0bec698222e7afdb8a495b229daf456bca6872b66
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.zip 1529034 BLAKE2B a30815639bc723fe9c7078c1fc5214e43aa946520c8d2d1efdc2cfb88b53c1faf50054f693d4f3b92461a64c07c8dbb845901c87a8deb86650cfcfc0482aae08 SHA512 113ecd43b0aecd6050a3a7319bbb43d351e62d71f01f9b98af7ab15b179fff616ebbb81920447f3b1192a9230c230c95bb20e9172981d4c8b926804ee92af508
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210422114643-f5beecf764ed.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
@@ -51,6 +46,5 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb
-EBUILD fscrypt-0.3.0-r1.ebuild 3448 BLAKE2B 34309372795fb8cbdab6eeece5126f8aa2ee90e7e07f9ed1a12dc957f684972d7e4c9f48626ce464af1f607ec3ef4ef47ca817b3dc1f88c33a8cc656baaea825 SHA512 407195243c6dc96016f8d507a180f923d70dd22db91849e904acc6a4f4e3f8cb81d364765d61ae6abaf70c2dbaa87d641a1cbf48ba983cb0aef9ab786d9a5929
-EBUILD fscrypt-0.3.1.ebuild 3488 BLAKE2B c5a0817fccd321446500974a9f2d3dcc02ecc2a790d7c6747ca5214f19947621566222ea41e3dd4c37ac154abee20d1f8dca449bb489b946c33e29ea7c119b2d SHA512 4a27be0dbe0fe4882cec11bf655fdc9dba77003ad81c25664a8594137bd2e19b42ec1f15af74bb375c22baca66b251ba9db372f205a3906f4b8570a3ab6dc0c3
+EBUILD fscrypt-0.3.3.ebuild 3433 BLAKE2B a7c768c40692af6387b04cf83656b55f09ca930cf8bd827af82bf41feb8bd2aada8ccbe2ab761a579cbec6825df2096951583c556b427a564c4d47723bc87887 SHA512 69c5817e31812a431bf323a51a9688d1dc9cf2a63acfa763e08376391a0302de8b15d055cf5cc376d518b4597667b531ca03b88806e4f01ad1ef31ea4da9d8c5
 MISC metadata.xml 438 BLAKE2B 24bde9b0773e0504dd06bab9abe25283a2cab7679be2eb6fd1c875c13078ff91b472a1ee989c4469fcd0d6ff21761cace021c5997877a3c41d876dcbb26104cc SHA512 1301f1fbfa2115779879b830274c67496269d12163dd36efa592e52500f21996b3f3adfa3c69a215274b5dd132ed7583fc31fdd898b02386973713fb6e60be8e
diff --git a/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch b/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch
deleted file mode 100644
index f1732df62aeb..000000000000
--- a/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e08e9d634ae6fe259ba35139ef0a7bb4b7e60d8 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Sat, 17 Apr 2021 18:19:59 +0200
-Subject: [PATCH] Makefile: Optionally avoid installation of Ubuntu-specific
- PAM config
-
-This allows non Ubuntu distributions to opt out from the installation
-of Ubuntu-specific PAM files.
----
- Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 6e79421356de..307eeedc5153 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,6 +28,7 @@ PAM_NAME := pam_$(NAME)
- # BINDIR: Where to install the fscrypt binary.        Default: $(PREFIX)/bin
- # PAM_MODULE_DIR: Where to install pam_fscrypt.so.    Default: $(PREFIX)/lib/security
- # PAM_CONFIG_DIR: Where to install Ubuntu PAM config. Default: $(PREFIX)/share/pam-configs
-+#   If the empty string, then the Ubuntu PAM config will not be installed.
- #
- # MOUNT: The filesystem where our tests are run.    Default: /mnt/fscrypt_mount
- #   Ex: make test-setup MOUNT=/foo/bar
-@@ -178,9 +179,11 @@ install-pam: $(PAM_MODULE)
- 	install -d $(DESTDIR)$(PAM_MODULE_DIR)
- 	install $(PAM_MODULE) $(DESTDIR)$(PAM_MODULE_DIR)
- 
-+ifdef $(PAM_CONFIG_DIR)
- 	m4 --define=PAM_INSTALL_PATH=$(PAM_INSTALL_PATH) < $(PAM_NAME)/config > $(PAM_CONFIG)
- 	install -d $(DESTDIR)$(PAM_CONFIG_DIR)
- 	install $(PAM_CONFIG) $(DESTDIR)$(PAM_CONFIG_DIR)/$(NAME)
-+endif
- 
- COMPLETION_INSTALL_DIR := $(PREFIX)/share/bash-completion/completions
- 
--- 
-2.30.2
-
diff --git a/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild b/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild
deleted file mode 100644
index d2d6c39c8c14..000000000000
--- a/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module pam
-
-DESCRIPTION="Tool for managing Linux filesystem encryption"
-HOMEPAGE="https://github.com/google/fscrypt"
-
-EGO_SUM=(
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/client9/misspell v0.3.4"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/golang/protobuf v1.2.0"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/pkg/errors v0.8.0"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/urfave/cli v1.20.0"
-	"github.com/urfave/cli v1.20.0/go.mod"
-	"github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad"
-	"github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20191127021746-63cb32ae39b2"
-	"golang.org/x/sys v0.0.0-20191127021746-63cb32ae39b2/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20191025023517-2077df36852e"
-	"golang.org/x/tools v0.0.0-20191025023517-2077df36852e/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"honnef.co/go/tools v0.0.1-2019.2.3"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-)
-go-module_set_globals
-
-SRC_URI="
-	https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-
-# Apache-2.0: fscrypt, google/renameio
-# BSD: golang/protobuf, rogpeppe/go-internal, golang/x/*
-# BSD-2: pkg/errors
-# MIT: BurntSushi/toml, kisielk/gotool, kr/*, urfave/cli, honnef.co/go/tools
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/0001-Remove-TestLoadSourceDevice.patch"
-	"${FILESDIR}/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch"
-)
-
-src_compile() {
-	# Set GO_LINK_FLAGS to the empty string, as fscrypt strips the
-	# binary by default. See bug #783780.
-	emake GO_LINK_FLAGS=""
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		PREFIX="/usr" \
-		PAM_MODULE_DIR="$(getpam_mod_dir)" \
-		PAM_CONFIG_DIR= \
-		install
-	einstalldocs
-
-	newpamd "${FILESDIR}/fscrypt.pam-config" fscrypt
-}
diff --git a/sys-fs/fscrypt/fscrypt-0.3.1.ebuild b/sys-fs/fscrypt/fscrypt-0.3.3.ebuild
index 5fda4eb5eb6e..6a019db69a91 100644
--- a/sys-fs/fscrypt/fscrypt-0.3.1.ebuild
+++ b/sys-fs/fscrypt/fscrypt-0.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit go-module pam
 
@@ -39,7 +39,6 @@ EGO_SUM=(
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index 541603e7c65f..e648de5ad52c 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -1,4 +1,3 @@
-AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
 DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6
 EBUILD fuse-common-3.10.4.ebuild 801 BLAKE2B ac980d00ee89cb0ec2e904d48fcfe09fbb048d51ebf4d9dfe973884f78f6ff910517d5d20f91464a8bda601da21750bf230958b83f14936275118d3ed9a8dd11 SHA512 dd479540f2776b8479afae1965e4141dc1cf83c7db4270fb16dfdb5d5a0e1d74d66a1608087609173e4208619455a64c930acfbf0544d683ec7bb4f3bcda6b3c
diff --git a/sys-fs/fuse-common/files/fuse-fbsd.init b/sys-fs/fuse-common/files/fuse-fbsd.init
deleted file mode 100644
index 27d90cc867f3..000000000000
--- a/sys-fs/fuse-common/files/fuse-fbsd.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting fuse"
-	if ! kldstat -q -m fuse; then
-		kldload fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
-	fi
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping fuse"
-	if kldstat -q -m fuse; then
-		kldunload fuse >/dev/null 2>&1 || eerror $? "Error unloading fuse module"
-	fi
-	eend ${?}
-}
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index 78282948d72e..70adab48a734 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,7 +1,9 @@
 DIST fuse-overlayfs-1.7.1.tar.gz 103575 BLAKE2B 1fc92852f3afdead707af8745db03e2f5b0cf1f154f12c13850e5c37b30a0ad84122aa06c7f96c3825cd89cc2d26874abecb8ffbf0ad4edec5e0ffc854962944 SHA512 2199f9a5040832537b57792fe361943065c6132d31613bb1f838e931049703011902fca3abc25f6d7136efb2eb5505161f11c252b91dfb19158ac663e1ec15c2
 DIST fuse-overlayfs-1.8.1.tar.gz 103753 BLAKE2B 42ac0b75b563cee9457721dfebe03355d930e074f44cda43d071e853df2d2192266f6b2901c4faa333414de45fb1b95e245a42ae15c52714e311a1aad98deeb6 SHA512 7a63f1f129c100615676bccdb0f7fd83c4e9901786064d98fa3776dd64dbb61c38913f8d0eff428a601cb44b1bfd3261ded5ec5e471b889c7cd28f81a859d8ad
+DIST fuse-overlayfs-1.8.2.tar.gz 103892 BLAKE2B 18473c9703d12befbd68b5c1374fd18233dca3663dc0c6346e0a0c2f6f8928a57e8c04cf151196db3d6404ca8816e5ef2826a989c86d3ec7171344a73cec189f SHA512 637fbde0e9481b31491fa7fbdce9315e3832e9de076668dddfeba407a0dd9ceb2072723348eb2a47586756da8a8242a040bc20dbb5e1ac3be3ffa795daf22b95
 DIST fuse-overlayfs-1.8.tar.gz 103726 BLAKE2B 12da116bba60c5833b43d130b24ba6a60fcaabe1248226fa30e8c0b2c2439a438c66b39d28a8d3dd0f65bf353c38811e87f23a2fdbd830982063a7b5df7b4808 SHA512 68a7b6a41fd2c44fbfb194d324cc6869d7f6ce198f7ff3ddf74e91f9679785ffa610634a6e35c2661549e0bb776bf68741be45501d860b1e8dd6814d2b3fb0ab
 EBUILD fuse-overlayfs-1.7.1.ebuild 570 BLAKE2B 5b4ff524cbe5ade3296faf95f7e781900e35f22d8a2a26773a4718d4c5c061378c5909f31909cdbbf641e6d83d01fc15ec880f938831c2c8ae61d5b1e11913c9 SHA512 135662cfd48682fd582f9328dc7a2553cb93241b97b498f75502b06d85fa10eb38614d929199c3cf3f0b0faf466ad81b2fb371344eb80af5f566e14576cbbd58
 EBUILD fuse-overlayfs-1.8.1.ebuild 572 BLAKE2B cb0cc0292bec9b522917a51f7a8e5d4a7f5449e71b39d3d5cd79f99de66150b45d7677b4ff410aae9ff4fde6acbb0a3fc94782a1ab26828d7d54e7baf8a130d6 SHA512 f2a4cf0a47d0075e93722f9ed8e270264e90b8df89264a47805269658e3b3a48d803ced6f27a61661d6cf73e30d5418d561900ade05c5da47656846d0fa9ca81
+EBUILD fuse-overlayfs-1.8.2.ebuild 579 BLAKE2B aa83941836f4b918bf0612e785c3f68af58ee225e8bcaa0f2ddf8ec8fdc0b2d80e0958e5866b680308ce479dbdce039150b7b0e53b3dfb490c888718c000673b SHA512 f18e3d1e8259bc5343cfdab1445ffeb8ee84e3152bb9fd0cd4c97db66a492294abddd4d8da7fc1498c04793b5a7259dca09a9074004269c8043e88f2ccc90dc7
 EBUILD fuse-overlayfs-1.8.ebuild 572 BLAKE2B 914440d5b4371a8a8cd119a9d55cb921b88499d1125b8bb6ceb3828237de51186e57580975d6ab01a2a6deb823a4a552c6f8ed85a50e6f30a648134c9ebea3c1 SHA512 ab3a027788a4fbc926ef42cdfc1e7754ae70129786425646b1109385b888c4f7fc06b334c3f3ba9062cc0efa425670804416d684ec4a397294dd97335f909bc1
 MISC metadata.xml 335 BLAKE2B be5c19676e0ab40869fde84241fc093e7af2ee0eb41844f1a0685bd8b2a828d2899fd130c4b1b40553f2a3e4700cfa2a82e393553cd1022ed4d4b9c10768781f SHA512 31fdf31f0b44eeafc2b32dcbb9b99bee6af7331a7a7f140d4cca92a617933d9be460cafeb65d6dc0096308698eda28e006d31a42a114efe9633d9864d4611b3e
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.8.2.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.8.2.ebuild
new file mode 100644
index 000000000000..ea15a96bde4e
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.8.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="FUSE implementation for overlayfs"
+HOMEPAGE="https://github.com/containers/fuse-overlayfs"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+
+RDEPEND=">=sys-fs/fuse-3:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/go-mtpfs/Manifest b/sys-fs/go-mtpfs/Manifest
index 1c223e421ee0..5e36f80cb99d 100644
--- a/sys-fs/go-mtpfs/Manifest
+++ b/sys-fs/go-mtpfs/Manifest
@@ -1,19 +1,4 @@
-DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv0.0.0-20190726130028-2f298055551b.mod 165 BLAKE2B 3c00585dfae81a1d3f411bc0bd8f24ed6837fbba75b567195ba611cec746bcc3b560fd2dbef2264d80ba6927af0a822d032356f2b5697012fbd41d43faf24041 SHA512 cb39e8ee3d11d09445bfd47e68c819b0aee04a5616967354833b6d5ae08611199050ee86e3165ae22b03bd85fe8d82985a2f19e515d60145fdca12154eb45ce7
-DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv0.0.0-20190726130028-2f298055551b.zip 296527 BLAKE2B 13b839fed2e680244d4cdb7afd78e8a7d79c9a4d167c9bbd09108bc18c74f0c136d1819e6d4eadfe66591c0e81caef4f6c150c92e2358cc35f6ff341e39e91c9 SHA512 012aa7ea118dd1d627869257d4dd2c0ba40108a0704b908a8b1c6737c67fe305b99e0e214653d9f8352e031c84b10b3846f4404b0b0adbbfcfc1c1e05e9d38cd
-DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.mod 94 BLAKE2B 36f3fb449d60fd88b98ab51277603a6c6aa551a1b15fc01ec289506cbb22fca2d7bc2841dd8574c9cdcc5ef14d70aacd5eecd240060b396c76422326f5e5dcea SHA512 a4ec6bdb7df5b5706be0a19144023042cce1fe54d1fe23d2556fcf1c23fadc112f5c4f16d6b497ab0ddf595fb21550543e65ace43a147747d894c220da346ce2
-DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.zip 219180 BLAKE2B 8b80ef3028be429c025c8b75aaae686cac7fcbd0d6b196311dc77c1079a5c8db5b8b2db602282345bb0fd25037669b00796e7a92a40cfc42a79cd299ebe0940d SHA512 b5a5bea977945d4305b3506e5a6f96d1acce91280e103f1c88f3b2c072437d5bbf84b8ef8760ae073106156342356a763ef0db9339b6e2c72002a73f8187ebf6
-DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.1.mod 168 BLAKE2B 0f0c27a9f98a7622d1549ab708bd4fbc12cf7f8e2d5e488a77524d94f105647a4d7125505a45287845e7d557a053462ace845f9244841954b534b31238ce0517 SHA512 3698021f166b89bbe92497f3b278a4683270f6e4887777837bb02f03ca6ece642abcb70bebf5b437bd71a90b0471930654069b83185ba15bac3318b854d0a033
-DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.1.zip 286729 BLAKE2B 3a268b05391216041ae50fab09a3a765b0b811b0f05f625c206d114c0feeec4058509616a1a31fbf03dae862baf5565b0234a3da180667f8b9bd0154995504f3 SHA512 cb0b4e22297d390795dc88323c8d71847760a027c5f168b59861b3bb03de5789bae466511b861c809c16b34c6659e2d7f72b36c768af85b0055ee62a48606061
-DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.2.mod 202 BLAKE2B 4f6833004dcb52b6d482749e2c5fb9b1be9bb40ae7f46beeee6b6eb026d39e6bddb92b9a99b32735ec1e42f3402f322fea96dc6e46a186719bbf908662e48ced SHA512 d2559ce7fd11ed7e5398e960b7c19038ec9cd2f322886c64d4967580d8fbe7b6d3e9da244c29f0cc080a192fd84bb508b75f29597ef4e09621acafb0e592657d
-DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.2.zip 287139 BLAKE2B c67d884c8cbd25a2dccac55dcd3b55fb34b8e07cd517ddd20fac33c5c5c66f466aa44f8b59acc92f39c344cefbe3080596a622925235975aecb3d33bdb5c72d0 SHA512 cd2dcc27bd09fdece5c55ffd946a14e22f3a426a094c8b5e05e3bb5e6e359775304772fa7859f55f2dc1bd0e13d3024a8d3537d1abc00d371f0491bf876bc316
-DIST github.com%2Fhanwen%2Fusb%2F@v%2Fv0.0.0-20141217151552-69aee4530ac7.mod 29 BLAKE2B fa81f7ee7eb868c49bfb7b8c6a527f2c9cf05f28a5322692b916ca755eea0255dcc640963dd002980d09145529a3e56dd6eaa6e714c2268c43b7ae19e17237aa SHA512 73bf0e1253c776a05d7518e4da2c74fc003f3b4a002303d64e1adea08ab157bd161651e647e2415603d5aa400eb12b0bde12ae7786755ea3a3448976f2aac416
-DIST github.com%2Fhanwen%2Fusb%2F@v%2Fv0.0.0-20141217151552-69aee4530ac7.zip 9353 BLAKE2B c00ec955841381512696975ae88f2925d7b81e46b21712e05459a14649130a48cb7ccd8e4daef8094eb3d5d5eb2687c996e7f15a7a678b0d216e37a81229cded SHA512 3ea8f1a5e7b1b03950721a22f89f3c6faa6acac01fca473bfe9b183d9c17fa90dc12cd54ab043534147fc88a3588b6fe2b4e6a994d6148394ee12000f7614d15
-DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod 37 BLAKE2B 0ff43371511295cc3819b33c0dc26e3d9352a4b931ad3dabdf79561e5ee077ddfdaf5a601827246c0b5cd8992d53d47ef74aab0b7deac6d08ef5f60f44a728ff SHA512 60a202487e693d925ec13186a89ca6b7f322cf53b2bb3d8657d50a0fa0561ef9f2d8416901478fa9783b7a44774511486fcc8735b1d15b558f7ce111f53d5a27
-DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
+DIST go-mtpfs-1.0.0-deps.tar.xz 2567480 BLAKE2B a98e0a5c8fb46acfe68ab6263bd75ed53fae6cbab1dc5f72f04efd2c042dfd6c460cc81bd54079178d41f3f157e6be2500fbf2b4c960effff2f83bdd35c322da SHA512 5de2244766b4d67ed1ae4403f5ed4d5600f1f4f5a0b9c95fdf8880eb63e094694c9f02ca6015485b011919ecc9af94ca2f00516ec1b14887291668c2a6eee05d
 DIST go-mtpfs-1.0.0.tar.gz 44589 BLAKE2B 2c5f0c30ae16fb9ded1e2ad405de94cbb7ca598b9c9681dcb2eaf811438c1040b8989afb2102cc97402415accf8e08e76362f697f049b37ae95a718187875154 SHA512 b66d4f3179f95a7137cdc921fc171a260d23c4d003bd680b92791b6aab79484c75dd3a5ec39129d42b52822b95711f98438900033da4aedecc7c6dc5e0f6a834
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.zip 1346335 BLAKE2B e51789de19eef04b939952b15828675a0ed71c7f7639355cc529ea02e9177a2c2a9f1350567fb514d8d7d6641ccc231dff1920d72c98b1e335eb76c636b3eb67 SHA512 fdb5d6f6f46feb491048048cf76ae94af824664e9f424f5c0fa2938b64bc8bd6ec810cd33bd3b34bf1d3e03bca7e8f067fb8487bb45ce791cf56ed002dc63d1c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip 1818872 BLAKE2B f8bb456d6c12b800b7a572f686788454dc81f4f65f61d2f5f7986e936a7dcd4a57417137df2ff16d229adafe2a2daddd9622cb558454648419fbf293857a0382 SHA512 15544b523ad8b302ab9f9fffaf971decb598f3f7789296125523638d5ebb56218312ba2b0d7d43dd8e786ffb761b012d957c8f123dcdcec8c967bb28a544f84d
-EBUILD go-mtpfs-1.0.0.ebuild 1779 BLAKE2B 7c660991b78dd23c070b1cf33ae3bb00d803622c9819e53e3865972deee998b55d0d8130fe2a6f097b0447e8eec56ffb157f14b995a8b1b82241b3d8b23272c3 SHA512 7dfc82558ffe089bae6ebc8976689aad748787df666e54c761c06d10d08c5ab47823653b24472bfa74263a4f7b9b03daa5b82f18197078f494d3792e529d2bde
+EBUILD go-mtpfs-1.0.0.ebuild 899 BLAKE2B de52e18ecfac79e2c35c338d58f36af12df10927904dbb420f95a3824cbe801aa6f4f2b1d9c4b233a048cd0b5955faf413f281987847f4dfd215a36eaea2cd11 SHA512 8090383905343bedac34e6281c9f60a5cadfee6ef3ebe5e159d4da072b8f8b82ea6ba8f59149fc7dd8e93e4620da57b5e6ee40a5f2dfd052bb56954382992b78
 MISC metadata.xml 329 BLAKE2B 76860306d6df4d032c6a7ee38b0bba071830540d15585fca82e90d4449c831c71c986af11d0d696e8d4a0ab5852ff71fbd09c4280d740dd1cdb0c0fe8d6c0e6d SHA512 ca01ec64bbecc5b53a6553224c4989d1655497558f18d699839227e9f581029eb01d7e2451be6e6afb923c423f05994bdfc445b44c67c9e739ebd0be5ebb51f0
diff --git a/sys-fs/go-mtpfs/go-mtpfs-1.0.0.ebuild b/sys-fs/go-mtpfs/go-mtpfs-1.0.0.ebuild
index 3d539c5fa7ff..dd8c0dec16de 100644
--- a/sys-fs/go-mtpfs/go-mtpfs-1.0.0.ebuild
+++ b/sys-fs/go-mtpfs/go-mtpfs-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,28 +7,8 @@ inherit go-module
 
 DESCRIPTION="a simple FUSE filesystem for mounting Android devices as a MTP device"
 HOMEPAGE="https://github.com/hanwen/go-mtpfs"
-
-EGO_SUM=(
-	"github.com/hanwen/go-fuse v0.0.0-20190726130028-2f298055551b"
-	"github.com/hanwen/go-fuse v0.0.0-20190726130028-2f298055551b/go.mod"
-	"github.com/hanwen/go-fuse v1.0.0"
-	"github.com/hanwen/go-fuse v1.0.0/go.mod"
-	"github.com/hanwen/go-fuse/v2 v2.0.1"
-	"github.com/hanwen/go-fuse/v2 v2.0.1/go.mod"
-	"github.com/hanwen/go-fuse/v2 v2.0.2"
-	"github.com/hanwen/go-fuse/v2 v2.0.2/go.mod"
-	"github.com/hanwen/usb v0.0.0-20141217151552-69aee4530ac7"
-	"github.com/hanwen/usb v0.0.0-20141217151552-69aee4530ac7/go.mod"
-	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456"
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://github.com/hanwen/go-mtpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
+SRC_URI="https://github.com/hanwen/go-mtpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -44,13 +24,13 @@ RDEPEND="${COMMON_DEPEND}"
 RESTRICT+=" test"
 
 src_compile() {
-	go build -ldflags '-extldflags=-fno-PIC' . || die
+	ego build -ldflags '-extldflags=-fno-PIC' .
 }
 
 src_test() {
-	go test -ldflags '-extldflags=-fno-PIC' fs || die
-	go test -ldflags '-extldflags=-fno-PIC' usb || die
-	go test -ldflags '-extldflags=-fno-PIC' mtp || die
+	ego test -ldflags '-extldflags=-fno-PIC' fs
+	ego test -ldflags '-extldflags=-fno-PIC' usb
+	ego test -ldflags '-extldflags=-fno-PIC' mtp
 }
 
 src_install() {
diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index e06ad2bbaf7c..22fa67a4a3d8 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,3 +1,3 @@
 DIST libeatmydata-129.tar.gz 358437 BLAKE2B 448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2 SHA512 dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1
-EBUILD libeatmydata-129-r1.ebuild 854 BLAKE2B 930e00459a0b3d9999c52ed112521b091017847e7b53f255e2a3505833f29d3b9aab58db03be88f7eea69053d606ff1c3f3bc35cf51c8eab2cedc620cfa2bd68 SHA512 4489fb2a05892e0554d6674ca69dca708d0a4fe174b38b25622ba8604152dd8ced24b4b3a967af899f8f1567a3758bf8c3f5a53fa5a7e8df6f276ac691204628
+EBUILD libeatmydata-129-r1.ebuild 860 BLAKE2B 2af86348726b6c475bc521f76376e87813aca3ed754c6ac88b180a36319c4c4f8914615ff3d04788e865bbaa176dfcf796c971666fbf2529c0df66792e1da3c5 SHA512 7242b38f1639746603464699383bdad70f90661661f213cf3f78582c54619c2bf5de2e32e858948271b87c1f6a37d0b40dcbd480a3e7ebe24c0a8beb926cbf14
 MISC metadata.xml 429 BLAKE2B 32b42d894377bd2663efb8e6a896d8e60abf7ff80cae78806d3de0e6ccdb3ad3ca2336754b65a3cade50cb15625dcecce894c48475383c289ddbd277bbcb0830 SHA512 c0f488caaaeaf482961d3b84eda772d9a3283b72b58dda5b9704a5754cd4091943a84b6c5324e86ae3f96de1cc8fd087ebdf46912c3a3d07daa9c660573a9d63
diff --git a/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild b/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild
index e35d9419d8ab..24b83a8556c8 100644
--- a/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild
+++ b/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index edeed8cb1765..801b67e22861 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,3 +1,6 @@
+AUX loop-aes-3.7w-build-initrd_explicit-losetup.patch 944 BLAKE2B 1fe676ac40df6a08c2e75769fba02fd627ac3411e1657ece64bcf368111b5e9180c9ee5fc392dc3a0bd58299dbffd18cd49a1ba4738bf798915869594f4749ca SHA512 d4f04cec3c39885464e3254366d1c0959ed778c8f60b4353669061b5fecb03c0bc23ecfb9b8cdfc8d143ff5e386d935183e9bb68942d526822ab4f0ebacd06a4
 DIST loop-AES-v3.7v.tar.bz2 378465 BLAKE2B 01d9c3719242846696c1e199a02a42254c06472abce6cee7ccc3882e456921176f7469e9c61331193dd86ee2fcf0d24972f9012026eadad150a8e6116dd4e275 SHA512 62c0bafd97bc07d78d128ba3bbcf471bf16bd979264ad9180132b83f01a1e8d4f6d9aa874c602a00bc85360abfefe16f72b28b2c73cc2ad863ea2d36eb7bc478
+DIST loop-AES-v3.7w.tar.bz2 379844 BLAKE2B 00877a1711afa0a232f6cf0d568fd667fe891393c4cf4602666c68169c71b4a1308806e37ce48f7e5372d5e2416be2f5f1a680302d6ccc795057ccc1d3716f4b SHA512 882653341edba90a4717624382826296d490cd71d4e8843c9f44f606eda0d30a9e685a5310ed3b996b04ab9095d7be6adccff2a16f1c68a2349c052a69fd0a15
 EBUILD loop-aes-3.7v.ebuild 1528 BLAKE2B 9774785e6db9f11ad9191e3b4b761b05507b6f613de6d347a3a756aa5abc4d63b7db56826b6345bf836ca837fcb8bc4f81fde6555c027772d2434931e32672c0 SHA512 8edae2efb1686106bc3f4a625f9a7e0e5da5034e80019b37be5ea568eefcc289916aa81c919e7d64223efcec5e21172994aa9db557f3b3d2b675102ff443c58a
+EBUILD loop-aes-3.7w.ebuild 1605 BLAKE2B add42c581a6f42a56a52eaab09a57745cc69c97a6e3d5e685faaf9cc48b135819a3030626813bdd7fcda84aef2259bbcc8019859860bd4fa2d834ff18cf82879 SHA512 b52794651103e6383d687dfda5bf7ed890482e54a8eddcb9c92aba49c30eb5732ab866799b2cd4bddf9b36f1005455adaa19f671c6721767bf160f3e6f9f56c8
 MISC metadata.xml 648 BLAKE2B 283db8a905c756bf44779739a188d2555ff87bdf77ff46ef2d0d947661633a45a0b163a1ad3a7bcc00a50e6502e01886178245af2c73d86947adda24c948c37a SHA512 8fa7faf71248ce5dc0c217869a2109ea3275c84de1b5f4b898fe97be5c0c4c91d38405699b41a8e591336993d52d69357becba2b2a7f15369dc5e0508c4788b4
diff --git a/sys-fs/loop-aes/files/loop-aes-3.7w-build-initrd_explicit-losetup.patch b/sys-fs/loop-aes/files/loop-aes-3.7w-build-initrd_explicit-losetup.patch
new file mode 100644
index 000000000000..2cf2976b71fe
--- /dev/null
+++ b/sys-fs/loop-aes/files/loop-aes-3.7w-build-initrd_explicit-losetup.patch
@@ -0,0 +1,28 @@
+--- loop-AES-v3.7v.orig/build-initrd.sh	2012-11-12 09:42:58.000000000 -0700
++++ loop-AES-v3.7v/build-initrd.sh	2022-01-05 18:27:49.410016729 -0700
+@@ -884,7 +884,8 @@
+ 
+     dd if=/dev/zero of=tmp-i-$$ bs=1024 count=${y}
+     /sbin/mkfs -t minix -i 32 tmp-i-$$ ${y}
+-    mount -t minix tmp-i-$$ tmp-d-$$ -o loop=/dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX}
++    losetup /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX} tmp-i-$$
++    mount -t minix /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX} tmp-d-$$
+ fi
+ cd tmp-d-$$
+ 
+@@ -978,6 +979,7 @@
+         if [ ${USEPIVOT} != 2 ] ; then
+             umount tmp-d-$$
+             rmdir tmp-d-$$
++            losetup -d /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX}
+             rm tmp-i-$$
+         else
+             rm -rf tmp-d-$$
+@@ -1002,6 +1004,7 @@
+     cd ..
+     df tmp-d-$$
+     umount tmp-d-$$
++    losetup -d /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX}
+     rmdir tmp-d-$$
+     sync ; sync ; sync
+     gzip -9 tmp-i-$$
diff --git a/sys-fs/loop-aes/loop-aes-3.7w.ebuild b/sys-fs/loop-aes/loop-aes-3.7w.ebuild
new file mode 100644
index 000000000000..5f6b4ed8f398
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.7w.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${PN/aes/AES}-v${PV}"
+
+DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
+HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
+SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
+
+DEPEND="app-crypt/loop-aes-losetup"
+
+PATCHES=( "${FILESDIR}"/loop-aes-3.7w-build-initrd_explicit-losetup.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	CONFIG_CHECK="!BLK_DEV_LOOP"
+	MODULE_NAMES="loop(block::tmp-d-kbuild)"
+	BUILD_TARGETS="all"
+
+	BUILD_PARAMS=" \
+		V=1 \
+		LINUX_SOURCE=\"${KERNEL_DIR}\" \
+		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
+		USE_KBUILD=y MODINST=n RUNDM=n"
+	use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
+	use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
+	use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
+
+	if use extra-ciphers; then
+		MODULE_NAMES="${MODULE_NAMES}
+			loop_blowfish(block::tmp-d-kbuild)
+			loop_serpent(block::tmp-d-kbuild)
+			loop_twofish(block::tmp-d-kbuild)"
+		BUILD_PARAMS+=" EXTRA_CIPHERS=y"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README
+	dodoc ChangeLog
+	dobin loop-aes-keygen
+	doman loop-aes-keygen.1
+
+	into /
+	dosbin build-initrd.sh
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo
+	einfo "For more instructions take a look at examples in README at:"
+	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
+	einfo
+}
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 2f1dfb70896e..32d3d7cf94d8 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -3,5 +3,8 @@ AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061de
 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
 DIST lxcfs-4.0.11.tar.gz 451424 BLAKE2B 8cb1f16ec8f2f5dbcaea9897553c21f2894ce75713c4de7fd9412254ef4e74cef93fbd9c79e259e0caf2426520d9454858bc0f09b652b00305699d52b4240cbf SHA512 60a76b8d3ab8a164ead8424cf2a20cdb616919318881348016299d2b5bff9d221c12b9208b46e6f72a84695632a762292313e0b51579d590ce505cf5b6fec6de
 DIST lxcfs-4.0.11.tar.gz.asc 833 BLAKE2B f70bcf119588c1e667111fe0e820c1bbd53c912027a94b600ce69713eb824f0b495cee4ab0107cf92bd5f10c0a17e9e5e85833f15f7ff570931c9df454f16bf9 SHA512 a9190c5913d0879c0034b1ff1f06b7755f8b78094270d64c89a371b56737e32c2a14681a58643e8ebde9d654ff2c66959ee9a4f6d5f6a6002f52da1362017d9f
+DIST lxcfs-4.0.12.tar.gz 461251 BLAKE2B c0d1cc699461eed2e29ddb1937e8f4719be78a8f17c20b9dd682a617bc0423b22b4491399b934aa7f4be8f5ca292ab4c9e97e7bf149700c0c3760c8b3804ae11 SHA512 da8415599bb08e4e15a7e4044edbcad217e4034d96366d508e06cceb2a75d459e24aeb7efd5716e2f41449ec653ecd9916f0d934f738e1df8e9576738cc1ac18
+DIST lxcfs-4.0.12.tar.gz.asc 833 BLAKE2B af8bf08039e7bc1f405c468de0dd628175cef3ea6087c5fa1c0d95f9153df939a84f9a5d9d895fb471c0262616eb88f03532ac789b0c6198ad1349cff9a6c5de SHA512 20f1919ff216f5459e8e387c78b1430b5122e662adec27bdd9c6fd4565645b73ed5bce5e7e843da05d8cfdc17f1a3e964c20c6ad47d4dbd5df68c3f9359fb362
 EBUILD lxcfs-4.0.11.ebuild 1624 BLAKE2B 4d3f5164a82359a7020632496e8989ab37b0cde46d00fab02789c20b8b41cb0f708f3284c0964e6698afbd97f8afebd2cf6f6a9ce3929b8b5ac9f97191f431f3 SHA512 4771c6fcc86e9b685743e5cb90d09d2d91abfe961082a6582941f6ece1a37c092fb81b6cf36cba2f60051118853e092f8d9345ee521ad3e5003d0a7c171e0a47
+EBUILD lxcfs-4.0.12.ebuild 1625 BLAKE2B 03ba878f828f7dd71e637049b1005ffcd45849e318e361d282d7a2dfe133efe07478c2d020bcda704592ca8998841256134c5b0b351a853280c17887ec7513fa SHA512 83cd2acc2f5c28be34df3954f028db7552b81be72f878c7dcb2e7e9b84da37c944dacd241f2dc31c7d0c28d14aa109ec126c89f31fd2ebd6c15659376c363254
 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab
diff --git a/sys-fs/lxcfs/lxcfs-4.0.12.ebuild b/sys-fs/lxcfs/lxcfs-4.0.12.ebuild
new file mode 100644
index 000000000000..8b6377221315
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-4.0.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd verify-sig
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0 LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="sys-fs/fuse:3"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man
+	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+# Looks like these won't ever work in a container/chroot environment. #764620
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Needed for x86 support, bug #819762
+	# May be able to drop when/if ported to meson, but re-test w/ x86 chroot
+	append-lfs-flags
+
+	# Without the localstatedir the filesystem isn't mounted correctly
+	# Without with-distro ./configure will fail when cross-compiling
+	econf --localstatedir=/var --with-distro=gentoo --disable-static
+}
+
+src_test() {
+	cd tests/ || die
+	emake -j1 tests
+	./main.sh || die "Tests failed"
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
+
+	# Provide our own service file (copy of upstream) due to paths being different from upstream,
+	# #728470
+	systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fs/mergerfs-tools/Manifest b/sys-fs/mergerfs-tools/Manifest
index ac3e124ed5ff..9f51fb51668c 100644
--- a/sys-fs/mergerfs-tools/Manifest
+++ b/sys-fs/mergerfs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST mergerfs-tools-0_p20210502.tar.xz 12876 BLAKE2B 760ae2ebb9017e3bb5508d008bc5726cca4ba1930a7f8ebf752e34ed94d92502c146fe2ab25d88c41d27e3ef94b75497b21e0c62c9e86b0e3872916116c4d67d SHA512 8a3c3e92ecdd1c57b8331a0bebfee11908f1d2361fb35cd906173d2d3fd0ce4195eabfb63aa1edac3c36be254504c25edf87caa0608900f6970551991f7a4a50
-EBUILD mergerfs-tools-0_p20210502-r2.ebuild 572 BLAKE2B 5f723e4708ca18a3b4112ad377791eba68267b489b659a06cce2a31e8f16c7376dd0c9814c3f922903353eef379f3b2fe2e9b2ceba14afe36d1f1c95be43c4b4 SHA512 5b7f4e15964c4c42b3e91a18bc23a64a5359d431898d50022661ce614572f92f4c3a6fab45540d7b333ee39228c5ee200b0f313da2f9eac84ea0636507b278de
+EBUILD mergerfs-tools-0_p20210502-r3.ebuild 575 BLAKE2B 1963c4a23051fd02334fb962e06e7a2b6ea074a6ee07d760f9863e33dbdae57ff2e3f958f7dcf34086737fbaac118b64ef20e28fe9f90f409a94a751cd2a711a SHA512 faee9ad3a7e5b8c807f9c610fa762b27a45d9acde7b2e29976849e21e155b8cb438fb9b61e35bcf5e214ce93366ac7d2765c8276754a69816e4e13e625f302d6
 MISC metadata.xml 341 BLAKE2B d231499cdadc6ccbb88b9bb76a04a7694ee2798954f7b3329d82b719ddcebb4612029f0a9b720a22226ab359ba15bbd243799755e28ac67a48a20e68e8cc2bf3 SHA512 045a57ae6c3a893a4ad7e007b5165ca864a89dae776b67e17c76dad6f3d8ebfe72d616ea990ef1c0ab64555c2e49d5ecfaf393d7d88a353ce3a1e73448b1ddb9
diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
index 6b237738979a..b7a3da26a2f9 100644
--- a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild
+++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit python-any-r1
+inherit python-single-r1
 
 DESCRIPTION="Optional tools to help manage data in a mergerfs pool"
 HOMEPAGE="https://github.com/trapexit/mergerfs-tools"
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index d0a295434648..66c48cf322f4 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,5 +1,3 @@
-DIST mtd-utils-2.1.3.tar.gz 383897 BLAKE2B 75aa73440101bb4bfc753b7e0b8371c141ea6b648aa3928c5c121f4976e01c37770d09da3683376891a9899d46c6ccbb7685b32c70f925e63916c552ae720037 SHA512 68efffda2077e14560b9c0b0e40ce8567aee21096c2a3e19bfb6febc3bc11d56c4ac5682728f08b6d215754e7cb39f956a3ced1f6bde3142f0d6ea8492b9bfda
 DIST mtd-utils-2.1.4.tar.bz2 630365 BLAKE2B 0538ecb90cd1215662cc8493d07e743e067218c1ae1ce09f40343a1ab13f5318d5e198d622a0d69acb2d677cdd3415880689c42afa41877730ff6a546c2b318f SHA512 4010a7b25cf32df2de02b8efbbe91c49789e3963618df7461e4bf64a8c588440c55f17c750a7d2df34367a732b0fefc487ee052129a5aa6a44a0023b714dface
-EBUILD mtd-utils-2.1.3.ebuild 934 BLAKE2B 535592a203700a669035cdb5e1f438d4cffa47c85cd390f734c4376a996f2e34fe04ad2cec6fb907dc395f8eff0c76c5b65af8ccf5d7636172379bade6917c52 SHA512 edde2b395a65eaa70acde895316ab0ea24d0f18c0f2ea2af6c248038c029e374c01a44dced887698c93e729a3c46bde9e5c8a2c734cc23ad2d88ff19f221dc06
-EBUILD mtd-utils-2.1.4.ebuild 908 BLAKE2B 4580eaa278a58eccd89e09632375a43bffcc259c61da162ee29ea665ee76891a8302a095ae9f066e2846f886baad428539ed951f5957bed3cac456308708d581 SHA512 ed0b712b336bc3cfea716c85b08e751e30ba1ce241fa967d7bdf79b1b50cf26a83be1fe5c1530ba578587e8421b7deb53cb7dfe6c2efca82537e868611e123a2
+EBUILD mtd-utils-2.1.4.ebuild 902 BLAKE2B fafe00e40c455f268dba717eacb8163a2313fe197908a76ceb69c4cc7a21087c820e188cea550ab06533888d78506153799067bfb3cf5d46e38684102f7d21f2 SHA512 332e96fba618f1064ff242da582666d53f2ce68d29e4dd324755367ff1d38a9a28ec0a4f0bbddff96ac8a0f73895276e6f7a7aabe2a6bb435d10d0e59b8ca4c4
 MISC metadata.xml 589 BLAKE2B 4991d24ee29697e60dd1672008647d8b7ef2f6cf60a64ccf3b1174eecdaf842b81783ecd9995a7b050f98b744546550074b6c2ea509e45f3f42106badbc3deeb SHA512 a3a46acfa94eb80e4220d2e143a929f4a02e1d6708378a4e429b7de4e82bfe1d04aee5868c889c98354b566b58f0512d50f36357f16fa6997afffd0c2177b696
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild
deleted file mode 100644
index 2dc1f42896e1..000000000000
--- a/sys-fs/mtd-utils/mtd-utils-2.1.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
-SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="+lzo xattr +zstd"
-
-DEPEND="
-	sys-apps/util-linux
-	sys-libs/zlib
-	lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/acl )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/libtool"
-
-DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with lzo) \
-		$(use_with xattr) \
-		$(use_with zstd)
-}
-
-src_install() {
-	default
-	doman \
-		jffsX-utils/mkfs.jffs2.1 \
-		ubi-utils/ubinize.8
-}
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.4.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.4.ebuild
index 1edb27beec20..02bb5cdb71a0 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.4.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+lzo xattr +zstd"
 
 DEPEND="
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 14f32fd671ed..d062db1e7068 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,7 +1,8 @@
+AUX mtools-4.0.38-strtoi-definition.patch 3484 BLAKE2B 85ef88843620e9d467382ad5323eb9f4f02fd1dd9c766ac451454c0bae24a0f490b62d17b3cf6c0fe7e67d85f148e8304e979d66a2cd09827fee7a2aa2c0b2c2 SHA512 ee56002b7beda7adeb59fee7a9f98400e78abebc6d15d2c70ddc5b99c3efa6dec3c0f12f08c0941ea7befa11532062bcf014b7189e1e5cb1d191de49b722bace
 DIST mtools-4.0.35.tar.bz2 455988 BLAKE2B 9c1ac7f3ad3f9f13a572d0e1ea3c3a9d79bd08f0ae963c7357a19a687b74536cd8442eb167a9e50f7d22398c56736753b0d98bccdaa4c7d8427d1c09e1dd786c SHA512 ef563b3319285667993c82d819e08cb819a6bcd71c466fc252568996b4218cfb3731107ffcd6150ba33c0837e012e02057def41e2b011f751eaf550bfa366a10
-DIST mtools-4.0.36.tar.bz2 445920 BLAKE2B 753ee3e412452572b36d15805982255f28bc277764ce66a0fe8483e19a3488fbb282b873a6be85e87e82a71bf7fda517e1234e1911f0b7c3f3992e25f8d18322 SHA512 2425ee0e39c06ea201a5303ab09a0aa9f0c59341522e2c15abc4f079320fd3d67d28afeb2870ee508d472bba6904c542e11c02b92652c8eda1bf338bab372d07
 DIST mtools-4.0.37.tar.bz2 441076 BLAKE2B a84ff9e532a1896706589dfe7e62b1e400baf0ab9b86cc3d4a09bd4a0a24d1e86f504b9005c98765f62d735d227d0a1d5ab78354c587c88e2d42a4146d127dc1 SHA512 5ff4da9050dd5d5c0929dd9977866086085bd8fef577f3c6ce2ed6fb958eec2304db612c0766e6be1a048819e29f62023cb0f0a9464a84ed7cc21de9561fadce
+DIST mtools-4.0.38.tar.bz2 440491 BLAKE2B 4d486b9bcbf31c9056ed6460d3d7ccb160f2d3d68e2b9a87590821251513a299ab321df825821722c41e13f608250eecad52e828c901ab956e471cd56871a50c SHA512 045e7dba159699c53abefd69e2065c116e2e360e7ec537df1e4d38309fb03587c600bb930363ecffef48cef1c8c118146691cf9a35c36abbb40e4546e532ce4a
 EBUILD mtools-4.0.35.ebuild 1039 BLAKE2B 589196fa40f2b431f37fd57202bcafeff5b9983c39ea7af707657909105e7a45976628db2ff42be2f8636902b6cc20e4d59399063a02eeba7637a25cbbef4e88 SHA512 24d053a6446ab3d1752fd9fd07bc378f0f7e69a596b088a5a690dcb065aaf146e895223ef9141beaa5c3461382ebb94025cb5aa9e653c5da9d9643250d247a05
-EBUILD mtools-4.0.36.ebuild 1046 BLAKE2B 56ef115a96cff7dae2e40d5e5d32b0c175052bd0bb3bb87b136bb47ffd85d965d65ee0f17a21e51ed558eeea073028784b55c3ef21c980a5575d93ac05703840 SHA512 860c7b5189e8794ef1c59096120c387404a5248fed1f304aa6de7c0daf2d4b45ccf9d74734f0881f513f00c023573bcfd45afe90b280695e13309ce54537afe9
-EBUILD mtools-4.0.37.ebuild 1067 BLAKE2B 0c2c5c80d4d80912a06a834a29251f154c22a95d0306f4bbbc6b97dde3512c02ece7af64c375e236231426bd6ef74e35fd69ff7c63389a62d7ff43607026392a SHA512 638fe9b332a90679c36d561e1e831b4aefd21d7f804342dd0ce614cc968600f85605926db5e9b7c52f887769d8f2736bb2a7b0ee9df0293dc486e2f127622a35
+EBUILD mtools-4.0.37.ebuild 1060 BLAKE2B caeed9304847d8a1d33982f3a406a9e089885df0b726ec0b87059e691548126f2aceabf518d6819c7c7ed56fe654f7b8ebd39b4962bcfadcc900afda233a9b3f SHA512 06ad2c7dd3ad0de7758a96e20fca19987f96e1d1dab02bcda2654d0a429c4f48614eaa911167fa3ee2c8fbcac8d66f0f822a0bc18b9177c1704573c64a299558
+EBUILD mtools-4.0.38.ebuild 1216 BLAKE2B 0d5355381636bfebb11efb427ec1c5c24af74096e84e8da78d8b2bb1ca2c0b8d4fd4947ec3ab7ec9d08eab53975d87cfa7f41f567d2a6aa1f0080e292bdfdd99 SHA512 0a930e771a7a5a3bf7835369293eebaa67e639f6bfeca309793ff3227ae3e781886e370f9f744a4fbce8231a898e25a4ffc059c80ca07dc95b4f7148ceccb909
 MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316
diff --git a/sys-fs/mtools/files/mtools-4.0.38-strtoi-definition.patch b/sys-fs/mtools/files/mtools-4.0.38-strtoi-definition.patch
new file mode 100644
index 000000000000..637e9193f43f
--- /dev/null
+++ b/sys-fs/mtools/files/mtools-4.0.38-strtoi-definition.patch
@@ -0,0 +1,94 @@
+https://lists.gnu.org/archive/html/info-mtools/2022-03/msg00001.html
+
+From d36dea2ea7f246f28719dcb01b7a8ad7ad8ed1f6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Mar 2022 02:36:03 +0000
+Subject: [PATCH] Use own definition of strtoi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Before this change, build resulted in implicit function declarations like:
+```
+* config.c:269:57: warning: implicit declaration of function ‘strtoi’; did you mean ‘strtoui’? [-Wimplicit-function-declaration]
+* floppyd_io.c:473:20: warning: implicit declaration of function ‘strtoi’; did you mean ‘strtoui’? [-Wimplicit-function-declaration]
+```
+
+The include(s) for inttypes.h are guarded by HAVE_INTTYPES_H
+(normal autoconf pattern) but we're not checking for inttypes.h
+in configure. But adding this doesn't solve the issue.
+
+If libbsd is installed, configure discovers the strtoi
+provided by libbsd  although the included version may still
+end up being glibc's as the include path doesn't change
+(glibc has its own which doesn't feature strtoi).
+
+If trying to use libbsd's, we end up with a build failure:
+```
+config.c: In function ‘get_env_conf’:
+config.c:269:57: error: too few arguments to function ‘strtoi’
+  269 |                 * ((int *)global_switches[i].address) = strtoi(s,0,0);
+      |                                                         ^~~~~~
+In file included from sysincludes.h:174,
+                 from config.c:18:
+/usr/include/bsd/inttypes.h:43:10: note: declared here
+   43 | intmax_t strtoi(const char *__restrict nptr, char **__restrict endptr,
+      |          ^~~~~~
+```
+
+So, it seems best to just always use our own definition of strtoi,
+given our definition doesn't match libbsd's anyway. This avoids
+the build failure as well as the implicit declaration warnings.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.in  | 2 +-
+ mtools.h      | 2 --
+ sysincludes.h | 4 ----
+ 3 files changed, 1 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 72cf205..eb1c754 100644
+--- a/configure.in
++++ b/configure.in
+@@ -218,7 +218,7 @@ dnl Checks for library functions.
+ AC_TYPE_SIGNAL
+ AC_CHECK_FUNCS(strerror random srandom strchr strrchr lockf flock \
+ strcasecmp strncasecmp strnlen atexit on_exit getpass memmove \
+-strdup strndup strcspn strspn strtoul strtol strtoll strtoi strtoui \
++strdup strndup strcspn strspn strtoul strtol strtoll strtoui \
+ memcpy strpbrk memset setenv seteuid setresuid setpgrp \
+ tcsetattr tcflush basename fchdir media_oldaliases  \
+ snprintf setlocale toupper_l strncasecmp_l \
+diff --git a/mtools.h b/mtools.h
+index b3fd3c8..190ddf8 100644
+--- a/mtools.h
++++ b/mtools.h
+@@ -188,9 +188,7 @@ off_t str_to_offset(char *str);
+ uint32_t parseSize(char *sizeStr);
+ unsigned int strtoui(const char *nptr, char **endptr, int base);
+ unsigned int atoui(const char *nptr);
+-#ifndef HAVE_STRTOI
+ int strtoi(const char *nptr, char **endptr, int base);
+-#endif
+ unsigned long atoul(const char *nptr);
+ uint8_t strtou8(const char *nptr, char **endptr, int base);
+ uint8_t atou8(const char *str);
+diff --git a/sysincludes.h b/sysincludes.h
+index 6dccded..0c17fb5 100644
+--- a/sysincludes.h
++++ b/sysincludes.h
+@@ -169,10 +169,6 @@ typedef unsigned char _Bool;
+ # define __bool_true_false_are_defined 1
+ #endif
+ 
+-#ifdef HAVE_INTTYPES_H
+-# include <inttypes.h>
+-#endif
+-
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+-- 
+2.35.1
+
diff --git a/sys-fs/mtools/mtools-4.0.37.ebuild b/sys-fs/mtools/mtools-4.0.37.ebuild
index dfa7a6a4f20f..1b4c09b1ccb3 100644
--- a/sys-fs/mtools/mtools-4.0.37.ebuild
+++ b/sys-fs/mtools/mtools-4.0.37.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"
 
 RDEPEND="!elibc_glibc? ( virtual/libiconv )
diff --git a/sys-fs/mtools/mtools-4.0.36.ebuild b/sys-fs/mtools/mtools-4.0.38.ebuild
index 52f5d5207032..18ce60a45f39 100644
--- a/sys-fs/mtools/mtools-4.0.36.ebuild
+++ b/sys-fs/mtools/mtools-4.0.38.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
+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"
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="X"
 
-RDEPEND="
-	!elibc_glibc? ( virtual/libiconv )
+RDEPEND="!elibc_glibc? ( virtual/libiconv )
 	X? (
 		x11-libs/libICE
 		x11-libs/libXau
@@ -25,12 +24,28 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.38-strtoi-definition.patch
+)
+
+src_prepare() {
+	default
+
+	# Only needed for strtoi patch
+	eautoreconf
+}
+
 src_configure() {
-	use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
+	if ! use elibc_glibc && ! use elibc_musl ; then
+		# bug #447688
+		append-libs "-liconv"
+	fi
+
 	local myeconfargs=(
 		--sysconfdir="${EPREFIX}"/etc/mtools
 		$(use_with X x)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -41,6 +56,6 @@ src_install() {
 	insinto /etc/mtools
 	doins mtools.conf
 
-	# default is fine
+	# Default is fine
 	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
 }
diff --git a/sys-fs/nilfs-utils/Manifest b/sys-fs/nilfs-utils/Manifest
index 0c6ddf503128..2a7950971026 100644
--- a/sys-fs/nilfs-utils/Manifest
+++ b/sys-fs/nilfs-utils/Manifest
@@ -1,5 +1,5 @@
 DIST nilfs-utils-2.2.2.tar.bz2 424097 BLAKE2B d38b40e9b70a17bc957a89f5d1551bcc0eaaf396ac5126d47dc2dd0a9e311033beb1164a916fb369b51794d38cb63793ede7917be2d76b8df02a32de11b0a4fc SHA512 2ac0f1f25472d8900732db9f31e6b824e7e591bf306aa18d8b55c5d93807f4f7ceb65ba7e49540a39c7f285ad63c5f4ab795d34b2a04398d91cd2beb5fc6edce
 DIST nilfs-utils-2.2.8.tar.bz2 440550 BLAKE2B 05cce6b639856df6d5748bc4045500d801260c46cedff31aa571c743eb7e2c8f3d6101faf9bc90b231425fbae349671f6603d902a3240f1f06ef7fd7fedbe2c6 SHA512 3232390581f63de5ebe7b461b178a40dfbdaa4bc6aa96b218ea8182c5bf81b162a1e632a1c21d9f1e89fdba9393b4e268e001c335a99ce22f645a62ae3154783
 EBUILD nilfs-utils-2.2.2-r1.ebuild 739 BLAKE2B 9877d1958e6e4d6ce7e11c8f3390852e831eca135d816b24cf236768f86af85c00064d4421d93cd21536b6ffa02532ef389fa06b58fc2fa0a12bce68df195ee1 SHA512 dcac252a7cc4662de83a1083ea29a4a684758d06eaa086c64e90410d368f8401cc013ac23753ccef9a4da87bf2e3b5aad316d23d132999d22dba468424da79ff
-EBUILD nilfs-utils-2.2.8.ebuild 1066 BLAKE2B 3656a6347c4cf67a03a15e7585b8ff54b8743f9ae01a92dc26ad0e269186dcb6a8bde16a0a9dddc3c96dfd116b7837c6852be9a33be53edca11e3545d0f69b2b SHA512 b698a31707d464b6a85359fe2033878cc56e98d9e77101973168bac6acb4bd1f009fde23475b5d4f3c396883aaaf78729845e2cc5183b4cc09279fd6f75ce2f5
+EBUILD nilfs-utils-2.2.8.ebuild 1065 BLAKE2B c452503d3dcdd0484a69647ac40423521d39e6f3ccc01225082b15086fec111f6ce91dcfc85e11421f241a06b809144159b92d585acee844727bf1cbdde07b50 SHA512 c1b9c633b525ea1d2bbc784b45b4a7e207ab86c169697e47f89dbd3d6f4716936a0b3c295503a87b4f358fe1522ea916b7526bf105b10d2c68e80e5831ee279d
 MISC metadata.xml 1180 BLAKE2B 949e69e4b635c9124d4f0ab9c46959ff212e72c11ad64af13924c072e033ecf56cef427a29d31680d0acf4a8de5d6e51e584b11e17922267205da11268dcbf49 SHA512 eeed1a4d4a05f652849b4d5683ddab0eccaab9a05b2236f079e76a2c9c5937ebc7defdbe2328430b3ff60019bd44f2008ed41b26db64eb8ca78bc8b39375b199
diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.2.8.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.2.8.ebuild
index 32eda7e330b0..462f3c47f4bf 100644
--- a/sys-fs/nilfs-utils/nilfs-utils-2.2.8.ebuild
+++ b/sys-fs/nilfs-utils/nilfs-utils-2.2.8.ebuild
@@ -43,6 +43,5 @@ src_install() {
 		find "${ED}" -name '*.a' -delete || die
 	fi
 
-
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index fab1fb8800ae..df63a46a0b8b 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,4 +1,4 @@
 DIST ntfs-3g_ntfsprogs-2021.8.22.tgz 1317499 BLAKE2B 403036c68a37ba83873b5faadbb2088deb25e0ff31deb1958d4f869a198d830caa44edea879492a7894f5e7a5ad6205a6fda57bf8de722ce49bf3187239ad993 SHA512 e0544df78a6c352999e1206d7b5d71c56e39396b7a0936a261d728c2ac9d61c6b95ef297f8529ac2a5146f31c1c9e43066d3e281064d4f5d781a04eba51f536d
-EBUILD ntfs3g-2021.8.22-r3.ebuild 2044 BLAKE2B d16a408891fdb5b368df38e338ff6f08822db2cb817f12c33ccb24c818fb8b71b2cba38cc70d1a6c8cba25cfb747d11bebcd682cdb7809b07048d20fb3dcbc19 SHA512 58dec845c63767f2b76df43963ffa4dc02f771792cbc8d2bb83da5a31ffad382de72f412a3d2690fb77447ef9c9d256a3f7aaf542aadd2ebf674a34e7494f5e5
+EBUILD ntfs3g-2021.8.22-r3.ebuild 2037 BLAKE2B 9f22dab696e83d70b4c3a599763c1c4cc8e8f8492577b5d5210fa969e69b60cf28afd9a5d09f1bec6d101ce95589472da640c4792a9ad827ac3d2a89bba1a224 SHA512 fa12216ba8e5ca0134b93856ec29e36b3e75b643f7566a9aadeac5af90626ccc733f618b6ddf7e2991d875faa1fa81572d32d85d456c0a732037a679791260e1
 EBUILD ntfs3g-2021.8.22.ebuild 2078 BLAKE2B 236f32ff2a280c8c42d84cb66b5a9aea465e0d9ef4095991406d40edd59a98b396598698318098762be665bb62c4c917abac68015a01a2183b28066acb24c25d SHA512 7bf7851726792dcadf394cb7278723a4a9a59f425c362bde4a2128e60e0c5677a286a4c02596c15f05b29830074891166b774a58f4c9c566c6272da29b04c1ae
 MISC metadata.xml 1164 BLAKE2B 276dcf2d0cccad4b91a84390949ff8a81b76e54c22d7bfbe4b778c97917224f3d0603079fb74e4b3ff0e058580f4ac6540aef3bae4fdc6ae9b2fb54b831e22ea SHA512 63391014c4dc8ba722c8f90d6fe1952b5f4386d44b1bb2af195e907e5027ede0f4063e4390679b6b521b892fcc12194914b4f40a09c6bc08a300a90bdd250390
diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild
index 28102ca67d43..8e3bee187cef 100644
--- a/sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2021.8.22-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2006-2021 Gentoo Authors
+# Copyright 2006-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/89"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug +fuse +mount-ntfs ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="
diff --git a/sys-fs/shake/Manifest b/sys-fs/shake/Manifest
index 59517e9fea97..308e56ef1ffe 100644
--- a/sys-fs/shake/Manifest
+++ b/sys-fs/shake/Manifest
@@ -1,4 +1,4 @@
 AUX shake-0.999-uclibc.patch 1180 BLAKE2B 158d92a4320e3db600f85b7fdcaef1b2c6a72693ee2c7925aa743773cbaeff9dfe5252aa03a481c7bba1e144368bdb122a99cf6937358d344e788480e5221439 SHA512 f37a4fbcc1ae932c0c8c9af090cb93481f3c6eb3de1994cc1585903e3ddaccf4c1c8a4e121b720119378fdd0f1d74235f197ba1a5c984aa416107bec6eb39a1e
 DIST shake-1.0.tar.gz 42885 BLAKE2B 999a4846a47a124c9f66f674e54ee1c89039b9598b7a3d0c5b5690abe5b90bcec5248e8f516f10681543bdba666ef4129172e4d05759b997016ca1071e33e4b0 SHA512 f73601ebf37ac934b2cfb5bcedd530e38bd6873615e80eae01c690bf935ed3924abb1d06fb31c46397b5804d47a36584ac5e11b4c7142b46e570ddbf3abe1775
-EBUILD shake-1.0.ebuild 510 BLAKE2B d5c218f2ea12af75d041f1b8a68e49a4169c53d53baf603dbdd624cf01fd922ef296bb3e31b5af57799c6a1b273bed94aa76df3ce3ae9bb318334d4a8efc8878 SHA512 7906f51d4c204f61fd80ed25d9c363a00eab90680ed7c66c177779d0e9c7bf37062b6d95c4efbcc8f9d01c8959e9a4b08303a3b6c47a3fe4b0b705efc4d4273d
+EBUILD shake-1.0.ebuild 504 BLAKE2B 04cc886b0ac47ff2aab89a76fc2470c2458c7f8c20f63e752e77c0e1124bf0b9698383ff4aecc0b37439fa5a7efcb95029cb53632ea357c50da54e16878293ed SHA512 f783fc6ed8f1149e6295d5cfe80361f3a3862970ba432e4d33946037fe7054fb558d2e4c9e35a431a78c6ba22bb3bbea8ae53c67da487815462dc9362f742e55
 MISC metadata.xml 453 BLAKE2B d5792c88cc4deef916358220332ac0cc81653ea1aaab8e214151936dd300a9046aaccca8e990cd374a741ef65360a27a978f711b91475b7839134bbd4c48dae9 SHA512 6a2f14d191a5516f39c2a85518c161ae3cea1531ef3676c4403e677b97e1e0f89b59d5ab2f67948012f30773ec89b266fe9d44d0e096e60d75fd5de19ada17fc
diff --git a/sys-fs/shake/shake-1.0.ebuild b/sys-fs/shake/shake-1.0.ebuild
index 2bf5d2e50ef8..a5e29e329ce2 100644
--- a/sys-fs/shake/shake-1.0.ebuild
+++ b/sys-fs/shake/shake-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Defragmenter that runs in userspace while the system is used"
 HOMEPAGE="http://vleu.net/shake/"
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 530c51086905..bf139c3d1d13 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,5 @@
+DIST squashfs-tools-4.5.1.tar.gz 270112 BLAKE2B cbd35daf582d284b021911bb754ed548763f2773e1bc02516ca18bab7034e352780c11eb7dfed1f047b70974dcfb716bb1a1d3729e5b25662203cfbf93553b73 SHA512 b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896
 DIST squashfs-tools-4.5_p20210914.tar.gz 252104 BLAKE2B f3e2e281c30464b3c2e9b2a3520979f90ccb83665ac61a2f68513b402d8ef658621fc75c782c2f42da20ddf51f884e2ccc6217df941790fd45b41f3f4e3ec970 SHA512 a814092be787bbcbd4115f87493a63b67caa364ad88fe5a3c82808083343cbcbc22b4617bd5c72d65d8abe2b11eb77853bcc55c11f5cd5dc3edf24bd27cbd135
+EBUILD squashfs-tools-4.5.1.ebuild 1270 BLAKE2B ce5e6b149260a4bd9a75cc03b247c003315694b1be767e39d390bc1b747f67b143c968f5ec4709f765e72c2f27a98b91c350964a91ddb6d73555e9181e851966 SHA512 ff3e7a7949e0566c64a8aa57e6e7850488e8a4dc387c8193ba9f6fe66a117a08765f3dfc0348f27f8919c65fb60f5e1ad75464e587ea9a22aa53cf2a27680c88
 EBUILD squashfs-tools-4.5_p20210914.ebuild 1501 BLAKE2B e909ffbb86ef8a7dc103f6436a101e31c70d2a1fedca07c697bff192ecba3e42afe9b51272ad9dad9722b78392da1d06a9834240f9747a830abb23dd0962a6ea SHA512 e301da8e5ec3201f27a5847dd876aca3d594390de2b849827260c50435c12b4b34f57f5a7b5c5e1f03815d7184ed689f279db5940a9ad65a99baa6b53e9dd328
 MISC metadata.xml 326 BLAKE2B b34f627cbc911d0e31c84e29ab196767d6618ae95909466efe663abdc54f76325b24e1d6a95ff5e7fa9d33f19b848dec1bfa95dc1b5f0b260839cf7337ce2c0f SHA512 354a34decfc9aa79c434275283e805423f2bcbbcb788e09236cd7b4e67a7bfbbc413e3874a45fe618f0e601036372e94c5965665483566cb651edea0728d5117
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild
new file mode 100644
index 000000000000..27d1c3f642c7
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="tools to create and extract Squashfs filesystems"
+HOMEPAGE="https://github.com/plougher/squashfs-tools/"
+SRC_URI="
+	https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug lz4 lzma lzo xattr zstd"
+
+RDEPEND="
+	sys-libs/zlib
+	lz4? ( app-arch/lz4 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )
+	zstd? ( app-arch/zstd )
+"
+DEPEND=${RDEPEND}
+
+use10() { usex "${1}" 1 0; }
+
+src_configure() {
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		LZMA_XZ_SUPPORT=$(use10 lzma)
+		LZO_SUPPORT=$(use10 lzo)
+		LZ4_SUPPORT=$(use10 lz4)
+		XATTR_SUPPORT=$(use10 xattr)
+		XZ_SUPPORT=$(use10 lzma)
+		ZSTD_SUPPORT=$(use10 zstd)
+	)
+
+	tc-export CC
+	use debug && append-cppflags -DSQUASHFS_TRACE
+}
+
+src_compile() {
+	emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools
+}
+
+src_install() {
+	dobin squashfs-tools/{mksquashfs,unsquashfs}
+	dodoc ACKNOWLEDGEMENTS CHANGES README*
+	dodoc -r RELEASE-READMEs
+}
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 9ea62357430f..96e460995479 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,3 +1,7 @@
 DIST udiskie-2.4.0.tar.gz 94008 BLAKE2B 23c062aa79cb2ffd6377f8cdf3eea1c8398b56743054c701e878dd6070bd1ee14e3f1aab9a791d4b6d44b1ddab68cc69f92eb3dd711c9598d3d770d90a43e7d7 SHA512 3f2d3d37996442b21d8c167929eb2e6f2fcb864b313334954407b03d913c83671dd25960226bafc68e463ab0ea38cfb6947467dd8bf51bbee7f072e4bdf19d7a
+DIST udiskie-2.4.1.tar.gz 94974 BLAKE2B f7aefecce230eb085ace5dd493ef2c24f7962138c6cae593887b7b62fc19360304442caa6454381321b287772eb517566ed4006bd4cace0f04a13bc060e31423 SHA512 0820ec5a04ede2076ac25110057bcee1bf8f69a9e7161017f23e108701b2d135c1bd62496c70727c462561612916d1eafb6cf69d1d77b8d5e0f4af3eab445eef
+DIST udiskie-2.4.2.tar.gz 95178 BLAKE2B eec6f4d2aed9ad86400ee8f3924a8b748cbb1e7ccc1aa2b681858065c18d172def5cc32763a7c2af0899fd719b53bf08d6fddbeb2611cfa74d5b968da0a756b9 SHA512 0881872c614f73b034835f6157eae7f944b6f4ea08a5dabaeb1e6a476a620720dfe950e538a03a3cbdd2a54e95f64a5349650decd554930d02086fdac2e45f23
 EBUILD udiskie-2.4.0.ebuild 1049 BLAKE2B 16668aebb7fc9cd178378220cce7db126b949931eda24c4654264a2aa00eb9245186f50278b20a8dbbaad8dbe5e80bf5987dfb0c221db043912af4c8db59a9a6 SHA512 6041ab9ec91a0a05513ec6e9fa3520c80d1c714ed0e8e636b065899ecfb4b45762539120ddf478ffa2506ad0b021394b1d6bf7644965cb999a34bb652cf5534f
+EBUILD udiskie-2.4.1.ebuild 1051 BLAKE2B 4ec41e92d8eda0e845c6147ef5eae83245520cc4748e66e891f00d1a6e9a12b9569080506d81251b2f61526a389e82dfaa11ead785a38011b1b6576311c5c18e SHA512 f28de0331e28589944dee3a2bd7ada8f5f93733cad13c4cfe101f92f752b9b85503da09c6255d71c6f03008f1625367692d759d6c27edc663306321d379c9629
+EBUILD udiskie-2.4.2.ebuild 1051 BLAKE2B 4ec41e92d8eda0e845c6147ef5eae83245520cc4748e66e891f00d1a6e9a12b9569080506d81251b2f61526a389e82dfaa11ead785a38011b1b6576311c5c18e SHA512 f28de0331e28589944dee3a2bd7ada8f5f93733cad13c4cfe101f92f752b9b85503da09c6255d71c6f03008f1625367692d759d6c27edc663306321d379c9629
 MISC metadata.xml 370 BLAKE2B d5b749c5ab2cf4ddd7c4df39045f109acaba44b50e8babeae6e3ad31e730a52e52bdce7922780a1f358e1a9e1f11d32882eef0f2ceb20ef04011301b7fd3ff83 SHA512 9fd25405737377b4fe0a38672bb3ec871d6d099dcd8b7cfb0bac631a7407133f5974b4d43751dcc186e48dc27997388da30350608139166351a390bc8d02de39
diff --git a/sys-fs/udiskie/udiskie-2.4.1.ebuild b/sys-fs/udiskie/udiskie-2.4.1.ebuild
new file mode 100644
index 000000000000..43fe883fb3af
--- /dev/null
+++ b/sys-fs/udiskie/udiskie-2.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="An automatic disk mounting service using udisks"
+HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	sys-fs/udisks:2"
+DEPEND="app-text/asciidoc
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/python-keyutils[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
+	default
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C doc
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/${PN}.8
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-fs/udiskie/udiskie-2.4.2.ebuild b/sys-fs/udiskie/udiskie-2.4.2.ebuild
new file mode 100644
index 000000000000..43fe883fb3af
--- /dev/null
+++ b/sys-fs/udiskie/udiskie-2.4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="An automatic disk mounting service using udisks"
+HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	sys-fs/udisks:2"
+DEPEND="app-text/asciidoc
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/python-keyutils[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
+	default
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C doc
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/${PN}.8
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index dd684a2afc7e..61629fa7b5dc 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,5 +1,3 @@
-DIST vhba-module-20211023.tar.xz 16144 BLAKE2B 70f922c9cf4de5e495ccf812c2b4eecbf3ba4dc49bb59763b97754505198506de4fce7789a4ef6e93dce4cef5275f7aff6c5c45b856a40ad6f62a5fae58d7187 SHA512 e398f8bbdff8d57d001633d98d3720d7cd424d0279de96d9d3e30dcc9013eedc4afaef4e2ab9962306e2073b30ed9d36ccff328253e1d6d36fde1944b2b78e5a
 DIST vhba-module-20211218.tar.xz 16168 BLAKE2B 37fcc56cc34dfbc68c8a8212f30a54c6a04f3b9014a5964b995bfef59df1b8f5a005e6cbfff97f1233451d215b6c4fd3c09a0cd39ebf6cb86bd6b327e5d7d718 SHA512 02b554bb2d0c91c090edeeb7c692164f378273e475a64653df845cb30cdd15d689f7fbe5fa890f77f82bf778d4d228384f656d202b6b6baf02d08321d7c2598d
-EBUILD vhba-20211023.ebuild 1085 BLAKE2B d340728beb02725c1cc7c70c6abf61457cb63e53e07b1c0b7c6fea2d03dbb5467777e3dd0e0dcf73e8d4d90a00a86c1afd6efd0382e21ac9aa518885f46a76e6 SHA512 18d9b3e6bd8fb2e2869936e6cbecee30220af174258284db217899c31a090c559643d5751dba69941b1a570a7d6beb4dce90e32e1b0bd4e6fc5655d203d9fe7a
-EBUILD vhba-20211218.ebuild 1087 BLAKE2B dfb152749f95783d44e0e83757dab6ef703103d148b8cb583ebbddc24e453e8a147b94f4d7b1199be451154d8a8e0ef7de62b8f85924f967718b5e1b331ecfe1 SHA512 09fa9bfe73beb92ee0fcee18a61983db0b168b60beeadd69dc44cb89904b256ea6f49e9912e0a90fc2b1cc4984f6c6e587114ede1065f8307d65c6b24378328e
+EBUILD vhba-20211218.ebuild 1085 BLAKE2B a62c5b7806ddd554eee19cd545cd72ac19f18e93482c6432e4185ce3cd826816cd4bb079e3bfdc59738e5e849848beace551439cecfb019ef184e285fe12aaf1 SHA512 c3840faf010683360e42a7204bc9abcf8141ef0c54cf5561d7a73757b8f7a5f00e0931edd9a8f23b81022bddf0bde760f9fca5f18dd570472f0f86bc5b8f19fb
 MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129
diff --git a/sys-fs/vhba/vhba-20211023.ebuild b/sys-fs/vhba/vhba-20211023.ebuild
deleted file mode 100644
index d9e0c2610800..000000000000
--- a/sys-fs/vhba/vhba-20211023.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod udev
-
-MY_P=vhba-module-${PV}
-DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
-HOMEPAGE="https://cdemu.sourceforge.io/"
-SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MODULE_NAMES="vhba(block:${S})"
-BUILD_TARGETS=modules
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
-	check_extra_config
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# Avoid -Werror problems
-	sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed"
-
-	eapply_user
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README
-	linux-mod_src_install
-
-	einfo "Generating udev rules ..."
-	udev_newrules - 69-vhba.rules <<-EOF
-		# do not edit this file, it will be overwritten on update
-		#
-		KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
-	EOF
-}
diff --git a/sys-fs/vhba/vhba-20211218.ebuild b/sys-fs/vhba/vhba-20211218.ebuild
index 458a74bf9381..3261cbfecf35 100644
--- a/sys-fs/vhba/vhba-20211218.ebuild
+++ b/sys-fs/vhba/vhba-20211218.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index e1563f84c31e..4db31b14a980 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -3,7 +3,8 @@ AUX xfsdump-3.1.9-fix-docs.patch 515 BLAKE2B f630b5e7540b8857c62b212b81ce33f2e08
 AUX xfsdump-3.1.9-no-symlink.patch 1027 BLAKE2B 35e0a308e9c368448305361e1632a22922b85442ff771efb130f23f4cb292741f244caf76010e9bb0d95f282214c405284f5fc49cf568dad928cd6492fed7735 SHA512 1ac052d93dbd02b8da31c9fccbee05fad773babeaa35ad43b074f9c76566e80733a1f9d311acc2cf95c3d258f9abba3f43cc4971b08e397fd1cffeccd77bedd2
 AUX xfsdump-3.1.9-prompt-overflow.patch 329 BLAKE2B 58bada935969c61fe9a161e810c6402642a87d0803076c89f1cecf5367037f96ff234d3231c49fa8b450810b21f60ac391bd631400e30738b9b11d3000158bd7 SHA512 dae03fd09ac45c8a974cf1818625cbb07c1bd7c88b28613f855d0a5878c1bf3bcb071c6f8ebd46627b83fd482ff4847a33f8a54f1de5be7595025df9f22d2fdf
 AUX xfsdump-3.1.9-skip-inventory-debian-subfolder.patch 468 BLAKE2B 81cf0af8cef61efa4dff6e230b71c0db65c3e7d93fd252035b6b5bf14afe28e65eccaef22bc3fc4419d196b0cca1428bc1697233efcc4f28aa138beaf3a5ccbf SHA512 c94af1c52c95a7617586b64a8936cdbfbd3a264c9580fabc3e1e7d3d5c37ca368b97f730baef2330e796ef7459561fa37b03280601aaa3b79eb2f90d9af5170d
+DIST xfsdump-3.1.10.tar.xz 609424 BLAKE2B 742d392c4ca4532e64ab8fd89a27b0d7c669e3f977fb9362f3f41e1db09c250951aff3906a5f598892cf58b00a7aab636864af9461afb724feec2708f52cdbd9 SHA512 8a1b671b22fffb5d2eac45d5fd7a2948c137b3ca21fde06779cff13fc6eaa27286876f56715f2eeb82ce107278d763028474260a54a8fec722e5a5d7c5875c9a
 DIST xfsdump-3.1.9.tar.xz 600348 BLAKE2B 9e833acaacd3ad581b4f23731d7d613fcffa3d518f43638cddbc7da7015e582cb9415e00616e5e8586836831b6d5877fa83e8a5fd931fd454731bf2af7072095 SHA512 e8f9811d16fc06ab49fe2c109de0546c989575eca6e68b579c6d219a745f935952020069f58b357c5c87b944c5097ca2894466d328d09f06beb8a55880142351
+EBUILD xfsdump-3.1.10.ebuild 1620 BLAKE2B 1e832a79810f6bddf605e8f11b4064736360403479060c88d2568f0200421945f1341975dddb50cd27ad56c608a6b5065344390599feaa01879545c3b51e6cc7 SHA512 743668303895e950a51e3895b40a1d5d0445f56694ab39bee83e1e36036996d331945e82bbd7111170b2f75c3e6c6bce352b241f2819c9bb1a51de4cdbf49543
 EBUILD xfsdump-3.1.9-r1.ebuild 1581 BLAKE2B 0613d92c205bf68359bad98cd4ad56bb0e1c1b6e1996189d85e68b41aebcb73d8643dd9f63ee9c97d6fc7f316a791b44bb74a77a28c7b99875e68ec75dca6a2b SHA512 5ea03e7f5f112ae94578db745372394559a37a7847baeafbd24b687c03568649c1e3c5eb21d03362e17ab161eaa8f068a8c42f5ca9d6539532b649f88a7ab0ec
-EBUILD xfsdump-3.1.9.ebuild 1590 BLAKE2B ea9a24f9de2a46bad7f53623e496ab2d7a8c5ffa8ef13d0d3adde7a35d572bd7afd7d8796b8de82697c0c7f05aed0ff4bbe19304f110a4413345b079c2f486de SHA512 06705e20c725ef6239208d08badf6dbc8f3691ac88501b5431179ad6bda7da867f024e0d2555515887166c80fdd491614dce1b391f4129151cd9db6a8ebcbd1a
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild b/sys-fs/xfsdump/xfsdump-3.1.10.ebuild
index f89dc7dcba2b..0ef28b237d54 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.10.ebuild
@@ -11,28 +11,28 @@ 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 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
 IUSE="ncurses nls"
 
-RDEPEND="
-	>=sys-apps/attr-2.4.19
-	sys-apps/dmapi
+RDEPEND=">=sys-apps/attr-2.4.19
 	sys-apps/util-linux
 	sys-fs/e2fsprogs
 	>=sys-fs/xfsprogs-3.2.0
-	ncurses? ( sys-libs/ncurses:0= )
-"
+	ncurses? ( sys-libs/ncurses:= )"
 DEPEND="${RDEPEND}
 	nls? (
 		sys-devel/gettext
-	)
-"
+	)"
 BDEPEND="ncurses? ( virtual/pkgconfig )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.9-prompt-overflow.patch #335115
-	"${FILESDIR}"/${PN}-3.1.9-no-symlink.patch #311881
-	"${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
+	# bug #335115
+	"${FILESDIR}"/${PN}-3.1.9-prompt-overflow.patch
+	# bug #311881
+	"${FILESDIR}"/${PN}-3.1.9-no-symlink.patch
+	# bug #561664
+	"${FILESDIR}"/${PN}-3.1.6-linguas.patch
+
 	"${FILESDIR}"/${PN}-3.1.9-fix-docs.patch
 	"${FILESDIR}"/${PN}-3.1.9-skip-inventory-debian-subfolder.patch
 )
@@ -43,17 +43,20 @@ src_prepare() {
 		include/builddefs.in \
 		|| die
 
+	# bug #605852
 	sed -i \
 		-e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
 		-e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
-		configure || die #605852
+		configure || die
 
 	default
 }
 
 src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
+	# bug #184564
+	unset PLATFORM
+
+	export OPTIMIZER="${CFLAGS}"
 	export DEBUG=-DNDEBUG
 
 	local myeconfargs=(
@@ -62,10 +65,11 @@ src_configure() {
 		--libexecdir="${EPREFIX}/usr/$(get_libdir)"
 		--sbindir="${EPREFIX}/sbin"
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
-	# enable verbose build
+	# Enable verbose build
 	emake V=1
 }
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index cbe25190d82a..f0ad77c19e77 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -4,8 +4,11 @@ DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea
 DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682
 DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102
 DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb
+DIST zfs-2.1.3.tar.gz 34898999 BLAKE2B b4fc59ae97c74661f1303e4ce6efd5304842d382e278633debc4475c32074b9d272379d5d4caf8155f7a8cb1cb2b871b8c61fc36e14a612220757c5703a4c50b SHA512 26525bff7d0a831de780883c11eec5b3a142bded269c1dce95a4c466e753feb851cbbc001f0fe40f40209801192f9094fe179570fd117f90931cf11116439aeb
+DIST zfs-2.1.3.tar.gz.asc 836 BLAKE2B 305d44ae02a28bc1dc24bb429a0454fdffe19a21e4a5f45ed924e81f8f1972638166a0cf64f99e92e53a50161886935a86c7d42d8fd9533b6b46c6c16c316d9a SHA512 6cdc92bc834f0b6bff9c0939224f1898729f2ae9b865f84906abb2a6b44a75f6aed6c256f03f81fe888d4edc7c421073b9b2f730b804fe532fd43cd127fdc505
 EBUILD zfs-kmod-0.8.6.ebuild 5746 BLAKE2B b8d5cfa1c83f6ae0b565a0469f0c69def97fd536dc2645b623fe31cd2ca6d802976b3aacd05023ede636abb45c5a968256270809e4c080ace95993d640646f4b SHA512 758cbe8be086ade139b4559684e4cfd6b8b1c61273c88f15b7bb612ae49b89b59f05b8f843a8a4993833406769ca017c582e7dadeef41fc70732bac7d1aa944c
 EBUILD zfs-kmod-2.0.7.ebuild 5624 BLAKE2B ec04bc269acb6ea08e202b2a52e9883bd7b16d436c9c0fea54247e73c163664a449997bf06058c24602aba7718c49a224f4e1adc74228a5837290b02bacabf37 SHA512 31b39f7a831e034fe6aeecb169dc46e1641c6844f74c4d74127b30cb691bb4fe4a52a998008c2a16b860398192508727cc3b87f9325d30b6e45f2d0d48ea2ee8
 EBUILD zfs-kmod-2.1.2.ebuild 5260 BLAKE2B 4b518043257f793b8f3ec0e4aee6f758ae6cd7ab9ea587507e4517c9431c305fd82da279eceee860869677f52e93ac589507d4fedb200687d20d6cb6508c08d1 SHA512 ae320718801a32eec16f37d9937e6f0aebf31a362b04bc830642d510992a4810147980bf9826e747930e7b6c0ed885169436251aaffcabc796e535f0bfb3ebba
-EBUILD zfs-kmod-9999.ebuild 5245 BLAKE2B 6770468fefbd8fb234452bc27c5fc3b2862a22a06ec4aef527e80f1aec34fc209ad59435914a551cd9529494f84cacbd2dd83e3944d0a73216195144b3afe20b SHA512 d535a279d7ee1cf24f2db571cc0f8e2f5e1444a19354898467ef0b6e625f68534993640e76c41246a7bc008a7d6ebdaa703deefde6f1cbe0f0d1a33b5c395c12
+EBUILD zfs-kmod-2.1.3.ebuild 5245 BLAKE2B 0c4f801a8f4d865be45756462fa533ad86064392e88f3e1cbdd580ffc51cf0ac4584650142c9a7fe0d08e43b7206551cd146b195d1bce3c1287e610df35be312 SHA512 ab5c86fe0dd03b49026b7ef0767ebd39e7a0f2bcc34faff16769f46055a4b5b43cdc0222fb8d97f3b5417936bd3b6129e53d2ef42413a9193704b12cf46f9942
+EBUILD zfs-kmod-9999.ebuild 5245 BLAKE2B 0c4f801a8f4d865be45756462fa533ad86064392e88f3e1cbdd580ffc51cf0ac4584650142c9a7fe0d08e43b7206551cd146b195d1bce3c1287e610df35be312 SHA512 ab5c86fe0dd03b49026b7ef0767ebd39e7a0f2bcc34faff16769f46055a4b5b43cdc0222fb8d97f3b5417936bd3b6129e53d2ef42413a9193704b12cf46f9942
 MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild
new file mode 100644
index 000000000000..2c6ab28bcfde
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_PV="${PV/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
+	S="${WORKDIR}/zfs-${PV%_rc?}"
+	ZFS_KERNEL_COMPAT="5.16"
+
+	#  increments minor eg 5.14 -> 5.15, and still supports override.
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}
+	!sys-kernel/spl
+"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/awk
+"
+
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+="
+		verify-sig? ( sec-keys/openpgp-keys-openzfs )
+		dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= )
+	"
+fi
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
+
+RESTRICT="debug? ( strip ) test"
+
+DOCS=( AUTHORS COPYRIGHT META README.md )
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!TRIM_UNUSED_KSYMS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
+
+	if [[ ${PV} != "9999" ]]; then
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+
+	fi
+
+	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
+
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != "9999" ]]; then
+		# Set module revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+}
+
+src_configure() {
+	set_arch_to_kernel
+
+	use custom-cflags || strip-flags
+
+	filter-ldflags -Wl,*
+
+	# Set CROSS_COMPILE in the environment.
+	# This allows the user to override it via make.conf or via a local Makefile.
+	# https://bugs.gentoo.org/811600
+	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
+	local myconf=(
+		HOSTCC="$(tc-getBUILD_CC)"
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	myemakeargs=(
+		HOSTCC="$(tc-getBUILD_CC)"
+		V=1
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	myemakeargs+=(
+		DEPMOD=:
+		# INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile
+		DESTDIR="${D}"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		set_arch_to_portage
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use x86 || use arm; then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	if has_version sys-boot/grub; then
+		ewarn "This version of OpenZFS includes support for new feature flags"
+		ewarn "that are incompatible with previous versions. GRUB2 support for"
+		ewarn "/boot with the new feature flags is not yet available."
+		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+		ewarn "Any new pools will be created with the new feature flags by default"
+		ewarn "and will not be compatible with older versions of OpenZFS. To"
+		ewarn "create a newpool that is backward compatible wih GRUB2, use "
+		ewarn
+		ewarn "zpool create -o compatibility=grub2 ..."
+		ewarn
+		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
+	fi
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 5a3434fb444c..2c6ab28bcfde 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="5.15"
+	ZFS_KERNEL_COMPAT="5.16"
 
 	#  increments minor eg 5.14 -> 5.15, and still supports override.
 	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index d578453dd70a..6512785af2e3 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -8,8 +8,11 @@ DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea
 DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682
 DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102
 DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb
+DIST zfs-2.1.3.tar.gz 34898999 BLAKE2B b4fc59ae97c74661f1303e4ce6efd5304842d382e278633debc4475c32074b9d272379d5d4caf8155f7a8cb1cb2b871b8c61fc36e14a612220757c5703a4c50b SHA512 26525bff7d0a831de780883c11eec5b3a142bded269c1dce95a4c466e753feb851cbbc001f0fe40f40209801192f9094fe179570fd117f90931cf11116439aeb
+DIST zfs-2.1.3.tar.gz.asc 836 BLAKE2B 305d44ae02a28bc1dc24bb429a0454fdffe19a21e4a5f45ed924e81f8f1972638166a0cf64f99e92e53a50161886935a86c7d42d8fd9533b6b46c6c16c316d9a SHA512 6cdc92bc834f0b6bff9c0939224f1898729f2ae9b865f84906abb2a6b44a75f6aed6c256f03f81fe888d4edc7c421073b9b2f730b804fe532fd43cd127fdc505
 EBUILD zfs-0.8.6-r2.ebuild 6527 BLAKE2B ac889061cc532d89d87705f610fa3220d1f0d8ef08a8e948a61c1eeab616ebb4815c1a5abf9bcc2a662a89a2a43cc1d659183b06fc170bf1f7bb716a2fa1dc4e SHA512 b21b4e0ca160a17f7fb3729cebdfc4efcd83898265445ef5cc4dfc1a6fcaf692552a8300f8465bad3b07fda73e78a212a5c868bae702d1896448945f22d4588d
 EBUILD zfs-2.0.7.ebuild 8435 BLAKE2B ecb10942cd6d51d0c5cb9c0e8ad5beef3afb580507514478b10dc3d59355262e87b2714c5f641e497bb2b351355400acb31b3aee81b98912c9a4753d7bcf55da SHA512 caeba0a22fefd58d0f7675c50d11d9a71f006e802960bdd810ff1799219526ab73e4d6993e8428af9823629a99d95932494911fcba8e0e6578c0cf697b0ad4e6
 EBUILD zfs-2.1.2-r1.ebuild 8611 BLAKE2B 65f5e13bdf9ed34e248b9d0e6245fb76ee5b829398e0ee40a790b2f049042ea851ef4b35244264ddc899f31b5511e14c8bf9bc6ad77e2e11c811ccd4d8e2290f SHA512 03274ba778d38678cbf818f79b7ed124cd25af8071a00233d9d01fb86d8d8907a3a53a032dd464558fec196245a75dec95f6117a99371900fa4a6fb6fec2bd90
+EBUILD zfs-2.1.3.ebuild 8648 BLAKE2B f9f1cb8ae59d0c3266ea62a421e1e49cdfd971640cec9dd1305fef8917c1739fd18833d7bfb3df8de6fc4cd3b332163385dd1044e5be228d591c27b252aa35f8 SHA512 6c88726fad3f86168446de959d5719719d731d23c19786decdd3ebc75c806b96991702f45a500c127c7ccd3a8ce7afd215087a3293e289b5541beba26e0f227c
 EBUILD zfs-9999.ebuild 8602 BLAKE2B c3154af855d5e81642f6dd39a846e19c96a9bb7879217a00c675d5b689fd2574ae486bec0682be921374ff20456f4dadc1f88129c185eb0fb095a0d7eeecc5dd SHA512 172c44e8c88613e0713d3647a8ed2e8b0d552a57c5d16c4e34cf0ccaaa7bf438b8cb54953519d1885b46000ba21448973881e3730c6fa1d7e4a0a3634c461f39
 MISC metadata.xml 2194 BLAKE2B 57b0d1bcbcd78039d0cfd20f087bdfc339eefebbec3150af3c06d2e1a6dee882c4f8f97a9e470f63d4d628441a10650bda8b1843e33240dcc8d3e2ad55d104ec SHA512 fac8750d64d844b397fbbdcca9b7aea671f7642c64da92b89480439919ced80b9b6292ee3a2cc55e412e3c55dd02c418ef7c056f2973b7eb0f53ee763e099098
diff --git a/sys-fs/zfs/zfs-2.1.3.ebuild b/sys-fs/zfs/zfs-2.1.3.ebuild
new file mode 100644
index 000000000000..17e749df605d
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.1.3.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3 linux-mod
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+	S="${WORKDIR}/${P%_rc?}"
+
+	# 2.1.3 unkeyworded briefly for some testing
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
+
+DEPEND="
+	net-libs/libtirpc:=
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	dev-libs/openssl:0=
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="virtual/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		|| (
+			dev-python/packaging[${PYTHON_USEDEP}]
+			dev-python/distlib[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	virtual/awk
+	dist-kernel? ( virtual/dist-kernel:= )
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-kernel/genkernel-3.5.1.1
+	)
+	test-suite? (
+		app-shells/ksh
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
+"
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
+REQUIRED_USE="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+libsoversion_check() {
+	local bugurl libzfs_sover
+	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
+
+	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
+		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
+	libzfs_sover="${libzfs_sover%%:*}"
+
+	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
+		echo
+		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
+		eerror "ebuild subslot does not match libzfs soversion!"
+		eerror "libzfs soversion: ${libzfs_sover}"
+		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
+		eerror "This is a bug in the ebuild, please use the following URL to report it"
+		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
+		echo
+		# we want to abort for releases, but just print a warning for live ebuild
+		# to keep package installable
+		[[  ${PV} == "9999" ]] || die
+	fi
+}
+
+src_prepare() {
+	default
+	libsoversion_check
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != "9999" ]]; then
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="$(systemd_get_systempresetdir)"
+		--with-vendor=gentoo
+		# Building zfs-mount-generator.c on musl breaks as strndupa
+		# isn't available. But systemd doesn't support musl anyway, so
+		# just disable building it.
+		$(use_enable !elibc_musl systemd)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		--disable-static
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	# we always need userspace utils in sync with zfs-kmod
+	# so force initrd update for userspace as well, to avoid
+	# situation when zfs-kmod trigger initrd rebuild before
+	# userspace component is rebuilt
+	# KV_* variables are provided by linux-info.eclass
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
+			elog "  sys-kernel/dracut ( preferred, module maintained by zfs developers )"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
+			einfo "You should add zfs-load-key to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /sys-fs
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)