gentoo (valentine's day) resync : 14.02.2021

56 files changed, 632 insertions, 583 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 39fe51499aef..79a525928d19 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index 2d258e7ad466..85d23318233c 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -1,5 +1,5 @@
 DIST avfs-1.1.1.tar.bz2 606819 BLAKE2B 240bb342dc9f993ac8deb60941411b1419c190f9909b5b1bde65777b82f622e121f44f238d2bd8ddc303c86ef376950d4af773c8fae79848b466ec3a3c5aafc1 SHA512 0707f8e746d8d3633755b1a1efb944a400c095b517a7befd75de4d25e2fad1a1b5132b9cf94285b05ad1344bfc138ec75e9cb5f8a5d7775a69595b9b35266f92
 DIST avfs-1.1.3.tar.bz2 609901 BLAKE2B 2eea31365533372fc5ea252d57da97a8e0d362b6db5f0a6e10af9255105ccdcadbd7f5157aafd63244da2c7a53dcbc6781d0c4ba5ca231ce2937855d400ea4e5 SHA512 8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005
 EBUILD avfs-1.1.1.ebuild 1491 BLAKE2B 4456b482d395814bcc942b915c443593d661284f5d8ac25f6a143b474f00b6bec645af06ffb56f355597195d01213285082bb7288c10f95e238ee9db98100538 SHA512 f983cbc72aaba0a55f88a26d8cb76b34baaa6f0cefd816ab9952eefdb2530dafb2b49ea5790b7281324d27159e37fef63cea9884ce9c6e052f2b5c44e0395e0e
-EBUILD avfs-1.1.3.ebuild 1616 BLAKE2B d6c930d1dad4142a1fcf45634b3adb3f7dc8983874a88b3f2170b61574c41569ba957552a0c8869f5f20f30d7d4800da55fcf9a57d6f0eef6c023e93290709ab SHA512 22f38e1341d2cb976c5fffed5c886d13111cb6ea1d2dfaa704e73a231380a8021adc9ff0d58decc88d8257a259e807d7ffeb887c1267f39c70ef91fc2dd56ba7
+EBUILD avfs-1.1.3.ebuild 1613 BLAKE2B 289e0d10b67d6df761441abd5cfe35287955005af4d38b8ce70d058a1196e075727aaf6569c5ad7c6714ef355fb3520f93cecfcd3a3ba5b10302b1a9901d636a SHA512 fc7ddde213394a99640f2ab96984cfbed794f2f105cfb0178fca90722e057d280bd37e01dfe27988b8d3ab7b4cc62f09b5434002be66d7965935c0c3494095e4
 MISC metadata.xml 421 BLAKE2B f4c3e8cd39e16235b32a251153c5ff5aab035dc31394cec6029ceef4e99c3e34dc4a58c9f0030dfa4c3618e30da404e4dc5e4802b9b4eca1def912cac902d1d2 SHA512 05215354a0ab9d2a810c2b917d345b1cc061fe20c58799d85549efdc7211bfd6be7ae4ad8bd4b7f5e34239c782cf103a272b2b7e04f356c4271e159758b23c89
diff --git a/sys-fs/avfs/avfs-1.1.3.ebuild b/sys-fs/avfs/avfs-1.1.3.ebuild
index a9d5071514cd..a96738c6cad1 100644
--- a/sys-fs/avfs/avfs-1.1.3.ebuild
+++ b/sys-fs/avfs/avfs-1.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86"
 IUSE="+lzma webdav +zstd"
 
 BDEPEND="
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index 8ff4f2472ed9..5003d08d8d2e 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -1,7 +1,9 @@
 DIST bindfs-1.14.5.tar.gz 407863 BLAKE2B 2c75b426f2b2fd8947c2f7e8b74fd9826cccba99afce661713946acdc7765cd8065475ecc244d4ffd534fde8243d100eba03abcc643cec2a9d2fbec954c4ab73 SHA512 df8245339ef0491a58d69f3fca215b4cca4853976cedc507ba4c953ef136d34d245130c7bdb9b75adb7661e0f359582afae0b6e7b5f69252ca5adecbc09c51ec
 DIST bindfs-1.14.7.tar.gz 409427 BLAKE2B 0027ee589a39d6d29b4bc337aaa87e4cf231f4549245c14353a39fb7a66e8ade17412740f5caf2e2eed4cb0501b6537beaf4929d21256c5b0625304b056829a3 SHA512 03b0bce29b87219e7e159077942e66e7e0e783b8c41234231696f96aa83e66271431fd3b4e7c1d98ba74705ec7255bd7da9d9484981ddb86c4d1c1b35dcaa0cc
 DIST bindfs-1.14.8.tar.gz 410096 BLAKE2B 93184ccbb5b2ed3b75bb74e2c79e92d4b0f90a977713936a3aaf70d56a5801ca0316ea4a4c09818c435618b8a3c848a9d115fd038190a30053c82134a1a38106 SHA512 aa76528d227024b10631dc542c87d6ed9511226ee2983f8aeaf4da5f59acd9537194065505302f506b12150177f1fbdd654366aceea568ca16f40ae8dd2bdb94
+DIST bindfs-1.14.9.tar.gz 410344 BLAKE2B 3875c436e7f52a59c0b7aeb2d7fbcfa7d4edfc3f8397bf7d2a920a260f857ec16df64b78655175f9b0929b93788fb6af46c2844f30ee59c30b6ef9fb5beb4cf7 SHA512 e8c454b4edd65faa64255c7706c195aa1cab6436a0d3481e434a5e535a3c24df1b13342b72ed3da097e68e9d94582237d682dbb675734061d115e863d5767ffd
 EBUILD bindfs-1.14.5.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
 EBUILD bindfs-1.14.7.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
 EBUILD bindfs-1.14.8.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
+EBUILD bindfs-1.14.9.ebuild 478 BLAKE2B 2be2fd62b6507cbaf1a5e57a0582f87278bb6f568f000ef805f159bc4e655104d2f18ac9b1f9d164155b7706d6779f13abdb63979fb3e9200be837dd8e715d12 SHA512 c006e5f23ffd417f5a8c77b417f20ca083ba2a4669189806217a73685a8b62ede8bab826bd6ae713af35dda4bce2eee800f5e12e4866d0f3b6cb1dc53e1434b3
 MISC metadata.xml 325 BLAKE2B aa0a376311bff962fc56dfcfdf9f0d7eab54cde65ad9518ef24e38651e57bccc1514e444657e1dfc4c9a5c7f651e700b5b7122dedca39ac24029b6b7e990c493 SHA512 466c2a77d115de2a7b8110a3076d58b604e0f53a9de46842ffcb0fb2c913e0cc6e0393035432a101327a780163453ff973044f0b473584eb2be65a53a181e83c
diff --git a/sys-fs/bindfs/bindfs-1.14.9.ebuild b/sys-fs/bindfs/bindfs-1.14.9.ebuild
new file mode 100644
index 000000000000..726cd4bf8101
--- /dev/null
+++ b/sys-fs/bindfs/bindfs-1.14.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
+HOMEPAGE="https://bindfs.org/"
+SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-fs/fuse-2.9:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+src_configure() {
+	econf $(use_enable debug debug-output)
+}
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 451b7ca5778f..d11908ebd578 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,8 +1,8 @@
+DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
 DIST btrfs-progs-v5.10.tar.xz 2203516 BLAKE2B 17cc6ccc0e9ae489c5eebd8dfc52fc7edcd4b22ca49c2b5e44febeea2f57b84ceb34e75d1a009126e1c865d63bbe8384be7b2a6b3eeb4933baf8befb7f131be2 SHA512 c94b978ec4aaac272c32e3c91332e85327cec7c7d2ae4d27ba0181f94e14e0dcc50f4f7a53ee9b5a2fe2c76a54dd18aa6c6821e05a592cb5f151abaefd0b12ca
 DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f
-DIST btrfs-progs-v5.9.tar.xz 2189724 BLAKE2B 3692e058e5e52c2a3684548d0b0ca94a9101a66dc8951266a49a71b6848b7f0cce8ade0e914ae8b71345021750e7d20742af13aec69aef7d52e3030fca289529 SHA512 38db047198ab0467d3fe235f7e8e1fd14ade00dd0b182588220c5f5e4b598efbdcd30a3d5d56cf0a0ed8a902d2374af0927eb7f3720cd761172c7291a2a65c94
+EBUILD btrfs-progs-5.10.1.ebuild 3070 BLAKE2B 56289d7f3b80ee4370957694f696b9b3862b7e050d02a1dcda2564eabb68abf20b841fa8259475ffdbe39a1f092a268a79579bcf5526d3dc2a3d35eb7222e41b SHA512 1fe2eaed192f6a96f9eb3adbe41c58e58b282ac120e3ba44a792004ef6d26d5bea05e7c091417461d8d032373f87ecff4bf1a871000e1bc16251b859723d4ced
 EBUILD btrfs-progs-5.10.ebuild 3070 BLAKE2B 56289d7f3b80ee4370957694f696b9b3862b7e050d02a1dcda2564eabb68abf20b841fa8259475ffdbe39a1f092a268a79579bcf5526d3dc2a3d35eb7222e41b SHA512 1fe2eaed192f6a96f9eb3adbe41c58e58b282ac120e3ba44a792004ef6d26d5bea05e7c091417461d8d032373f87ecff4bf1a871000e1bc16251b859723d4ced
 EBUILD btrfs-progs-5.4.1.ebuild 3056 BLAKE2B a2d362c80bb40672688d25a283240be4a3830266bbd5ca2ccdd2fffcca6ff1b3ccfae511550863f509d0d8d5f3e281dff913ea10061838a1a5a565ada30a961c SHA512 468ae334e9dc072583f237bf0108be6dd68d194cdfd57cbcc59ead705ab8796763a399a90ebdcb620b8aaa2a074fb3acb402917dfb68203cc0169ce4941089b1
-EBUILD btrfs-progs-5.9.ebuild 3069 BLAKE2B d898dd77212968b88aee7c6be8144d2a3f789fd231a46e54a80426926aa2dd36238d8d002d6111239ca20bd5c0bf7aca621a3f46cbeaf28e67f61135b9a4ab4d SHA512 487bc47fbc4995ad0858c4bc7c94d75644adbd136c59ee5b7c754d56f71d017e5d260924566b3ac9ffbf5ec9a9a7ce28cfffcbda644006c655da3270f9cd928f
 EBUILD btrfs-progs-9999.ebuild 3070 BLAKE2B 56289d7f3b80ee4370957694f696b9b3862b7e050d02a1dcda2564eabb68abf20b841fa8259475ffdbe39a1f092a268a79579bcf5526d3dc2a3d35eb7222e41b SHA512 1fe2eaed192f6a96f9eb3adbe41c58e58b282ac120e3ba44a792004ef6d26d5bea05e7c091417461d8d032373f87ecff4bf1a871000e1bc16251b859723d4ced
 MISC metadata.xml 523 BLAKE2B 7757fa4d4f1400bf08e2975e5214a1dd0c8258b61366c98089ca9c497b8c62e497cdedad605370f7034519b91c266b23e2e42bcafef3bb2bb69cb6b93319fa00 SHA512 3830f8f555ade672eeb52394a5b262e06e69b8b27d947d81dcde9b341fea9f16b77df8101ee5cd3314b6552543431a5f32a2592bf77a7a50e28cc56c95a4b164
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.10.1.ebuild
index 02813be85f9a..e7da9aa59cf0 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.9.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest
index fb1fa6cd1708..5905aae5182c 100644
--- a/sys-fs/compsize/Manifest
+++ b/sys-fs/compsize/Manifest
@@ -1,4 +1,6 @@
 DIST compsize-1.3.tar.gz 14782 BLAKE2B 738ff0e2b936f5974064759914284e495c895d22d95b705e1b8fac4b3189891771b0e5be7e0eeac0883dd92f9cef276400bb7ee79840fd7db14a5269e7f78f11 SHA512 411b92651fdc3d03deccbf38f72936fee95cf80c67d6368efbc0dafacfe9793815a23ef0d02f7feadf31391e415df3d90cd19fb3acc8cce94f37cb3e4eed623d
-EBUILD compsize-1.3.ebuild 960 BLAKE2B dbfcde92a1f46173797d02234b62321341e1a21ad81948a718d79d801a8170bed6a3fc6a6d00d466023508ebe8478d8951ca93f4b6edc68c0784826f6ad6f27c SHA512 fc7f93faba100c79d64de5699bda9a189d1aaab1588933604009e1b508c3823a9daee945ea6e9c90ed07574597becea1b1186bc5bfa0857386ca807033a9b770
-EBUILD compsize-9999.ebuild 1086 BLAKE2B 99aa3fe99ee99f19ee8beb7328dc9bb1af8288111a6b8e52b0551ecc1cf818f9d2ff7e939ed88a40493e421e1afe2c56cd69a64e92bd5d788517d0ea997c31ba SHA512 4e54a226690115710a9ea85d05a77448b593e5657a9392f52570ef1f4d70770d8b7bfa5a666c6fda50270fafaba9f7009059fb8e4a30230e7e4c5c7d5d2c0259
+DIST compsize-1.4.tar.gz 15001 BLAKE2B 7e4d4a1f3ea59b23fec891c084f68ddb74838320a817767e48eb857de9678a1915d304d25b454afafec867ea6a028d99d9182087d3229ddae55d8305fe6b174c SHA512 c07081721f87d8a59e724a62a0a6d6724434292e6bb3ffb71acd7c47e21727db8f02f4df296cb6094c0e80d3cd555018e492616747ce69055d21302a6617ca54
+EBUILD compsize-1.3.ebuild 966 BLAKE2B 190fe583af11b73cebc53de403e6db93b227640d211501ad7f0320c47684cb1ccc9e4fcce6248eac7ceebdb8bc188e1f518e15091c71acc2d64489eb75ecde35 SHA512 0e8e2cb492d64db2192e7eeeece71628e9395bbe30bfed2530ce9b7411dd12033f88ffd5260f1a0b0c40d7d7f35137c50b68ec7017eae528b353e9e11251ade7
+EBUILD compsize-1.4.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366
+EBUILD compsize-9999.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366
 MISC metadata.xml 444 BLAKE2B 0eacf312059aaec47fa5f5036bc09afccf3275819b8e2890a02130d9e142020945f68d3e155cee27e18d6c061ddbbd6de71231beeab8a4b29e5535ad84db308c SHA512 1c03b76ef3eae52b3212d7f1a8b2e822ac24dcad2a95ed078d4819a7084e6e701f76ce3c17e38efaaeaede24357126cbf54e311c6b2a5c26e75299971ac7649e
diff --git a/sys-fs/compsize/compsize-1.3.ebuild b/sys-fs/compsize/compsize-1.3.ebuild
index bf8f1d40bf84..fc78e5b437fd 100644
--- a/sys-fs/compsize/compsize-1.3.ebuild
+++ b/sys-fs/compsize/compsize-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 	KEYWORDS="amd64 x86"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ GPL-2"
 IUSE="debug"
 SLOT="0"
 
diff --git a/sys-fs/compsize/compsize-1.4.ebuild b/sys-fs/compsize/compsize-1.4.ebuild
new file mode 100644
index 000000000000..f00e46619d53
--- /dev/null
+++ b/sys-fs/compsize/compsize-1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Utility to find btrfs compression type/ratio on a file or set of files"
+HOMEPAGE="https://github.com/kilobyte/compsize"
+
+if [[ ${PV} = 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kilobyte/compsize.git"
+else
+	SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-2"
+IUSE="debug"
+SLOT="0"
+
+DEPEND="sys-fs/btrfs-progs"
+
+src_prepare() {
+	default
+	# Don't try to install a gzipped manfile during emake install
+	sed -i -e $'s/\.gz//' -e $'s/gzip.*/install \-Dm755 \$\< \$\@/' Makefile || die
+}
+
+src_configure() {
+	use debug && append-cflags -Wall -DDEBUG -g
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+	einstalldocs
+}
diff --git a/sys-fs/compsize/compsize-9999.ebuild b/sys-fs/compsize/compsize-9999.ebuild
index 3144e142c1e2..f00e46619d53 100644
--- a/sys-fs/compsize/compsize-9999.ebuild
+++ b/sys-fs/compsize/compsize-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ GPL-2"
 IUSE="debug"
 SLOT="0"
 
@@ -26,18 +26,14 @@ src_prepare() {
 	default
 	# Don't try to install a gzipped manfile during emake install
 	sed -i -e $'s/\.gz//' -e $'s/gzip.*/install \-Dm755 \$\< \$\@/' Makefile || die
-	# sys-fs/compsize > 1.3 removes '/usr' from install paths in Makefile
-	sed -i $'s/(PREFIX)/(PREFIX)\/usr/' Makefile || die
 }
 
 src_configure() {
-	# Used in upstream Makefile, but clobbered by portage's CFLAGS
-	append-cflags -Wall -std=gnu90
-	use debug && append-cflags -DDEBUG -g
+	use debug && append-cflags -Wall -DDEBUG -g
 	default
 }
 
 src_install() {
-	emake PREFIX="${D}" install
-	dodoc "README.md"
+	emake PREFIX="${ED}/usr" install
+	einstalldocs
 }
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 373db4603517..e1dc81c692d9 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -6,5 +6,5 @@ DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8b
 DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 EBUILD cryptsetup-2.3.2.ebuild 4237 BLAKE2B 162a44538c0e962723b53de1e1c62252b2ba18d102724572d97c7a769d2a3298fe9c02170c0a6569d8f915c5987e4ebcd3cbe5d03c093d7181b8dbb8f98d8abc SHA512 6fd1de10c444320888ec5b0d4378c45001afae613f501c89914647a210cf3bb1ac8414325aa79d32fbfd4d4b6954b77ffcd50e06a3867c9fa43d8b044c9e59f9
 EBUILD cryptsetup-2.3.3.ebuild 4246 BLAKE2B fd0847b15440e36bcce552f84678dc995e06722938e64f4700d51c545f77dfc60fe08f0e4cabd8ac5bf02496ae3d42f13f413f75b4b1dfc484559263dc7d0b9b SHA512 388e9da18c262989e564a3cc8c5d0bababa3620b9ad13e1b49aa63d0082d1837460845e626e839befe07dda48b32c8c41248e77156dc46909ff5c70c41be8323
-EBUILD cryptsetup-2.3.4.ebuild 3924 BLAKE2B cb9f482303c7ac087bd11eb7e891a592f274026b4282f1fa12d92a7b156bc0d2d9e6507d730ea4592a15af5beb7ed2abb78fc2117e77a5ac3ecfb2559eef69dc SHA512 2aa95e79b0e0c494d5aef3d5dfcde47ff38f600e93059a0175f15f9677350da0b4fcae8d3c29d987d261c44c9f3a9fa74a197e5bb98408a3d3ee9449fcd747df
+EBUILD cryptsetup-2.3.4.ebuild 3918 BLAKE2B ac28ea0f8533e159aa4b47ad6f844379959807624f6a9af4069c6eb90ce299c839a20fd758a03651f2c6f33987508df219fbca04ed080259c07a64230dee9bd5 SHA512 646a9e1bd8b5c8672c5a642ed0dd8e7c25af8f2878740a0360fda0956ad2498ed9eb3524c465c62fcdaa9f643cfc8bd9a387d788607e5e59493def36f1d63bf9
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index 78f20a6fafb3..994ecb298f9d 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 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"
+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
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index cf9753f82691..bb3d3711c9af 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,3 +1,5 @@
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
+DIST dosfstools-4.2.tar.gz 320917 BLAKE2B c55c7592aa80f1fe39e838c83e147ad7141ddd0f72c9c000ba7708ecb7287c3a92b4b52f72c8d0d1171b0f9609dfb7861bbbe475c5cbd7011151c93c2b1d3d0d SHA512 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156
 EBUILD dosfstools-4.1.ebuild 1026 BLAKE2B 98bcc331cc8e6e4837eff7d74a8d71e40646d1a8ebcb208d5a34fa34bbb8161906e74b4470d22b8f3a95ec125990f01e2ae8bf8aff338563e50af0b1b5a7dd04 SHA512 c2ae1a386ba2b21fc8d15d8163d79ee5ce28285d9f3b418cebb2a7dcf646eecf94824a496eb7851b51392bba87b5820a2a9095f7a60786d2816f90ceddb497e4
+EBUILD dosfstools-4.2.ebuild 964 BLAKE2B f32f6ae1fcd08b2f37d6b6c5d0571722bac6475a3b3c8e9eb4f9a089068320bb3d7423c34d922c7e7311108aac47e76a044decf8bb07fb12369801894d12d523 SHA512 e7b3708d2c79ece0dd5d8c0c3b467bb0250d08a94bb01f5de08ff51fe8d4d941767f444dee41ef9c941eeefa17d3e945f4ac79626fe839fdf0746c64f7f3843a
 MISC metadata.xml 496 BLAKE2B 32b7ed76d0385441b8a40fff8ca15d6848fce7cf1ae511a6905d3c12b8a7593bbc11494f7ca720c465f61175d8d84cd9e6d41f084a140fce88513c6b95965615 SHA512 40b886dc36d892d733a6a6528eed5dec3977eecb71a22b5cee2ea6c0417401951b966509c3816ed5a2761eae4b8c5def7ef5e99d9aedab2e09000a3f3de6b354
diff --git a/sys-fs/dosfstools/dosfstools-4.2.ebuild b/sys-fs/dosfstools/dosfstools-4.2.ebuild
new file mode 100644
index 000000000000..c6c4bfbe5915
--- /dev/null
+++ b/sys-fs/dosfstools/dosfstools-4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
+HOMEPAGE="https://github.com/dosfstools/dosfstools"
+SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="compat +iconv test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( app-editors/vim-core )
+	iconv? ( virtual/libiconv )
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable compat compat-symlinks)
+		$(use_with iconv)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if ! use compat ; then
+		# Keep fsck -t vfat and mkfs -t vfat working, bug 584980.
+		dosym fsck.fat /usr/sbin/fsck.vfat
+		dosym mkfs.fat /usr/sbin/mkfs.vfat
+	fi
+}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 190f73d65e2f..43e3c64a25c8 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -8,7 +8,9 @@ DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
 DIST e2fsprogs-1.46.0.tar.xz 7007144 BLAKE2B d902028a0e538a62428e18e3c2a0a917a73351afc7d8eec804ddac459a1b8c2e11d104201235fb64170acc78942d2c9d5a45039f770cf5ce537cdba18cd559e6 SHA512 c865360e532da42264200934229aa9cfc88c3342fc4e206e82d1fe2a908b0fd3b58f2e9a4796f2ecdeafe1ace9f9ee444ea5b2e3efd488cb934f9a22af6a8f7e
+DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69 SHA512 fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c
 EBUILD e2fsprogs-1.45.6.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
 EBUILD e2fsprogs-1.45.7.ebuild 3985 BLAKE2B d7aed9912b3b1debc59c09ed47283fefb5dac60d23c5ce609b0a9ebeba7792a168c56c465c31cf6632c2fcb4c9aaf09816517ede38431a246cc93363021553f6 SHA512 95db486d2735f237c708748e7067beb4793f46b9191f24662797ca78298deda1cd8eb9580191523fc4f013fbb71f7331d3dcfa92b8eb05794157d544a323c944
 EBUILD e2fsprogs-1.46.0.ebuild 4060 BLAKE2B cbc8e97a47a9792d36cfaa2c9e7237df110a8900443d093ce7873ba1c38a53498f6bd745d885b4778f5d72d193cda7adc03c66c3d2e42727413f07c08298a89e SHA512 296dbe871c4d71cde4ae1522c41929f454df6bc2e97b0137a5c1b670b820adc3462bf9e65f9d17158e2fa24d3924b53d716333e0547a7e87c602e4d7def8ee6d
+EBUILD e2fsprogs-1.46.1.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
 MISC metadata.xml 634 BLAKE2B 57204ec7bc4afb2ec4eac7c7b3ed2b417863bf36be9e7c32c50464d3406de8e0af92af03d9a6947e688bd6c7477029ae68358bdbf8f4a49c54ffe1a9905bfb81 SHA512 bd65352e175b8e2e5f11d175b91f369b509e8dfc83f84d3d80e23c2d5cbbb474b057821e7835cb1f3cefafc9af926c3fa5960bcdff1286ff3842b914615771df
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.1.ebuild
new file mode 100644
index 000000000000..963bf42ad0c5
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
+	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+	>=sys-apps/util-linux-2.16
+	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+	fuse? ( sys-fs/fuse:0 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+	sys-apps/texinfo
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.40-fbsd.patch
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+	# Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-mint* ]] ; then
+		PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+	fi
+
+	default
+
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+
+	# Get rid of doc -- we don't use them. This also prevents a sandbox
+	# violation due to mktexfmt invocation
+	rm -r doc || die "Failed to remove doc dir"
+
+	# blargh ... trick e2fsprogs into using e2fsprogs-libs
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
+		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
+		MCONFIG.in || die "muck libs" #122368
+	sed -i -r \
+		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+		Makefile.in || die "remove subdirs"
+	ln -s $(which mk_cmds) lib/ss/ || die
+
+	# Avoid rebuild
+	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
+}
+
+src_configure() {
+	# Keep the package from doing silly things #261411
+	export VARTEXFONTS="${T}/fonts"
+
+	# needs open64() prototypes and friends
+	append-cppflags -D_GNU_SOURCE
+
+	local myeconfargs=(
+		--with-root-prefix="${EPREFIX}"
+		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
+		--enable-symlink-install
+		--enable-elf-shlibs
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable fuse fuse2fs)
+		$(use_enable nls)
+		--disable-libblkid
+		--disable-libuuid
+		--disable-fsck
+		--disable-uuidd
+		$(use_enable lto)
+		$(use_with threads pthread)
+	)
+	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
+
+	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+		eerror "INTL sanity check failed, aborting build."
+		eerror "Please post your ${S}/config.log file as an"
+		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
+		die "Preventing included intl cruft from building"
+	fi
+}
+
+src_compile() {
+	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
+
+	# Build the FreeBSD helper
+	if use elibc_FreeBSD ; then
+		cp "${FILESDIR}"/fsck_ext2fs.c .
+		emake V=1 fsck_ext2fs
+	fi
+}
+
+src_install() {
+	# need to set root_libdir= manually as any --libdir options in the
+	# econf above (i.e. multilib) will screw up the default #276465
+	emake \
+		STRIP=: \
+		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		install
+
+	einstalldocs
+
+	insinto /etc
+	doins "${FILESDIR}"/e2fsck.conf
+
+	# Move shared libraries to /lib/, install static libraries to
+	# /usr/lib/, and install linker scripts to /usr/lib/.
+	gen_usr_ldscript -a e2p ext2fs
+
+	# configure doesn't have an option to disable static libs :/
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	if use elibc_FreeBSD ; then
+		# Install helpers for us
+		into /
+		dosbin "${S}"/fsck_ext2fs
+		doman "${FILESDIR}"/fsck_ext2fs.8
+
+		# filefrag is linux only
+		rm \
+			"${ED}"/usr/sbin/filefrag \
+			"${ED}"/usr/share/man/man8/filefrag.8 || die
+	fi
+}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 3d71e5c109d8..0c76b6104f63 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,9 +1,11 @@
 AUX 40-gentoo.rules 365 BLAKE2B ac97d87870286b489804d319bbc7ee6fdbc480d0cf811d422b25cc3466542f34e849c3c6aac29f55ad1fbcfebeb943b8782e146f803a0a945f65893300c83806 SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b
 AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88
