gentoo resync : 14.12.2020

45 files changed, 285 insertions, 495 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5a7390e87139..31a0dd3eb114 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index b8c5965c297c..b020e2b9f422 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -4,7 +4,7 @@ DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a
 DIST btrfs-progs-v5.7.tar.xz 2182728 BLAKE2B 47573baa26cde058003b402dadba28f278b4b3ffd270d002ab8fd72d94ee41d3fdfb3d36c0c579e24ea6afae4b2dea2ca704d9dd809fcd10fbc146d63d48980c SHA512 72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16
 DIST btrfs-progs-v5.9.tar.xz 2189724 BLAKE2B 3692e058e5e52c2a3684548d0b0ca94a9101a66dc8951266a49a71b6848b7f0cce8ade0e914ae8b71345021750e7d20742af13aec69aef7d52e3030fca289529 SHA512 38db047198ab0467d3fe235f7e8e1fd14ade00dd0b182588220c5f5e4b598efbdcd30a3d5d56cf0a0ed8a902d2374af0927eb7f3720cd761172c7291a2a65c94
 EBUILD btrfs-progs-4.19.ebuild 2935 BLAKE2B ec90c74cd306183cf06e9a16551d0bb3c029eed1336ee32ba06fc243fa6598cfeacf896334e36855055031c67c49d4eaac15f27d6c2c13e1dbe125cfef757c7d SHA512 cd4490f127fa27ffd9916c8464c3dcf6453d5da8e9a4ba81e3c4ddcc6fa17740293c7324a80c1bc5d3faa2a28b6f7dbcf5cba577cf6a9e09652fb1a02bb66cff
-EBUILD btrfs-progs-5.4.1.ebuild 3056 BLAKE2B 1e99fa5a44629e1ff802fa056a3c026ca4c2f266415f910910bd2a205e8a98939355221d220e938fe276c74daf8462ee44f8038d449a5d46e26c9fafc3278078 SHA512 963080d0816c9b226848d8c8cbcf0bdc979e37dc0a0212c23202e4167170595490fc9cdd83597473ed723a903aa6a4d64e66bf29e4f8da93cd2667ccb1ae695a
+EBUILD btrfs-progs-5.4.1.ebuild 3058 BLAKE2B d2be1b014f995baf9393b13dbdca9fcb48ecc234874fc17e942132d64b367a6e0b361d75afc4dc8e4fbde1aa117fe946da21470442d914600e170af6e73f17a1 SHA512 3517e324fc6cf4f40a74bbab8979e454b105d790d093f2d614630038b64cc3a3eddfabf90f611612d69ac5c5cba5e9d89c65414a2a95dbce9138c32f1f12ef39
 EBUILD btrfs-progs-5.7.ebuild 3071 BLAKE2B 36dbc24c764f7a903b611b52ce125e06c4e29b54dfd4ab3a89d77b7f52fc5696b0f01dce4b4305e1852d317f7624090e60598ba319a92dd52128424760a6dba6 SHA512 d09374b0ff974ecf54aad32eaf6394289f36bdce10940ed80f4100444db3fff03e847bf4834937a1a9aa8748b6bef32e597ea0a6bf08d0de29f497ef75062190
 EBUILD btrfs-progs-5.9.ebuild 3071 BLAKE2B 36dbc24c764f7a903b611b52ce125e06c4e29b54dfd4ab3a89d77b7f52fc5696b0f01dce4b4305e1852d317f7624090e60598ba319a92dd52128424760a6dba6 SHA512 d09374b0ff974ecf54aad32eaf6394289f36bdce10940ed80f4100444db3fff03e847bf4834937a1a9aa8748b6bef32e597ea0a6bf08d0de29f497ef75062190
 EBUILD btrfs-progs-9999.ebuild 3064 BLAKE2B ce781c34885668adeef3e1a0009f0a929122b482e7ef356a33652d791f082c9f2832b280c1f10894f3c43b0724c24f69850b26fbc26ee3d6a56b47dc7c409f9a SHA512 2797cbc83b6716addd885daa532fd17df55da984d8c184ecc37a75cbbc47765cb530909572671adf680f7408a3d75f58aceefcb544ab948d9a5b6cb9c77168ef
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
index f20f3fcae63f..9b2a580e3367 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index cd36de7d2a75..e47b645019cc 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -4,5 +4,5 @@ AUX diskdev_cmds-332.14_p1-no-sysctl.patch 235 BLAKE2B 4eebaa367a3c1eef94c82755d
 AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2f974a42ad33f0f65551bcc4c2a873b50a4413cf16542b74f277244f578142fcd5f1bfe63063c280062bf06aed20f601385 SHA512 21325ea43ea19a06962b7123ba418d5759d712d44b1ba7d35fa982613a95d2d91d1e7cde287b497d9e6de9483658f36378f7d3d03e5780d7dc468a82e5b0da69
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
-EBUILD diskdev_cmds-332.14_p1-r4.ebuild 1365 BLAKE2B 7c3d826f5dfcea2b57ad7ec286b6e49ffe91c336c46511ad91bf1947098f319e44f77def8286eb44e83a6e56bb33e6bb8cae1a2f94357c11b7ff80b6ad38ac32 SHA512 eac51622d965571b6bd9dd170d9b37015a8d9571e5ecceec7cbb84ac6077a941d815dd226a41c21f7278f2be27415793e805937473ac79539ae366d67ac6a727
+EBUILD diskdev_cmds-332.14_p1-r4.ebuild 1372 BLAKE2B 2572adf06814bd274704ad88e01651d3961d0a2a91d48842801ded31cddd5c994ba9228061d5c0a7ef5f45c3a3f4d9f4516dcaa1962294a068e5ebcd0c4a07e0 SHA512 d20db0f4f5955e468dbeeac670ea09db534820da2a5096e2fd20691dff625ca0853bb306d74b908ea0bd3b263d8fd6c16dddef9b413bd7072524a38a97054675
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
index 722b317a2d7c..3fe0634bc4f6 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.
 		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
 LICENSE="APSL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="libressl"
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index 8d67bafa0ae9..7e1598dd2a57 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -6,5 +6,5 @@ AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 BLAKE2B eef9d2ef5f2766773bf83bba93
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
 EBUILD dmraid-1.0.0_rc16-r3.ebuild 3266 BLAKE2B cae1fe9893033caa1ef9c166e5d76582520e0d672b2d2124183a1ea88268d21c90205bc49515cca08d6104024d46490840cba2391f1ee77b13e14da61cf767eb SHA512 509e0ebed35e1a7b6832dea0d69d10dd5ae96cf48605117ba228d5c12a8dbe7c52d91a48bf73bde8ac0efabd1b30743671e9d1f4effc5d8489826e765940d690
 EBUILD dmraid-1.0.0_rc16-r4.ebuild 3199 BLAKE2B df8cc50e363a354ebbcfa4adbb98b3fac4d4ee23a102950819a4337576a69bc7d8501f73f9fa62f908c8d37220135546b15f1b8329d7179cd6270972ba27e94b SHA512 db1ac9ee6140aae30d3124895d4b8cffb414663449c53f5559a6d76f17d19433057419516c8978fc9b8afea0462f9071695d7042e766c427b08d86bf0432b9f4
