gentoo resync : 25.03.2022

28 files changed, 669 insertions, 30 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 10f5ebc9db1e..cd61fdec269e 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index 3a3d7ca7cba3..a553f4c1716c 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,3 +1,3 @@
 DIST aufs-util-4.14_p20190603.tar.xz 104096 BLAKE2B 901c7405866cc8db490248b86e45e57375ea5d8db11505c0c15fd49f5bd9e7ea5a6c3d272bd8f001ac3db11665a9c3607565c7eb5be8cd5f45acf4b5f994ceb9 SHA512 803ce51a77c3e4942d3b8817be638c5e2440821088eeb58742eb0395b9c83f68975ed64a0410b6155b18edf0af47ef9df916be07d912fdb2bd4e94987a037fa7
-EBUILD aufs-util-4.14_p20190603.ebuild 1051 BLAKE2B 040fc77c4aadd6add47ca89caa4ff209f6a325163de05bc5426f35a027ba4b0fd92820d7c29fffe3dac754b9929ea39778f38568efaf7dd58d2c2eff843f6816 SHA512 cbe27f86b772cad092f0eea51bac510f7513ca381993878ca78de9447a0c947517e0cd55e73d19155ed7b637814611607447c941a109bdc254373a2ffb1e452c
+EBUILD aufs-util-4.14_p20190603.ebuild 1053 BLAKE2B 6b3cfe266cee504edd5bb0ec5fe486ba845609110989486d5826e9788466f34ba62562d7bf0f8c663ff0db3640dac163595c0653947569828ded4860641fd24a SHA512 4b8eaf9ca757dac8c8b726a0b466df5cb61dbcc035d7743ba289540012c1e6bd057e9b28da304e8d9b1e0ec225f93c8442c5e37ad3e155ff9480e054d0c42715
 MISC metadata.xml 247 BLAKE2B 7f4f32428b3e942416d38a533e7d38321d3469158a19b510b82f0d33761426eb7681d53bea7b4fddc1e7eaa7630627bf609a073c2eea4346b8b6a3b9484adf30 SHA512 3097dca8764edbe0aa83f854438c979322209e0d9e227f97076e2f2147a1d8be5d16a954993bc8a846e3eee6fa5e82f3ebb167f80d4b8544c49378e131c35a2f
diff --git a/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild b/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
index 65c39b7f1043..7e9701ae6984 100644
--- a/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
+++ b/sys-fs/aufs-util/aufs-util-4.14_p20190603.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
@@ -41,7 +41,7 @@ src_prepare() {
 		-i fhsm/Makefile || die
 
 	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
+	export HOSTCC="$(tc-getCC)"
 	export STRIP=true
 	default
 }
diff --git a/sys-fs/copyfs/Manifest b/sys-fs/copyfs/Manifest
index 41cc1fa70f06..402e07f38b4a 100644
--- a/sys-fs/copyfs/Manifest
+++ b/sys-fs/copyfs/Manifest
@@ -1,5 +1,5 @@
 AUX copyfs-1.0-unlink.patch 4383 BLAKE2B 5d73f8ef5985f801d4f9b9f400189db080d1d4010cbd59ca2640ba782d9d48af74afb5a22b8a65b29b35855f204e4b59d0aa306402eff672677861af5cd78064 SHA512 dc4a665e98f5250f36ff5dffb4b1ebe58ce9939724d58a0f99f6b21a7d7440947bc90bd6f07f471774cbcca9da5cc0b9f621081e2384797cf47302cb2769b0bb
 AUX copyfs-1.0.1-gentoo.patch 999 BLAKE2B 4ed27bf399a21e6ae0d949a5e3c0e7dca77784d7691a3be1e0cfc6099ee89330f919e8f386220266a91b582b84d85c81da4f457e10eb3b1f447f390a4b59c59e SHA512 45cf7dd29ef8deb2421177cf513906fd40864b93192a5cb2556ed3cd85227d173f7fd9a24e1c4ac78426f1059ffa5a05e348bf64ad6759575774f60407d31143
 DIST copyfs-1.0.1.tar.bz2 38429 BLAKE2B d10909762e95cd48ac24f7a93cfd388e911412c157bf74b85a32cff020b4e5fa3e86d4ff4577b4488507574a8f699004c6b0f01dc967e5e557eabdf301b2b825 SHA512 abe1a125913f35d8390385562d56a5a1aa238ec03bfa044d61ac8f514a4986bfa70502d30af9dbc90e58910dab7f0ab5e230de0b4fa2eb45fe3a2f6514be0a07