+DIST eudev-3.2.10.tar.gz 1961960 BLAKE2B 3708c78fad3abad6aa4b2beaaa325e25e118621aa2e6cb351732f6d8349dc17da9be852cab79045c7a513e927c2d1266c6443814fd264943765d98fb5b404e75 SHA512 d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
 DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40
 DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42
 DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
+EBUILD eudev-3.2.10.ebuild 6982 BLAKE2B 07231fa12444370e23cb9b9a7320a988db43721fa596f9cf24988df8392d618a3bbf7fe1b9eb23abfb7d7770cc3aa74d42cbd892303058c7f2fa16fd9c904416 SHA512 67af8926a9fc0c892f9d48f2d9072c469d6f52c2c8136e428257ca6b48f56190f3ce67b3622f3d92c6e81444e49b4778bcbafaa3beaef83b44e758c3b7d4b56e
 EBUILD eudev-3.2.5.ebuild 6812 BLAKE2B 0fdbb319de304026fb2c3f036f759cb47abdf33585062ecb3ea2491b68182b7fc29af8a50761ecf5642d5c4e5c587951db4e8e8bc6cd8cc807c4ab44fde24290 SHA512 6444a8d845287d76f8c20add841d1e2cca7ce398647c694b34d4388c9a29ee03e1c640e2ec7cdb9fb8265a5c812dce04d4536684f7ae67f04e3e39778f8d3bee
 EBUILD eudev-3.2.7-r2.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
 EBUILD eudev-3.2.8.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