-EBUILD dmraid-1.0.0_rc16-r5.ebuild 3295 BLAKE2B 56f9cd517355efbfe9534b5dbeb9374b7f432090edfd62a5bd654aae0e03dbaf824674e73a6966a7bb5d29aac31e2667e3b57d018aebf0ee912fb03f211d0bca SHA512 4a0674eb7eafbcb82e9f5aaaf65b926c4190ea44e5852fa7dfedebc7e238c98e543b1e005f9a154bf817e2a77e2bad934a0301777ae29a3d352afb0aa07993fb
-MISC metadata.xml 769 BLAKE2B 58eaf54f32d2bdfa2bdcdb149d97a5e23cfaa91edcf261041953b46ca79291dc8f687da56d9fc2c821697fe69cdc54f78515581566c2ab4a5afc125273e4c3a4 SHA512 e716dad80405dae942af5ded092214854432f43a5c622e8ce41f36af3f514c9425de401da278e2b0a2abc96103e4894896ff539f5665e5c48ec2640e57d11e26
+EBUILD dmraid-1.0.0_rc16-r5.ebuild 3302 BLAKE2B 80754d66d259660813df47f4378cff9541fc34cee3e7bc1314bea542c71cfc7635e18c11c1ea871dbf60af4b572df5bd2c6b8b08786fae3ced93357ca9c652d0 SHA512 306fa1221f44860fcf29fda84f481df1d87c04c975504ab2cb762e07e33c426981386f283f4d01d9d9dcd3e0f9cb1b91abe5cbec8cf42a88270245b40347f42d
+MISC metadata.xml 690 BLAKE2B 610874b7f4687e1298a8b264dc5bfea0a1b0d801cc06e8366868f0e20007bbc3e1c78372eb6646b50c13194ecdf29e650580f1842977b40ea4938af03e00f759 SHA512 0df41bb9107110e39d6bbb8f89017e39b72fffe8875e85996ea62df6d1566064f3a103b41ba22ffb82cfc1d6d98e31cd4003cf7c546b6574bd0dfaa75d92b365
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
index a4b58735f59a..7d42581d1fd8 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="intel_led led mini static"
 
 RDEPEND=">=sys-fs/lvm2-2.02.45"
diff --git a/sys-fs/dmraid/metadata.xml b/sys-fs/dmraid/metadata.xml
index 631bce7f7303..5088afcac953 100644
--- a/sys-fs/dmraid/metadata.xml
+++ b/sys-fs/dmraid/metadata.xml
@@ -8,9 +8,6 @@
 		<flag name="led">Enable LED support</flag>
 		<flag name="mini">Create a minimal binary suitable for early boot environments</flag>
 	</use>
-	<maintainer type="person">
-		<email>axs@gentoo.org</email>
-		<name>Ian Stakenvicius</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>This software discovers, activates, deactivates and displays properties of software RAID sets eg: ATARAID and contained DOS partitions.</longdescription>
 </pkgmetadata>
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index bf0946a2997f..00f00972f7db 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,5 +1,7 @@
 DIST fuse-overlayfs-1.1.2.tar.gz 98055 BLAKE2B 04cee8052671431604031ddd3d0ebc254de0ba00a527b4a7caa24bf4a0b74be81c9d0f2c02e5eb583c3f6a61b540762b52617531f266341878cb54f40e087331 SHA512 41bb7ed21d0408af61820b9aebefb08ee6add0c9a15ff1cafd8abc7ff6fcc46afd53740c946c6835bbba8c58ee8bfcc8351cd2a1fe81d749dad81934ce44032b
 DIST fuse-overlayfs-1.2.0.tar.gz 101375 BLAKE2B ff71ae8ad58396a8365fd65574145b45ae9632f407e2246096822cca12eb17d7a7ef9f5cc3546c83573b7af56b96d8800d6f390477cff2fe88c2858ed198740c SHA512 55aa7c92f964ab18b886607de705b98510c7f25cc0d90e4712fb8493a4baab9ea722d8966a9b7e8f8fd8e5d2163a54993e9e45dfa2699db6cec8b447bdc5399b
+DIST fuse-overlayfs-1.3.0.tar.gz 102059 BLAKE2B 30564f9a06ed04f7716170ee864bffeb899f8fc6b411cc95dbe920632dcb2ea2d9d7a9472b35fa33ddca86570978913f8651c35e3544bd650a95c52ca0d4d3ff SHA512 c374b5dd4d369ab0134f66ff021c8efbc35f173a2d53a7212d5ec459c5083cd0fb5fc93b68696db5903891aa33c719be7eb3beedcaab043459f8b506d7cf5c0d
 EBUILD fuse-overlayfs-1.1.2.ebuild 564 BLAKE2B 1932eec0743d4360b15f3f487e337271b4b6befcb9365869dee089e31145926dc4be46c67c81caf3ed18ffafd26cd799f3126d62e8427abb8f6573fb083aeefa SHA512 d94880968425bf4c54aa40fae97744d72b8ac41427f7216f399e796ab771fb850bf72c7b890a80e69b3ab9e5c5b2d55d2086bfbf8e7442be877fbac4054a117d
 EBUILD fuse-overlayfs-1.2.0.ebuild 564 BLAKE2B 1932eec0743d4360b15f3f487e337271b4b6befcb9365869dee089e31145926dc4be46c67c81caf3ed18ffafd26cd799f3126d62e8427abb8f6573fb083aeefa SHA512 d94880968425bf4c54aa40fae97744d72b8ac41427f7216f399e796ab771fb850bf72c7b890a80e69b3ab9e5c5b2d55d2086bfbf8e7442be877fbac4054a117d
+EBUILD fuse-overlayfs-1.3.0.ebuild 565 BLAKE2B 6cad51a1921aa1c48f25baa727c28c51c5876c83944be93529c8639bfa75f90adfed39c7247768b0beef5cbd612e4087485078c9a4508a1ddd8d982fb9797c9b SHA512 60da39f950d584bac0c032f2ecdd8a479875916816459083c7fb21888fd912d6cf4b78c4419a8f30f909473a52818aa60cd75d140cc771352677c30b88ddb65d
 MISC metadata.xml 334 BLAKE2B d159a1336d5c016f97f854c7dc8267a7df63d9352fc81670d09fb436aa1267c842a466bbe026443a57c3e910c927f361d0ad25e9785ea785e522500c966beca0 SHA512 c91863d890e5145d3e05d247455ee2d0bda70525dfbc15632e11df75ccdd40bdb0dca17b41d3f8485ad1768cf401915ada074ee05f739d74df93d440785b6fd5
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild
new file mode 100644
index 000000000000..ca9d3f24ac43
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="FUSE implementation for overlayfs"
+HOMEPAGE="https://github.com/containers/fuse-overlayfs"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=sys-fs/fuse-3:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/hfsutils/Manifest b/sys-fs/hfsutils/Manifest
index 30f1734b0f02..79e08b69a2b3 100644
--- a/sys-fs/hfsutils/Manifest
+++ b/sys-fs/hfsutils/Manifest
@@ -1,6 +1,7 @@
 AUX hfsutils-3.2.6-fix-tcl-8.6.patch 158 BLAKE2B bb12d05629bede97e0d0eedcf42cbabd3d4e5c682253002b726db1d33a72f70f4cade4a2cbfbde810ac0481419c6a1561e4a3e29a81e0b0f48152e4b3b9830c1 SHA512 7b9cb4cb04fad7c092e2061568ba804f0c7035160c6213d3b069deefab8789d624e4b51b39c8bc77a2504279c641b72fad92ceff0a3e2049dad3c9b65e0163fa