-EBUILD copyfs-1.0.1-r1.ebuild 926 BLAKE2B fe265673681fd518b8b24b845e389b81712ba872476ba9ed3b1ba7666ffcf8e00e31805ef2615d41cc75dd614949d77fa69f82ee21f73805b13cee5beda5bd28 SHA512 6d036bb2a452c50f654f03fb1adc6f437906ce5f3ef016254fd1b73b1a18b3cc4135b613d2fa699e6798ac75abd5b3cfb7952dc3651abb3a7fc0d885a5b593b3
+EBUILD copyfs-1.0.1-r1.ebuild 928 BLAKE2B 0fa491c03a23b671ad1558c5c4f66955994bace8a20740e3fb28340dfe3edf7f5d3dd3d0b7559d2d45b010e1a17034810e34ae7e5d24f4767cc52781e8362642 SHA512 b30a51263e8a9ffc8718b555ec8296ca2a7ae59330bae8ab70e5d7b9c4d639dc6e4ba90233a6690f118ee5a15a91971d72df184fec0b25ca4189403042e5d7fe
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-fs/copyfs/copyfs-1.0.1-r1.ebuild b/sys-fs/copyfs/copyfs-1.0.1-r1.ebuild
index 543302c45eb9..14daded7cf71 100644
--- a/sys-fs/copyfs/copyfs-1.0.1-r1.ebuild
+++ b/sys-fs/copyfs/copyfs-1.0.1-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
@@ -34,7 +34,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 776bfb4379e5..2956f1196aa7 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,6 +3,6 @@ AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f
 AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a
 AUX 2.4.3-dmcrypt.rc 9693 BLAKE2B a426ad90c9e4540a82873cd3a1594def778063c97278b2f82cfefd79cedecda97f1b6038775ce34433ba25519e3fb565bc0b79eedb39b46080a2fec68d564a99 SHA512 9f2ff42e0ef1ab3046b545c550153e13ae7d2446560b4154c23e32ca2dd8c2871e68b07bf8cc273c18730ad6e13b50b07aadb91ae7f43077ab08bdce01db5323
 DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f SHA512 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e
-EBUILD cryptsetup-2.4.3-r1.ebuild 4180 BLAKE2B 2552ca833cf04bdb890e3263aa7a857a4ca720f18a96ce946627766a249b0ed820ba0303f2fe7a14dea41fbb2f606cb1b0394995e3f5fe62e88128d097eef255 SHA512 e249a460e172161e6de87d8b0bc385baf94a34cc98270f19c48d9fef0d5a7735a9d51464611f832f2be85a4430d024365f0df0c683254416eda47eed64ec4a0c
+EBUILD cryptsetup-2.4.3-r1.ebuild 4212 BLAKE2B b79ac99dd69703e8d4587f71a14007189705c007d8d17c339d5595d00918eeebcef12c833c50e9975c1ec738acee4ec29d4b5d1266103c705715b674690d5eee SHA512 78310bffcfb1c3007481ebf47d556c46e78c046c58130368b5f3090df4c1f5d643299e8204ca0b5823ce01634f7147c4132acba86c78f003fdaa7ff9124221fe
 EBUILD cryptsetup-2.4.3.ebuild 4172 BLAKE2B 769f38ca8f374b8e08916ab3d7baa4a5bbb250d8fd4dc7f58b8f6a00a062b7def3e033a89781227f1edb15111da7b005dce2e5fe012d747f56d2e995f313baeb SHA512 d671d6d91158d2233b85b026f82fcfb79bf72d8bc0434bfe18cd803d974310c9962bcb4c98bd1bec23590fae7d073fea48bfbf2516322815a08a375679cec5fe
-MISC metadata.xml 1076 BLAKE2B 132b07201bfa3a7d8889d0b2558c15f35829bfa021b31cd5a9cf2cb21de822ceb89fae177b014590f46411cd609b4e44b20165b07c7676483a547987fffcbb9d SHA512 b06b884e0e369022cea4b3634d9df3c7d62d854754969d0c7848a3baf3a3ea69cce2131527539600424c72c539e502378b0627ba7c4fdcbc74e6f7a58b5800a8
+MISC metadata.xml 1132 BLAKE2B 4e7b9a495fa1208119744ad84a75117ea3010e5ca2c55bc542017d280b35e8a2b7f3b5f38e45373660c11ffe58e8bc2243e704513f1f80c2f32b7d33e032fb04 SHA512 5cb04665b058d4895969510f5ffd5bc4bf7d6c753a4c6a78b0be0b4468fc67d2aa2eec700ceb434d757721b0b9dc5a1f258806cbaf11bff5ba4ff40ebd576f86
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
index 8287adbcacaf..f2ac3491ef69 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
@@ -16,10 +16,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 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 test +udev urandom"
+IUSE="${CRYPTO_BACKENDS} +argon2 fips nls pwquality reencrypt ssh static static-libs test +udev urandom"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt !ssh !udev )" # 496612, 832711
+	static? ( !gcrypt !ssh !udev !fips )" # 496612, 832711
 
 LIB_DEPEND="
 	dev-libs/json-c:=[static-libs(+)]
