gentoo new year resync : 01.01.2021

56 files changed, 242 insertions, 69 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f850b90a2600..9b3ee162fc42 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/arm-fdisk/Manifest b/sys-fs/arm-fdisk/Manifest
index 58875125958a..e657d2a6d5b7 100644
--- a/sys-fs/arm-fdisk/Manifest
+++ b/sys-fs/arm-fdisk/Manifest
@@ -1,4 +1,4 @@
 DIST acorn-fdisk_3.0.6-6.2.diff.gz 5580 BLAKE2B d4c70c874cb60b02403edadd51a2547781f78efe7a09f3d776c1ce3a135a07f1c856e640f5cf0e2a1308ff80541f9a0c68cadfa44f10000bd81f576fc823ce2a SHA512 076587945548f10fef92a93910aee670927a2de9b1b32fd1b4ab72b1cfc26440177745f09b62f9b903987e3802060f4e278e1647ee12b7e2f29a0fd7b36ff188
 DIST arm-fdisk-3.0.6.tar.gz 62266 BLAKE2B e9554325562fd8fa03b896927fd9dca4cd61b86a4dd1a9d0bcc8aff638e0f0d1a9bca5c5b4bdf7bc9f1799f712497c8677af74f5204646bd505bc107818dfecf SHA512 954c1112c8108da676a0c4223de3a7b0320a37286b0ed099f3000bf4777ebb483b0b62eb0a5dd480f775c503020e7d9ed6ef737ef7bbc5bce858ae68aa471a3f
-EBUILD arm-fdisk-3.0.6-r1.ebuild 936 BLAKE2B 5ea8ce9063d9859531d7954c96dad8837158bc417a612c4c30ffbca714a29188670365d8e701becf4dec3abd2121d89c61e5bbb75a45f23ed9ceace664ef8ae9 SHA512 08e06d48337039e6e955f626d9f257b92593b548f7adbd13cf35e6c175e4691f221443b217fd00c3be19704c7a05125ae6b09cf3418a352ec72ac0211dc10c3d
+EBUILD arm-fdisk-3.0.6-r1.ebuild 937 BLAKE2B 6d64e7e39b8b0de3e522c942bdd83d61a2792481f391d587cd28d4eb6b7897300bb8e494f47e8fb71ecc9de8f61c5c0e39a84e0e16451d2e7f82d66977e65719 SHA512 a17af0188cab77de1398f3f4a91bba2280467d06afef9ba73bcbf4bc4637cf2860ca9f3e3b982cf36e6fc30aee72ebd131239b94bcf7550fc567f240de013fb0
 MISC metadata.xml 255 BLAKE2B a9541f4bfab6e4a12975e8b3d56e433e65828b6376510448f11930d35451e23cad5bbf264180f150629ce9c1dea24eb7fb4f2b3f950ee5ff5d345811e017773a SHA512 4408b5018e974df4d7508f29e255f318bbd09b4056927cae6406ff1f427c06d5d655f677a28440cb84af04e411c88e4582f9ad1ea76829afeee0bbe4e3841c2f
diff --git a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
index f51b0bb234ab..e1e7186ca1e9 100644
--- a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
+++ b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.arm.linux.org.uk/pub/armlinux/source/other/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index e1d8e32f86e2..cf9753f82691 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,3 +1,3 @@
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
-EBUILD dosfstools-4.1.ebuild 1025 BLAKE2B 7208097ee0b0e914799cad1f68baccab3d970df9721bbc7467a1d45af455bab0d1bf8af45a85e106da804eabb7446860ca02ef659dc89f244e35d13fa1c0421f SHA512 1fc020d3ba1beaba72ac8ed557f9c1224c086d2873ce54244faf280200bb807ee812fe3ad59599aa56f1d4fcb6bced4fc78d77952017a8811d4334c223b411fa
+EBUILD dosfstools-4.1.ebuild 1026 BLAKE2B 98bcc331cc8e6e4837eff7d74a8d71e40646d1a8ebcb208d5a34fa34bbb8161906e74b4470d22b8f3a95ec125990f01e2ae8bf8aff338563e50af0b1b5a7dd04 SHA512 c2ae1a386ba2b21fc8d15d8163d79ee5ce28285d9f3b418cebb2a7dcf646eecf94824a496eb7851b51392bba87b5820a2a9095f7a60786d2816f90ceddb497e4
 MISC metadata.xml 496 BLAKE2B 32b7ed76d0385441b8a40fff8ca15d6848fce7cf1ae511a6905d3c12b8a7593bbc11494f7ca720c465f61175d8d84cd9e6d41f084a140fce88513c6b95965615 SHA512 40b886dc36d892d733a6a6528eed5dec3977eecb71a22b5cee2ea6c0417401951b966509c3816ed5a2761eae4b8c5def7ef5e99d9aedab2e09000a3f3de6b354
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index 1309df2a8afd..123303adec5b 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="compat test +udev"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 5273327c44b7..4c95e99b6f7d 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -6,6 +6,6 @@ AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
-EBUILD e2fsprogs-1.45.5.ebuild 3987 BLAKE2B b870c4acafb4d819339e86862dac99711d3904e54944d2f41ed0a6fbd3366e11ab5083563a225ffbc2d2756960b0967c3870c3c87b01b1c5cb9da4114f46ccd5 SHA512 b8fff7dec7463837ac0ccb068e3934fc97d48231c6602a569e07d2c7736695c0f43f0bd7f6099c8a21c95d26f18470bedf7e5cb1072ff51a6f225dd54c61249d
-EBUILD e2fsprogs-1.45.6.ebuild 3996 BLAKE2B f0b0f292cfd822c86ff8911d8fb463c06bb0b8ae810702b9e4639682d011ca21a3eee5c6da6b010fc200943038a8993712a30314fe4cdea01355491271fcc11f SHA512 22be93b9db74fe521b32bd67222bce96c6e87f06837e36e51aa683380f28bb870f9ae4a6d294c15a8d3710bcb258e5eebbb510f550ecf1eb64b561763ff63525
+EBUILD e2fsprogs-1.45.5.ebuild 3976 BLAKE2B b58d289b7f8549d80492551f99223e01817edee7e42b1eedad53912c7c67a9f746347208bea7e535e8aa3951e89c5741362b3117cea76d507e68b245285003b4 SHA512 24078e17691c1ab62f0ab798abb4b9ee32b70f60dc06ecaeaf12de7579bb42b480a0f10e9b66a660b6be0f5c54613d589e529482d5c96856b9706c05cff6c1bf
+EBUILD e2fsprogs-1.45.6.ebuild 3985 BLAKE2B 9c10fde654a047ab4e0d4bf4cb97a8bcede16092d49caa3738b98fbeb3ce0e2a275b22c33633ba28bc0593d819296173a7e3977d1ea5680e6692b46c39c54d68 SHA512 a2b046e4ec510a5411d7c0d79c7779527506d73cb52fc3572c7d4456fc4b04bdf76d7064b384eb3f8ecd28fac6e62c1f947001d92db174609d37ef2b0abf37ea
 MISC metadata.xml 569 BLAKE2B 0a09eb03e2d5f07a24f33d71a16d0e4cb7e12e5a03356b44127e964c712addfb5bb9d5bc3b26dc66c608544639b6a92ebe0dcc18c03b8820f50b6fabcc9c231b SHA512 fa3e24f0db835a5fb475d42874d3197bd30f0c1f606b66b1b3f285e61dd32624ae56014b37ee0de0a9ebfaf51dd2f06cc2f73f91a011c5314809f5d495d65e67
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
index d3c4e3c8cb9a..03c5ed1ace21 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
index 47bad0c4a4ec..89254a09e7e0 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
index f8f12e31c39e..f7b0499c8ec3 100644
--- a/sys-fs/encfs/Manifest
+++ b/sys-fs/encfs/Manifest
@@ -1,3 +1,4 @@
 DIST encfs-1.9.5.tar.gz 2798888 BLAKE2B d95e0ea8b807e2cbf4c20907bcc1b163c5397402eea934a7155e83c9d18a84db3097e1d4266a5e632acf39ecadf9812d5104b1565d25a149979e0f72523bb09d SHA512 036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46