+AUX hfsutils-3.2.6-test-tcl-8.6.patch 1651 BLAKE2B bc86ddce138beb81f3d70d43bc4c2fc4696543d70d4cc60ffc60598cafc4cd6573d9813ffd1443fd9bdedc3d99ba5fdbc4b3704d360b6cd9cd0672b4185770d6 SHA512 da19f521696bd837fd03b513f1439472cd2566a1992c92d03804f0aed794767a1b7ad97fa51f3e27488d22dfed5f3214a6270d778d1eb2853dd9f2fae86fb835
 AUX largerthan2gb.patch 216 BLAKE2B d8f9edd367883df8ad1e88660f6f2e0d0d0654cfefe38da0b846ae136f141047b99c9251e9ef63e1fcb11bfc56f6ff739007a81d9cdf655e11270dfd7499db76 SHA512 f20e52f571995a0fc0b0e0a7b804717a1d501fbaecf80460cdbb69cbf2e956a2b8f33ec8c9fa637af2e857edc1d2565797d4a6f2c3ce2ace0359311ef8dc0882
 DIST hfsutils_3.2.6-14.debian.tar.xz 6780 BLAKE2B 00474d328f5ec2614ec429052e6940b9eb10d04f433399f686ccc24d66ca1559e7ca45c4ab3ebe6386e02fc4de5ffd96242a7aa6f58d6032798d5536da912a61 SHA512 33d44f7b9094743031fc9315cf9380e158225ee2cd5af7a5ec7c55a2ae9af42e16f9cad3c667b153a1d3d9484d4ea773d34b88b78bfe9499df52a8b9d77defb2
 DIST hfsutils_3.2.6.orig.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