@@ -91,6 +91,7 @@ src_configure() {
 		$(use_enable !urandom dev-random)
 		$(use_enable ssh ssh-token)
 		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
+		$(use_enable fips)
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 7ecc557fd2b4..5f7443faf40f 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 	<flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag>
+	<flag name="fips">Enable FIPS mode restrictions</flag>
 	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
 	<flag name="kernel">Use kernel crypto backend (mainly for embedded systems)</flag>
 	<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index 19fef16b1344..741d1b99ba77 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,5 +1,5 @@
 DIST fatsort-1.6.3.622.tar.xz 123644 BLAKE2B 1db530753bdaee4ebda9ab36a47f6794584bc590de4cbf8d144a5baa770c080c9d27a1ecadd5a22de72538887c4e10f161f3c4fb3afb3e63bd18834897ebe905 SHA512 309c7424e53fb74f57d0c4272a1a4b3df57fa1130d7e7adae0ac73ac1c8b1900504e49efd0cc4dafea3efa2fbc9191f343b10bb97b647dd6124197356cd01c53
 DIST fatsort-1.6.4.625.tar.xz 123964 BLAKE2B 4d958886af48e9f6d6a39b128b5ff96b809e67667026483a5abfb3db6f16d8a5ebb257433f2a7fbba6c7e4d81614477cc4cec437bcfba868a2c2fb6b13b15c42 SHA512 1d67c3cb515295d0a47054803e5b2a625875e71f41b2fad17f9d495b6aa4a291776696692545800bb4d5b826e9d622ea34077c81f7f08f41b8dfd70491e439ef
-EBUILD fatsort-1.6.3.622.ebuild 709 BLAKE2B c55f68dad837981f511e25ac7d2dc5071a5efb025022fc8a9ccb54c231fc91db94e1ce3f8a438d44293071a7f0f52d207f7950d0e43ca57fb6ffd43c4cdadca0 SHA512 4eb71498be5f0667a82f8b0be259c6a7c599b9e34c13c26b408165a38b41e31aa3e6eb8e657e8b0ae27cb1eb2b4d792cd0a781c922ca3199cd46d3065078ccf6
-EBUILD fatsort-1.6.4.625.ebuild 711 BLAKE2B 98a7271583e4808a605fea798490cd528a5a294736c7b53e219eed05250145b5e528be8d8dc8b4805c7b97eaf96ceff7a98ef1adcee79afd4501b4ce6ebf35bd SHA512 4f2149fdc9eae0503a0451f4a749fdd664bffd97f318ed1ab94bf67c36ba94c862719cec8adb889f4239bb0618432f6098839b09d1a466153fb7bace3f159bf0
+EBUILD fatsort-1.6.3.622.ebuild 713 BLAKE2B d169a4b11e8379d413a8eb9bef788997723b4c298420cd1567906ca88a9169a6771db1a024553260f2dd292f598341e0118c3e868e7910fdc8c1a3752679bf68 SHA512 0525145f6894df5c88244752316a9814dd8ac52e5d31df71cdb104d0a936c5968e0c98eba99dbf6e17a2c39c97aa3b7fc643fdf2d3c7a5a89b8541a3f78defcd
+EBUILD fatsort-1.6.4.625.ebuild 715 BLAKE2B e79f16db4c952e024a2af6cc0e2f5a9b317f1762964d8ba616627be589356a689946199b7ce37a266afdeb6fb3b5913431ceb0b46766206d7b4a5d04cda50959 SHA512 56e3e5ef3ebf28845fea4302a270ecb627a36cfb4d96d85c0c4e5a2dfd2e4f3d3a5334dc4b9c6351204c53a93a0c1faaa59949a7aaf91e50dee1c46786f53969
 MISC metadata.xml 739 BLAKE2B e9c57a69520793f24cfafb131edfb6b94cd1d0cccbe74494835cbbd597ea6ae0c5d6eacb54bb82bb21acbf2db0ed0b27988cd5e228bfc092c847aceeacac10da SHA512 1983abae2f5d444b6a20039e50606dbf9a9894dae4a0f95b2337f60e451e61f0b7f556c8906d4bb5611ed1bf5201412a677e3dacf6344a4903bf44be13d507aa
diff --git a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild b/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
index c843233d12b1..2c171133543c 100644
--- a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
+++ b/sys-fs/fatsort/fatsort-1.6.3.622.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
@@ -22,7 +22,7 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) LD=$(tc-getCC) \
+		CC="$(tc-getCC)" LD="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		man
 }