+EBUILD encfs-1.9.5-r1.ebuild 962 BLAKE2B 0a0b54ce7c01509c47bb5849e741789ae52e2e8ac002f265fad69f3acbc4099e66d3b60ea8bacf24baf73c095847cffd50c3c19fcedd4592484bc3a4e88e93da SHA512 056770eab4af507f313f0867d3debe0ce6c0d5101e87d8bcba4de97249eec180029feea35ac38c8c8dcd701a4149c282eb3fe4674794621c3545997fe728023b
 EBUILD encfs-1.9.5.ebuild 953 BLAKE2B fed8b13ebff3766ebe08594437398e541a1a71c373f98dea59b8c78ec584fcfa21d2cec3170b148f251e8cfff315b71f29bdcdeb250637ec0517a500b97b81f2 SHA512 e5d941c595dffe482f08ffd0d276bac80c93828a8dfa71bee1de1cb232e197f65a6b8206086eae407d7cef349173edc3cf6c3379a7390611f2bfc20ace2a99bd
 MISC metadata.xml 379 BLAKE2B 87ea00a89eb0bc59a7bd2df418d8ac3b04bd3560f1a47365235bd72dbb3cb342f8039cbade3524109bdba5139b1fd3adb5c6b6dd1ea1da45811cbacdd37ad803 SHA512 f94de3e423b8666aafc57201813f1b4e7a1be7da71736957aa70c4aa2d92d2b64a240e58c82bec472d97df0afefe5ba95e863243fda973804555e1625118b59f
diff --git a/sys-fs/encfs/encfs-1.9.5-r1.ebuild b/sys-fs/encfs/encfs-1.9.5-r1.ebuild
new file mode 100644
index 000000000000..c4043c7510d5
--- /dev/null
+++ b/sys-fs/encfs/encfs-1.9.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE"
+HOMEPAGE="https://vgough.github.io/encfs/"
+SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE="libressl nls"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/tinyxml2:0=
+	sys-fs/fuse:0=
+	sys-libs/zlib"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+# Build dir is hardcoded in test suite, but we restrict them
+# because they can lead to false negatives, bug #630486
+RESTRICT="test"
+BUILD_DIR="${S}/build"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NLS="$(usex nls)"
+		-DUSE_INTERNAL_TINYXML=OFF
+		-DBUILD_UNIT_TESTS=OFF
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 3cbf38a88b54..3d71e5c109d8 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -4,10 +4,10 @@ DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d1810
 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.5.ebuild 6811 BLAKE2B 3854417721cbe03dfa48d911dfceef6d6f416825bf326555fc552d9a7190444f219246478a0c6f219708dbbc47b246ee84bb42559aeb447855661bde032e22ee SHA512 96ddd8319e9d0cda4e42332370e76eecb99e25166ad822503641131c1b2ea4ff9cafac01291b6e0a4aa47a4e5dab8921c416924820122b47564d3ef7eb08cf21
+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
-EBUILD eudev-3.2.9.ebuild 6977 BLAKE2B 374968e642cc9b0716f94413da943064ecf5116cedc1bbe4b2c19577ee1fa252d8d91b3a3cc26f8051bd439119cefcc3bced3737a8947d0303970c74fe2143fb SHA512 c80425fde0f0c171c6e3aa780584091d42cca3566b77c636272b310f05629be6f5da3c251af71cb2d3ac1991b9ff9dcf1f71c5934ecfbd25edda019316a233b9
+EBUILD eudev-3.2.9.ebuild 6978 BLAKE2B 4cbc237fba8d2c35fa40ed0b16f37fc0bf1960384dbe22071498896995eb724130b8ffe5dac7295a1d231a65442e3e8136d930c2b90c53a6f70e37add7e5dc99 SHA512 f678c4869426d9b78c4382884781198c820cb957ef05508af781bb65d149700c6179dfe5a53e34b7ebcc8ed1b61cf2383cc3d413f6a74bd94cee16320f151e6b
 EBUILD eudev-4.9999.ebuild 6111 BLAKE2B 534328760b1714d5a487fe36a8b717fcf5588128bf9d2702fc7739dea1a58b514f231e0cbd9d50dd5c455d0c106f0d0c155cdb89dec881188c0c78791977ad13 SHA512 c101dd4ea16381991470e13388d80b86ddd8930cc2e03993f338b374b1ea27777fcb6f8f934ecfed67e297f3219c3252dd11886133596e2c5aa28f5e981edf24
 EBUILD eudev-9999.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index bfcf9af0cb24..697e11f2dedd 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/eudev/eudev-3.2.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild
index 0488d8e41a06..5d106dc8f46c 100644
--- a/sys-fs/eudev/eudev-3.2.9.ebuild
+++ b/sys-fs/eudev/eudev-3.2.9.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	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"
+	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)"
diff --git a/sys-fs/genext2fs/Manifest b/sys-fs/genext2fs/Manifest
index 501ffeecb769..253f296531d8 100644
--- a/sys-fs/genext2fs/Manifest
+++ b/sys-fs/genext2fs/Manifest
@@ -1,3 +1,3 @@
 DIST genext2fs-1.4.1.tar.gz 103283 BLAKE2B cacb6e5e5e69f9fbb8550e2b9d79e41d4dd58e2bcc5516a79476918203e5b8ebee0d12a6a6463ff4ec659249a6647881b2728a8d6936fadc298a1e0e68833bdc SHA512 1b9ec7044014423345ae6b09862ba6903f5b3e0f68fb8bbcf97daf2705471cc1633a9fdbc5e00afe1b191e1af7bed87bde2e538bc7365469218f2a00b062845c
-EBUILD genext2fs-1.4.1.ebuild 336 BLAKE2B 838526bdbea4bf80980ae7c9126cb0c996e48eeb570235ee9704e27f2a9bd488893ba1b481a6d3d8f7ebf47d3ce893c408fbc0818d881f5b88062f86a67bb6fc SHA512 a0610f4a011227d051ee118118aaf8b5376c6a6603fa3ce32901424ee9d4df5b997e2776b4a2d117c355e52f14079147278918e96697a16f0e86e3277ca36f21
+EBUILD genext2fs-1.4.1.ebuild 337 BLAKE2B 96ca8d9974d5a81f2b960db36fce577d14f1c425e0841ea12b797628cfb1f34572361d4716e718f1cc9dc99bd79ced370212872fa0eecd7322833eb1bf59cb22 SHA512 1aea73e08ac5550e1ccd80a8b271e3bfc05878f70ae0f6091623a89892f71c1e68feda6843dfb8cf8a219322a7f3453894571434540d361a597b94ecbbfe1b55
 MISC metadata.xml 330 BLAKE2B b21c94403f0372dce68388b52978890823a6a6b50bd20c2b1ff4691b713f9a29b66018401773ffec48c9bd1c4a4528977e9b3a1c89e9e097ad53d79f85a92f52 SHA512 8e48e07c5c2ca3b935067bbf1b66524f1c9d83393df4efe704afdd37abd7041688a63ba59b3a3441fdf62dc97d75da625b89a0125f2872e63f9643f2f1845dbf
diff --git a/sys-fs/genext2fs/genext2fs-1.4.1.ebuild b/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
index 5276161cb27a..1007f0c45237 100644
--- a/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
+++ b/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
@@ -9,4 +9,4 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc sparc x86"
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index 9f4102a15b45..a932f708e982 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -2,7 +2,7 @@ AUX inotify-tools-3.20.1-rm-unused-cmd-arg.patch 495 BLAKE2B e838d5af6f64a1bc9b7
 DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2
 DIST inotify-tools-3.20.11.0.tar.gz 84827 BLAKE2B 1d3e25c4e213c9c6da74575677a6dc491405077b0544be79ee95e5ac2ee2ef2606ae2fd0264ad83228dc580447f15afd16e486bd5a8d51f6254ed805ed985260 SHA512 77b90e96efe0c90ab6ca4309c2f08303c2047ebddfad93ff62c616f30df8ca01102197867571047475b19b7dcc0fe369d9dd41425c2973cdc06467787098f672
 DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881