diff --git a/sys-fs/eudev/eudev-3.2.10.ebuild b/sys-fs/eudev/eudev-3.2.10.ebuild
new file mode 100644
index 000000000000..56fc1d448292
--- /dev/null
+++ b/sys-fs/eudev/eudev-3.2.10.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+KV_min=2.6.39
+
+inherit autotools linux-info multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://github.com/gentoo/eudev"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	introspection? ( >=dev-libs/gobject-introspection-1.38 )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-${KV_min}
+	>=dev-util/intltool-0.50
+	test? ( app-text/tree dev-lang/perl )"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10
+	!sys-fs/udev
+	!sys-apps/systemd"
+
+PDEPEND=">=sys-fs/udev-init-scripts-26
+	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/udev.h
+)
+
+pkg_pretend() {
+	ewarn
+	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
+	ewarn "as described in the URL below:"
+	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	ewarn
+	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
+	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
+	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+	linux-info_pkg_setup
+	get_running_version
+
+	# These are required kernel options, but we don't error out on them
+	# because you can build under one kernel and run under another.
+	if kernel_is lt ${KV_min//./ }; then
+		ewarn
+		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
+		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	eapply_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	tc-export CC #463846
+	export cc_cv_CFLAGS__flto=no #502950
+
+	# Keep sorted by ./configure --help and only pass --disable flags
+	# when *required* to avoid external deps or unnecessary compile
+	local econf_args
+	econf_args=(
+		ac_cv_search_cap_init=
+		ac_cv_header_sys_capability_h=yes
+		DBUS_CFLAGS=' '
+		DBUS_LIBS=' '
+		--with-rootprefix=
+		--with-rootrundir=/run
+		--exec-prefix="${EPREFIX}"
+		--bindir="${EPREFIX}"/bin
+		--includedir="${EPREFIX}"/usr/include
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-rootlibexecdir="${EPREFIX}"/lib/udev
+		--enable-split-usr
+		--enable-manpages
+		--disable-hwdb
+	)
+
+	# Only build libudev for non-native_abi, and only install it to libdir,
+	# that means all options only apply to native_abi
+	if multilib_is_native_abi; then
+		econf_args+=(
+			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
+			$(use_enable introspection)
+			$(use_enable kmod)
+			$(use_enable static-libs static)
+			$(use_enable selinux)
+			$(use_enable rule-generator)
+		)
+	else
+		econf_args+=(
+			--disable-static
+			--disable-introspection
+			--disable-kmod
+			--disable-selinux
+			--disable-rule-generator
+		)
+	fi
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		emake -C src/shared
+		emake -C src/libudev
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C src/libudev DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_test() {
+	# make sandbox get out of the way
+	# these are safe because there is a fake root filesystem put in place,
+	# but sandbox seems to evaluate the paths of the test i/o instead of the
+	# paths of the actual i/o that results.
+	# also only test for native abi
+	if multilib_is_native_abi; then
+		addread /sys
+		addwrite /dev
+		addwrite /run
+		default_src_test
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+
+	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${EROOT}"dev/loop 2>/dev/null
+	if [[ -d ${EROOT}dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
+	# process it as a list.  We only care about the zero case (new install) or the case where
+	# the same version is being re-emerged.  If there is a second version, allow it to abort.
+	local rv rvres=doitnew
+	for rv in ${REPLACING_VERSIONS} ; do
+		if [[ ${rvres} == doit* ]]; then
+			if [[ ${rv%-r*} == ${PV} ]]; then
+				rvres=doit
+			else
+				rvres=${rv}
+			fi
+		fi
+	done
+
+	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		# reload database after it has be rebuilt, but only if we are not upgrading
+		# also pass if we are -9999 since who knows what hwdb related changes there might be
+		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
+			udevadm control --reload
+		fi
+	fi
+	if [[ ${rvres} != doitnew ]]; then
+		ewarn
+		ewarn "You need to restart eudev as soon as possible to make the"
+		ewarn "upgrade go into effect:"
+		ewarn "\t/etc/init.d/udev --nodeps restart"
+	fi
+
+	if use rule-generator && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+		ewarn
+		ewarn "Please add the udev-postmount init script to your default runlevel"
+		ewarn "to ensure the legacy rule-generator functionality works as reliably"
+		ewarn "as possible."
+		ewarn "\trc-update add udev-postmount default"
+	fi
+
+	elog
+	elog "For more information on eudev on Gentoo, writing udev rules, and"
+	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
+}
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index b62845e4cc43..3dadb7ad2f85 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,4 +1,6 @@
 DIST exfatprogs-1.0.4.tar.xz 255736 BLAKE2B de2d64853e94944dd5c1f961a94daf5d31266a4b8f51e20a0528344fed24a5482ae6412f39d47b7da9807d5b8d10f87106b88818318f26339c0c8e05d52b247d SHA512 c3d9b92101b9461d47a9b3c7a43a99b90160ec81121662b04947aea18ad1b2381dc1d71c491bc4a5f2439120d6c21533ba2714a548134d9c918c4b1c72063d45
+DIST exfatprogs-1.1.0.tar.xz 259716 BLAKE2B 56ead392bc5311352155b03eefcec4f74d333464f6d2d20491c9c9f7dd10abeeaff4bbd1a86808e5af5ad9a5d5423ff82d5e5762d75ef2b19ea1eb3f6213c87e SHA512 6266c10585250d4d4818719f22b7876eec1ba1f8424e966875d207d87d1870a91e05eb066962ab0ad9b750f087db39d9ed7578ec2f1c0e4d03a1b62f01ac6386
 EBUILD exfatprogs-1.0.4.ebuild 601 BLAKE2B bf01b45d28396612a1de65bab39576f0d0c671e88f5edf736af7d7e341ef4dd38bde5e76e7a1c2bf7eacc37bc69ce262b1ed96d9fd164f958bbd7b58a6ac8662 SHA512 1f585fa1671b8ab418a2f5fb9c9d2743bca511627a1bab540159a863a1e7712a679ee397429244cb9f654330fc8555214f34f46aea10720a25f73808ec0a4d69
-EBUILD exfatprogs-9999.ebuild 601 BLAKE2B bf01b45d28396612a1de65bab39576f0d0c671e88f5edf736af7d7e341ef4dd38bde5e76e7a1c2bf7eacc37bc69ce262b1ed96d9fd164f958bbd7b58a6ac8662 SHA512 1f585fa1671b8ab418a2f5fb9c9d2743bca511627a1bab540159a863a1e7712a679ee397429244cb9f654330fc8555214f34f46aea10720a25f73808ec0a4d69
+EBUILD exfatprogs-1.1.0.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
+EBUILD exfatprogs-9999.ebuild 608 BLAKE2B 6b347868183cc62b4d30de2d80c926131793046705f6d8ff8f952b630b5dada45774b28e2cafa5d5d7b5bcc5092e8cd39f810ef12f3ee0bfff636d06298eebf4 SHA512 1d55217e4cc93ddcd89ef8c985927ea836c86d5d6a627c298e71e449128bd35c56f045645d83e65a42ebffdc2d5cf58922854c43ea7cce00d2b952818e46c22a
 MISC metadata.xml 343 BLAKE2B 76c85c7abf0d2244304b72aad5f78ab1ed278b01c943b3380ff5fbd5cb104284accbc33b1b620309f1f9034625e98e0424e89ba4d1d13887c07502b6fd8efb63 SHA512 ca7a2f710812f1e5ee73b4faeadf9628274b1130e96f60af6155388746e0d14559a5e18262191ba50fcc1255cddeb88acf6c2d40df2af48548ce676a7a2fb91e
diff --git a/sys-fs/exfatprogs/exfatprogs-1.1.0.ebuild b/sys-fs/exfatprogs/exfatprogs-1.1.0.ebuild
new file mode 100644
index 000000000000..29a89c2d1f56
--- /dev/null
+++ b/sys-fs/exfatprogs/exfatprogs-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)"
+HOMEPAGE="https://github.com/exfatprogs/exfatprogs"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="!sys-fs/exfat-utils"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
diff --git a/sys-fs/exfatprogs/exfatprogs-9999.ebuild b/sys-fs/exfatprogs/exfatprogs-9999.ebuild
index f262a17592a0..29a89c2d1f56 100644
--- a/sys-fs/exfatprogs/exfatprogs-9999.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index cfb6843e6674..d04c5c3a6caf 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -2,10 +2,8 @@ AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c0
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
 DIST fuse-3.10.1.tar.xz 1898800 BLAKE2B ddccf4dc697547edb6ed48ca76b4379a5f94884fd19118926d82b82316d4b83fa80b9f4bda7edc51eb80ec72c06763fd766ab1216767456db8d6238c725f838b SHA512 7cf16c41060a8aaee2f815f271b4dd410c2e072e7629e55b92faca9b2b47544592704736c7da11a598f18ad4a537f0ba76964fa76e3f1a23b4facfe5c6053302
 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
-DIST fuse-3.9.2.tar.xz 1674292 BLAKE2B 42d796802d3ce2e072120153b695d1e64d160695714c58ffba7859281bfa2c1ff3d9f95b92a38c1a5443abe5a8468f0d9d285845b97a444ae1b64bf750e234ae SHA512 47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
 EBUILD fuse-common-3.10.1.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
 EBUILD fuse-common-3.9.1.ebuild 878 BLAKE2B 2b36fcad7d4b870240f6d8c25639825bc51c8ceca28488a46708317f72d7e58978fa6c8bbdcc12be211016c256e36408723ce9f042d935fb679f433cf2046956 SHA512 36f14cb465000d7d48ebe0367e2a84af714567cfc28ba4583e9e9b6d8a92808e1acf001a2742d0996bb0ad9875badde088e380e66ccce6eaca851bc3c85fe4e8
-EBUILD fuse-common-3.9.2.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
 EBUILD fuse-common-3.9.3.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
 MISC metadata.xml 407 BLAKE2B 037af22bfc4bf2f29d8875a5dd0e9884597553b5a9d6a8853dfb30e69220c310118c6959440d2d619b40c6b14a3077b2e7b19351596af7d2795f37a0522705cb SHA512 5d4c0f0c1fee3610133de2cc7bd075c63de6dfe48782c10a882f8dcc2827ffe7b089b743ae5a5099fa47666f65b9f10cd3a3b41481f3f1090f0e67efd4268991
diff --git a/sys-fs/fuse-common/fuse-common-3.9.2.ebuild b/sys-fs/fuse-common/fuse-common-3.9.2.ebuild
deleted file mode 100644
index 1562ff02eb90..000000000000
--- a/sys-fs/fuse-common/fuse-common-3.9.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
-
-S=${WORKDIR}/fuse-${PV}
-
-src_install() {
-	udev_newrules util/udev.rules 99-fuse.rules
-
-	if use kernel_linux ; then
-		newinitd "${FILESDIR}"/fuse.init fuse
-	elif use kernel_FreeBSD ; then
-		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
-	else
-		die "We don't know what init code install for your kernel, please file a bug."
-	fi
-
-	insinto /etc
-	doins util/fuse.conf
-}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index ee530bbf941e..511124efed52 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,14 +1,12 @@
 AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
-DIST fuse-3.10.0.tar.xz 1899596 BLAKE2B 39f7c7caf3d7cd2807381ee968a6fd704b29e1171a811d918fe70b9fdf6891d553d97a70ac7b217e01c4776e3d8576c60bef0bd3f7b520685d7d0e4ee3b78bf9 SHA512 a59d430f46ad59d51848ab9a07a02940f167fd5552232067dbcc442717a444a2ab30b1743282a7839ae79c0a74949742cd54d09472449c90b5fcc89adc7eff35
 DIST fuse-3.10.1.tar.xz 1898800 BLAKE2B ddccf4dc697547edb6ed48ca76b4379a5f94884fd19118926d82b82316d4b83fa80b9f4bda7edc51eb80ec72c06763fd766ab1216767456db8d6238c725f838b SHA512 7cf16c41060a8aaee2f815f271b4dd410c2e072e7629e55b92faca9b2b47544592704736c7da11a598f18ad4a537f0ba76964fa76e3f1a23b4facfe5c6053302
+DIST fuse-3.10.2.tar.xz 2071936 BLAKE2B 295c77ba7ffe2f56325bbc4eb8336b0765a8958152142660eca70b3e9b97f853adec917a161dbdd59f30d86ee19eb62f451a8bfca3fc797ba67a6139f0258a6e SHA512 8a306f69662126747321144b9e62fe43496ee2b5e96ba6094b7756a365205aefea477f39407c3d2b27528fae773a0662130de9d41503da630e17df564ce76260
 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
-DIST fuse-3.9.2.tar.xz 1674292 BLAKE2B 42d796802d3ce2e072120153b695d1e64d160695714c58ffba7859281bfa2c1ff3d9f95b92a38c1a5443abe5a8468f0d9d285845b97a444ae1b64bf750e234ae SHA512 47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
 EBUILD fuse-2.9.9-r1.ebuild 2070 BLAKE2B 2946ac81c95dbb8cc329247aaf0f123a45475113028b8d79a845ae71388d3fd639c1c660c784284436fc4f603a7a248f33f19687569fde508929f16ac9168822 SHA512 d005e464d34b1a0edb69c795440c56d74c2147cb04403f8067987964ae243bb122adcbacd6f330dd53ed0cd058fdaee2ca4642dd711dfb559903b30364927fde
-EBUILD fuse-3.10.0.ebuild 1831 BLAKE2B e550f8152b6f7427a06ba68c91918115dc82e900f8098d45c5735ab2a80498f8334918306541fd0a7a4bfe5b6eb0bbd27330e2c7c8b587918f7654577aecbcc0 SHA512 47b5e99faccb1e9bb2eaa7c62952f52647906d748ffd0a29c615a30190f1de7a69d6fd25170cf9c7c38d64a6327e21bbc527f2f9de60a39c94c068009f9bf3aa
 EBUILD fuse-3.10.1.ebuild 1833 BLAKE2B 411bdedf4c9da2872462e6c75a11ac397a2f07ed0d144ef8eb58806bf1f35fea3c5de33d3aac04e10d2b899f210ad6ba84c95c711616a9384a1f06e90918083d SHA512 351b75cb8a1aa390be5d208c0ca490a17053d2c90ce3363b2a4fdf133f7f0e4cad824f793f865d747cab470ef3c6824dec9ae16d57755de689d70cd25c7412a2
+EBUILD fuse-3.10.2.ebuild 1840 BLAKE2B e986793891d75b48bc28abf79707236790a1ff8047ecdbe89c75c8c094e52d1f51578a700edecb633ba483d4cbb3a10d5902ee486ac852f8aaa577ce87500f12 SHA512 9e963fc387c1082fcd3297b0b3e002a85c956c0b9beadd37564a427227bab08bb7ace5db9be4c3df4b2ec1eec3651de01a1fc87f1af52295c75110fadb6c6783
 EBUILD fuse-3.9.1.ebuild 1949 BLAKE2B 2446b31c9ebeb764a44f0bd1fbae922211cc243953705a1675e2efdf7cf5049e5d16b2483434fc02c4b6258afb7c1a313d32165f0b5c51d73d91922ccd11d48a SHA512 420ff41139dc9a9f049c03d7f53fa4a0493bdbebdec32fc2a2af33e060f71da23bcff33e37edf8f2d63007dd1801ab165ac107970fc01c42a627a807217812b1
-EBUILD fuse-3.9.2.ebuild 1957 BLAKE2B 0d5745c3c3e0701b6837336c73d98018f690170f1a95fb39bef9017529ad0a070da5da5fe02d82d1e8c25acd14b2dcaded733a41847420df8de6af548c5fa0e0 SHA512 06b0fece0ece43391052026f53591a20630eeb8318110b96bee13d7dc71c5590f0915ca6f4fb12ba9aa6543ec2bbd1722e04caeee7038200f43764f2a868dfb8
 EBUILD fuse-3.9.3.ebuild 1957 BLAKE2B 0d5745c3c3e0701b6837336c73d98018f690170f1a95fb39bef9017529ad0a070da5da5fe02d82d1e8c25acd14b2dcaded733a41847420df8de6af548c5fa0e0 SHA512 06b0fece0ece43391052026f53591a20630eeb8318110b96bee13d7dc71c5590f0915ca6f4fb12ba9aa6543ec2bbd1722e04caeee7038200f43764f2a868dfb8
 MISC metadata.xml 460 BLAKE2B a8f51e9fc0148b7bcc163ea5e0f72291f9e36f3dad8c20076495fe32cb8d5fe992579ab069f840bca251164ff646c522ee0b7ad5ffa7b3115effa89d5acfe332 SHA512 e56ba815557e847487dbc76dbec4ae657c7c4ecebc9b3c02c39402daa699c5ff90923bcaf1843747c94d2025f339ca6521f35f48c6c4583d36e9de33e6f3a586
diff --git a/sys-fs/fuse/fuse-3.10.0.ebuild b/sys-fs/fuse/fuse-3.10.2.ebuild
index 866a200892df..f4e0fdbf39e2 100644
--- a/sys-fs/fuse/fuse-3.10.0.ebuild
+++ b/sys-fs/fuse/fuse-3.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit meson multilib-minimal flag-o-matic udev python-any-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+suid test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/fuse/fuse-3.9.2.ebuild b/sys-fs/fuse/fuse-3.9.2.ebuild
deleted file mode 100644
index 02612a79f61f..000000000000
--- a/sys-fs/fuse/fuse-3.9.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit meson multilib-minimal flag-o-matic udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
-	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python_setup
-}
-
-src_prepare() {
-	default
-
-	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags '-flto*'
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dexamples=$(usex test true false)
-		-Duseroot=false
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-src_test() {
-	if [[ ${EUID} != 0 ]]; then
-		ewarn "Running as non-root user, skipping tests"
-	elif has sandbox ${FEATURES}; then
-		ewarn "Sandbox enabled, skipping tests"
-	else
-		multilib-minimal_src_test
-	fi
-}
-
-multilib_src_test() {
-	${EPYTHON} -m pytest test || die
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# installed via fuse-common
-	rm -r "${ED}"/{etc,$(get_udevdir)} || die
-
-	# useroot=false prevents the build system from doing this.
-	use suid && fperms u+s /usr/bin/fusermount3
-
-	# manually install man pages to respect compression
-	rm -r "${ED}"/usr/share/man || die
-	doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index 0754b57895ee..eea38de147f1 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -1,11 +1,7 @@
-AUX iprdump 256 BLAKE2B 3b4d530a9778a4a730d65bedfd383b89bcc2c741bf0754ecd1d16c4ab97681da9d3e0bf0f90a0c707c95c0c30e7eb8043cf76b6d0c8ab77f597d70fcb8cad64c SHA512 19459acaac6915f341042682a8b8c36726492241a7f3047fd4e3da9d9ca01aedcde97dddc12821bcdbf2c9c541ccf3527100e87ff4dbf616ab7676860f4793a0
 AUX iprdump-r1 272 BLAKE2B 2e6f75349744e44cf09a9b08794abeb0464145a5b9e61a8ea7ddbaa273080fab3f8015a70b9d5a0a0f937ebdaace15a84238416dd3868acbdaf9775bac46cefc SHA512 0b067dce09c7c25a8a02cdb52153f8a3070fe96e180c9a237e64179b27315ce11cdd3c0fe4f1b05cd8059c693c038e986366ccdb9d78d8fd0a9621f014f2bc7e
-AUX iprinit 346 BLAKE2B 5e53c2ccce584965ead96cf596d373645ef17b44136acc9773d63256969361d5c3a4bc8921625aea22728df40183cdaeb77a954dcc35ae702d038ebe22df8f1e SHA512 39b98ba9b1bcd07a4ee7fff74927fb858918226624c0b64b60e33144d968c931d6dc836106dee67bd34fbece8bf056a31bf8449eaaf886c5501dd15aa1124625
 AUX iprinit-r1 350 BLAKE2B 6f8bc65a7daf0969c7b98cb3f8aa522a3b5e0f2a5db45ff4965da358d541f943c3ccd28dd1bba5a1ffa19df0ce0f4ab571c587d61a6e95a0944fed5195af23c8 SHA512 acd1197bda70e7698c0df0ad48c74df870ee2932d87a5a78b0d3cb3c634b372e9accc25cafa4266da027979469bfd634941a0203d62b5082f4455008f1e8e758
-AUX iprupdate 193 BLAKE2B 9fb60ebf6a62bac469c693b0d5d2386b7364d8afebfeae6f6f8c21005a9aaa4e84f23415ddd7945ca78be5430a932524df76936797a4c2eb5ebad909cc0e2fcc SHA512 1b793065cf39cccdf8937546ee4becdc9e202733786ca77768955cc7936fdd41f73622e2019b5a81ec500d97dff019470585030f145955f37e012b2cee20181b
 AUX iprupdate-r1 197 BLAKE2B 4989e933a4d182583640fbd4977a7a43402de66437355d2b889745758ac04c1e8afaff299ac21fbceca2e8cbf7a2c88f4ac69eef3c92667c8064f6b87004e07e SHA512 2398ff3b8c4331f959f3740f003cb119b95357ffa15b9c4c9bb44ab191d2e863ef0b00e90d54ea012a66f309d2e3dc7fbd87c9e8817606523d0805a02153f29c
 AUX iprutils-2.4.11.1-basename.patch 172 BLAKE2B 8075c38277fe0290b47e1a107ba721d02d9d453e9bdb60197e815b0967cc5db4530754c037dc0873483057f93b3b30de0faa4fdd41906ee3c92b0be6a70ee7b7 SHA512 3c0d027d720970028588a241a2399ed5cd658b69b0d4f6ff1645b0ce3eb58eb1af7e485cb674972f11033261f4d9ec9a0c42f583f319123cbab48ce6481caa7d
-AUX iprutils-2.4.7-tinfo.patch 569 BLAKE2B 8188fe255a04685e1240b6e99c8ae63e1993e9942bd25cd526d40f6f7dab568f27816a22360fad60d10418b4455a764fa1484b71a284276019a260adf64b42f1 SHA512 2d489b2a5107fe16c0cbdbcaeb589249d27b7bf40633d9c830d7384053e0659690d2db974a2447a3383bf5af04cc94d64d0fcadc5b18432f57dbc69e338aa0fc
 AUX iprutils-2.4.8-tinfo.patch 551 BLAKE2B 8638750e930e7fe265e75fead2a9c111f0a7304676c4f48c8789be1cf42a76b5ac4a21e0b9fc3ad5536771ce543541c1f032c64f6f264929e6197ba09f76e31d SHA512 c03595b85e17edee22191c49bf8a3361b0c81a9f4dc50bf6d2393dc2be5a0a7c0c77c61de9d17c2e262d150fb0a896274c89442b4df29742532595448171fd5a
 DIST iprutils-2.4.18.1.tar.gz 524809 BLAKE2B c32b01ada70e67748653b8e346cdecae35f3ac240a7eaa8be0ff70590bc68b8be770bffe2f3131cbd6cbbe75812f12524c0817aa02674cd4643e846724be2891 SHA512 42da77c0fde0a2650368b2f0605d63762389ab394f755f4e4144704e155333a2ad8133731244b8383e9a334517aca45f62487229a27a2e90cf22a10c760aab3d
 EBUILD iprutils-2.4.18.1.ebuild 995 BLAKE2B 9a77d8f1dd776aadfa0a8d9fd9f0f1d3783aa37c28624839160a44adff6d377c0169b06b57e0a9fd3eae714eea777ceae6785bc7380b1cc608bb7438a923a3f0 SHA512 07799db4a6ac46dfbe84d452e32d3ae8a35df7691af89ed8018cd058933d8043b573f22ac74aa9e9b10d6fccef1d8141a667c5ae1fc497110520cd9233782b55
diff --git a/sys-fs/iprutils/files/iprdump b/sys-fs/iprutils/files/iprdump
deleted file mode 100644
index 4bc9fdee64f4..000000000000
--- a/sys-fs/iprutils/files/iprdump
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need logger iprinit
-}
-
-start() {
-	ebegin "Starting the ipr dump daemon"
-	start-stop-daemon --start  --quiet --exec /sbin/iprdump
-
-}
-
-stop() {
-	ebegin "Stopping the ipr dump daemon"
-	start-stop-daemon --stop --name iprdump
-}
diff --git a/sys-fs/iprutils/files/iprinit b/sys-fs/iprutils/files/iprinit
deleted file mode 100644
index 0b8a032c7f20..000000000000
--- a/sys-fs/iprutils/files/iprinit
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need logger
-}
-
-
-start() {
-	ebegin "Starting ipr initialization daemon"
-
-	if [ ! -d /sys/class/scsi_generic ] ; then
-		/sbin/modprobe sg
-	fi
-	start-stop-daemon --start  --quiet --exec /sbin/iprinit -- --daemon
-}
-
-stop() {
-	ebegin "Shutting down ipr initialization daemon"
-	start-stop-daemon --stop --name iprinit
-}
diff --git a/sys-fs/iprutils/files/iprupdate b/sys-fs/iprutils/files/iprupdate
deleted file mode 100644
index 3c493149dbf9..000000000000
--- a/sys-fs/iprutils/files/iprupdate
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need logger iprinit
-}
-
-start() {
-	ebegin "Checking ipr microcode levels"
-	/sbin/iprupdate 2>&1 > /dev/null
-	eend $? "Failed to complete ipr microcode updates"
-}
diff --git a/sys-fs/iprutils/files/iprutils-2.4.7-tinfo.patch b/sys-fs/iprutils/files/iprutils-2.4.7-tinfo.patch
deleted file mode 100644
index 406f3efff2a7..000000000000
--- a/sys-fs/iprutils/files/iprutils-2.4.7-tinfo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,10 @@
- AC_CHECK_LIB([menu], [new_menu], [], [AC_ERROR("libmenu not found.")])
- AC_CHECK_LIB([panel], [show_panel], [], [AC_ERROR("libpanel not found.")])
- AC_CHECK_LIB([ncurses], [curses_version], [],
--	     [AC_ERROR("libncurses not found.")])
-+	AC_CHECK_LIB([tinfo], [curses_version], [],
-+		[AC_ERROR("libncurses not found.")]))
-+AC_CHECK_LIB([ncurses], [wnoutrefresh], [],
-+	[AC_ERROR("libncurses not found.")])
- 
- # Checks for header files.
- AC_CHECK_HEADERS([fcntl.h libintl.h locale.h netinet/in.h nl_types.h \
diff --git a/sys-fs/lessfs/Manifest b/sys-fs/lessfs/Manifest
index b62af9c0ec52..1a331d3a22d2 100644
--- a/sys-fs/lessfs/Manifest
+++ b/sys-fs/lessfs/Manifest
@@ -1,4 +1,4 @@
 AUX lessfs-1.7.0-openssl11.patch 2725 BLAKE2B 47c6bc1d6a841f2a2c295e593576d18733befedc7176e7e418f0872d5ffbf4cc36cd64394cf818293f31271e7816cb007ccabfa0f72813cbf84544b5c1512298 SHA512 f296654e621b03495ab9a8a1bcebb169cb03da42763a2803f0adabf2d6951db871c00790464aa527e93373cb876a6d62ecf0595d32a6c9e248865b205c828f1b
 DIST lessfs-1.7.0.tar.gz 514667 BLAKE2B 249e240dbeb95ed9412495d00fe7fdc708a931c65d724f2f16019213f62a9c6333ad6be849337399243a99e3d31d692cdec9a8e0347957087a6f7a36daf11586 SHA512 a868b28159fbcd2e7672607d46e3007c7b959bd8c8880b6c98cdab6c61fd104ac222e156f543c2b3e9f9d9fe2f1879c2988ee80605946f03b646481e7c6f15d1
-EBUILD lessfs-1.7.0-r1.ebuild 1384 BLAKE2B 5f727e4b1a03c881474de413f80d9b0eea3d97fae86cb2c3f9d4815490572a87fba9948b080926db46c9705fb56a1f24d26e623ea2228058ab7ed6e0c67a0bb0 SHA512 09c20c3a8f86ba50f98d601d5626e17cedecce96b4869f150516c77b457958ca125e4d4571be9b32bcb225bcb63cd1b9eab238a80af49fa188426d9c91501cb1
+EBUILD lessfs-1.7.0-r2.ebuild 1414 BLAKE2B 3230b62666dda0aec85879eeb3e1ad8b9d816a753d56ef0a73f9d28e0e350526ee7b4a43d0c9c838773a3250afe96984a2fe28d47086225d392acf6b08390238 SHA512 5d9c370fdb75acc309e03069bf88a2030ae466a08c898417573b46e6083647b4b6567a9a4303f25f2d070730cca6284987ed8615013ce30dbf2fca4a87961ec4
 MISC metadata.xml 1322 BLAKE2B ac82c4e0fd85254c88a5ba7af8a0090f27c670461a4dda24e118b85e542d9c9f04f48d8ece110f2edd955fe02a8ed32f34fd0ed25e52f8bd7a4db9c223d0ef6e SHA512 01c7f7c8cbc83c96ba514e3f8dc7579b06e20a2a8435cd48cef0915637486db1d971bda56eea9015db9f2fe7447409604882f68b5b6f50f0049d629754a199cc
diff --git a/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild b/sys-fs/lessfs/lessfs-1.7.0-r2.ebuild
index 7f0e7606c04a..2691c219976f 100644
--- a/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild
+++ b/sys-fs/lessfs/lessfs-1.7.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit readme.gentoo-r1
+
+inherit flag-o-matic readme.gentoo-r1
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
@@ -17,14 +18,13 @@ KEYWORDS="amd64 x86"
 IUSE="berkdb crypt debug filelog memtrace lzo snappy"
 
 RDEPEND="
+	app-crypt/mhash
+	dev-db/tokyocabinet
+	sys-fs/fuse:0
 	berkdb? ( sys-libs/db:* )
 	crypt? ( dev-libs/openssl:0= )
 	lzo? ( dev-libs/lzo )
-	snappy? ( app-arch/snappy )
-	>=dev-db/tokyocabinet-1.4.42
-	app-crypt/mhash
-	>=sys-fs/fuse-2.8.0:0=
-"
+	snappy? ( app-arch/snappy )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -35,15 +35,19 @@ DOC_CONTENTS="Default configuration file: /etc/${PN}.cfg.
 
 PATCHES=(
 	# From PLD-Linux, bug #674422
-	"${FILESDIR}/${P}-openssl11.patch"
+	"${FILESDIR}"/${P}-openssl11.patch
 )
 
 src_configure() {
+	append-flags -fcommon
 	econf \
-		$(use_enable debug) $(use_enable debug lckdebug) \
-		$(use_enable filelog) $(use_with crypt crypto) \
-		$(use_with lzo) $(use_enable memtrace) \
+		$(use_enable debug) \
+		$(use_enable debug lckdebug) \
+		$(use_enable filelog) \
+		$(use_enable memtrace) \
 		$(use_with berkdb berkeleydb) \
+		$(use_with crypt crypto) \
+		$(use_with lzo) \
 		$(use_with snappy)
 }
 
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 9ddb45b0f816..cee06f94a787 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,10 +1,7 @@
 AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
 AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
-DIST lxcfs-4.0.6.tar.gz 451636 BLAKE2B 97de1825c4a91f4107dbee513246ff48a04956adce7a262a9744730067ac9c31fb6c7802757912640e58eb93504e12338e572acacf3ad300c1253eb517583226 SHA512 843ca196304efc963549c0e081bea4d58182887611da36232e875de4898d738111a967d89b4b49a9df51f25daf119ad2d488b8298cdef82926be03a7fa99a8a2
-DIST lxcfs-4.0.6.tar.gz.asc 833 BLAKE2B c5700c962a608fabc1a7ae4cd708c590a26dfebb72ea9c3db81500bb4e936e7f7358fbfb2c2a0e9531ffceb266d719bb3f6415f4d018ac1ba87b7b7ebddd21bf SHA512 ceffb3dfe3b2751b944be08df84dc30c465b8cde12e16d37e54ce616e5f2032f287a475ca280da51bc4fc518904e64ea7f4681dd6070e63ebd7ecba8b09600e5
 DIST lxcfs-4.0.7.tar.gz 454108 BLAKE2B 8af5a9177089d0629ef05b6f28b9945dcf6f1102bbc3c5458fd71959912201d24b9ea31fc4b4dc51dca388d59ba1ad2a4494561108632abe8b90f1bef4a2e85f SHA512 ab66d4278f8a5e0bb0e7495badcd587ef5fa48fb6271d8682cdca8b0f7c5c4b5f889ca43a86520e6aa28d6824be20f050707169bbed5921e3e4f7eaa0be7a1d5
 DIST lxcfs-4.0.7.tar.gz.asc 833 BLAKE2B 26cb25e41471257925600fcab5a01933076c1ab304e14f71defc21c5b7563e2c0acd832051def79f277322e47a0efe76eb41121293a9b796e486e8a7747f5e2f SHA512 3e9ff48197caca2776665171167805627a421741c02ee4a30e22b3c4ff8e9e58d71997302f45772c58de831ba5315fd335e8856553cfbfcbae1909ad8625f505
-EBUILD lxcfs-4.0.6.ebuild 1363 BLAKE2B 82731f3940188d78b8503c3b050bedfd06d4c24f6742cd80c006487aeb481bde50b7b444bfef7b1860967da759840088977b2cc2b3cb20b3306f541d81698fba SHA512 a7effe7aec113adf8c48b4bbec38fb0e81a7f5568f6bbf84886ca7a7946648f6a5b427df2d3f567fb6d16ded5fc09ccc89698354db8c99abe0086189059a5a0a
-EBUILD lxcfs-4.0.7.ebuild 1447 BLAKE2B e5711cb3ae0d93591afede59b97bafe863486c18d7f6b314905f3c991e08f6764b7fe69005f33ed07bef49a68ecedafd7b1c377a137fd83d97b8a53cab09fb09 SHA512 88fb2e45a0931820bdb1c94e0275a87bbe2989d3ea6f7851dd6adb587936991db178ce388a5cf22341f0dc8a1c3bd48d99aefdd21ece01799b16d4b426710e05
+EBUILD lxcfs-4.0.7.ebuild 1446 BLAKE2B 7c7eb6eb44f3cdeb5c38be49dc36b34f6fe77b23283b4928ab5b0d13edfc21c6d0b29b366f8d771dba608ad5970bee4b9ceebfbf37ccda82aea9c977d2583189 SHA512 549ce7620931289cfba89a89aff9bdf4cc62759e67fc96df29d0227718751ca4b2743b0d981d1c484038996eabb2402653abf93ae88bb037c49d1da4e1acbc76
 MISC metadata.xml 709 BLAKE2B 7c053869dc93fb8eea0b63604fa137736820ff1e2b8e6ee7d500ffd2a46ab381dc1321f2df0268d8f34eef10935f98959089b9f983c112b6809880b27f93eeb6 SHA512 bba720236a7d3fb0c4e71f624575c14a79abacea4441d672a151a3fe16c220fde0c03fa4bbdb2f7d0171920ccb787e1357a0c7aaa54bea4244e8e6771423f19c
diff --git a/sys-fs/lxcfs/lxcfs-4.0.6.ebuild b/sys-fs/lxcfs/lxcfs-4.0.6.ebuild
deleted file mode 100644
index 2ac14261e39b..000000000000
--- a/sys-fs/lxcfs/lxcfs-4.0.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools 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"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="dev-libs/glib:2
-	sys-fs/fuse:3"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/help2man
-	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-RESTRICT="test"
-
-#S="${WORKDIR}/${PN}-${P}"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Without the localstatedir the filesystem isn't mounted correctly
-	# Without with-distro ./configure will fail when cross-compiling
-	econf --localstatedir=/var --with-distro=gentoo
-}
-
-src_test() {
-	cd tests/ || die
-	emake 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
-}
diff --git a/sys-fs/lxcfs/lxcfs-4.0.7.ebuild b/sys-fs/lxcfs/lxcfs-4.0.7.ebuild
index 61b57c9974a8..b652ae461b57 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.7.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-libs/glib:2
 	sys-fs/fuse:3"
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 332236a61231..de163ed1af77 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,14 +1,7 @@
-AUX mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch 1874 BLAKE2B f1ed2498105ae152f06048c2723d02d0a797d3f129e4401a4069046f231219d363506c40e054c5770de2a874e6d44da3dbc8c29f959ce7ff6b85e3414d087644 SHA512 8294242cb6e25198296e7d7bf4a2808cec10fd33ce95aed1669459577c26c9de6868abcdb6244cf50bba0819e2bfab31cbb38b138af0acbc257fe906cbc92c32
-DIST mergerfs-2.28.3.tar.gz 294065 BLAKE2B 2e59e00726aec53438d5a5df143ca204069794d68c663a130139102a19e118a54fede1c8eca99199a3e634ffa92cb21c25c30718ea0842826de8a64e876b2819 SHA512 5469b3515464680aa72fc393c218fb038bed31194a933e6736eec478d87a110979323308b642d7f100a5c506534ca75badf4a87a050007cdc77cd2a641217929
-DIST mergerfs-2.29.0.tar.gz 302391 BLAKE2B a7d051c63b12a95af2868d8b3be9b32aa1be3d9c4cc4e359914b07e18ed30dadece80861ad559d5cdd85b375f565b9e70dac9ad3e34b98c054dd54822897c1a6 SHA512 2c21dedffc2f261c6c8427af59cffcacacc9b67bce7bb9989bd5946aa645c68bac0f56250ec19710e586a00892f7198853390bea3ff5981035d5a492ae4569a2
-DIST mergerfs-2.30.0.tar.gz 316560 BLAKE2B 7e6be39cfa5f085aabbc928e1da9c0bf1f6442be1de4ccef1868832c852d138901071129cf7feff19b13dd5939c5fff56520c5292473b92c71a85430818ab25c SHA512 6914c5efa783d66293ebcce0a6a493267eedfa45ac058cd24b2024aea15a866b997f4474363e4ababa4af59d302466c5f8c6b9f07ee42f7661b335d4701315b4
-DIST mergerfs-2.31.0.tar.gz 314286 BLAKE2B 595dd05e7bd4e6b2fbc2b1901a0d752710c6efea9957c400b394594e5586607a88899bf9966a9406ca0a57e0059af214ce30b06d87db5871aa42b5443a872cdb SHA512 c4504a8f585ffc7f58b11df441755db821611d9754a630ec211aaf611657df82c72120737ba2a2480e1ebebcb0af05adef2e4b8c463b97f4fd98ab5630890253
-DIST mergerfs-2.32.0.tar.gz 314388 BLAKE2B 8f009d8328702c48ec134e2dc80e65c88aa684dac541b9c09d0adaf81f3a013848d826e809fca9fed9d0b68917300f3dd65c5ba687f349006e950c7935b6adab SHA512 a25d075afcd0afb589ebf0306fb25bf8d170ab293047e1501128dcda1941abdce84b5513d9725c06aea3cb003f8abb4573826e81d11cfe90e4a2825ef75887ca
 DIST mergerfs-2.32.1.tar.gz 314392 BLAKE2B 8024dd835af3380fc53ed7255e720c2475da229b2cb3cea68c7bb64edf2b56de903f82c22f65459ea40f08ff724a60fa474a20fbd1e964686a9b1f0df5c5a05d SHA512 2e09ae48d9b06c5a6b7cc577b458a9ec402fcd8243c023f9c03d0b37a35c28722586c738e76f7291559deae84aa69f52bcc76a9042947f984b24b85d84276807
-EBUILD mergerfs-2.28.3-r1.ebuild 1050 BLAKE2B 8b5ea7c3cdb6751b706c1a1f7917f3f6cd1d5bfd08848a711f99b32e1fb5ef594ed22488562a33f6c22bf42144b881fa97389b6f28420e9ed35337f4d1327b3e SHA512 79ce0ba08e48defd5d704be474c2be7fbe2588bdc343f921a71ce9f0b2c94483b141b6ec4f9322c4400bb3d03397166094e2d293f28741e930234bae250edb1b
-EBUILD mergerfs-2.29.0.ebuild 963 BLAKE2B 2df7a15e80299d35e0931db932b3af8d74d452e70eae97382fa28a75ac13cec48b62ef1bcfdacfb82fc04d4d3ef7bc3b148da806a6af1120c5ce73e60ab46a54 SHA512 226502ebd8e52f109039c7a3e6ccfd283f5212c1aa29f9b074eeeb4e81a001a004edc355bb7eb3d42e923990fcd260cc5ca9c7b992a2ffebf799f556d8dc0891
-EBUILD mergerfs-2.30.0.ebuild 1149 BLAKE2B 2e935754ebac73c65dda54dfe817b00dbff4a2821928572850b59b21f29fd38260538f933325671f4c129005819c21d436aa1da0a0ea6c0dd3e1715cc8b36a86 SHA512 bc919fd0d49a2012bff05ab237728c4126a2fee4b0a3e4a711a0030671cf3322f18231bfd2664cc78ac840febf0b12d8678d55e96152970d9cd56030981aa0e0
-EBUILD mergerfs-2.31.0.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c
-EBUILD mergerfs-2.32.0.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd
-EBUILD mergerfs-2.32.1.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c
+DIST mergerfs-2.32.2.tar.gz 314267 BLAKE2B 768241671202019262e16ff9e2247014904fdf503057472b8b68805980215c6585a77047b66aa105fc99a83642b104d002808e532445021500ef3da4cdd3a6ae SHA512 f138f53ce9a9fbda6194847e74e3b3b161f49d84bc659f85c56cd61113fb7e5a89a9950eb54537c4a486a57ade5c8644a9809f97bbfff981cff32a6043329a73
+DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd SHA512 f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d
+EBUILD mergerfs-2.32.1.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd
+EBUILD mergerfs-2.32.2.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c
+EBUILD mergerfs-2.32.3.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c
 MISC metadata.xml 334 BLAKE2B e0f154866ccf08a8534567e5848aa41a0413a31cbd0fc92af2b873e77da2b007c222ab7431a81513e12f3cacd5e8bf8deb8a426e4cee2a64c8d02d0d9b56e4c2 SHA512 8b30ddda63065e140e02f4d3e79d933f46fd9460d2acc5b70e453f82eb6b5c204c810aa0019d183b256fcbde18239efbf01fccc40c5a1ddb632183418a596496
diff --git a/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch b/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch
deleted file mode 100644
index 05166bacd874..000000000000
--- a/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6c38066..d98021c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -61,13 +61,14 @@ SRC	    = $(wildcard src/*.cpp)
- OBJS        = $(SRC:src/%.cpp=build/%.o)
- DEPS        = $(SRC:src/%.cpp=build/%.d)
- MANPAGE     = mergerfs.1
--CXXFLAGS    = \
-+CXXFLAGS    ?= ${OPT_FLAGS}
-+CXXFLAGS    := \
-+              ${CXXFLAGS} \
-               -std=c++0x \
--              $(OPT_FLAGS) \
-               $(STATIC_FLAGS) \
-               $(LTO_FLAGS) \
-               -Wall \
--	      -Wno-unused-result \
-+              -Wno-unused-result \
-               -MMD
- FUSE_FLAGS = \
-               -Ilibfuse/include \
-@@ -76,9 +77,11 @@ FUSE_FLAGS = \
- MFS_FLAGS  = \
- 	      -DUSE_XATTR=$(USE_XATTR) \
- 	      -DUGID_USE_RWLOCK=$(UGID_USE_RWLOCK)
--LDFLAGS    = \
--	      -pthread \
--              -lrt
-+
-+LDFLAGS := \
-+    ${LDFLAGS} \
-+    -pthread \
-+    -lrt
- 
- DESTDIR       =
- PREFIX        = /usr/local
-diff --git a/libfuse/Makefile b/libfuse/Makefile
-index e3001aa..2bbc45a 100644
---- a/libfuse/Makefile
-+++ b/libfuse/Makefile
-@@ -29,6 +29,8 @@ INSTALLBINDIR  = $(DESTDIR)$(BINDIR)
- INSTALLSBINDIR = $(DESTDIR)$(SBINDIR)
- INSTALLMAN1DIR = $(DESTDIR)$(MAN1DIR)
- 
-+AR ?= ar
-+
- SRC   = \
- 	lib/buffer.c \
- 	lib/cuse_lowlevel.c \
-@@ -46,9 +48,10 @@ SRC   = \
- 	lib/mount.c
- OBJS = $(SRC:lib/%.c=build/%.o)
- DEPS = $(SRC:lib/%.c=build/%.d)
--
--CFLAGS = \
--	$(OPT_FLAGS) \
-+CFLAGS ?= \
-+	$(OPT_FLAGS)
-+CFLAGS := \
-+    ${CFLAGS} \
- 	-Wall \
- 	-pipe \
- 	-MMD
-@@ -61,7 +64,8 @@ FUSE_FLAGS = \
- 	-DFUSE_USE_VERSION=29 \
- 	-DPACKAGE_VERSION=\"$(VERSION)\" \
- 	-DFUSERMOUNT_DIR=\"$(FUSERMOUNT_DIR)\"
--LDFLAGS = \
-+LDFLAGS := \
-+	${LDFLAGS} \
- 	-lrt \
- 	-pthread
- 
-@@ -78,7 +82,7 @@ objects: build/config.h
- 	$(MAKE) $(OBJS)
- 
- build/libfuse.a: objects
--	ar rcs build/libfuse.a $(OBJS)
-+	${AR} rcs build/libfuse.a $(OBJS)
- 
- utils: mergerfs-fusermount mount.mergerfs
- 
diff --git a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
deleted file mode 100644
index 101fdf4ffc72..000000000000
--- a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A featureful union filesystem"
-HOMEPAGE="https://github.com/trapexit/mergerfs"
-
-SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-
-# Vendorized libfuse that's bundled is under LGPL-2.1.
-LICENSE="ISC LGPL-2.1"
-SLOT="0"
-IUSE="+xattr"
-
-DEPEND="
-	xattr? ( sys-apps/attr )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="sys-devel/gettext"
-
-src_prepare() {
-	default
-
-	# drop -O2 from those handmade Makefiles.
-	sed -r '/^OPTS[ \t]*=/d' -i Makefile || die
-
-	# Hand made build system at it's finest.
-	echo -e "#!/bin/sh\ntrue" >tools/update-version || die
-	echo "#pragma once" >src/version.hpp || die
-	echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die
-
-	if ! use xattr; then
-		sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
-	fi
-}
-
-src_install() {
-	dobin build/mergerfs
-	dosym mergerfs /usr/bin/mount.mergerfs
-	dodoc README.md
-	doman man/mergerfs.1
-}
diff --git a/sys-fs/mergerfs/mergerfs-2.29.0.ebuild b/sys-fs/mergerfs/mergerfs-2.29.0.ebuild
deleted file mode 100644
index 97325c3ba210..000000000000
--- a/sys-fs/mergerfs/mergerfs-2.29.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A featureful union filesystem"
-HOMEPAGE="https://github.com/trapexit/mergerfs"
-
-SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-# Vendorized libfuse that's bundled is under LGPL-2.1.
-LICENSE="ISC LGPL-2.1"
-SLOT="0"
-IUSE="+xattr"
-
-DEPEND="
-	xattr? ( sys-apps/attr )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="sys-devel/gettext"
-
-src_prepare() {
-	default
-
-	# Hand made build system at it's finest.
-	echo -e "#!/bin/sh\ntrue" >tools/update-version || die
-	echo "#pragma once" >src/version.hpp || die
-	echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die
-
-	if ! use xattr; then
-		sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
-	fi
-}
-
-src_install() {
-	dobin build/mergerfs
-	dosym mergerfs /usr/bin/mount.mergerfs
-	dodoc README.md
-	doman man/mergerfs.1
-}
diff --git a/sys-fs/mergerfs/mergerfs-2.30.0.ebuild b/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
deleted file mode 100644
index 09f2db8f49bb..000000000000
--- a/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A featureful union filesystem"
-HOMEPAGE="https://github.com/trapexit/mergerfs"
-
-SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-
-# Vendorized libfuse that's bundled is under LGPL-2.1.
-LICENSE="ISC LGPL-2.1"
-SLOT="0"
-IUSE="+xattr"
-
-DEPEND="
-	xattr? ( sys-apps/attr )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	# Hand made build system at it's finest.
-	echo -e "#!/bin/sh\ntrue" >tools/update-version || die
-	echo "#pragma once" >src/version.hpp || die
-	echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die
-
-	if ! use xattr; then
-		sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
-	fi
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/725978
-	tc-export AR
-
-	default
-}
-
-src_install() {
-	dobin build/mergerfs
-	dosym mergerfs /usr/bin/mount.mergerfs
-	dodoc README.md
-	doman man/mergerfs.1
-}
diff --git a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
index 5d1e3ec0e4cf..1a8305d70486 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="A featureful union filesystem"
 HOMEPAGE="https://github.com/trapexit/mergerfs"
 
 SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"
diff --git a/sys-fs/mergerfs/mergerfs-2.31.0.ebuild b/sys-fs/mergerfs/mergerfs-2.32.2.ebuild
index 5d1e3ec0e4cf..5d1e3ec0e4cf 100644
--- a/sys-fs/mergerfs/mergerfs-2.31.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.2.ebuild
diff --git a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild b/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
index 1a8305d70486..5d1e3ec0e4cf 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="A featureful union filesystem"
 HOMEPAGE="https://github.com/trapexit/mergerfs"
 
 SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 22666df567a7..2c833f2ecd61 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,5 @@
-DIST udisks-2.9.0.tar.bz2 1671841 BLAKE2B 5f0f26b203a4a54736875211d8299c1b81a4e2722561028f802200b3a0916fb70baa923b2f7f5474580ccf14581d4e3cf203bf9e864cf01613275d3f1b1935db SHA512 314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c
 DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3
-EBUILD udisks-2.9.0.ebuild 3384 BLAKE2B 86fefe57eb435e5d77b734a22aa86f33fe44e410a36a16ea00e9e1b302ddc9d0852a3f524f50e46e1ecec59cd7072ec28f64696dd937a27e9c5ea0569073a12b SHA512 bc22927d295a93bf4d4054344f1cb379ee35a26cd2257931d56e2021035e28413b5f3b6bf848b2efdfa6ae5fdc84526e959d2a3c41ca4eddc5d24c6b6f1705ee
+DIST udisks-2.9.2.tar.bz2 1701377 BLAKE2B 402cf2354907acee13230d035c8b22634a70efab0e61939d8ff260391c80a0d166de67f57cc4b78025da027df16deb07c5620ab546d37181681d824ea84d0e8c SHA512 73a162bbb0fd6ec1e6a79af2a01185672712d7e94eacdc1a913f559a87fc620a095fe4c8b4dacbaa12bc816f565fc966d28c2f9299104da18581d4879321aee9
 EBUILD udisks-2.9.1.ebuild 3473 BLAKE2B bacc1690696c7dac9fb2a2d49faa60f15d6478250c1b3a401bdff9ae36fbd9442e1ccc686889bffaf32c7d84f6f7ff03206c82b44f8e3224bedd59f6d152ece3 SHA512 2b962bfcf6c812afcc3e6e9804a1a184e3a85e99747f19829df8c1516ea290254186bac1f57cb63e067dd052d7176d88a5b87dafc6a245ed8928ec724964ec13
+EBUILD udisks-2.9.2.ebuild 3588 BLAKE2B 230cdd8b7180c9b219258f67b057bb22dc8a736a6c34eadd937d8d232c4bcc6f93e3befe9bb748b3b71280b2a3f96976cb722bbadb3af6c97a839aeaa7dbf02a SHA512 08c60003b133d32bb32961d975c4aacde4186fadb5915a9b9ce8218520813e1350a992a9b351c8f9c006d89503a50e3b775807105541a91aac9dfa4c12108954
 MISC metadata.xml 728 BLAKE2B 4a540e1378d04b04e2b75a531e9df8c13faee4870c8bc3778e9e08dc742eb9e28e2b1134448302e43cbb8815432fa0bbbb402f22722267fa4869fe0c04775c8b SHA512 9f057eb51f5924b53cecf5e495b02bb6fad41e9b23c197b1f24a972e8a25504506e73329a93295e9eb30e62863f7c4454909fba10fdea696be23caa7cf50d8cb
diff --git a/sys-fs/udisks/udisks-2.9.0.ebuild b/sys-fs/udisks/udisks-2.9.2.ebuild
index e86b1253b377..508387e11dbe 100644
--- a/sys-fs/udisks/udisks-2.9.0.ebuild
+++ b/sys-fs/udisks/udisks-2.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,18 +10,22 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
 
 REQUIRED_USE="
 	?? ( elogind systemd )
 	elogind? ( daemon )
 	systemd? ( daemon )
+	zram? ( systemd )
 "
 
+# See configure.ac file for the required min version
+BLOCKDEV_MIN_VER="2.25"
+
 COMMON_DEPEND="
 	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
+	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[cryptsetup,lvm?,vdo?]
 	virtual/udev
 	acl? ( virtual/acl )
 	daemon? (
@@ -33,6 +37,7 @@ COMMON_DEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 	lvm? ( sys-fs/lvm2 )
 	systemd? ( >=sys-apps/systemd-209 )
+	zram? ( >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[kbd] )
 "
 # util-linux -> mount, umount, swapon, swapoff (see also #403073)
 RDEPEND="${COMMON_DEPEND}
@@ -96,6 +101,7 @@ src_configure() {
 		$(use_enable lvm lvmcache)
 		$(use_enable nls)
 		$(use_enable vdo)
+		$(use_enable zram)
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index 7443950f89a0..4487eac2d0cd 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -1,4 +1,4 @@
 DIST unionfs-fuse-2.1.tar.gz 47917 BLAKE2B c76edbcbff98db28092f61facbdf443eda12ea97770126feac3d590e0f85e51df84308d0eeeebd96e5bafd126b472b0ded6a2ead72cac0fab3614e3cc04730dd SHA512 851e378f8c189d8a84d2a0cf47ce8f1e9cdda5e789a8c0c97aac6e0757c2f6480ca4d931a525bb94cec4af11789073ccda44ad01d7ed02de1c29ded72f578aa0
-EBUILD unionfs-fuse-2.1.ebuild 974 BLAKE2B a6eaa6af893d029ba26dfdff8bc4247105fb2877f3a8a579b33d4f685bfbd6b5e3060930e3141590a0c0e8c2bcdda1d929652e98e1c0c8fe81997761247b4680 SHA512 936a56ea59fda60099e71d2b317096a4adb146054622acf87d23ca86b5034a914501c52d15fc4bd42440cbe0c19f629a7dcbba3d63b419242b1e0fcedfbc92d7
-EBUILD unionfs-fuse-9999.ebuild 932 BLAKE2B dc257d50b1d43e42f80494388f41158de3400c021ca240260a645cddbda7fb5accde6672a89b49cfbe1e36f55bcc8553e9c17cc3195c2230476107732be15ef8 SHA512 3f665d4db266fb72a4cace70c6fd1cde6d7a60642bcb9e95acf00e732744c52e0738a695956016a1a8b68c1c400bfb91e272d58aa39dae3cc99fbb6a9a0c8a49
+EBUILD unionfs-fuse-2.1.ebuild 1006 BLAKE2B e84c1581e028696331f8ee1c09e3a3f3327f23904d70d89527b03f32b5e907b571e52c9a6bfb6867dcf4c3d5ef0c3895ff5f33a75144aa9f66494bbaab3f6dd4 SHA512 211c3161df223f7ca0ec848bbe7a4d7d448480a8c3fa8bf1cb84cdd6e61b3d45f25c55df29eda9eb1530b05690c44c27e321ae3e0a3efbd71779357da8d0b260
+EBUILD unionfs-fuse-9999.ebuild 964 BLAKE2B 16297e64d3137ac4562c1ceece6c341ec31a4b53e6b63ea86b59b4ac4986565051b6b4cc858e309b7f035c0d606ddc0ef7001f89ac3408b1b0ad3dc962090919 SHA512 776252949ac73f675d1935f1c3ea24e5801b55c9a2e80b3084c4a05478ee9656d809f917fca7a80141d50cb8713b4aa0c63a9961c5cbeca6a99806974e3fa9aa
 MISC metadata.xml 336 BLAKE2B f9d55c17815e8d3179029c92fd758b0811b455b4d375aa31c44d7643f9d792a70dae915ae25d069e9967fbac2954c197b1ebcd85828b744a9924dc719eeb6f40 SHA512 54597ecd53cfe8d92d717481a533df32cb5fa7272cd64a42a0cd4b4803024b10e3451845569e3d7b199ed63f4070023468dd7528cb438f155539e5e752144197
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
index b9d37ded3403..329020ca1173 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -41,6 +41,7 @@ src_install() {
 }
 
 src_test() {
+	[[ -e /dev/fuse ]] || return 0
 	addwrite /dev/fuse
 	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
index 61aad0ff62cf..c5479601a118 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -41,6 +41,7 @@ src_install() {
 }
 
 src_test() {
+	[[ -e /dev/fuse ]] || return 0
 	addwrite /dev/fuse
 	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index b3f2e2df562c..7c86801821c6 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,9 +1,9 @@
 AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23
-DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
-DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94
-EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322
+DIST zfs-2.0.2.tar.gz 12980696 BLAKE2B 34f4168365d36372349a4986f17cff64987a697e445c2de2ff0bf5d218725fad4aab12b0436ca816300a65856f5918f0cdb8931abeeacd894046daf013bb944f SHA512 5033645ad8fc2afd73187cc00e775ad79ac89e9a69841e1bda2867c2f05dab082f55fc83eedf2fdff1dab322f0eaac1ba2f8411def94e9cd7c011a03e84d5363
+DIST zfs-2.0.3.tar.gz 13114404 BLAKE2B 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 SHA512 8b2a6e0edfb3c85441076b2c6163ad3d7d239e11db128ab74d60bf8dc802d67b7f5b8d1cc7227316a7dc3917f14e9ac072ebf1583957f2a45c1b8438e4068200
 EBUILD zfs-kmod-0.8.6.ebuild 4761 BLAKE2B 03ae7e6c75b1e0b2032758272eeef7ac5ceccb367ba9180aee173bbe322580ca9757915eaa13dcd88781d738341748e338f25c41eec95f6293a066850dfe286b SHA512 9991249746e2f912c6978eb8f771d2f25cb082a31b26c9bd5167985a6f8c11dcbae4851e965053dccfa7fcad323e973d150b0a4963f47be39c6513d614097d0e
-EBUILD zfs-kmod-2.0.1.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41
+EBUILD zfs-kmod-2.0.2.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41
+EBUILD zfs-kmod-2.0.3.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41
 EBUILD zfs-kmod-9999.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41
 MISC metadata.xml 448 BLAKE2B 4a3c4f00039257710b1afa9fceba0480ea53df29d5c7a7eb0037fe326e9cc19f2dca572fa1122d769b6c432b4f6bbf6864d78cc9d0dd3fa797831d7c497ab8b4 SHA512 09d8c75b14b0934d134e10456074f51feeb35f77b59a089f7c6720ce9aa6c83819cdb7e72aa3879a71621310cdd24466ec2c9fd82e6e8040303547249c5464d5
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.2.ebuild
index 2fbfd85f7ccf..2fbfd85f7ccf 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.2.ebuild
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.3.ebuild
index c5b1b6d6625d..2fbfd85f7ccf 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic linux-mod toolchain-funcs
+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"
@@ -12,13 +12,14 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64"
-	S="${WORKDIR}/zfs-${PV}"
-	ZFS_KERNEL_COMPAT="5.9"
+	MY_PV="${PV/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	S="${WORKDIR}/zfs-${PV%_rc?}"
+	ZFS_KERNEL_COMPAT="5.10"
 fi
 
-LICENSE="CDDL debug? ( GPL-2+ )"
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 
@@ -60,10 +61,6 @@ pkg_setup() {
 			DEVTMPFS
 	"
 
-	if use arm64; then
-		kernel_is -ge 5 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT"
-	fi
-
 	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
 	if [[ ${PV} != "9999" ]]; then
@@ -75,13 +72,10 @@ pkg_setup() {
 		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
 			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
 
-		# 0.8.x requires at least 2.6.32
-		kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
-	else
-		# git master requires at least 3.10
-		kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
 	fi
 
+	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
+
 	linux-mod_pkg_setup
 }
 
@@ -114,7 +108,7 @@ src_configure() {
 		$(use_enable debug)
 	)
 
-	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -155,6 +149,10 @@ pkg_postinst() {
 		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
 	fi
 
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		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."
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index f189fa305add..1a5186faf545 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,9 +1,9 @@
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
-DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
-DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94
-EBUILD zfs-0.8.5.ebuild 5693 BLAKE2B 77894a238f74e1d208ad9606fe38bc95caa4221a8cb9da8196c8479aa53dc63ac93da7259ae3230a0dfe851c342f243df44f8251ffd74fc364bdea9f2af5e299 SHA512 b5bc4272449ea08e454d25b26f41399fb15b6a74db350d78d034e8e92ff82b0045690fd0c614c71fb6be114a792323f8c66b19644d79ff8a26b6694ad5a45534
+DIST zfs-2.0.2.tar.gz 12980696 BLAKE2B 34f4168365d36372349a4986f17cff64987a697e445c2de2ff0bf5d218725fad4aab12b0436ca816300a65856f5918f0cdb8931abeeacd894046daf013bb944f SHA512 5033645ad8fc2afd73187cc00e775ad79ac89e9a69841e1bda2867c2f05dab082f55fc83eedf2fdff1dab322f0eaac1ba2f8411def94e9cd7c011a03e84d5363
+DIST zfs-2.0.3.tar.gz 13114404 BLAKE2B 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 SHA512 8b2a6e0edfb3c85441076b2c6163ad3d7d239e11db128ab74d60bf8dc802d67b7f5b8d1cc7227316a7dc3917f14e9ac072ebf1583957f2a45c1b8438e4068200
 EBUILD zfs-0.8.6.ebuild 5695 BLAKE2B 1512678bd01715aaabb552739c4a5fdfc2251af572032b8aa4b4402828b18c2b6543d742f41c975f97b3be4c3019f0354f97ca62613dfcb4e79cd54565d090a6 SHA512 d3cc8513012eca1ef0d121e97a9347223278c3f0b6bbaebdbdd70403ddad53c508ee614f682a2280d781d777a74b953f90a9d777edbd744c0a3c45addd20f882
-EBUILD zfs-2.0.1.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705
+EBUILD zfs-2.0.2.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705
+EBUILD zfs-2.0.3.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705
 EBUILD zfs-9999.ebuild 6017 BLAKE2B e5103b662623047ae487ce98a339732b26fbf06f91f8c4203ccc48dc628d64bed7cb871f5890aa32cd8f662f3028368ce36a4c13e77758c42f7253032a154d01 SHA512 f07f334e0ec1336028cb3bd02a78222cddc7363312ac1709a02f143e3df5fc97768da2d502bf2ff98ef7815e094de99a9c55630c5d7bc04bd6a229cb499c6705
 MISC metadata.xml 900 BLAKE2B d51eb3a6b612d11f2687117c3e26960834de7b2a6071117bcefccd034f7c105f1158fda5263823ae90d20ebfb3e850a298333502d47566aefdb4ec0b871d570a SHA512 a746956ce9e80348503bd924bd592c3a4d8e11614732bcdf5f1ea824f2439141694654591fe7f744a2d08f3dfb7ec0c17476079d3490b0ab1838cbbb487dde0a
diff --git a/sys-fs/zfs/zfs-2.0.1.ebuild b/sys-fs/zfs/zfs-2.0.2.ebuild
index 1d1a3c6ccc7c..1d1a3c6ccc7c 100644
--- a/sys-fs/zfs/zfs-2.0.1.ebuild
+++ b/sys-fs/zfs/zfs-2.0.2.ebuild
diff --git a/sys-fs/zfs/zfs-0.8.5.ebuild b/sys-fs/zfs/zfs-2.0.3.ebuild
index e595b2f8c845..1d1a3c6ccc7c 100644
--- a/sys-fs/zfs/zfs-0.8.5.ebuild
+++ b/sys-fs/zfs/zfs-2.0.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"
@@ -15,13 +15,17 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64"
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	S="${WORKDIR}/${P%_rc?}"
 fi
 
 LICENSE="BSD-2 CDDL MIT"
-SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair
-IUSE="custom-cflags debug kernel-builtin libressl minimal nls python +rootfs test-suite static-libs"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+SLOT="0/4"
+IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
 
 DEPEND="
 	net-libs/libtirpc[static-libs?]
@@ -32,6 +36,7 @@ DEPEND="
 	libressl? ( dev-libs/libressl:0=[static-libs?] )
 	!libressl? ( dev-libs/openssl:0=[static-libs?] )
 	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
 	python? (
 		virtual/python-cffi[${PYTHON_USEDEP}]
 	)
@@ -73,9 +78,7 @@ REQUIRED_USE="
 
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/bash-completion-sudo.patch"
-)
+PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
 
 pkg_setup() {
 	if use kernel_linux && use test-suite; then
@@ -136,16 +139,20 @@ src_configure() {
 		--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="${EPREFIX}/lib/systemd/system-preset"
+		--with-vendor=gentoo
 		$(use_enable debug)
 		$(use_enable nls)
+		$(use_enable pam)
 		$(use_enable python pyzfs)
 		$(use_enable static-libs static)
 		$(usex minimal --without-python --with-python="${EPYTHON}")
 	)
 
-	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -160,9 +167,11 @@ src_compile() {
 src_install() {
 	default
 
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
 
-	use test-suite || rm -rf "${ED}/usr/share/zfs"
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
 
 	if ! use static-libs; then
 		find "${ED}/" -name '*.la' -delete || die