diff --git a/sys-fs/fatsort/fatsort-1.6.4.625.ebuild b/sys-fs/fatsort/fatsort-1.6.4.625.ebuild
index 85bf5c3f3520..633230c83408 100644
--- a/sys-fs/fatsort/fatsort-1.6.4.625.ebuild
+++ b/sys-fs/fatsort/fatsort-1.6.4.625.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
@@ -22,7 +22,7 @@ src_prepare() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) LD=$(tc-getCC) \
+		CC="$(tc-getCC)" LD="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		man
 }
diff --git a/sys-fs/fswatch/Manifest b/sys-fs/fswatch/Manifest
index 8de9c755cfaf..6f84e7728149 100644
--- a/sys-fs/fswatch/Manifest
+++ b/sys-fs/fswatch/Manifest
@@ -1,3 +1,3 @@
 DIST fswatch-1.16.0.tar.gz 844804 BLAKE2B 55527e7d38421f16a9d2c51b5455b73de54220d280233d905a02d192bc374ef91b02c0d68dcd1c1ed6a29351421df0cd0ee9fad50bb98ec9c9018088a6064d4b SHA512 80100b92f5acef503436bbb684f07f5b692099a7eee0970a61c04670de67cd9bfa7942af40b348236dd97fc4d02fcd6a081b96486332efbd06500379c1eff806
-EBUILD fswatch-1.16.0.ebuild 603 BLAKE2B c7c856a4bafb3f92d504b6bea4884895e1c8b6800eafbab8e1cea2ecb03d3b5a5f401ddaf2d815fe6d0ff2dec3fbaf91d2d74692950df55ad140917d7a1ff104 SHA512 7bf6b555a175bdccf126e410ff28028b99ec41b745d547a94dc63cf89fa178cb31d862a641d7fda0222fd006ff5f915520049731a6a1176e726696b3ffcc96b3
+EBUILD fswatch-1.16.0.ebuild 606 BLAKE2B 4c469be305113213dccdf9b92286a679f6fe546f323f248597c0756fd04805cea0ff75fecdbc50dae332ddbda448d8b9decfdf348f23cb3577cf272a6daefac3 SHA512 f9d79eb8f231893b5566d30d96a38ded99573bb804afe688003b7e92d97024e427d85f848b0f34f585c057dfcacbd04b71e93ac847ebde1e7ea05c12dc90ccc1
 MISC metadata.xml 216 BLAKE2B 921055d990617104de7e3437bc9fd4598cb830193bfcdc34254102a1df2c6025916af7025843f161dff8de731f9726641906b86f831375c5d29303ba64991da2 SHA512 8c43f5f2be76799c8ace4df222de22380c389e058bc7e36bd9b19564cbd4b90ab7515b90f822139a18b3a2cba70e76d3b4eb5426f88a0508798175893073d732
diff --git a/sys-fs/fswatch/fswatch-1.16.0.ebuild b/sys-fs/fswatch/fswatch-1.16.0.ebuild
index f145c182b0f7..dc84ca695257 100644
--- a/sys-fs/fswatch/fswatch-1.16.0.ebuild
+++ b/sys-fs/fswatch/fswatch-1.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2021 Gentoo Authors
+# Copyright 2022-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,9 +8,10 @@ inherit toolchain-funcs
 DESCRIPTION="cross-platform file change monitor with multiple backends"
 HOMEPAGE="https://github.com/emcrisostomo/fswatch"
 SRC_URI="https://github.com/emcrisostomo/${PN}/releases/download/${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="nls static-libs"
 