-EBUILD inotify-tools-3.20.1.ebuild 877 BLAKE2B e8c8831cd4596a80e1a2d0092489e3c0355086ff66d7cdbf5d0d3246539918e337b5679a169439aad4070a48f3ab7794966ff16e4c4b316bcdf4e45af0b7bc3f SHA512 fd7f3f20a5e087a6f3bedcc136f92fe2f320d08d2afe7b7a2a9c6dc5ac4307800595e300be71b2ec9aa6bdb24f60221cf7d0d6318075ff4a61356ae2e09178da
+EBUILD inotify-tools-3.20.1.ebuild 878 BLAKE2B 9b6f38589aeefaeacb4d2591c4dfd01566b195a076a385f814db48e909ab0cc77b402164215f989a6645f2b390f312bbf372fcc180fb4ab38728e86b31b7f2de SHA512 17aa77439aaccb143eca5509373d3ff05499eec793bced223dc508291b7130c27ed9c64070118da6be24751bfba49bc695309894e4d2fecbe571e1adb2a21f93
 EBUILD inotify-tools-3.20.11.0.ebuild 940 BLAKE2B 6781dcd55ad545831371389cc9a824e1a6ef1873f09eeb34acb00010277a3929d78d2eda86b5dbbd0cbfbaa83e8862fb031790a2e0b4b1915bbaa90a54610142 SHA512 0c8f6e041fbb5730ff132d0cb7783b8137b161f18fefe77fee2444e862d1ecff856707b876ac966e585d4c4cdf88e7019bb3f0ec52e9c544080ef488e875a407
-EBUILD inotify-tools-3.20.2.2.ebuild 937 BLAKE2B 5a31c637c50c4457da9f353f2cfc9dce4121d23dfb4dd89331bbd6e427e4b005912560453487335414047c2c4812c81380215f222210586cbeb3319987d90466 SHA512 367a550c5e4f0797de2d9fc28b30f9636825c3084066e75b6fd1c00ff5e2348964188a6706b1199763728e7bf539aae6a6b712bedf54822c230dec30977c3c88
+EBUILD inotify-tools-3.20.2.2.ebuild 938 BLAKE2B bc07f0848f71767679e59c5e1ddc0e76c18705b4ff39bef4743ec1e709875e9fba11617ea1e58c456411a50a2de54721dc1911bf86b19cef6b170e27b8824cc1 SHA512 d773975fe71add5896ede0227ff04a6c215ba0c2a46905cdc3aaa60c83594e8a7e3d934ff2d0f1054b6408238385502877ede8937ee03b2d9d5c406a9a32bf45
 MISC metadata.xml 649 BLAKE2B 414281eb4ef1da7d9b3cbaf61603043a64c6b748b6d21f7693b1bc4e6fdb1c811fc59490c3246cdf0526de0658ada36251493ea9c5f00f5e700d8d4e68f99868 SHA512 62eaab525f91d97a37b526fb07b7ee4b5c7abcfdd9f785655d3252de2a4f545649da51341c5c0ff4201e0ea097bb7206d2dbe5285c9008a392c55e4802c229e7
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
index 34e25a33f645..8874ede472d9 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rvoicilas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
index 9f37d558a023..8eff88206893 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~mips sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index 82bf70fb5427..0754b57895ee 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -8,5 +8,5 @@ AUX iprutils-2.4.11.1-basename.patch 172 BLAKE2B 8075c38277fe0290b47e1a107ba721d
 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 1122 BLAKE2B c94343844730156c0cbb6d29e691e4dde09621ff1d7dc16d1f82a95ba3d4cd349456b76a3fbe897c993c681087a1e100656a67a0d21fa4c9a236d96692ba01b6 SHA512 ea6eb2bc10b350cdb423176c4762445ca710f147110466037a4514495ab8be27175cf1bd8959b5aa04c5b4fa709cdef8933be1d990344a7913d41b15a675e779
+EBUILD iprutils-2.4.18.1.ebuild 995 BLAKE2B 9a77d8f1dd776aadfa0a8d9fd9f0f1d3783aa37c28624839160a44adff6d377c0169b06b57e0a9fd3eae714eea777ceae6785bc7380b1cc608bb7438a923a3f0 SHA512 07799db4a6ac46dfbe84d452e32d3ae8a35df7691af89ed8018cd058933d8043b573f22ac74aa9e9b10d6fccef1d8141a667c5ae1fc497110520cd9233782b55
 MISC metadata.xml 338 BLAKE2B f1a657a6c8fc11e853f0530c94e8376b8b424818873d909ed8a54c0bef0e47bea40733eea3e8f8e8340562c58dd29c2d3b072023dce9edb6ba803f2774fe1076 SHA512 6323616f564434719f3466d45a7d0a41969ac75a8e6efb5b0225a915061f9a5e8698aa296633ec54f3708903b39ac2d8fe5275686a2bd76bd1ae8662b8dc7600
diff --git a/sys-fs/iprutils/iprutils-2.4.18.1.ebuild b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
index b1595889fdb3..abd37a998769 100644
--- a/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
+++ b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools bash-completion-r1 eutils ltprune toolchain-funcs
+EAPI=7
+inherit autotools bash-completion-r1
 
 DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
 SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/iprdd/"
 SLOT="0"
 LICENSE="IBM"
 KEYWORDS="ppc ppc64"
-IUSE="static-libs"
+IUSE=""
 
 IPRUTILS_DEPEND="
 	>=sys-libs/ncurses-5.4-r5:=