-EBUILD hfsutils-3.2.6_p14.ebuild 1393 BLAKE2B 6c0981a18fedd2c7c9ed27eed5e7b85dbbebb4639837bd976c0fb06580d1f4180b053d13810bd9e44c8bd65dc0ada48b8e45505ca4b029365f5f5a2e8f8791cd SHA512 bc5da1ce959572c8824f976f4cb309d1ba80b02f218e6a9a864f3a989230f9daf422283a018022d39a44eb1acc49860818e0fa690e2d453c972edc0e114bc2cd
+EBUILD hfsutils-3.2.6_p14.ebuild 1590 BLAKE2B 8c208c89cf03fbafe7e5472d6dda27839c2c7b0069e0abc6c949363c505f60c9a26c7db99659a8da91d6451f85afece51d1e804215066338dfb500eaa81905c0 SHA512 29d951b1c231d5c941b86cd020ba92714799ce4e2ec5eb730211947f4efcc537e77b9364320b31fb67d3a8afac2c95e4d56e8812b5b2c11415b16da65e2a8076
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6-test-tcl-8.6.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6-test-tcl-8.6.patch
new file mode 100644
index 000000000000..fc2a5542ce40
--- /dev/null
+++ b/sys-fs/hfsutils/files/hfsutils-3.2.6-test-tcl-8.6.patch
@@ -0,0 +1,62 @@
+Use Tcl_Free() for arguments allocated with Tcl_SplitList().
+Use Tcl_Alloc() for arguments passed to tcl to be freed by TCL_DYNAMIC.
+
+https://bugs.gentoo.org/757924
+--- a/tclhfs.c
++++ b/tclhfs.c
+@@ -1313,7 +1313,7 @@ int cmd_hfs(ClientData clientData, Tcl_Interp *interp,
+ 	  badblocks = ALLOCX(unsigned long, listc);
+ 	  if (listc && badblocks == 0)
+ 	    {
+-	      free(listv);
++	      Tcl_Free((char *) listv);
+ 
+ 	      interp->result = "out of memory";
+ 	      return TCL_ERROR;
+@@ -1324,13 +1324,13 @@ int cmd_hfs(ClientData clientData, Tcl_Interp *interp,
+ 	      if (Tcl_ExprLong(interp, listv[i],
+ 			       (long *) &badblocks[i]) != TCL_OK)
+ 		{
+-		  free(listv);
++		  Tcl_Free((char *) listv);
+ 		  FREE(badblocks);
+ 		  return TCL_ERROR;
+ 		}
+ 	    }
+ 
+-	  free(listv);
++	  Tcl_Free((char *) listv);
+ 
+ 	  if (do_format(argv[2], partno, 0, argv[4], listc, badblocks) == -1)
+ 	    {
+--- a/tclhfs.c
++++ b/tclhfs.c
+@@ -378,7 +378,7 @@ int file_cmd(ClientData clientData, Tcl_Interp *interp,
+ 	      return TCL_ERROR;
+ 	    }
+ 
+-	  mem = ALLOC(char, bytes + 1);
++	  mem = Tcl_Alloc(bytes + 1);
+ 	  if (mem == 0)
+ 	    {
+ 	      interp->result = "out of memory";
+--- a/tclhfs.c
++++ b/tclhfs.c
+@@ -902,7 +902,7 @@ int vol_cmd(ClientData clientData, Tcl_Interp *interp,
+ 	    }
+ 
+ 	  result = Tcl_Merge(listc, listv);
+-	  free(listv);
++	  Tcl_Free((char *)listv);
+ 
+ 	  Tcl_SetResult(interp, result, TCL_DYNAMIC);
+ 	}
+@@ -1038,7 +1038,7 @@ int vol_cmd(ClientData clientData, Tcl_Interp *interp,
+ 	    return TCL_ERROR;
+ 
+ 	  fargv = hfs_glob(vol, listc, listv, &fargc);
+-	  free(listv);
++	  Tcl_Free((char*)listv);
+ 
+ 	  if (fargv == 0)
+ 	    {
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
index 663f0b115d7d..5df159088c92 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -24,11 +24,15 @@ RDEPEND="
 	${DEPEND}
 "
 
+# tests are enabled only with USE=tcl
+RESTRICT="!tcl? ( test )"
+
 # use tk requires tcl - bug #150437
 REQUIRED_USE="tk? ( tcl )"
 PATCHES=(
 	"${FILESDIR}"/largerthan2gb.patch
 	"${FILESDIR}"/${P/_p*}-fix-tcl-8.6.patch
+	"${FILESDIR}"/${PN}-3.2.6-test-tcl-8.6.patch
 )
 S=${WORKDIR}/${P/_p*}
 
@@ -54,6 +58,11 @@ src_compile() {
 	emake CC="$(tc-getCC)" -C hfsck
 }
 
+src_test() {
+	# Tests reuse the same image name. Let's serialize.
+	emake check -j1
+}
+
 src_install() {
 	dodir /usr/bin /usr/lib /usr/share/man/man1
 	emake \
diff --git a/sys-fs/jfsutils/Manifest b/sys-fs/jfsutils/Manifest
index bcc8c804fd17..498be7e545a9 100644
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@@ -4,5 +4,5 @@ AUX jfsutils-1.1.15-gcc10.patch 2015 BLAKE2B 58accef19b804367f6801724a443e9eefd3
 AUX jfsutils-1.1.15-linux-headers.patch 318 BLAKE2B c04fc414526ed854ed9fd0ac6cd8c1874c924e4446ade2ec85eec2ccbdd8a9c6f580fe6b4b91e61050a468855c46082f2373de08246640362ab81b8e74199cad SHA512 1fd097f403e0ffd434b433fcbf20664166b7ed9b9878f81719d45747fc96249ebac25f8afc9f1f6e532bfac90fe98f1474bb616da3c83fd69cc57d2fe3c11815
 AUX jfsutils-1.1.15-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5
 DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858
-EBUILD jfsutils-1.1.15-r1.ebuild 1211 BLAKE2B e7d449eda7a3419417b8f74142f48d1e13a06e9029f824498d31035ad72fab053191fa73e5615759ae2dcd0c1a17ed42e59808f408237c9b3d8273ec568a00a0 SHA512 ffbb3a604b0c781f8ada406873c17e008b9626accad700197d062ad9a0aa1966327bacb135664e625e585a7c07d8418fdbb6272fb164e06338d34e010b08fdd2
+EBUILD jfsutils-1.1.15-r1.ebuild 1218 BLAKE2B 67890f2cb6f5284e00d7770477f18a38811fef5ee3bf95ca59c20798248a2cd8072be2afa9b37c9f60df7383b4627de6cee7d296c249e928b4e3b410f5dbc87e SHA512 ac1b2cee8bbc0c54f193d782dc5525c08ad10cbd76f59664b41ece9396f0f182261f475635fdde34b72f2bdde3b6a82624410310100aaa60f70202089d5377fb
 MISC metadata.xml 683 BLAKE2B db09548b3469462387d1835ad1c835cb45be5fdf5f18b4940ba35e20a1dd5a57159519e862672fdf08989a0c1b4351d721226ee289523fc214dfafb506150f23 SHA512 e81833363d32078db3c370d6a3faa1803857af05e6df470bc3b625da06680bcf725b443697ef356d73d3b4d4c7e4230ba54459e260f9a5e738978a08742af189
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
index 2a8654317bd8..bdca7f2146f3 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
 IUSE="static"
 
 LIB_DEPEND="sys-apps/util-linux:=[static-libs]"
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 4d72748f1084..347a7734ff81 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -29,6 +29,6 @@ AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c9725
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
 DIST LVM2.2.03.10.tgz 2510568 BLAKE2B 1b4e9d09ef948b79a2e6e70fa8f8c9cd38ec8d8d1462eefb059f93020f65664538cee9bab41b81aaaf719ca428a9e824a2b181f40ebe261c5dd0fc6551ebcbb3 SHA512 8678ae2f99739ccad0250f6f4b4b8e84520f2053835985a1ea9c80196a64df31a48858aebf983170c3dfcafecea83f2c6aa630ef73fd31dd84cf1627a1b421e4
-EBUILD lvm2-2.02.187-r2.ebuild 10170 BLAKE2B 538b3fec167771ac31218769a03f203a1fbbfa7d25e621153a210dbc195680677eeae0df4e6d2d71d5ca14e341c08d5425107fb4bbe5526c6e57ab4aa4280516 SHA512 f4cfae2f60ed861b5f4c406005e862659de2a0de9a12a86af9475350946edfacc1d24a280f8463b265e830776b8c7861c53777d00ba4c8b4f50b8b236244ea92
-EBUILD lvm2-2.03.10.ebuild 9617 BLAKE2B 995b48f9b4be54e950154399c6201c562534ba5d3a275da69d82a426451a93cf509a3efd98804dfae1f1f99fc53c1ec869e44c4d8581849565bee6be017715e4 SHA512 55f15137a06762104db963abf86700aded570c9152e13a35f34c42139351b4730e5699d9134a0725bd8696fd1362b49dc248613a8eb71a7f1544545ad20e07e2
+EBUILD lvm2-2.02.187-r2.ebuild 10065 BLAKE2B 1c218be6a3234cf8da1990991417dc429acc8ce5fc9cee06c0edfc89b1af894a1b2abe6d42ad9341608f39b70fe2e7bc97b4caf5afcb64a4de9baef7cd0b7890 SHA512 bf357c4cfd8eb8e75d20e2157b4f5203b2cfb8b2b16dad298796c4ce8dde8c6da07f6760bda85972bec5cb77fe08b94133a8bef7e793ab9c4c31ac30b7ce7e11
+EBUILD lvm2-2.03.10.ebuild 9512 BLAKE2B 39d40130cd82a79f3ea2e5ecc18a0bc56f739eb7eee4a6974e24af1a1e75a3db222ec12b5b5f9ac513a106d177bb9da03fff9ea0eab57d1768037d5c5d9b8e9e SHA512 a83a7ee5cecf50d677a0ecfb9356d60d01fa12cabff76ca2223f4125a614303766bc90907e967690643030a8296c3b8a5fba0d7ff984340b0ad8e2079feb0ad2
 MISC metadata.xml 1020 BLAKE2B 6427d15f63ac775b03758cef58620c77fb2dd6f92de8ac23a87b51d76ae3882acf5f555c3aada81235afa0f52290e35d142083004e53443902a710721228e213 SHA512 834e3798b590e693d6a26c708985ee6c3eea27b958924827d9325fbe7bd00711bdfbfabfd21d408752393f99131588116b3d2b841107afadf67e09cae3289ed9
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
index 2bc6f354e530..54f28eab2cbe 100644
--- a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
@@ -36,12 +36,10 @@ RDEPEND="${DEPEND_COMMON}
 	lvm2create_initrd? ( sys-apps/makedev )
 	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-# USE 'static' currently only works with eudev, bug 520450
 DEPEND="${DEPEND_COMMON}
 	>=sys-devel/binutils-2.20.1-r1
 	static? (
 		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
 		>=sys-apps/util-linux-2.16[static-libs]
 	)"
 BDEPEND="
diff --git a/sys-fs/lvm2/lvm2-2.03.10.ebuild b/sys-fs/lvm2/lvm2-2.03.10.ebuild
index c1a7dbc3b20a..7009b7723550 100644
--- a/sys-fs/lvm2/lvm2-2.03.10.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.10.ebuild
@@ -36,12 +36,10 @@ RDEPEND="${DEPEND_COMMON}
 	lvm2create_initrd? ( sys-apps/makedev )
 	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-# USE 'static' currently only works with eudev, bug 520450
 DEPEND="${DEPEND_COMMON}
 	>=sys-devel/binutils-2.20.1-r1
 	static? (
 		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
 		>=sys-apps/util-linux-2.16[static-libs]
 	)"
 BDEPEND="
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index db7a0cd33c0e..1888142031f8 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -3,8 +3,10 @@ DIST mergerfs-2.28.3.tar.gz 294065 BLAKE2B 2e59e00726aec53438d5a5df143ca20406979
 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
 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 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c
 MISC metadata.xml 334 BLAKE2B e0f154866ccf08a8534567e5848aa41a0413a31cbd0fc92af2b873e77da2b007c222ab7431a81513e12f3cacd5e8bf8deb8a426e4cee2a64c8d02d0d9b56e4c2 SHA512 8b30ddda63065e140e02f4d3e79d933f46fd9460d2acc5b70e453f82eb6b5c204c810aa0019d183b256fcbde18239efbf01fccc40c5a1ddb632183418a596496
diff --git a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
new file mode 100644
index 000000000000..5d1e3ec0e4cf
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
@@ -0,0 +1,52 @@
+# 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"
+
+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/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 80e33c8123a8..ef1ec592fd51 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -4,5 +4,5 @@ DIST mtd-utils-2.0.2.tar.gz 355964 BLAKE2B 9a795ddac1287c7c44f52215faa4b6295cf5a
 DIST mtd-utils-2.1.2.tar.gz 380333 BLAKE2B 46cccf9cbe870f3415237deaa00a3ff57fbaacc019d4adc69e1ed516e752e58776ed5f53be0d46baef69dff8a0d90e1df5ca32a80ecbb620dd4bb0231f8c94dd SHA512 bd2d61d81f367a1d9f5345fa3985f5403e37fad1c1f811e2ab291b64339170514aa1fbceb89b78ba7a357f8cc3d7ade99796e9318c9624a40e2266fa0b3a9921
 EBUILD mtd-utils-1.5.2.ebuild 1577 BLAKE2B b180c7b895a621d8ee4078b5ab94ed92d3d41b0c88f47898fa8f0ecc42b85b446e7c92537d9417e03675f45925344c37af0cbc1be98e5116cda0ed7076e4bd5e SHA512 19af1ceda473ad24fc128c2f6704d9d33b630dc63aa4975b03cd5139978d55669210617597f2128d4fd192908428dcddadde2900749bf8db76408e4239ba5216
 EBUILD mtd-utils-2.0.2.ebuild 1334 BLAKE2B 5ba40d20c85da672c1c066bbae5b9ab2396aec08c97dd6688a08886c70f393c7004ca879860d3d9ce499db9835ae8305e38e75427a7bfc3d0c24451c2387241c SHA512 7d8e5bafe51f74121c167261c43023bc889baab53ba60e8c69cac792a0b9ca5011e8082d4d2bb59d0ef8b803fd9154e706301e05586b4760a1f730f34bcaef21
-EBUILD mtd-utils-2.1.2.ebuild 937 BLAKE2B e141ed661b76f446d363103893685ad88cb940f702929ecfd438a3de2ba6bae6ef339abc4d260b2b81937ddd76233cdab51b0d3a783c8e2ee3ceda976f79db0d SHA512 dd6a9fd6d4dc454cb82020c1bd5bb498c204be3669ca18536901d0b499c16471d9f8da75a0612fc6e0380b8acc5188b2edc471f14243119bf13def14b2b9a72e
+EBUILD mtd-utils-2.1.2.ebuild 934 BLAKE2B 08857a5efddf9f9662cc0cb639f15e92daec187a4d3f2cbd7af2a18d80460b737ad6a87ff5d0b0c2633d892dcb1952971941d7ead697c0926d2d097bffd3dc1a SHA512 f7c229db5f44be7f31aaf9eff48a6c5756ccbe00451d5c3c6ca34256f3b690b835a7c8c8702eb0ab4e64ed2df3e03f0ec475dc648b369306ef96a4460d9d7018
 MISC metadata.xml 416 BLAKE2B 88cdc71a56448e05d3d8bba7b5bb031b043d7b798ad40a04d7ab416b5148fc9c27501366991d26a51f44186953fa6eb3a1214cc8d0872f6e3cd39861c532a672 SHA512 e75a4504c7558e19937f8f608a852905853f8efc2aef32ca3c383517fce86673aa3647a6ed5305d105f16be2c6a0f9667bb8326a9453050810b29b8f72fdc7ac
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
index 297168afea61..efd42d896bd9 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+lzo xattr +zstd"
 
 DEPEND="!sys-fs/mtd
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 37d782a1522a..3ca674c640b5 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -3,5 +3,5 @@ DIST mtools-4.0.25.tar.bz2 421807 BLAKE2B 54b0de421d5de003c6dff9a524af2a37d7fe0f
 DIST mtools-4.0.26.tar.bz2 420648 BLAKE2B 02f75722e8569c75d09fbee8667b24d8fd5c685940b235de33e268b8a349a49798f50db22470200e9fa30244768c07a568bfe124969f2a34f652c157ddb37e89 SHA512 32303ea16314ca00f33aee103451958f13c71ab1f3975e9a1dd9236c8e775286985ee776c38c64a1f8f5f8d0a66cbf84643182913e4e2c2dcaff384a9acd8633
 EBUILD mtools-4.0.24.ebuild 1045 BLAKE2B 2861833d297fdaf906239a2a52a5c922e0a195116ae73548c6d47212faa682b7b12f7bd20b68a167d86ecebfd2f6561236ff53bffcf093686bbf7c2c1893d6fa SHA512 dcb73024498715f8173c65076fa02a78873d01f22849fa568a6757384fc93e47981f1c95125a56646612f7dc4af39b4995ba0ef1ef41467f51eb60a99ee2b030
 EBUILD mtools-4.0.25.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
-EBUILD mtools-4.0.26.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
+EBUILD mtools-4.0.26.ebuild 1058 BLAKE2B 8236f510b4711b3d09257cc283075f271e02a704895930590a22ab9d6b9f91780bd4f0e47a6375b8e7dd2a149ba878b54d9df8fef0cc890f08df649044d37812 SHA512 c5330d2e62434e874b80bb13843d33c30a52e73a0ab64a588cd8a97481d413e4b166dcf538218be5e419ffa41515b2e621aa6cb290e42ea7a30636bb438e0815
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.26.ebuild b/sys-fs/mtools/mtools-4.0.26.ebuild
index a10154dee9ba..9ad4033e88f1 100644
--- a/sys-fs/mtools/mtools-4.0.26.ebuild
+++ b/sys-fs/mtools/mtools-4.0.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index 581bd251c366..73653a881241 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -4,5 +4,5 @@ DIST reiser4progs-2.0.2.tar.gz 994469 BLAKE2B ac680b901807c22b246ea5601b89d51fdd
 DIST reiser4progs-2.0.3.tar.gz 995921 BLAKE2B fa38c8998603ca0c26a17c75240d07afec6c46da1b437e5a733ce3a5a865329591d4343b52d7fd5dc56bb6afe34f4f7685e7dc258ed075dfe4a70a7ad420324a SHA512 59bcd6d73a220fd0e71cc4213489801f45597ebfcf0be55f150e929ef391e0a461a94ab99ee9698e1fb1eb58840497277ece6a2ea57e88d54573347a8854da87
 EBUILD reiser4progs-1.2.1.ebuild 1295 BLAKE2B 8ef4781ad4a121a92f6c732ba92eb8d6adb51f918eb975eb7cb97969135d1380e41bb1b010788ebd970805d29d8ca7267387ed3da75943922ac0fad729066ef1 SHA512 81f2db7655fe926394e628cacc97ef1d1749a4387393a7c04575cff245268f42b8e9fa58c974a5a8647b9d34f9e73b4f9b596dc70bf512f53b90fd3022af9fdd
 EBUILD reiser4progs-2.0.2.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
-EBUILD reiser4progs-2.0.3.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
+EBUILD reiser4progs-2.0.3.ebuild 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246
 MISC metadata.xml 327 BLAKE2B dcc63f48d652f59288d08c38c2f0e430bc15f4224e2b5cf8b690e4e2cb1bcbd7ff97151d2e13f7482f21c1e9a92f45b867beef2aded7bb090f9011532c401e93 SHA512 f578c1f4305a1e24c06dfc53231a053cffde7ddebdbd7f61dd0fd58b650dadc8bc1cefa48213ca9734e081d30436bb7e5a093682eccc1a4a1a9e5bf707d61846
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
index fa83088da8fb..45ddbfaabf1c 100644
--- a/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
 IUSE="debug readline static static-libs"
 
 LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)]
diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index d3bbe3c31488..51c59e4fd9ab 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -3,5 +3,5 @@ AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc2
 DIST reiserfsprogs-3.6.25.tar.xz 448984 BLAKE2B d9f032e51f70497cf84f5877172b68e8acacf8fecb3fee7d7c3d82c98cbd5c70f870baa96471b02f092345a86bb02501bd53156cc8e7e3230660a7a6865c2421 SHA512 247ca392d227680fb24e94cd490319e77e82d00d7d357516690d2cab6f0bbe8b35879f8a25ed5046bd3a7a3e1f2b140a8a82404043aa0e7f6f60f57d069857ae
 DIST reiserfsprogs-3.6.27.tar.xz 449176 BLAKE2B cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341 SHA512 bc524aa1ad7f8502238761fd185bfb8473048947bd579e2803c73371928c6b245e0d90bd9d458f4bebcbf163892dbc9f4bae65aec68ebbaa436be7451c13f50c
 EBUILD reiserfsprogs-3.6.25.ebuild 1195 BLAKE2B ceaf86a46b3f368ec17e317838c73b63542c983cc1d968306a240005941b5eb3edad629e31df7f0642cbc3fe5da19b77667f522d14cd3688e923912e147e72b0 SHA512 01ba30ac86e5c4cd042348ede60a3e456fe178031ff30a0a6f326e8228e08b05f0ea69d65a94c8bc4bdbbd43a6a168feddc84a29fa30883e235eaf4504fed680
-EBUILD reiserfsprogs-3.6.27.ebuild 1247 BLAKE2B eb821d09d7001f03ad03507212d841fd1b30126af795a0a70ed2f1d34b2b245aecb06501e6e28e873c2143ce8654ab2784df0f2769dd4829a35c1e8ab05569c8 SHA512 71e269dbb1bba07a352a2822228278c38a4621cd21831d1eef8b552476ab8c655f3db931443ae43434ac2b08f0f4c1dbe27702c3db6dee8ad2ea7dd9a491b09f
+EBUILD reiserfsprogs-3.6.27.ebuild 1254 BLAKE2B 192834988dcbfad708f466890f79fba99ed14b2ced9db74e7929d400b4a40ecfd644734d40521ec84ba0e2237b9962db3e6c1b849744b1808310751ad13b4fb1 SHA512 563cb398c78889aa1699bda1ac0e14fe2af5c5b50f43be1f29d9a1e40161d6d49bce84b9383e412822ab87f9ebf38b523208eadb817c275e210c78590b3a0415
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
index d4e1b9ebc88d..1889e0c146d4 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/reiserfs/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index be44d2f8e75a..258ca9020e18 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,5 +1,5 @@
 DIST udftools-2.1.tar.gz 555440 BLAKE2B 09ed67d67a5194aff1611ca40907465cf5d9b83a6a9c1771118c80599be29e8d68fc48c10b38d33a4aed4fa6e7e6dbf0399b5d04bd103153f42a705e17edcf6c SHA512 0bdb3f2e0595200dadb771af4f31ba513d0bf6a0fbd30bc3a1f8aba4ab5f487f61635e65dc155926d2f566cb6e2b2f3a57938071616058cf703692d529971a64
 DIST udftools-2.2.tar.gz 543515 BLAKE2B 8702959e9840415201668255272a7f5bb3b88d1e11a20ea6818c9c031d602ceba25a4892965f77961e265d55a687c6574a9aa7c657610d85e56549550a978d58 SHA512 1d6f7b725053ab8c2092ca07bce07fb075168ba48f7d2580076ee84b2652af3898622746c5a2f0bdb8c0d1d0e09d1f4a3cbaae4f998924652a56561b84690e2b
 EBUILD udftools-2.1.ebuild 550 BLAKE2B 026a1ff99b0c4cefe88ab802897f98aea94f7711db84a1d40e8b5683fa76e02a2273657ad844482e7aafeb101e408b7c0305f10dc37003682524ce8585c836b8 SHA512 a541cbe3dc4079bf074a3320079035749b4e0e8d812801e25a161de109a678847dee96af60180998d00ab3e6ba497f8e2f54f764538ee82a42dab899ff48d4a8
-EBUILD udftools-2.2.ebuild 581 BLAKE2B 5661c7835873585f282d2cbf4e1bbc7e549b5a20e3e83b0d2107980c458ce418567ed85044c56d4a64a5c45c9b8bd0fe233b14c01b8f4dfaa6b8931a6ec5f9fa SHA512 17e539835787fa78119e67d5a39f869bd09b959c6276764d92ca5b179f4a8522ec94029bdf92e9e432cec8d1be6db6ce8d871622ad8eb426018749ad5992d3a9
+EBUILD udftools-2.2.ebuild 588 BLAKE2B c29176d9459319cb4fc3115e9f2c4965fc894b353978aeb5599338b2d122537e0d8b85e2ae4d7096f0825a9820d8919a2f8d33a532aa004437189849221677d7 SHA512 4d1ee19fea8cb7af3e5b98935b8fb9374263942b4dafe1eb75e93016cb42fca7b48a397dd3ddbe949379361ec03b8f48141224d5af0183a800ca63e81086986e
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/udftools-2.2.ebuild b/sys-fs/udftools/udftools-2.2.ebuild
index 03a562512736..a57b048c42ec 100644
--- a/sys-fs/udftools/udftools-2.2.ebuild
+++ b/sys-fs/udftools/udftools-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index 24b225497a3d..71f296ec03ef 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -1,8 +1,4 @@
-DIST unionfs-fuse-1.0.tar.gz 48149 BLAKE2B d1ef74980158f4710f5b545c3e98abd27eb4eb610cbe141fa1befaa2a0efc3cce3cead1a405ecdea7dd0f02fab2d2f030d96a7b1d5068a1cd5de4e2f5bfe3aec SHA512 805151acaeae8526fba430701a1690f6eb0ad8331a9e730095ee538dc2b148d02fe996a63e8a7f6471d1ef622cc5c03d82bd2b2faad1ebe3b614ec343c2f55de
-DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
 DIST unionfs-fuse-2.1.tar.gz 47917 BLAKE2B c76edbcbff98db28092f61facbdf443eda12ea97770126feac3d590e0f85e51df84308d0eeeebd96e5bafd126b472b0ded6a2ead72cac0fab3614e3cc04730dd SHA512 851e378f8c189d8a84d2a0cf47ce8f1e9cdda5e789a8c0c97aac6e0757c2f6480ca4d931a525bb94cec4af11789073ccda44ad01d7ed02de1c29ded72f578aa0
-EBUILD unionfs-fuse-1.0.ebuild 500 BLAKE2B 76060a23c99f96ee5d491dbad82ed1939bd72b364f656fdd58de737ac2c7388f8e177b46176e2ab4d1d0add262130faf492b3cce47ce4f12797e105b453c5477 SHA512 0ab0d5efdde62268f38cc319f972dd058586d312baf992b68ed5b05e4c6c0a63c4da8d0e0efdd5f9c598ecb9f71bca2f418cfe36a6506968597d9ec95b35ff92
-EBUILD unionfs-fuse-2.0.ebuild 500 BLAKE2B 86562c039d231ff38a14252b22eb1126d53ad533adea0c15eb9565e3c55545afa4f1affeddfc6da72b09b838eb4c9af3d37f4e15918888aecbd70a52af34358f SHA512 7a1d69a0f8fc0d96e1abb5e041f9bd9a1f2c8973c64be26b6f7c526c77b82d8ff2eb7ed11635847b7237d8076b8134ce0b08f7ffd3f061a2ae02f3cfd9477818
-EBUILD unionfs-fuse-2.1.ebuild 975 BLAKE2B 788def03fa8977c36cb049501a2e5a2479fd579b14b78082e2297b2ba44e466b48bbd1c98d35db8d5dfe2978752249aada97dcd8fb0edde902e533e0aceedf75 SHA512 933ac0df00d6aad1347e274258e52ef7a21036fba13f5cb26a9ca949077b6ee0f6c56d0bafab50b007a68706f1336ece70e8f34929f1da0eed83a15d94e38871
-EBUILD unionfs-fuse-9999.ebuild 940 BLAKE2B a20a79d69fa7452dda0d824da744f372ee9d192fa16200243e60e5851c58d70f0c18f1dda408d8f6ea5124adfb52a161ec01fbd70006441840c2edb9090aeee8 SHA512 a3695a3743f8ffc2bccc4d750faba0b2fea116f4401bdc577ddea8231b84e05e8e5e7b648ca88665fbfe8dce460a681f98d04971dc155c1ad39b94a43c8234d3
+EBUILD unionfs-fuse-2.1.ebuild 974 BLAKE2B 76746d9973f108aef1b11bb919b6a7ce8ea3b352f791f2a2caf48a704f3ce516ddeb1764af82f8bbb7958a32a1ac0276e20065ac41c9173f2d4f603110a83a01 SHA512 814ce2048e250a362a1d8da52de68c7ddf26063f211c3ea9d2f9a1eb8fb38b29a2974aef3adf8d83b14aaae00d56e49d7554cb87af92a0a649089c18af661155
+EBUILD unionfs-fuse-9999.ebuild 932 BLAKE2B 027c25e6ee52f1ece66ad1ef7a104a7320b5334429b23a04f50b5a3e5879f80364a3f73053810c7367cf2a63e6b8bb9c8c22ca4a9d9c9a65a150aeb2b0d79476 SHA512 5fcdde2c53843c26226983206222cd74c10f8a2964941a927c770118e00bd03af6373d51822df76ac528bfb44ddb965636c932fa1057094e49b4b9ee721dac82
 MISC metadata.xml 336 BLAKE2B f9d55c17815e8d3179029c92fd758b0811b455b4d375aa31c44d7643f9d792a70dae915ae25d069e9967fbac2954c197b1ebcd85828b744a9924dc719eeb6f40 SHA512 54597ecd53cfe8d92d717481a533df32cb5fa7272cd64a42a0cd4b4803024b10e3451845569e3d7b199ed63f4070023468dd7528cb438f155539e5e752144197
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild
deleted file mode 100644
index 1dd309e439f7..000000000000
--- a/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
-
-HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
-SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE=""
-
-DEPEND="sys-fs/fuse:0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild
deleted file mode 100644
index bf4a922ce675..000000000000
--- a/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
-
-HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
-SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE=""
-
-DEPEND="sys-fs/fuse:0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
index 480634c6bacb..fbc542c0c0ec 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit python-any-r1 toolchain-funcs
 
 DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
index b935d86f2bc3..9c0fd03e3a91 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1 toolchain-funcs git-r3
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-any-r1 toolchain-funcs
 
 DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
 HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 39a21a898954..e5b32c78ca24 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,10 +1,12 @@
 AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
+DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd
 DIST xfsprogs-5.4.0.tar.xz 1248688 BLAKE2B dd00083b62a4989ca94d117eabad3905dc487c3e6d4f20bbe855399e99e2195c1a45f2be3b117048e2a7f2374c7e6258e7c1edd63d12a405c88f4c9fa6cd5e8e SHA512 c0973fcf97e2666385b46c80cd1398728702cb34fd7e0f89e2a63686300573405d09a81d3ae43d79c2e9710ccf6b6bd6ed1c3f3f831c75cd0916f094f203aaa7
 DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
 DIST xfsprogs-5.8.0.tar.xz 1260580 BLAKE2B d4efb81123d46fd7907dd81605922ba283642ead92f6270a3b0d93a0c7321963d5b8b0068a2b6b4cdb236da0653a6432b74056feff77354d2557e899b01f1a62 SHA512 11f2810402ecb83db204346c45ff9f7d643ff2390767794e311a06a10eb97118095e4c377d2b065be50611ec5fc82ac5cbc0a8c7122ee7e9820a2db4e9f177c1
 DIST xfsprogs-5.9.0.tar.xz 1263364 BLAKE2B 0504e06a9b2b664289fec3dbb083508438b4950c623e309f326954b81f2e9ca0e65d9eb0c9fa029c49f6708e7995db2e9cab0bc7f42aa048e7f9feb80fc7ec77 SHA512 76f7da8c57e859326b33bff4ceae9f73af485357252b2b1c09808ebb309af5abbafdceb874b9739a1aa87b8f130e42c5ee143fff117edde20844182e7babd0ce
+EBUILD xfsprogs-5.10.0.ebuild 2257 BLAKE2B d2f631604dad9f4434c062c33735bf652d8e809cd82620cef7c078b4bacd6963bfa543e737a4003f39c2e52c306dbd86071d086525868217f2a41d32c712f20a SHA512 ecbb03877e2fc85678777f0966b170877c6a3e8c8267925c73285b178a9481f67dd11883435e678899f64aee6d8b9a12f045fecf08cdee50ed4065225a5bd169
 EBUILD xfsprogs-5.4.0-r1.ebuild 2847 BLAKE2B b81f15ddd470b549433942259ce7c7edb4f102a7903d361fd2ddc151b4d3ba1abcda491425d64d2cb5b50d1c034f4301e4350856a2e7df80f2690f065bc93c0d SHA512 962334a565a0b3686f28ec9c9091e1260df3f842da3f64ffdc3d524e6baed77663c8ee2100964471b44935661d60331e7b4c9688d151bcd2c16ef7208d1b9a54
 EBUILD xfsprogs-5.6.0.ebuild 2603 BLAKE2B bfa5d557473a872df4f5afd89aab9f7484fdd11c7d567dc1474bcfaa880c03eb7c9fb68cfcac81a9a21f1a5d32b7afe09f1af58b1f25e1669206df423fac394f SHA512 0ff4477ac23129c22f9bcec54fb4335dee11e0b759887909a269b6d01d4b27188f68661269b5b3907d1d84de0a8911f1ca1ff84075644e0eb3fb8df44578e73d
 EBUILD xfsprogs-5.7.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf
diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild
new file mode 100644
index 000000000000..1661c39dc4e8
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs systemd usr-ldscript
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu libedit nls"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	icu? ( dev-libs/icu:=[static-libs(+)] )
+	libedit? ( dev-libs/libedit[static-libs(+)] )"
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/inih
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	unset PLATFORM # if set in user env, this breaks configure
+
+	# Avoid automagic on libdevmapper, #709694
+	export ac_cv_search_dm_task_create=no
+
+	# Build fails with -O3 (bug #712698)
+	replace-flags -O3 -O2
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable libedit editline)
+	)
+
+	if is-flagq -flto ; then
+		myconf+=( --enable-lto )
+	else
+		myconf+=( --disable-lto )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install
+	emake DIST_ROOT="${ED}" install-dev
+
+	gen_usr_ldscript -a handle
+}
diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest
index 2086c9aaac7b..666899a7a4be 100644
--- a/sys-fs/zerofree/Manifest
+++ b/sys-fs/zerofree/Manifest
@@ -1,4 +1,4 @@
 AUX zerofree-include-sys_types.patch 284 BLAKE2B 45b375568b6bfc767a65d5d1082f44db4030ae687edb4d528f0000d1fc8dc78c10f98cd6bf57eaa9b9dd2d0ce96aee408ecddc1126ddd59faa737f7dcd236d7d SHA512 0cf3833271195c2f1da591af625928d8207d6bb39702cdc9f8ade0e7e773096e4f55860438863f06639f205283c0cccbaaf8b4d9ee98e3850a5075e38d06a187
 DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c
-EBUILD zerofree-1.1.1.ebuild 947 BLAKE2B f2d5575eda702b83c454889bfa54e816405c3037a983705a3ad1cc260a74b9cef35c9a3ba78af281d246853a23c3306bf76f7030ad032807fefd4a22a807bfa9 SHA512 f7750e84509daba6bb0242bc6f59744678c94c298384bffa54d03631d3aa267a1c0deeb3fb38e2300e20905d0e68cf0cbfea7de02bcd98129d88b68c7615c3af
+EBUILD zerofree-1.1.1.ebuild 954 BLAKE2B 6201d8c315c1a47d6661165bf0e486306fcc9993fb9604fe34aecfcb3f986273e579b4d07844aee2abca50bfa9e776e72de322901e4f6215cbbac49ab86e407c SHA512 83f746c7ea899b3d07a5a5e9fb56bad5b13911ac1c257e9dc87e481997bb8d02a2a14fb24f245bfe3d34dcd7650096d1ce104043c68b52b29da7575d87b9bd53
 MISC metadata.xml 433 BLAKE2B aa623f9df641917cb34f2a028d4db98e33b241e89b94ac424045fb053bbe16b124f62329394d30cb6163689f8716a1eef4697115648f06f9834ee41c2914ae26 SHA512 c454915a2972c289341df97d9d8cb9bf26ea2f4c00ba4555a2d14e69e8f48f7bc8fc33c404ad19c175ff7e96900f3cead4dbaf32b0c36981c8a4926212a017e8
diff --git a/sys-fs/zerofree/zerofree-1.1.1.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild
index d234d5d2144f..ffa8a9947d42 100644
--- a/sys-fs/zerofree/zerofree-1.1.1.ebuild
+++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://frippery.org/uml/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 IUSE=""
 
 DEPEND="sys-libs/e2fsprogs-libs"
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 647fd7e18afc..0c6dbab0dc96 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,8 +1,6 @@
 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
-DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8
-DIST zfs-2.0.0-rc7.tar.gz 12994030 BLAKE2B 12dde3b935cddabd3d3e5874685cd914f0338526ba8d22aaba2b1ff09aae64a67cc66ea0acc7d08cdc438fd8dfc93a2727bab5e90c08c2a294074692f4189214 SHA512 fbef7bc76c2b913ef8c4af55e6feb46bcadbca856b8ba28c72432bb91b8dc88de191d657aaeb5efd67ee2d67a6ffcf5d3d53b4490f9a32211a571687694e7e65
+DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f
 EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322
-EBUILD zfs-kmod-2.0.0_rc6.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89
-EBUILD zfs-kmod-2.0.0_rc7.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89
+EBUILD zfs-kmod-2.0.0.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89
 EBUILD zfs-kmod-9999.ebuild 4317 BLAKE2B f805e2c20a65d928b89496aaff71f548c49594b5f4d7decf776339a173b16f39ea5a7e0bfca78f5b1fc01c08ea3a06fa11317458dc2cc4022bdf459d273d68ed SHA512 4ce6398c6ec3cb2015751b0deb6e8694afa22a6b19b0ca83661eed0e195f7ac06f5fb73eaa52a4d86ad2c039dd300de4d49c8901a51e1d80dd37b3e1b0185319
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild
index 81328da6d290..81328da6d290 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild
deleted file mode 100644
index 81328da6d290..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	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.9"
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	!sys-kernel/spl
-"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/awk
-"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	if [[ ${PV} != "9999" ]]; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-
-	fi
-
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set module revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	use custom-cflags || strip-flags
-
-	filter-ldflags -Wl,*
-
-	local myconf=(
-		CROSS_COMPILE="${CHOST}-"
-		HOSTCC="$(tc-getBUILD_CC)"
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	myemakeargs=(
-		CROSS_COMPILE="${CHOST}-"
-		HOSTCC="$(tc-getBUILD_CC)"
-		V=1
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	myemakeargs+=(
-		DEPMOD="/bin/true"
-		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
-		ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of OpenZFS includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 1c4bb2e0b701..07a349c2e783 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,9 +1,7 @@
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
-DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8
-DIST zfs-2.0.0-rc7.tar.gz 12994030 BLAKE2B 12dde3b935cddabd3d3e5874685cd914f0338526ba8d22aaba2b1ff09aae64a67cc66ea0acc7d08cdc438fd8dfc93a2727bab5e90c08c2a294074692f4189214 SHA512 fbef7bc76c2b913ef8c4af55e6feb46bcadbca856b8ba28c72432bb91b8dc88de191d657aaeb5efd67ee2d67a6ffcf5d3d53b4490f9a32211a571687694e7e65
+DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f
 EBUILD zfs-0.8.5.ebuild 5695 BLAKE2B 05e6a12ea2ab6c7655b2a62d642ed97a9acaa59959f648896a20f9b2336b81af79a60a398e5ad53844b7173abe95705b18fd420362f7e82182896ef0360a637f SHA512 f879e459304b5a2a3a53c5ebb01c0d54d822c3f1f1abb4d26c7a065bc5a184b744aab2777340b7bee9227a855cae4bf44e9cb1ab61b98031b1190d3b387a9367
-EBUILD zfs-2.0.0_rc6.ebuild 5952 BLAKE2B 617854bd385ad9f86e8c031c1e96771776d4fd0fb963fe22fc2580d6befd3008e19492ec0023dfdf073a229289c19fb2227f818e9ce5631b5c66f55c2dd55d60 SHA512 e2d6f029c687c32440a35069e22d8cb38c6677999c737ad32c8d73ea43d04fc1234314f55fdc0e072e4bcc967ed73fde6c66055b9153603d10cc3b0582f51cc4
-EBUILD zfs-2.0.0_rc7.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a
+EBUILD zfs-2.0.0.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a
 EBUILD zfs-9999.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a
 MISC metadata.xml 1003 BLAKE2B 640ef6d6f178ae9c3f3281a8e8539980c4a263f6cf0c5f4e1de3f0572f2acfe409865e85a12473129eb026130c9b76b946ee7698bd990b05f14e6b26c40fcb22 SHA512 965eabb5488a3cb54b360b33c847a2eb0d326a2c6761d86d581e06c2f52db9478fe7df131f68cb57bf32a2a872ecc1597e2a1a6b457d254f578d684cf73810c5
diff --git a/sys-fs/zfs/zfs-2.0.0_rc7.ebuild b/sys-fs/zfs/zfs-2.0.0.ebuild
index 83e1b87f58a5..83e1b87f58a5 100644
--- a/sys-fs/zfs/zfs-2.0.0_rc7.ebuild
+++ b/sys-fs/zfs/zfs-2.0.0.ebuild
diff --git a/sys-fs/zfs/zfs-2.0.0_rc6.ebuild b/sys-fs/zfs/zfs-2.0.0_rc6.ebuild
deleted file mode 100644
index e5684e2ff427..000000000000
--- a/sys-fs/zfs/zfs-2.0.0_rc6.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-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"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 linux-mod
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	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/4" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair
-IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
-
-DEPEND="
-	net-libs/libtirpc[static-libs?]
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-	virtual/libudev[static-libs(-)?]
-	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}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${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}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-
-	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
-	fi
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "root on zfs requires initramfs to boot"
-			elog "the following packages known to provide one and tested on regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}