@@ -18,7 +19,7 @@ src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable static-libs static) \
-		CXX=$(tc-getCXX)
+		CXX="$(tc-getCXX)"
 }
 
 src_install() {
diff --git a/sys-fs/ldapfuse/Manifest b/sys-fs/ldapfuse/Manifest
index c0d3316f890b..f35713ceab50 100644
--- a/sys-fs/ldapfuse/Manifest
+++ b/sys-fs/ldapfuse/Manifest
@@ -1,3 +1,3 @@
 DIST ldapfuse-1.0.tar.xz 76024 BLAKE2B fa7bb67637e069e013c5a0d849f196803466cdec82b538ccaa7852e589c8c1ec5e68d73e88c3d3c69237dce89fd62e10d949ddc8b84e3c72d4e0c9b43ec90c66 SHA512 ea9af757d69fe9931ac745039d75a52d3e590c16737a71e6d9a6a8654b5514a1c86e26925f5cbe117c5bedcef8888ce69bec3bec2c02fe4dd233fee7f3118e7f
-EBUILD ldapfuse-1.0-r3.ebuild 521 BLAKE2B f84c94bb13f7610405b4f3b2633019e4bc522e006279a7785a7c6dbe6989378e5d8d5394ffda6f5fcddc09aaaee4e3cd0a71a52cbc41ec30ae474d11dbd94ec6 SHA512 369827ca4bda03e7d7a70da13f533543c7cf1a7d1589ed61ff708128e03cab72f7eee97e19da264e81770fcc0b7e4043711771083d62c207cfbdbf776373f41c
+EBUILD ldapfuse-1.0-r4.ebuild 523 BLAKE2B fd767709bf1bf7fd6e2f8905db139d64667f0fa5bbc6728de84d2668cf8e5fdd78bdda49e0bcfb43d7693a5f421aa5e3f2bb33ddbe57e82d47d4a42dc7374b06 SHA512 169773705b3fa523340f8156f8dd65b5b73b4dfb64c9c1aef5f22d07aa6b762a6156b7a2131d7dfc6fd36372a1a4954e70ae63c3fefe450a7c9914a61d0903ea
 MISC metadata.xml 246 BLAKE2B 5eb4234a49b184f3aa80113a0ae283de60f9e428a6227cda85db00a78d855900d85d2f05d7fca05a2ed077acb498098d159ff51474bb755e28d6f65646647564 SHA512 2cab401339b3091d2ae15e1a1d2405e105f5f31d5ff23d4041ed8735cd98848eb5d87afe5560d8631ad00be3faf86025a5d482d8c21a4f49469e3dbd3daac023
diff --git a/sys-fs/ldapfuse/ldapfuse-1.0-r3.ebuild b/sys-fs/ldapfuse/ldapfuse-1.0-r4.ebuild
index 06bdb19e918f..0e01a694da64 100644
--- a/sys-fs/ldapfuse/ldapfuse-1.0-r3.ebuild
+++ b/sys-fs/ldapfuse/ldapfuse-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	net-nds/openldap
+	net-nds/openldap:=
 	sys-fs/fuse:0
 	>=sys-libs/libhx-3.12:="
 
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 32d3d7cf94d8..c33af8837dbd 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -6,5 +6,5 @@ DIST lxcfs-4.0.11.tar.gz.asc 833 BLAKE2B f70bcf119588c1e667111fe0e820c1bbd53c912
 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
+EBUILD lxcfs-4.0.12.ebuild 1624 BLAKE2B 715f7d3e6dcddbd187116b6f71e62baeb41b71ac8b0d9bb15b7743ba01e4f33a9b8a30349c23011dd5dc3779a693b05f4983f5887eee19cc5b9e02237ff83d5c SHA512 7885a391127c14e7f88acd984284f01261428e372ccebef8eeaa091264bc3be3b0b6b950e3c79a94604c5befa08530c437152d1b07d0b6ea0e0167e1b0f10cd7
 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
index 8b6377221315..bde4889e46c0 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.12.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
 
 LICENSE="Apache-2.0 LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="sys-fs/fuse:3"
 DEPEND="${RDEPEND}"
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 85865f0b3aa6..f60b5314b49e 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -7,7 +7,9 @@ DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5
 DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801 SHA512 c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd
 DIST multipath-tools-0.8.8-no-compress-man-pages.patch.bz2 2493 BLAKE2B 08d77d6524861a590e07e3e9eedb1039c9b15b589becd912f17f37f728a751c7566699540c025aa1f8a0b2e04db551b0093d066f6e340a15309794fdde197483 SHA512 662f32ba5437be2a3cfffc5a466dccb7923668eeef5f23112b31d6c1b43eca2917579729e975cfbe4cd60ecfaf547f534d304626ac19d165bb2f1a3ae4bb1cc6
 DIST multipath-tools-0.8.8.tar.gz 527412 BLAKE2B 15e24a04ff1c41c8562033ca22214c015ab4c4a9e9833323830b665793c1964b6fcb7b710761bf501f0e99d461d6e6c7dfe80851a0ded4d99693a1561490598f SHA512 f09932da93b6ab06f0f911b09c605ea931fb8cb8b5530ef9999d21a41056fb48e944fc245dfe20096b2746ce1c9ebb5b548e1182079a3b52659d33263a441969
+DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30 SHA512 25f2a5d436af6a343804988cef45ca1574d4a981655a2b91563ddb89138619158befdf5af92d836a17c95d6dcf901072b614473c2129274e5dcdb1a1d64edb4d
 EBUILD multipath-tools-0.8.6-r1.ebuild 2138 BLAKE2B e6be272ce638c903e22abe6dddc932b2b52a52293ff2719e4a56dea2d782592ae034171f100379ee0239d7b2e0c8254d02396e50ed0c51d357dfb3118ea21be7 SHA512 66e6adbfbda1b831333a4e2dcd928f78e9aa89aa3415a803c716b9700e8247c822be2094ce5780718da879546738d344b012d4cf495aabf7c885b865367aa805
 EBUILD multipath-tools-0.8.7.ebuild 2132 BLAKE2B a42ce3be0b507c66af3690b81593f9d18a5d3a70dc77ee323cf816fce04628b07dd12acd12b624ea7f2fb3d0e7468d80d2ea0c4200dc17b848d5f68333870268 SHA512 3231f180433566de5eff4b7398db745dea00ecee4ca64de35dd5d32921686a4543982068c894c86dcd3741e83488ef6c821461de80f33e32f9fd4f50162c8904
 EBUILD multipath-tools-0.8.8.ebuild 2255 BLAKE2B 37fede21aa5acc7ccb2bb0a30b1643b5961a50d729cdaee83a3c335d4f25c4f67cd9c5d7f2953eac2b58e529aee1e5f35276570e33f33c9b9fc99838bd8787eb SHA512 7f0c5d91cd0a7826d34292d5015fa9dc6423062a4bdf7e90667cbe33ad6ece7c47c6bd543a96bc511466adf3ab10906268b4d5a0f78925f02764a03b6dea2188
+EBUILD multipath-tools-0.8.9.ebuild 2089 BLAKE2B eb64bbcac55df3a285c99c8c8120632772c37b374d720c1b481e79d7abbd200414b55b442e4088f9be942cbbda9ad778945691f66f24653c149f1b6242d19d22 SHA512 fa04dc51808a1be4d2359cb1613efd75c01e60fbe0cacc34bf78c79b884291d3258acfc78cd0415fe4b5e1364b4b77037a39b1f9fc81681f3cbfda2dc77a2659
 MISC metadata.xml 453 BLAKE2B 2f2a56731716bfb47dee061219c80834aa382daf9e6ce937cef2237fc1bbb05e988672cc178ad471d68e9ab4f9292677be71ef9198a163f85a7f3b8658f5d698 SHA512 e8df3db70f5d919789ff0512409365fc80dfbb31ede6079c49910e8acffc6b5289290a48acef8230bc59899262801255048d1a730f81c3642945f8c872ac5428
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
new file mode 100644
index 000000000000..232f231a81dd
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd toolchain-funcs udev
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="systemd rbd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/json-c:=
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	>=sys-fs/lvm2-2.02.45
+	>=virtual/libudev-232-r3
+	sys-libs/readline:0=
+	rbd? ( sys-cluster/ceph )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.7-respect-flags.patch
+)
+
+src_prepare() {
+	default
+
+	# The upstream lacks any way to configure the build at present
+	# and ceph is a huge dependency, so we're using sed to make it
+	# optional until the upstream has a proper configure system
+	if ! use rbd ; then
+		sed \
+			-e "s/libcheckrbd.so/# libcheckrbd.so/" \
+			-e "s/-lrados//" \
+			-i libmultipath/checkers/Makefile \
+			|| die
+	fi
+}
+
+src_compile() {
+	tc-export CC
+
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		LIB="${EPREFIX}/$(get_libdir)" \
+		LIBDM_API_FLUSH=1 \
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man{3,5,8}
+	emake \
+		DESTDIR="${D}" \
+		LIB="${EPREFIX}/$(get_libdir)" \
+		RUN=run \
+		unitdir="$(systemd_get_systemunitdir)" \
+		libudevdir='${prefix}'/"$(get_udevdir)" \
+		pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
+		install
+
+	newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+	newinitd "${FILESDIR}"/multipath.rc multipath
+
+	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you need multipath on your system, you must"
+		elog "add 'multipath' into your boot runlevel!"
+	fi
+}
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index dbe8c108acaa..8fced846b700 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -8,5 +8,5 @@ AUX quota.confd 359 BLAKE2B 37d0cf75f96ca4ccd2d9be1ac3def62a3ac409873cfad33e1faf
 AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b77d2b16adb36dcdd9e510cb7bd15444b1ae8b606d607cc1ebaa10afb064b052d31ed780afbd SHA512 6a0536285bb340779cf4989060ed5a10c9c4a24a48d334174cd84cd54938d042f7a4047f837f96fc7a3c88a1d20317f662c984bd88c00b32cbf48302ba82a529
 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954
 DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871