@@ -27,8 +27,8 @@ DEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
-		"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
-		"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
+	"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
+	"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
 )
 
 src_prepare() {
@@ -37,10 +37,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	emake \
 		DESTDIR="${D}" \
@@ -52,6 +48,4 @@ src_install() {
 	newinitd "${FILESDIR}"/iprinit-r1 iprinit
 	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
 	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
 }
diff --git a/sys-fs/jfsutils/Manifest b/sys-fs/jfsutils/Manifest
index 498be7e545a9..64ddb2597afa 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 1218 BLAKE2B 67890f2cb6f5284e00d7770477f18a38811fef5ee3bf95ca59c20798248a2cd8072be2afa9b37c9f60df7383b4627de6cee7d296c249e928b4e3b410f5dbc87e SHA512 ac1b2cee8bbc0c54f193d782dc5525c08ad10cbd76f59664b41ece9396f0f182261f475635fdde34b72f2bdde3b6a82624410310100aaa60f70202089d5377fb
+EBUILD jfsutils-1.1.15-r1.ebuild 1219 BLAKE2B 09e7aff9baf2bf6f945f4cd7cd674ccd14fd6a5ad5d85f864515cae23a0e623501bcac391496df0f2742744a46a87d5709429998f5d06926559bb52b0145a70d SHA512 0eac361121dd5900450400d1634fae4656f9ade3c0ad9a3fa8b251407a2d2a55af9475f3099e2b7807e02b566a1160008773651e3822aecc6d630bfe552c1a4e
 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 bdca7f2146f3..9b4d50930d3d 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 ~arm64 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/lde/Manifest b/sys-fs/lde/Manifest
index 749e02d49fe3..f5b05fe70fbc 100644
--- a/sys-fs/lde/Manifest
+++ b/sys-fs/lde/Manifest
@@ -1,4 +1,7 @@
+AUX lde-2.6.1-fno-common.patch 890 BLAKE2B 993008642739d4048d345d0f82f3c7b71c265b40805d375d1bbcb9e070328796b863fe6fef3f6de6d06eb6cd2f935767a2563b8f6c932b46b1803f1ef1737a38 SHA512 194c7cfb1d7a5491ced955732f7c277aa0de73d595774fe0362b0975151b3c78b391d78983ade9d4c05dfccb576a13cde1cb75a874aab64bdda5b97267fcc7a9
 AUX lde-2.6.1-no-shadowing.patch 1296 BLAKE2B 22d2f0efc08196c050498796b5dc28688e6b6a0afb1d57d71d77ee0d7509d4df1e5c9fa2abf3f2cc21c4a9e2b3c87f0064b426b9dd96f19b32b929ba82f82460 SHA512 71545fc978fc5ef792fe61d5495e5690d50f6a9e44b1a48b835738cb0b05737db311fe10851b90655373e2d5cb5f7e47a4befcc40db5170092e28243fa99b32b
+AUX lde-2.6.1-respect-ar.patch 229 BLAKE2B 62b6e599b7d8cde2338816dc4d92ac57190cad1509c5b01e7c8dbcfcc96acd63f2d1b271c46c28c0de74029f73c1b02ea7028d1f06473eb0d53c632c789ff504 SHA512 49f76e035e7046bdf1ba815a05a32d56ba439f8752bf95b8e63701c0ed6389d31870317ff2a1f067462555f5411789dcb7af800c893994ff78b4fda34cbc1a43
+AUX lde-2.6.1-tinfo.patch 773 BLAKE2B 6ec56d92ed75f91e6b3bf6000f094a004483b24450c5fb6c9d0801c30e1c46971e2a5fb3bd10dfe4605d6b0332ba6def2fa154a2eba31f0d9d41304304ff2bf7 SHA512 2df8b0fc7feba65a7a0a456bcb8504f67645fb0adce8373a7449cad74f2827521f36a11145e8d1ce1270884a6ecf34f28d0086b426cb6bb03d87369637a1293b
 DIST lde-2.6.1.tar.gz 598050 BLAKE2B 5ce0dd9c06de599016fa408e8e67ed71923acc556c0f0fce54bbdc091bde99a2ab1b0783ba2928b9a1c7d3521c82fe62e359750d0ef26ba64a3e022d5471b0c5 SHA512 b77baa9998a3d45493b6949a81df81dc5c0ee27060108bbae29548af09595aa260fdfcd12e958ea8ecf12805d97c157f5aad147137d6b42d806529ac6a3ab015
-EBUILD lde-2.6.1-r1.ebuild 584 BLAKE2B 7def205da62dedebf58f2b908e070933fe850a695f7ad650ab9f3cd5593b5157fce2bf0f7ec00608d97d851d8ea6c12efa649e8ca0de29bef27d0ed83286674f SHA512 42cd34a8b8b77c9ac457390ab349e0ed07b7f34620d2bd13dcce52f93639b2aa30a5aad1c9e9674854d8fd10b3dfff3bd3f1b589708661751fdc1aaf7eb6ccc4
+EBUILD lde-2.6.1-r1.ebuild 823 BLAKE2B 366aa1f0935f812f41282e1dca0d2dcd9285a81a7999335684429d026d94d3ab5a3c0f403a87c8c839e5ffa98d7f662dbf03d49e543983606c0673e520ed3aa9 SHA512 e161df936f5ebce50e379516dc15cd906288eb95d5516b4bbcb1d2696e998f92d81a242d458b22ff232b81abe57ec252e409aadd5afbe933236f1e67b17ffd23
 MISC metadata.xml 323 BLAKE2B a2df9affe6f199ea2e9741d775185681bd5d2776d9e8b4d63a4e374f507edc6c53df67d4d9d4078c2c32499d2aeb85b31bce3150ded4146148665d9705e3504e SHA512 7da6b75e5be951e2227e74cd49fb6a6f4c2be3770021989d9fcc43a816138ddbaa2841f1a28316e8312fc624b5ee2124320a212379eda33ecace5f0a83293d4f
diff --git a/sys-fs/lde/files/lde-2.6.1-fno-common.patch b/sys-fs/lde/files/lde-2.6.1-fno-common.patch
new file mode 100644
index 000000000000..8e246aea95ac
--- /dev/null
+++ b/sys-fs/lde/files/lde-2.6.1-fno-common.patch
@@ -0,0 +1,32 @@
+--- a/src/lde.h
++++ b/src/lde.h
+@@ -211,7 +211,7 @@ struct fs_constants {
+ };
+ 
+ /* File system specific commands */
+-struct {
++struct _FS_cmd {
+   /* Check if inode is marked in use */
+   int (*inode_in_use)(unsigned long n);
+   /* Check if data zone/block is marked in use */
+@@ -231,7 +231,9 @@ struct {
+   unsigned long (*map_inode)(unsigned long n);
+   /* Map block number in file chain to physical block on disk */
+   int (*map_block)(unsigned long zone_index[], unsigned long blknr, unsigned long *mapped_block);
+-} FS_cmd;
++};
++
++extern struct _FS_cmd FS_cmd;
+ 
+ /* Flags */
+ struct _lde_flags {
+--- a/src/main_lde.c
++++ b/src/main_lde.c
+@@ -90,6 +90,7 @@ int  (*mgetch)(void) = tty_mgetch;
+ 
+ struct _lde_typedata lde_typedata[] = LDE_ALLTYPES;
+ 
++struct _FS_cmd FS_cmd;
+ 
+ /* Check if device is mounted, return 1 if is mounted else 0 */
+ static int check_mount(char *device_name)
diff --git a/sys-fs/lde/files/lde-2.6.1-respect-ar.patch b/sys-fs/lde/files/lde-2.6.1-respect-ar.patch
new file mode 100644
index 000000000000..104aaf45b774
--- /dev/null
+++ b/sys-fs/lde/files/lde-2.6.1-respect-ar.patch
@@ -0,0 +1,11 @@
+--- a/macros/configure.in
++++ b/macros/configure.in
+@@ -30,7 +30,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PATH_PROG(RM, rm, rm)
+-AC_PATH_PROG(AR, ar, ar)
++AM_PROG_AR
+ 
+ AC_CHECK_PROG(system,uname,`uname`,unknown)
+ 
diff --git a/sys-fs/lde/files/lde-2.6.1-tinfo.patch b/sys-fs/lde/files/lde-2.6.1-tinfo.patch
new file mode 100644
index 000000000000..bb4c6c2386c4
--- /dev/null
+++ b/sys-fs/lde/files/lde-2.6.1-tinfo.patch
@@ -0,0 +1,22 @@
+--- a/macros/configure.in
++++ b/macros/configure.in
+@@ -14,7 +14,6 @@ AC_SUBST(STATIC_LDFLAGS)
+ AC_DEFINE(_GNU_SOURCE)
+ 
+ dnl Must use builtin() as it is overridden by some AC_ macros
+-builtin(include,./curses.m4)
+ builtin(include,./misctests.m4)
+ 
+ dnl Search for ncurses by default
+@@ -187,7 +186,10 @@ AC_ARG_WITH(gpm,
+ dnl ------------------------------------------------------------------
+ dnl  Search for some version of curses
+ dnl ------------------------------------------------------------------
+-AC_CHECK_CURSES
++has_curses=false
++AC_SUBST(CURSES_INCLUDEDIR)
++AC_SUBST(CURSES_LIBS)
++PKG_CHECK_MODULES(ncurses, ncurses, [CURSES_LIBS="$ncurses_LIBS" CURSES_INCLUDEDIR="$ncurses_CFLAGS" has_curses=true])
+ if test "$has_curses" = true
+ then
+ 	AC_DEFINE(LDE_CURSES)
diff --git a/sys-fs/lde/lde-2.6.1-r1.ebuild b/sys-fs/lde/lde-2.6.1-r1.ebuild
index 30c88f3438ed..ed69cd926321 100644
--- a/sys-fs/lde/lde-2.6.1-r1.ebuild
+++ b/sys-fs/lde/lde-2.6.1-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="ext2fs and minix disk editor for linux"
 HOMEPAGE="http://lde.sourceforge.net/"
@@ -12,20 +14,33 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="
-	${RDEPEND}
-	dev-util/yacc"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
 
 S="${WORKDIR}/${PN}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-no-shadowing.patch"
+	"${FILESDIR}/${P}-fno-common.patch"
+	"${FILESDIR}/${P}-tinfo.patch"
+	"${FILESDIR}/${P}-respect-ar.patch"
 )
 
 DOCS=( WARNING README TODO COPYING )
 
 RESTRICT="test"
 
+src_prepare() {
+	default
+
+	cd macros || die
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
 src_install() {
 	dosbin "${PN}"
 	newman "doc/${PN}.man" "${PN}.8"
diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index 85d52bef74f0..a2c752971d84 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -1,3 +1,3 @@
 DIST lsscsi-0.31.tgz 191650 BLAKE2B 0bd9b72356cc8f9a7f83bf5bdebdc7d3093efa09b1c72e79b45f6e6dacedb6c80e085fce8ce734e298d03c959bc4428f7a4faeeaace3cdeaa3b2d6bfc4b547cc SHA512 e76a011b79657fb138e88d37ff38d83b6bbe2e28330fb621ca5972ba4ffb0131a5e67c8afeb0292c002eaf91e1b69c8f051d48849e5ed822e8705365092a53ba
-EBUILD lsscsi-0.31.ebuild 336 BLAKE2B 8d73e5b1d732bc3827e22eb3de73bf62247b2db83431799f7b692183b9a6eda8ae7416f67b525d3ec99875aed55de9300c15e4cede42e7fcb153f134423bc1d7 SHA512 5e89db0f0be0e1eac5de15b0d93522ab980583969298670a7268215f6e1bdccac44979d9a4c5b17aa1314a45fd8ac6a4208d839779012f162ad3bce77e3d0d59
+EBUILD lsscsi-0.31.ebuild 337 BLAKE2B 9f95dd2bdd6564e06ce6b7b59c52abb8fdea702e81feb761bcc260b67c5a5148f15bc32eb9b47a0b3351b7bc74c6aa01cb9a98a674fe4775c71b505f190487eb SHA512 20657225b9f362abe93ca048c7de67f04f057bd14bdb779a82b58881b0a3ff8a999a3efd1ca911b996528b7ec09469f992d79dc90a1285e50a709519f71b1a97
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/lsscsi/lsscsi-0.31.ebuild b/sys-fs/lsscsi/lsscsi-0.31.ebuild
index 7879201a16ed..eb792c163557 100644
--- a/sys-fs/lsscsi/lsscsi-0.31.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.31.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 2d6cd11e6f27..1ad9cca9ad67 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -7,5 +7,5 @@ AUX mdraid.confd 383 BLAKE2B c61fd2c072a0d12ca21ad4f8a60a55101b4e452f9acc8cdcdf9
 AUX mdraid.rc 759 BLAKE2B 41f1b4cb9dd29411d56bea656dddc2cb2fd3cc14b183d05c502fb5e29407d1d816de9595e13349ef7e03240308cf4395578be31149f59d1960d1feee0165506d SHA512 d76190646b393d1480607b0d89d08ce4196738295fbb7790fa1035c53a041b5cb88fe857bb2070920a9c3ae21b9fb8f7838dde240fa0e275e5915add9c113021
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
 DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698 SHA512 e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63
-EBUILD mdadm-4.1.ebuild 2363 BLAKE2B 893b47fc7da1d600ef8a0cf920744c1bfc4da18086f1b92707b8afd43b48c96efb736eae40a5ef4fb1da8939dac8cff2d65f96e258d3268295c24668aa3fe7ae SHA512 04dea6546e91034a298a00a0661d948f308eae5542378648d9926879cd3c501a1a111502fed4567e29759f617b5ad3c8ccfa2a84bce58858ed8ea7a2dc655814
+EBUILD mdadm-4.1.ebuild 2364 BLAKE2B 2d29a2b0f63c9d3d63ba66c97386c2e755a5786c41c29fd9b78af62347e5adc567c556cae0dbd2936e275222a41e278107b9e1f823f9ad9119604df9e7b36136 SHA512 a7c51baeb079666bd8562478c99e20f3b66356912021147e952c538df0c32d6b2e85e69cc047596ed734c4cd33bb2d6deae34cbf325f827c41eb645952af7869
 MISC metadata.xml 338 BLAKE2B 09821f9f1d507fccd175044288b7d5d8966b7bb807399c86e9e2e5b41134ac39a76f79b7c9000ecee890b902175aa86b7dd1ce2f288b6926fbe633496c1b1d9c SHA512 1f86c31c1f9c17f0a0d57a17c7bdfe6da70eed4e8102f3c545f447b58e892b0f6a3b0f6c4df9c611abcb544d6b26d3a0d0c591f1afd20f91a445746e3454eca1
diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
index 9aad93609658..0eda9d8fbc1f 100644
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 1888142031f8..f7aec45bdc90 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -4,9 +4,11 @@ DIST mergerfs-2.29.0.tar.gz 302391 BLAKE2B a7d051c63b12a95af2868d8b3be9b32aa1be3
 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 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c
+EBUILD mergerfs-2.32.0.ebuild 1064 BLAKE2B 04d53de6bb618c91a1fa4e662850c385443fa454af159a434eedc8f82f2513f44a30960139a600d394ba0b7218d9537d3883120d50f2ca9e00d539d0d80dffbf SHA512 d3dc43f522ff6cb3741b2123bc3d8a8825e849c629377ed2c55033cd9874f36a0bc3ca72c35bbfc19841440ca4b44b11408a513158e60b00008dd1ef1f8601ad
+EBUILD mergerfs-2.32.1.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
index 5d1e3ec0e4cf..27aeefa5ab58 100644
--- a/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.32.0.ebuild
@@ -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.32.1.ebuild b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild
new file mode 100644
index 000000000000..5d1e3ec0e4cf
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.32.1.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/nilfs-utils/Manifest b/sys-fs/nilfs-utils/Manifest
index 56652049b847..3cc18b21bab8 100644
--- a/sys-fs/nilfs-utils/Manifest
+++ b/sys-fs/nilfs-utils/Manifest
@@ -1,7 +1,7 @@
 DIST nilfs-utils-2.1.5.tar.bz2 389552 BLAKE2B 38de1d2eb2943ec1e4564deb44f8d9c13dd3a99184acb1523cbc61daae7575d0ca9397d0f5fae864616c38a93afe2bc15809dcc0c9f6a175b5bd37e2034921d6 SHA512 a9c0cf6d9df524b9cdb3379bcb8e0c1427aa6e1a792cc649f366a68416374cfc7c9f0db3dd78f3c3165be05a9e8eefb0db30c394ad04c8e3e89ee6ebcbfa42c0
 DIST nilfs-utils-2.1.6.tar.bz2 391303 BLAKE2B 95fd6a1f6ae8af5e8dcbd678170e41e35af2006b5244e09e8f3f7cb810f4ee7145a6c6887fb5268d9439970367a574c4eab6b3277d52e487fd5a7833679ed1ab SHA512 ce0cbaccd6cbf4f7f45cbf0d94cb253c77dafbedac4b71229002ed6c772ad6bb8af598c1e933614f9837901f85b217462ed0dbd5a577b4fbb50528a732a60f83
 DIST nilfs-utils-2.2.2.tar.bz2 424097 BLAKE2B d38b40e9b70a17bc957a89f5d1551bcc0eaaf396ac5126d47dc2dd0a9e311033beb1164a916fb369b51794d38cb63793ede7917be2d76b8df02a32de11b0a4fc SHA512 2ac0f1f25472d8900732db9f31e6b824e7e591bf306aa18d8b55c5d93807f4f7ceb65ba7e49540a39c7f285ad63c5f4ab795d34b2a04398d91cd2beb5fc6edce
-EBUILD nilfs-utils-2.1.5-r1.ebuild 779 BLAKE2B 9d2f1953071e7632858dac0f821e27589a3eaf971fe0ad67d5bc1ae60b1535bb1e6cfc88b2e31a3fb4226c2b7003b846a3b3fb4d5d52b8202e2adf40fa9dd525 SHA512 b7ad27b2e16141094017446cdabb2732fe7a2fa0b2a182d6e85d2caba0c047bd6a8784f1abf1386f6dda592305540c81780122e688c0f1c5213995ff898afcc6
+EBUILD nilfs-utils-2.1.5-r1.ebuild 780 BLAKE2B 703ccc05e0fa62f9a48388fb6cf5caf01f49b5c87f1a82415a80d51a935f1b5f71f4d64e90e53e86b7615145b52b11d8900a297801586a9dad39df1429e4aee5 SHA512 ddbee4f6689767f634436048ca6e45ff690bae1f6e1501056f40b9bc2c367f412402c07dd23d6115dc155f162c140d3d302a1d8b397d04d3168f5cfab80f818a
 EBUILD nilfs-utils-2.1.6.ebuild 787 BLAKE2B 137ab89a4dd7a54b82740b04de6f0d8c2c6fe71b9fb59ee636f73dc8560636463cc920920d8811c1720d805624e8ab530c43573e4388ab7dc09ea6d644d88b3c SHA512 9c660d462fdb3cb1659ec764182382b57f05627daf59c0bc0693689634effd5431a1a9913252c2e7d7db718829077efda9fda21bc423ff17eb0dc35c196203d3
 EBUILD nilfs-utils-2.2.2.ebuild 787 BLAKE2B 137ab89a4dd7a54b82740b04de6f0d8c2c6fe71b9fb59ee636f73dc8560636463cc920920d8811c1720d805624e8ab530c43573e4388ab7dc09ea6d644d88b3c SHA512 9c660d462fdb3cb1659ec764182382b57f05627daf59c0bc0693689634effd5431a1a9913252c2e7d7db718829077efda9fda21bc423ff17eb0dc35c196203d3
 MISC metadata.xml 1179 BLAKE2B c4cf4672955d063439f41edeea9ef305a5f00589d27bfa7bbcb40ae1bdbfcbb4683836f7a7594aa2fa1297a07cfc8cbf889cdb201b4b38dc26553b82da41dc68 SHA512 7999a459170e86c6ff83043686d80127223175ed43bef2dca57fc296673cf8f1d4644ad47f44dfe0f5bc5d3f7c959c0e801e98b46319cd9c79269a2ac158b475
diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
index 9f9ebcde1558..719717ffc968 100644
--- a/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
+++ b/sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nilfs.sourceforge.net/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/e2fsprogs-libs
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index cfa529d40e18..53ac4226595a 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -8,6 +8,6 @@ AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b7
 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954
 DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2
 DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871
-EBUILD quota-4.05-r1.ebuild 1560 BLAKE2B e618e2d76a444f254a9edf3185e32616d8eaab8669c0d616316c57d60b88ff6fdb41f50f60747232451377927cf5f5f556929de5ef9c173eb3ad855ec094ec46 SHA512 19a9557d7f9fe22e7ed9eea549546f7dad50d69642753aa974f80a63d43b6962e375fd9b5ffb83b81eebe87ca51937be321ffc7b0a0676da4bd77d4b698881f6
+EBUILD quota-4.05-r1.ebuild 1561 BLAKE2B c94f0e1fdb676edefbfdf73fb0a3f35b5d94a656ea85cca69893d76cf99629b07d95687f9707e92c5f26c61e3cf25d8fec307ba15d380c0bdddccfc45d2a17b0 SHA512 97c5b75089743aded281e400c629dc2c09d461fc71d10a4e774d5b051df8d8e33e4e5aa479fd933da0c6ed545e3b3b4b9d7524ec03f3f0b90ea13bcd5ea342aa
 EBUILD quota-4.06.ebuild 1577 BLAKE2B 7a3ddaf149f29f4bd1f9228f27a9084dc72a96f03b8a4b7842e3bd4e0ed7a3b5c1c14d8f9469b67b715850b446b6394bed20480d65b2dd7b8f4beefa0a89c726 SHA512 8498b17c4852f96a4a508e26c4e9e71e297bbd93a21792d995671246c44abc3cb6d8f65e71b40a1673e166dc379cb8934125ab12ea1a3f8fe258d36f7789b9a2
 MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e
diff --git a/sys-fs/quota/quota-4.05-r1.ebuild b/sys-fs/quota/quota-4.05-r1.ebuild
index 6751a1a13189..25220c8565b6 100644
--- a/sys-fs/quota/quota-4.05-r1.ebuild
+++ b/sys-fs/quota/quota-4.05-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index 73653a881241..ee3bee319974 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,8 +1,8 @@
 AUX reiser4progs-1.0.7-readline-6.3.patch 472 BLAKE2B 88f0489b88691e72a8813145428e949b0ace21b15dc01f18da4292524e3601adfbe30e3b6cb3d1f12174bc5241fa7732bf36856025c7af5c678f3ca53d24497e SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788
 DIST reiser4progs-1.2.1.tar.gz 980203 BLAKE2B 8c9cb77458c083c50f34c17bddf4747b755b52b911a63835152ad584494c2738a5317c28e5b3f1e6bfdc49416f3715ca4fbbd9c8a428b5b484b54f8f4a861a58 SHA512 2caac5a98d672d68910c6df3e694a42365fa6273ae367c26126778c1fbe956aa502dac236d36c3302a5bf109468ad3447e645a6eab89c83f122dd1afe2aeda21
-DIST reiser4progs-2.0.2.tar.gz 994469 BLAKE2B ac680b901807c22b246ea5601b89d51fdd8ea12636bdacbddcdb191455c4ede50b116edd0d8d7398f99d6fb26ea9f44c5ffc561296ab3ee1c3ae0b5eade2e1ec SHA512 b7473c6ab4e3f3249b60081ac31e92c267a1408c32f82dc6d27e92297ac4e90263c129ef748891ca4c7cf31035ac723867f9bed649bae9ea1b73525278fdfdb3
 DIST reiser4progs-2.0.3.tar.gz 995921 BLAKE2B fa38c8998603ca0c26a17c75240d07afec6c46da1b437e5a733ce3a5a865329591d4343b52d7fd5dc56bb6afe34f4f7685e7dc258ed075dfe4a70a7ad420324a SHA512 59bcd6d73a220fd0e71cc4213489801f45597ebfcf0be55f150e929ef391e0a461a94ab99ee9698e1fb1eb58840497277ece6a2ea57e88d54573347a8854da87
+DIST reiser4progs-2.0.4.tar.gz 997361 BLAKE2B 3d083c2c702f6c469403447bd2bb59257c22a6f87e062b83227c97147c37e69f93f1ffb6a1ea2c9f23f94a5ac8fcb834da475893c9bd268fc8902e6af2af4c10 SHA512 222eaa69f89fa1cfad2b5791af028560fb6e57e44fbb5e025122c25b50dd4aea28a8fd362818a884fa6b3d6164e5b0c78ab63f0649e2e65780f1aee2c0d26375
 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 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246
+EBUILD reiser4progs-2.0.4.ebuild 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246
 MISC metadata.xml 327 BLAKE2B dcc63f48d652f59288d08c38c2f0e430bc15f4224e2b5cf8b690e4e2cb1bcbd7ff97151d2e13f7482f21c1e9a92f45b867beef2aded7bb090f9011532c401e93 SHA512 f578c1f4305a1e24c06dfc53231a053cffde7ddebdbd7f61dd0fd58b650dadc8bc1cefa48213ca9734e081d30436bb7e5a093682eccc1a4a1a9e5bf707d61846
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.2.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.4.ebuild
index fa83088da8fb..45ddbfaabf1c 100644
--- a/sys-fs/reiser4progs/reiser4progs-2.0.2.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.4.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 51c59e4fd9ab..7f155b389092 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -2,6 +2,6 @@ AUX reiserfsprogs-3.6.25-no_acl.patch 274 BLAKE2B 1b49c0c98d935c1bfcb0191882a7e8
 AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc299fdd3a4529bc29370ffa8129499ac9d6e1f0a7ed66c93fefa1a647a304ae77309dc87deeeb8b29961398e509f30d0cb27 SHA512 74332f8acd84a3d0374d6ff9803e63bc78ceb18ec130fef213bf326a6b146b8e4951ac8aee5b7349239716627889febd1c832862ae058a822cc71b0a75333d2f
 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 1254 BLAKE2B 192834988dcbfad708f466890f79fba99ed14b2ced9db74e7929d400b4a40ecfd644734d40521ec84ba0e2237b9962db3e6c1b849744b1808310751ad13b4fb1 SHA512 563cb398c78889aa1699bda1ac0e14fe2af5c5b50f43be1f29d9a1e40161d6d49bce84b9383e412822ab87f9ebf38b523208eadb817c275e210c78590b3a0415
+EBUILD reiserfsprogs-3.6.25.ebuild 1196 BLAKE2B a604d14eb3a004e8306bbac4c75e89647faa0c9440f241ccb8361d7dfa1bb1d525045c4a2c663d4adb18cf4ddf0741a09571a38a2de6884fcc6fe2262227ec53 SHA512 86a4f031a2ea1dd03899d6caac2355bc544a0714fbfa9fe2856216adbac9b8d1b7b6de4b8263728d265d1d27a097a03641d8e35e164d2cfa4793e0cc16cccf94
+EBUILD reiserfsprogs-3.6.27.ebuild 1255 BLAKE2B 733ae69b51cc97a7a18f48e5add6ec854bd48b75232c7242b9839b415e12cc0d08c416efd88b7c6636be0fa8d7b67283c897c584dea94186a422de57d07a106c SHA512 cf818ae77e507987175cc9553252070178a9e288cafaa13b279976acf4e63a92be0b46952693fbe02b6f5a51e4a913c703aa7909c21f1d4cf8ff66d94149877f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
index 5df0b1836175..fd206ba0d7b1 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.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 -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
index 1889e0c146d4..998ee9006da1 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 ~arm64 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/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index d8a769892472..d4eeb2287a1b 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST squashfs-tools-4.4-git.1.tar.gz 241963 BLAKE2B 7a80c353efbbca851b2eb44e742f20b4cf59e91058b53b77c74d879dc18d882e3bb6de8a010a4469c0a53384ccf2968bba4cd1d6f10cfcede70fe07eebbf2409 SHA512 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0
-EBUILD squashfs-tools-4.4_p1.ebuild 1313 BLAKE2B 589a3a76413933addc8d051678baf19d8ae8e557c0544df7df53d1e872216983610d2a04f52ae71236d1d0305232dcad852c204bdff0bf07a75b8e638e9cf741 SHA512 ccf88d8ca9eef5d96d50b51afd5df5cc34239562e88b4f5c0e119eea8502dfcd25d3271c0ce5bd0d72ba597347461fd170bc145499e9760a6785d66938578907
+EBUILD squashfs-tools-4.4_p1.ebuild 1314 BLAKE2B 6dc4f62605de8c1a4cbec46bf85288c92f5f44285186028c3e7e2dec5a6b23dd90f93cd3c160eba160e3336a5783f9906df43792c0fbb60d6107249b421189ad SHA512 1d0a38dc2be5460960245f5ed789fbef18a1a382792d274b2abba8db0e05959a1ca5ac9733d9741ee26d47cdcf655f40b81d38a6233bc10de8030c1a3339bf97
 MISC metadata.xml 325 BLAKE2B 69746d14350ab40f297e7944dd2ffa3af61c6b7890012856fa7a8c8971246591844a078f3ca79cbc579bbd1d8d5fad5e6c8338766a80d4a2d068219ac303e77d SHA512 452fd4de6f1a2ab284e8dd388c18caaf75bba2c07bbf3eb5d990259d92ed6af0f7a2174a85998214f17a09f087f796dae7550e09ebfaad15c6a8ca514335afe4
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
index 9faef4b6fd90..21394c8c9e94 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="debug lz4 lzma lzo xattr zstd"
 
 RDEPEND="
diff --git a/sys-fs/static-dev/Manifest b/sys-fs/static-dev/Manifest
index c56f33eb68fc..f7b851c4f0e3 100644
--- a/sys-fs/static-dev/Manifest
+++ b/sys-fs/static-dev/Manifest
@@ -1,2 +1,2 @@
-EBUILD static-dev-0.1.ebuild 1142 BLAKE2B 4e9160b2c29ad118e6760f4e71171e456bc42c2294b3f5e4094a4c2ff77c054749e37f48f41ab641063b992fca7257ef9e83f80d187c06581639708fa96b11c8 SHA512 c01efa901f012d3febb17cb1deb7d625b9c73f5b31894c2541b5e1770554c67cb81b8cd9a1904483a7c5113d0aab03ba49fcc0cae3c5c1097b33ca904e7cc463
+EBUILD static-dev-0.1.ebuild 1143 BLAKE2B a7365f211de8110c0965b1ffbc14d243844322da1ad4eb694e2bac7409d10f53a2bcbcaf331448a98fb1f0019702df17797b7d905f2ecb145e6dadcfa2c745bc SHA512 a1ee6c6714d0abc225bed3067b2a0cdf1b51eb96d36260055fb52c17a94d374fc10eec78923beedf243480657562c999cab1a93bb43dbff40c009332c7aa471a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/static-dev/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1.ebuild
index 7a72fe7ad5e1..9140ba94e4b3 100644
--- a/sys-fs/static-dev/static-dev-0.1.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="sys-apps/makedev"
diff --git a/sys-fs/sysfsutils/Manifest b/sys-fs/sysfsutils/Manifest
index 4c69b542b04a..9c86ba4a1705 100644
--- a/sys-fs/sysfsutils/Manifest
+++ b/sys-fs/sysfsutils/Manifest
@@ -1,3 +1,3 @@
 DIST sysfsutils-2.1.0.tar.gz 788885 BLAKE2B faaeba9d156e48b98ecc50c28711205dd7b99da4966206493f2b63d8a7a3e730b6564a1dac9304c8af56c516e5a13d6d9cf1ebd8773563617c3acc2387059a09 SHA512 485902d98b41a69343cb037883d0c0a1de8a1a4aed657cd4528fe10bc845ac51629657dff01deef042e57c9bd9243095e23fc931d06d74db31b03c5f0a18cf07
-EBUILD sysfsutils-2.1.0.ebuild 962 BLAKE2B 19c397c9f5e7d3cb5585d40cc4306ef8fe8b52514ae1f1270cf6b21fdbb2e3bba63d504cd43e40ac44bdfbac39042dd4168d769af0569e2d698450073e148172 SHA512 729d442c25a9a5fedd45c6521ecd2bf523d9af8f935256f3d559986c8d26ce119a17b6ed228e342d3179d4e2beb0cdbd2bab813df73b769454f0ee8c0e919474
+EBUILD sysfsutils-2.1.0.ebuild 963 BLAKE2B cef3f293bdfdb117dda03f184f1cc699a9a0b4d55b5830674558232e1fe32c7cb6372b18537cadd7255902c75b129705060000cc323f2505701d363e5f744c20 SHA512 46de2b7ca69bab0771b97d247d531167e03f449c13161dbdd93721c0c42994bf35071deccef4f757d16cba1a1125a0cf5e25616769f8d21bcec8a12fa11308fe
 MISC metadata.xml 330 BLAKE2B 704f504eef71b56802b1d24554ea1e4887cbaa3bc859021c9decede47242997906e1e87cf18a9a0a7668000a629c5a48699d09b7ebc4532cb304899d61a5091e SHA512 16dbfcfa75389172827d78272e473ea69b20ac564ae8c17de031599ccbb5166ffdb7e42208b52e6ba53cc5bda75075c980c7954516646cc0fce4fb56e431070c
diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
index ad1fbe589d59..6f67ecfa8829 100644
--- a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
+++ b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index b22f45f0d307..8b1659e3c7a3 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -3,5 +3,5 @@ DIST udiskie-2.1.1.tar.gz 87216 BLAKE2B 4860e8ae7310c89d3292fe7fadcd49f6c92f0562
 DIST udiskie-2.2.0.tar.gz 88232 BLAKE2B ba037b0828b7bf42b00be481ecec807bc9ed591ad3990cb6b6f0db21b4894c184ff2fcb5410272a55f3f78caae999458cb159cd450ede540606138e5e9dab1af SHA512 7c6c096eeb52458a2e30415c1489a640ca679489a34729f5502ae35f178f810476111a17f082a092d61d6d08022cfd208cb1f71ab34d6b88ea7f1f4e4a1ae49c
 EBUILD udiskie-2.1.0.ebuild 1094 BLAKE2B 32f5aed7d312f8e5e03e9ff1ca9ef06338f2f9bbcd21c76a7f175f1ba9844cdf8c8b081daff9ef800fc1fa794e0f7292dc8dcf0537acdd280faafb8d60d598ea SHA512 3a91284b4bdb3eddc252be3513eb8d1512d7a40b1b0b19e478d618a253a187d6defb1062dc148362287e09889b7a7a734382ba82bfbee470b5693b7788558970
 EBUILD udiskie-2.1.1.ebuild 1060 BLAKE2B 537b294271d993616124655a924b2b4bf665271fd17507146b9ad59edc7fc6634ec8449f339466c1d1f493734e03765f1ea69e3586296a438dbaf049332cf59d SHA512 04827ea4f09649134f953482d1ac5b90f944e301ee1ffa21ab43695c2109c92cfe8ae1c3eb275fbc388a5f1dd5d80a9637425a35d422cc09df183f326db2e522
-EBUILD udiskie-2.2.0.ebuild 1002 BLAKE2B c063298852b39093da4f4f1542e103549486f7ff79a5285c70747eb1ea4a370833e6f2bfe9aeeba333e7da6f06d3f6c3c9369b089cc2e105c694753c60b3c13e SHA512 841b5571a788189d63ba6aca2222b7f2043a8f1cad1bab1d6543442f04f7f7b766d1fe462662248a4c1eba4c1f38aa18e1ae061d7d26c194b02aa72bdc3f9407
+EBUILD udiskie-2.2.0.ebuild 1003 BLAKE2B 20fdd6665401685ff2c97f82b989e916f08060e0085a87a1c327c3fef469a00f8c085456b8d5f5a9cf3a098fb752143fea68b98a99038fe20a1098f29d76555e SHA512 b6283de8d33f593580a566572912750f294544a960ea810c5003aedc2cdb8747848f9893047d91c8ac335efeda5aaf84b0586f500e422abff26e00a90713d39b
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-2.2.0.ebuild b/sys-fs/udiskie/udiskie-2.2.0.ebuild
index 21ed699c49aa..b8889d66bdf6 100644
--- a/sys-fs/udiskie/udiskie-2.2.0.ebuild
+++ b/sys-fs/udiskie/udiskie-2.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 gnome2-utils
 
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 50d33233054d..a6ae3e1507a0 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -7,6 +7,6 @@ AUX xfsdump-3.1.9-prompt-overflow.patch 329 BLAKE2B 58bada935969c61fe9a161e810c6
 AUX xfsdump-3.1.9-skip-inventory-debian-subfolder.patch 468 BLAKE2B 81cf0af8cef61efa4dff6e230b71c0db65c3e7d93fd252035b6b5bf14afe28e65eccaef22bc3fc4419d196b0cca1428bc1697233efcc4f28aa138beaf3a5ccbf SHA512 c94af1c52c95a7617586b64a8936cdbfbd3a264c9580fabc3e1e7d3d5c37ca368b97f730baef2330e796ef7459561fa37b03280601aaa3b79eb2f90d9af5170d
 DIST xfsdump-3.1.8.tar.xz 603304 BLAKE2B 8f923ca267f648e88e4e964bcafcfd3bfde0fdb4e6753a9c21bbb8a1ae0f63e868cdad3da4eed5e95ffda861278eaaad49758701384681f3b0a19b93e07a232d SHA512 84720c83627647c75b42c59d180bb31cbb6e064568bef18b73641cf821fa7d39e6f7e0df4a6c7ffd36fba63296ab88cb83f0effdb1f6aa98f4b593ca0e658e0b
 DIST xfsdump-3.1.9.tar.xz 600348 BLAKE2B 9e833acaacd3ad581b4f23731d7d613fcffa3d518f43638cddbc7da7015e582cb9415e00616e5e8586836831b6d5877fa83e8a5fd931fd454731bf2af7072095 SHA512 e8f9811d16fc06ab49fe2c109de0546c989575eca6e68b579c6d219a745f935952020069f58b357c5c87b944c5097ca2894466d328d09f06beb8a55880142351
-EBUILD xfsdump-3.1.8.ebuild 1493 BLAKE2B 6a6a5138b8d61cc116c1f2e300e0b89b6b41583bae7fad2f93432bf388a1e40cd1c1c6d30b9a501e8b0c15c1e4471b492b5da839b906d1f4cf4e783bf29c293a SHA512 6d728c56f1d0e44c06209bf39b36ad372cf0fd2413feea663a64b1e549bc73cd8a12a34b13f96de4bcc99d8577d07de12c2685559ee694d05b21ad8a14ac36c0
-EBUILD xfsdump-3.1.9.ebuild 1600 BLAKE2B bf6f48868a80ed4c16f48fd261b319787337732f8f7f6943246ee0162f9be6a370097159eeef93cd37a3e1b23247543c334bbdd6d063d73b23f1c4d01f84db3c SHA512 bb0c9596bbe30bfcef70b9a716adc4763fa8a6fbdf3d3ebae190e8d8146b1385bfc9362a9ce33201288541b941c75c8a98b01c48add3b318c9823525dea1bdb3
+EBUILD xfsdump-3.1.8.ebuild 1494 BLAKE2B 07f5fc8fe8aaf1ef720f0ea73360a38b2145b0364555acfe89c7ff6b8dcbf8e42e709f8a01a564df03be8097da791a062782f781cb384443f4c45d1814e4534e SHA512 fc462a777f5d292fd51e06bce613882e8b99497848533d6cde6754a982c7cf025c93ad269e27346e3f4805988c04b50bbac05390704f74841ef2b31f5e7b290a
+EBUILD xfsdump-3.1.9.ebuild 1601 BLAKE2B 34502fc05e19c87e2fdaa74c1d86a4d2f559cc205b307e0e7ab03c53898e05af714196520f6924baab7f11e52199dc065313fe704500bff8bc455728dcfc186f SHA512 5316169fe548cd37570ae99871bdaddf3c6c9cd2bd448cd05465027a903fa75647fe5cb31fcb12b806baed0f34ddd07f040e2cbff80244299f98c36cabace7cd
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
index da10eef71028..65b2309d566d 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 -sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86"
 IUSE="ncurses nls"
 
 RDEPEND="
diff --git a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
index 228afe7cf7c6..23dff387eab2 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 -sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86"
 IUSE="ncurses nls"
 
 RDEPEND="
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 22cecaec9940..1f41508abfed 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -7,7 +7,7 @@ DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac
 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 2318 BLAKE2B fdf4057fe3d3bbe283c8f3873ec85cce69dc55b20ad71f687df67ae980927dcfc1580de437cfacc53b986e906d37fa4e5da96c03f5728334dc1bd600e58f9ab8 SHA512 6d708a25a5f2c61edf2f0381eee32cfa495479018e09bfe6338a3c786d2b17f912e3354366a1c56545365233267eb04673df5cf3d5adab8b9dbb7f0b5012bbe9
-EBUILD xfsprogs-5.4.0-r1.ebuild 2847 BLAKE2B b81f15ddd470b549433942259ce7c7edb4f102a7903d361fd2ddc151b4d3ba1abcda491425d64d2cb5b50d1c034f4301e4350856a2e7df80f2690f065bc93c0d SHA512 962334a565a0b3686f28ec9c9091e1260df3f842da3f64ffdc3d524e6baed77663c8ee2100964471b44935661d60331e7b4c9688d151bcd2c16ef7208d1b9a54
+EBUILD xfsprogs-5.4.0-r1.ebuild 2848 BLAKE2B eb3bde0412e145bf9b247d41271f2cd1317de1085173a3fa76d02cba4884124d9de76505af4983d60b016e78b33a7000fae73082fa9576814517b12e4325bda2 SHA512 9348ffcf0249b7089c100e6e8c164fd35f967c6a9bcb4242321708c3e1d017c2597a9e3c88879fffdfbb62bab7d67b6eae56a83a5cd51e4fe90fa576f56c35fc
 EBUILD xfsprogs-5.6.0.ebuild 2603 BLAKE2B bfa5d557473a872df4f5afd89aab9f7484fdd11c7d567dc1474bcfaa880c03eb7c9fb68cfcac81a9a21f1a5d32b7afe09f1af58b1f25e1669206df423fac394f SHA512 0ff4477ac23129c22f9bcec54fb4335dee11e0b759887909a269b6d01d4b27188f68661269b5b3907d1d84de0a8911f1ca1ff84075644e0eb3fb8df44578e73d
 EBUILD xfsprogs-5.7.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf
 EBUILD xfsprogs-5.8.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf
diff --git a/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild
index 2da1241f7328..a17560e6bb88 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="icu libedit nls readline"
 
 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]