-EBUILD quota-4.06.ebuild 1618 BLAKE2B 089b7603e91519948a2c5f73364caaaf276a820ed12f49422b186dd9398619c4f2a6180479e0582b6870c974118c83c04e334f4125699aa79ff304a9556898d1 SHA512 77ea9dff644703a8b213cd6ecd82129bbd11df32ef9ac288659c628d88260b1600d9207ee600ab95215a37c7fa04be33ce6c7b7266f8358a5d42d760a1ae6f67
+EBUILD quota-4.06-r1.ebuild 1620 BLAKE2B af22ce41ad07fce67a7d1795f40965a2fbab6a6445e40f7f22e3d310a48da694646da2332e2a2ff77cdbefc334ec6a96ee1e80fb91f65901c3299edf3f01acd6 SHA512 064cf7cff51f4af75eaa070a38a7a825d268767e0f61ea42f145bb7249f42b660938bc260be7fb188f4911bfd218e19d1e011eda96279214c3c10e04ac3df40c
 MISC metadata.xml 483 BLAKE2B a66c5218d5879916eb8d1158e838644b600c79c0285236bb622d4c71d977593c4c95c2e35f52d2be34a3990a0e6ac3a9f6461c541cdf0d704c303ec242a77656 SHA512 0fe78ffe3560e8518ee02f71b7ce3b0ef4963f8d87fd16daac911e42acf269f7f652cd5efa5a498c0e50efa9854c1ba10cd79382b82972aea682510433804614
diff --git a/sys-fs/quota/quota-4.06.ebuild b/sys-fs/quota/quota-4.06-r1.ebuild
index 1c4cd2de9211..c60ede4d7067 100644
--- a/sys-fs/quota/quota-4.06.ebuild
+++ b/sys-fs/quota/quota-4.06-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="
 	sys-fs/e2fsprogs
-	ldap? ( >=net-nds/openldap-2.3.35 )
+	ldap? ( >=net-nds/openldap-2.3.35:= )
 	netlink? (
 		sys-apps/dbus
 		dev-libs/libnl:3
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index f0ad77c19e77..a589a7a4fd56 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,4 +1,5 @@
 AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23
+AUX 2.1.3-werror.patch 1008 BLAKE2B 612c91254cef19ef05fd35e5a458f28d22a8d9f51656b8ffdf3be0b07c7c72668c954c0caa2b8eb215060df1c190cb77248baed41568aded6076a048dfee0f6e SHA512 075a3ff6800420e56662c6453a0d4ccf9ea63c8f1e76e690d46f7a3cb0eff3b392caa6a050e306e7b8b14e20ed925cbb6381d442b4845f6178f5026667ae9081
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
 DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21 SHA512 1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f
 DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682
@@ -6,9 +7,12 @@ DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b
 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
+DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 SHA512 c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e
+DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a SHA512 53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee
 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-2.1.3.ebuild 5245 BLAKE2B 0c4f801a8f4d865be45756462fa533ad86064392e88f3e1cbdd580ffc51cf0ac4584650142c9a7fe0d08e43b7206551cd146b195d1bce3c1287e610df35be312 SHA512 ab5c86fe0dd03b49026b7ef0767ebd39e7a0f2bcc34faff16769f46055a4b5b43cdc0222fb8d97f3b5417936bd3b6129e53d2ef42413a9193704b12cf46f9942
-EBUILD zfs-kmod-9999.ebuild 5245 BLAKE2B 0c4f801a8f4d865be45756462fa533ad86064392e88f3e1cbdd580ffc51cf0ac4584650142c9a7fe0d08e43b7206551cd146b195d1bce3c1287e610df35be312 SHA512 ab5c86fe0dd03b49026b7ef0767ebd39e7a0f2bcc34faff16769f46055a4b5b43cdc0222fb8d97f3b5417936bd3b6129e53d2ef42413a9193704b12cf46f9942
+EBUILD zfs-kmod-2.1.3.ebuild 5292 BLAKE2B 80d9d7cb25cf56286e6808a313a5033af257c5dbaaea8c29ad33c62f8ffb9372cfb50e1217435ab8eac57adac297f5f1b701412201229891e7cae05e16a48d16 SHA512 d26725a3274346917775a21e51b77ada79f025c00d477a9c8a888fca74fd2dedcb8d36af58616678cda7f48ed43da6fa5f2b157c4572b8dcde426831e31cf029
+EBUILD zfs-kmod-2.1.4.ebuild 5245 BLAKE2B 8614756dc32cca2fd5cf61048385b94b646f2d2b35fe5f20029afc5c3faf1e8fc1b1b2ec3e5abe4f9b120dd8c25af689911f130e9771626e2fae7b9fe14191e2 SHA512 96d80fa36f7c55aa6e8fd1ddd62be1ac5b4f5db16446729d82ccc15d6c18c803ccecc49355558bc779b0916d4832e7d24e367a6295a289268911863cce7bfa3f
+EBUILD zfs-kmod-9999.ebuild 5245 BLAKE2B 8614756dc32cca2fd5cf61048385b94b646f2d2b35fe5f20029afc5c3faf1e8fc1b1b2ec3e5abe4f9b120dd8c25af689911f130e9771626e2fae7b9fe14191e2 SHA512 96d80fa36f7c55aa6e8fd1ddd62be1ac5b4f5db16446729d82ccc15d6c18c803ccecc49355558bc779b0916d4832e7d24e367a6295a289268911863cce7bfa3f
 MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724
diff --git a/sys-fs/zfs-kmod/files/2.1.3-werror.patch b/sys-fs/zfs-kmod/files/2.1.3-werror.patch
new file mode 100644
index 000000000000..b4aba47d8324
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/2.1.3-werror.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/835646
+https://github.com/openzfs/zfs/commit/7b215d93bcc0a72d7020ccc050c64f39aa7f2be8.patch
+
+From: Ryan Moeller <freqlabs@FreeBSD.org>
+Date: Thu, 17 Mar 2022 13:18:23 -0400
+Subject: [PATCH] Fix module build with -Werror
+
+This is a direct commit to zfs-2.1-release to fix release builds that
+error out on an unused variable.  The issue is avoided on master by a
+huge series of commits that change how the ASSERT macros work, but that
+is not feasible to backport.
+
+Reviewed-by: Tony Hutter <hutter2@llnl.gov>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Reviewed-by: Igor Kozhukhov <igor@dilos.org>
+Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
+Closes #13194
+Closes #13196
+--- a/module/zfs/arc.c
++++ b/module/zfs/arc.c
+@@ -1205,7 +1205,7 @@ static void
+ hdr_l2only_dest(void *vbuf, void *unused)
+ {
+ 	(void) unused;
+-	arc_buf_hdr_t *hdr = vbuf;
++	arc_buf_hdr_t *hdr __maybe_unused = vbuf;
+ 
+ 	ASSERT(HDR_EMPTY(hdr));
+ 	arc_space_return(HDR_L2ONLY_SIZE, ARC_SPACE_L2HDRS);
+
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild
index 2c6ab28bcfde..39f9cc590a1a 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild
@@ -62,6 +62,10 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-werror.patch
+)
+
 pkg_pretend() {
 	use rootfs || return 0
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.4.ebuild
new file mode 100644
index 000000000000..415a0f781f18
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.4.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.17"
+
+	#  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 2c6ab28bcfde..415a0f781f18 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -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.16"
+	ZFS_KERNEL_COMPAT="5.17"
 
 	#  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 6512785af2e3..e6dc0e2a194a 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -10,9 +10,12 @@ DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b
 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
+DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 SHA512 c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e
+DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a SHA512 53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee
 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-2.1.4.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.4.ebuild b/sys-fs/zfs/zfs-2.1.4.ebuild
new file mode 100644
index 000000000000..17e749df605d
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.1.4.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
+}