gentoo resync 08.09.2018

42 files changed, 48 insertions, 135 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index ad7738f2f56d..7274176e4cf0 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index e06727248ad1..a00b189d7e5b 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,6 +1,6 @@
 AUX dosfstools-4.0-udevlibs.patch 1132 BLAKE2B f6d5d052a56a8d997e12cf293bfa7e482b728aa98e8135aa14d34367f045b3c494a0ff1b3ce0242f5645c99e885e8fd66eb76f46eb6ba589d2eebd69ec8f439a SHA512 0ae6fac866f4f634ed733279859c039f789d8420401217c039c06c995cd0be1fc697b24353135ee5c7abf04e4638c810726f0a310979251dd126e70c76739928
 DIST dosfstools-4.0.tar.xz 157564 BLAKE2B 13dd374eb6824b2c5d5ae849dd802a4bb1b85729f4654e3d23ee8c3698a72a45a73e1a7d7cb95ae7cba13ea9737e80e253eb4603b342e49743a8402d7f7ceeba SHA512 81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
-EBUILD dosfstools-4.0-r1.ebuild 1128 BLAKE2B f206442267b7ca15ec8237ce5c0e8edef758cc97ffa4064cfd308bc016cc36202dfcd02b04c72e4b582b80c7a2588df7a01c08c0246027a98fcd173d427b73dd SHA512 846bed50093c29ad3f47948f3b0a6538f9e05dffccf82131af97f0c6092a05e22b3e97b20c12fcaac3ce5c8d2f3e4544a80cbd3a66ad89b00df09dece366571d
-EBUILD dosfstools-4.1.ebuild 1012 BLAKE2B dc2561b559cc34b44b43ec298ba0015b6f29aecbd38da21e8e28d0c7fabfb421029314f48024e323ef1c0f68793d05ae72425c4c5ef56344bcf5f64c7517d90f SHA512 dd6dfb8251c5fa3adbd7cd5febcdbd2143d41eb5b68d4c9bd6444965ac2653a1baab730e3ab9a4aeb82ea82c370ea16c4370d9d19914383277acf5a78d166ceb
+EBUILD dosfstools-4.0-r1.ebuild 1117 BLAKE2B a973db2963f44141e73cd3fe8e680ae4ec10564bf3eb2397254d5070a7ad395a4905484d1d61bdc91c89464c02bcb494efa9195cb76608966966101e013a8816 SHA512 f00d35306a1a95d7b3b23fb8e23f5587e16cb8f4e02244f53fc4ddda3b07a704727a7d463bda724015f1e08273102f2aa1f165e4b9bf5be468bc7f9363fda597
+EBUILD dosfstools-4.1.ebuild 1001 BLAKE2B ddc181a69a0168f18c8f35040aab32f00707660e1e17f1b418d630250a3a917bef43c66e594183e9727f1f676d23edb3c76d7f4c6ddbd484596d465dddbffed5 SHA512 26afe1536b2d6902b09a569820c501cbca6570802c61c6c2137fccffdcf1a4dc8899eb849175f10e569487c5db2ce29a791beaea2ef2ae14d9782f11d6677f82
 MISC metadata.xml 424 BLAKE2B 01d65645ef9a1e617bf40a2d401a5fd3f1444c68f41a3c64e746e445b100ebd7c8af05b48c250f4bd9c679842906dd2e9b679edc298b1001f7dfe5b183f5f77a SHA512 d82795b70fc583b8154a2c3b14b6565cff36924b91fb3888cd2b6c36d8036614be6d67a0ea0fc96f2fa4bfa5516675b8aa74571e578ad8d42c06cb9f503c565d
diff --git a/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild b/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild
index 4e41940da926..e7201e863037 100644
--- a/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.0-r1.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 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="compat +udev"
 
 CDEPEND="udev? ( virtual/libudev )"
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index 36848b2cec2b..00dc71c5ffad 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="compat test +udev"
 
 CDEPEND="udev? ( virtual/libudev )"
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index baa4a255aa48..fb21511b3218 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,8 +1,3 @@
-AUX duperemove-0.11_beta4-sysmacros.patch 259 BLAKE2B f2749d5b372244aae43d54698a33175546c434718eaf205bc55984652a28a6607d34457a840c4500e12a1bc3b088e658665627364cf2a141d6a39a96cbddc310 SHA512 59decd2c3d761faf683edf807454f3a00f4c71ce60302b2fb9e4ce7408f449659f714ec71488f4a69dd1d1a12bd1e5715f2d897e66fc947adf3cd1d70ac63790
-DIST duperemove-0.10.tar.gz 95656 BLAKE2B d52916f21f48a929db98a4cb132b41030b4f8b884851242690aad8b0b4faef12bb176aee51bb16cab940495d033b2467e0572e0b54d9533c920b8da4d3a1f719 SHA512 11bb1a9937b9ca7969b9176bb4cfc8fff91c257a8645baa0ca0ec6b634ae3c464712414f856d5a75ed16c6d13f0ae85ac3584df1f474575a975cb20ae0d7a9f1
-DIST duperemove-0.11.beta4.tar.gz 114532 BLAKE2B 76301204c87c0978421ede7652dbb9cbc273f5ef4a99c709517b1421ec7bb94bafed9465a744c9a42c74c6ee936de1a1e5510a58ed36c7ec783436cefeacec69 SHA512 e3879f558026a11d34c996243eeeab267bebec508a0bafa76ad563fe81c3bf911650745f27bd449c4d788c302b08324bb780e4d86dc5996678e06a1df233a286
 DIST duperemove-0.11.tar.gz 115307 BLAKE2B 39fa9f80c017583c8943a5cddd1c69f38216adad26548c248e1877548717995d7b80f03f0e1c1515648aaad90996c80c224bb36fa27f13fe14fb22a123facf48 SHA512 b1bc2beb92223f9b46f8838e2f983ec763a9dff302f4202a34cc5e10591b985519f0464b6eba566c56872e671ba80583c7fdf4a232325086141d011384a286cf
-EBUILD duperemove-0.10.ebuild 831 BLAKE2B 2f7902dd16acba90da55cebce325e6717b3af806ec55466d7e4bd91dad3d814f01b9818433ef6e59dac5d532888e1152e6a3e4d4ae040d438a0709a5b0f754f8 SHA512 1869181a31a17d9ae5a85d4034bc8d87105b2e05cb49071476b195ada90787b01ab1e6c42dd04771d6189aed03a512b410db77409a349a8af968fc3b4cc8c7e5
 EBUILD duperemove-0.11.ebuild 718 BLAKE2B 86957fdec43344c42f89ec0e9090cf14186143579a313c29d6afa19720dc6d886740f561c83ec12f05f06429cfe56a7dea56cde7a3edba26b830201c99360189 SHA512 ed8056e44214443449ccf1381e599e1d62b21dc8958464840564692a99ef5a800c76b442752b9c394e71bf44c9368176110cb5b693cd5e486f6c7b84bbf53693
-EBUILD duperemove-0.11_beta4.ebuild 766 BLAKE2B c31b61f19033d159d6e0c8c91841027dc5cbea3f85a2098b2f34487eb035c6141f8b241e62587f7eeda5ad5a88865a38a0c3224bef90ba40b3587a47b55b077c SHA512 1b480cc6b94e974bd32ffd8f912d00f2bd1b542046bd0885d725de4fe7ae7fe4645d2f8b533fb182bf8437f3e77f9a1ffb79fe8dec2ce4db450c740538a4674c
 MISC metadata.xml 475 BLAKE2B 53dbd2deecde55b464cd06ba45fdc917e4a1b17232cb312400192be505a0ff870be87503857c513bfeaccf4c256748ad91af42d3e7a1cd1268f3e1c01ad9d86f SHA512 dc74d3d2be21f9cc6ac03cd6812d6e90bccd26bdcaf0a4e22f16ec7bae30e8cd252ac4b191aee2d4d94d45401ac680b9ee9ce8c7adad7a92afac908c9ab24de1
diff --git a/sys-fs/duperemove/duperemove-0.10.ebuild b/sys-fs/duperemove/duperemove-0.10.ebuild
deleted file mode 100644
index fc9db47deaec..000000000000
--- a/sys-fs/duperemove/duperemove-0.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# includes code from libbloom, xxhash (BSD-2)
-# includes code from polarssl (GPL-2+)
-LICENSE="GPL-2 GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-db/sqlite:3=
-	dev-libs/glib:2="
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# CC & CFLAGS are set via = so need to override them
-	# LIBRARY_FLAGS are set via += so need to pass them via env
-	local -x LIBRARY_FLAGS="${LDFLAGS}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.11_beta4.ebuild b/sys-fs/duperemove/duperemove-0.11_beta4.ebuild
deleted file mode 100644
index 281d0698988b..000000000000
--- a/sys-fs/duperemove/duperemove-0.11_beta4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> ${P/_/.}.tar.gz"
-
-# includes code from libbloom, xxhash (BSD-2)
-# includes code from polarssl (GPL-2+)
-LICENSE="GPL-2 GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-db/sqlite:3=
-	dev-libs/glib:2="
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/_/.}
-
-PATCHES=( "${FILESDIR}/${P}-sysmacros.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/sys-fs/duperemove/files/duperemove-0.11_beta4-sysmacros.patch b/sys-fs/duperemove/files/duperemove-0.11_beta4-sysmacros.patch
deleted file mode 100644
index 6355f5e9146f..000000000000
--- a/sys-fs/duperemove/files/duperemove-0.11_beta4-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/dbfile.c  2016-09-27 22:28:49.000000000 +0200
-+++ b/dbfile.c  2017-08-17 18:23:30.768591897 +0200
-@@ -8,6 +8,7 @@
- #include <inttypes.h>
- #include <stddef.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- 
- #include "csum.h"
- #include "filerec.h"
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index c1ba31544f2e..b89763ce9843 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -10,9 +10,9 @@ DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf
 DIST e2fsprogs-1.44.2.tar.gz 7562398 BLAKE2B a828cb9f5f3ee1579a2c5b29ef0eaf0e5696e2bf27a639cf1bf27b8d334bbbd1d142588e53e359934338f2ec95d06343a42b7c2fbd44dd6e01b348958aae3189 SHA512 d416e14a69f3e2e4ea2f4563764c422cc63400bcd514ddb12ebda6456ef04cff523da215664ede1329183acc22246111016e1abd92ff604a23e015e066dd379a
 DIST e2fsprogs-1.44.3.tar.gz 7570472 BLAKE2B be713a388e3de73c0f21c85ababcf0a63aa654c988106bd38b21db6d4566915afb201ce1a3c6d55c9a300880e2b39b1702e8463c478bad51749482f379e4d844 SHA512 6203a24e5149de5b6d44cc158f9ed1d87c3083a2b41c5249ceb09fb3cdf795ab3839d7d8ce73d4b0e11d4c505b961ff8cbf0de45b9aab0a03d504750fc7da885
 DIST e2fsprogs-1.44.4.tar.xz 5363496 BLAKE2B 8c7216bd63dbba0660c7383d6ed068be0a7016b50235d22f855283bb57d3355a3ea5bfa47294b71b67fcc5d4af28219abeb9cf4a6429595a43680d3d787bdf1a SHA512 52e39565dee30997b9c245b5d8791844067a903a570082f3a5ff9d9ef96624535322617bb21029056c88259fef46416eb1181bd7aec419e64fc021830887ec8f
-EBUILD e2fsprogs-1.43.6.ebuild 3792 BLAKE2B 6eed219723a8af06340afd9b2d483e663634ff96add9e073270c91ab4011b0fe531466d488b796d423f8b51d1440c7b09bdea5e33a03c6c41ad26483c4cfc2f0 SHA512 ac14f85a1926ce45994ddc07fd61ead5287341aa77826d28c6f350d9a2c0037629f3f239f0792458b9b448532850bf29bbe16059d6b7d2365a3e012433533c01
-EBUILD e2fsprogs-1.43.9.ebuild 3815 BLAKE2B 5ff7acc3f08ec6c96730e18f5660b49f996e28cbca389f07997965220fbfec2501c97fcb8b6c50a2ce6ff8518515ad12cc9ecfda35eccc4739a4b8876313f6ac SHA512 0e2966f93d6bbaa2ce99af63fc2552f0bf931f3829a1d47be1e2e1a95a7bb2e99bb46add48e5733cdc09da9364bb7ff97f71353ee602fd30fd3a3140e17de47d
-EBUILD e2fsprogs-1.44.2.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
-EBUILD e2fsprogs-1.44.3.ebuild 3820 BLAKE2B e1d9d4528bed4566955743a32f5c3871faddf6d5bb0790f6e63f3e4f9c161c4b0231956b805cfd54713586fffccb8d8429acbf4a14db4ba298c1c5af63f24f69 SHA512 13334fd36ad01576cb09d04cde5fa4afbc377db4a77cdedb230172ffb137a5a762301d68ae0279247f4ecd9a789bad58f8b83b6493821c455f6dd78b8a2638d0
-EBUILD e2fsprogs-1.44.4.ebuild 3868 BLAKE2B 2f286c32a260e95da2d6b0470998c5ada4acfbef943edafd1131567c2afedb3ffa4efa16e478266a8349be00bb65e53ddf92f572d46f3585c39598c22924171b SHA512 f7f0b6177b2d6e28b542812e1c4ef6d09ddc5b7aa18d42153b0fe3ff98192439651aa3f37aec4f8b0f9445712f12737915a92da8fa0fbcf9f9876f0ccac95b68
+EBUILD e2fsprogs-1.43.6.ebuild 3781 BLAKE2B b68206959b716f2f7018da95f2e7872bdab4dd1ba554d83fc089ad5dead7e2e51b5c7a3d67669083bbe7f8d67c5b45919439a2560d95a4de3dcc217dd4bdbe1a SHA512 71ce74750ec162caac3d07602cc011ac0ed429723f8aca43d4f4918184cb3ea9a4ae770e834ab46ba2dacf351cf5288463b05b36c66f90d127cbe50452c7a727
+EBUILD e2fsprogs-1.43.9.ebuild 3804 BLAKE2B a110adfe131292172510d7133d8c4266742c54cc3a3aad3959375d966672d462d2761561b79a2f952c6f4ed2b3004bc7abbc0ef90a6d44e8b89203a0df96cd09 SHA512 143bdfe5f8dd353782e84e3c0b9955127eab10aa7fa07e6c024656282225ec5ba30880d1fab61e249010d5192b2d546278694f0b951138500fb1a6ac3ee70a6d
+EBUILD e2fsprogs-1.44.2.ebuild 3816 BLAKE2B 9ee2fc47f8df9398b3eb53230ec49d48e92d3c9a76bdff5a84cc0680ad807276f054af8a2d18e123ed5939ce6fb6c82a2d67968748576c74a12c86f9bacabbbd SHA512 a953470afe52b7dc3ec3c49f8baf329aa48e81402ead32b9c2ddba997c536f4b3453f7e983866ef9147702f873402b69267ccb93d04a7c1add20a63c86c74353
+EBUILD e2fsprogs-1.44.3.ebuild 3809 BLAKE2B 60c64418b2dd15a46d54c194e165fa415e519e48e2cf11b9d4f5eaec50238203285e577af6d2e44ea9388ca89314f4e725ca3d142f7f10bdfd14181da9c56db8 SHA512 f6fed38e7b06f60480dc10c7df6184c9c72ac66f923ade50e06e1ac3e8ad45514124904121ae49a095b8c87a2da316dd59127e0f081ec158c95ffacfa9369f0c
+EBUILD e2fsprogs-1.44.4.ebuild 3857 BLAKE2B 3e9e55635efdb8a463a760bb0eac8c602b3d474e936d8b8aee6c56a950d33a14d30bb3f47b1ef1ef9762ff1db019a9495e7d970f72ccde2dda89c9429ad9f3af SHA512 a7f0441b1cd0fbb2f3c0a06b9b4ea831c97eaa36516bf5b205d65e7212d6e1b0312c64b89d2f72076bc580a5cfe9775bb0b237e6b76bc6de5d54de03ecae8fe1
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
index 92facf09f870..92b21222d8c5 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
index aa04289c54f3..414030c706cd 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.2.ebuild
index 76d036d2679c..0b2c33912d9a 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.3.ebuild
index 306a1bb38a03..793a8dc1ea16 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.4.ebuild
index 87bab9113498..256963ab46d1 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="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 e4f77d2ec736..af3895568f9d 100644
--- a/sys-fs/encfs/Manifest
+++ b/sys-fs/encfs/Manifest
@@ -1,7 +1,7 @@
 DIST encfs-1.9.2.tar.gz 11043181 BLAKE2B 5e1ada5b85166312010dade2537b83d44b67dcfa0cdbdc1cf4076e4a92ed593aed6129457c241492ea8afe7049ab12889dbe292c4d427710ff16c11a67085819 SHA512 7664a2f48dddde77cae005aba70962704b002f60afb2da35c4661f7e4e22ce5c003d3b674ce125fcc72e9f0588164c1f7dbf22f2b9061d0736b8c164c1ec70a5
 DIST encfs-1.9.4.tar.gz 2794574 BLAKE2B 95f0a96eedf52984fadfc6fb34c938d61b80310f97dc163cb7f8340fca8d6a56be574190cc56cad00fdfde2b907fc594ecaba3e4f2a90da171c84d8c4ab43630 SHA512 082e35e6eae4730b5e7827eed729422f9d995ebe9e441c5f9725f39cc2f46f014ac1479c7b0a7ce04e9e7228c1a93ecf5b4228e667fc48e6a7d3b68d2324cd0b
 DIST encfs-1.9.5.tar.gz 2798888 BLAKE2B d95e0ea8b807e2cbf4c20907bcc1b163c5397402eea934a7155e83c9d18a84db3097e1d4266a5e632acf39ecadf9812d5104b1565d25a149979e0f72523bb09d SHA512 036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46
-EBUILD encfs-1.9.2.ebuild 924 BLAKE2B 8edaf582da614574a50f99efedbd25bbab3e8eb93971c6470fa1ebac75de8ef9990356cea694f0ca0acf2166891871b16d5baf79400f7cee49e9657b519a6a6b SHA512 6f73d9abae72f2d70c4fc31456d9aab72b640e6e3c4000e82bea61b7d0993c13aac19f2076e5a90509480eed1238ead59a06cac81160f7c2a73449a934c19ce5
+EBUILD encfs-1.9.2.ebuild 923 BLAKE2B 127b7ba531627540a93b45dc75cd1cd8eb7b751103bdbd2930a81688b41d5669a807746a4b9f3b39baba302d34422555bbc526d726e74879d436588179311739 SHA512 e608948c6fa46ce5ea156a23928f5c216d14da89bf0233f30a478d99faaa753f5d1e74135d9a2f40d9fdfcaf6e7e52d9fc78be9aad86edb17cf575bb0e10eff0
 EBUILD encfs-1.9.4.ebuild 949 BLAKE2B 8db5d431d43eb66a365342e27bbacb0f52ef74784362c60e366c4b722652f5481534079c3f36050fc3813bc0bdd4b0e3d6240ab518dc92996e6c084cfbd54faa SHA512 ca29eb93717a1087e55c6a15ddcaa15b7ba5016748d7f18cfa20dd3e4a346bcb5a055c8556e469628262d48a56f29518b5a9eab82fb7a3dbb5a3f2805720d7f9
 EBUILD encfs-1.9.5.ebuild 952 BLAKE2B fdc0a63d1ed0b27e118b4750b0bbe778a9677dc8d10b8f29e9fea6695ab7e75e31a4bf3c3605b32a5c0d8bdf3b03c89b1bfe5fd0243a3f7a587e4e1165f36114 SHA512 6ef4d7a1bd2e4b0df88a11e0467e5085c491510bf9984103c16b192088826c7596790b80adf84edc092cb2f94a9977e540ad125167b17f4f72dd1d708b44c13b
 MISC metadata.xml 379 BLAKE2B 87ea00a89eb0bc59a7bd2df418d8ac3b04bd3560f1a47365235bd72dbb3cb342f8039cbade3524109bdba5139b1fd3adb5c6b6dd1ea1da45811cbacdd37ad803 SHA512 f94de3e423b8666aafc57201813f1b4e7a1be7da71736957aa70c4aa2d92d2b64a240e58c82bec472d97df0afefe5ba95e863243fda973804555e1625118b59f
diff --git a/sys-fs/encfs/encfs-1.9.2.ebuild b/sys-fs/encfs/encfs-1.9.2.ebuild
index f51c6b663be6..3fd739dd5bd8 100644
--- a/sys-fs/encfs/encfs-1.9.2.ebuild
+++ b/sys-fs/encfs/encfs-1.9.2.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~arm sparc ~x86"
 IUSE="libressl nls"
 
 RDEPEND="
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index 98b3bc58e6ac..d1a3062f6b73 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,3 +1,3 @@
 DIST exfat-utils-1.2.8.tar.gz 181121 BLAKE2B 679b7662d14d9caa26b6d0aff1007130f6d7ad7a3eb36238847f9cb735011fe69fb367e013126419b780ad1fa61c6ad1fdb163e8c5727c4dcff50db85959b7b2 SHA512 98acebf74fe5f5181098cdd880303d6c78d5aa88aa7a87d5371c887e4614536b19a24d48526b235de034fad26b68ddaf4f286b68b5963e95cc1cf7cee1c7b58c
-EBUILD exfat-utils-1.2.8.ebuild 649 BLAKE2B d1e85531d5c76bf8cac89ecd0bed9ad656880f5821f9819d9777317408ac4defda124e6a3e3755450e420d914d5ede6edc0b0312a1cfb75249c4c4ef8a46e569 SHA512 61442860cc5a317a9818d52dbdb9c12cd8b8157b176a4860a9bc5bdac478c26da1deacec77d92a2fc858cbe0715c53e2974a95a3f47cdd08b9aaf584452d3fa5
+EBUILD exfat-utils-1.2.8.ebuild 638 BLAKE2B 5de4958b72b4d8522ab9eed8e45f56fc74511ae09c3de7b75ab605b83a055cfbe40a3bda8b67676758e69dcd43335f10f81953f18166ebe89b6369fcb701e210 SHA512 322012c9bf1ad9281cb7d3319703bc9a3a3db6f79548a1edfb49e8ffd4cc0b176e71eefdde6e83a386e51ffd6ba337baa00fb053d6cf8bbc2fa53b97bdcb7975
 MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9
diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
index 3eefa5a511c8..3952f64c133b 100644
--- a/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
+++ b/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
 # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
 
 DOCS=( ChangeLog )
 
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index f2de90337db6..daa69801ded4 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -1,3 +1,3 @@
 DIST fuse-exfat-1.2.8.tar.gz 159588 BLAKE2B 929fb87ee75aa70ba68814763c085c76fa1e263451bc3cd388b67dc6e793383c8eede1ea754a55c7ce7f14b38b7ec40f503acd28b0709d1ef58b10cb977a1d58 SHA512 ce81f15121b9f21bdaaacb09bdeeccdc8d556585967b85f1ab57534a8da07ea45434541fc571069b5795bae0f2ba5f090bbe7a0d5881dd35de06b706abe6d395
-EBUILD fuse-exfat-1.2.8.ebuild 671 BLAKE2B 9e4875e949740aeaecbf4b38ce421f439db19d9da5eb277b6de3129ead497a1638825710851fbe5e7c646821837308e2fb37dbd4c09ab94120aecc320d2f858c SHA512 6c730ed920af0567044feb6ab2794028a1d3e12c71dfdc192d568a1ab95aea76f48acce2dbb7f4991e8a89ec719d51c6b8def628bbd97b24488c2681422e1396
+EBUILD fuse-exfat-1.2.8.ebuild 660 BLAKE2B 0312977cba4bc43838eefe3c0e2134f7de980dc2e37334c7ccb82cb10a2af2aa71d4c6de209ea7041cb9e8257f26f2e697ab41451fa716899ef45dc45ced26cd SHA512 e05ba0abcb4734cfd01d8910b724440a6e5ea415c726254bcaaa835caccadf3d5dfa9884e5dc4a4eaaf639ee121a7486ab60472920945b5d34fa5f08ddbe3079
 MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
index 11c81243deb6..729d41d9a216 100644
--- a/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
 # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
 
 RDEPEND="sys-fs/fuse:0"
 DEPEND="${RDEPEND}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index b69bcf6bced9..466c601446ee 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -5,8 +5,8 @@ DIST fuse-2.9.7.tar.gz 661138 BLAKE2B 8e56cfa8634e919bfc4f9fa589074763bd8c272d51
 DIST fuse-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e
 DIST fuse-3.2.2.tar.xz 1187816 BLAKE2B 4cda342ded747a92f31417c32006e202398555d2112134f403addd1f2ef896ed46e1082a13437e657795ae93b67fb2692746b759b9efb3bd8c70857623ca1af6 SHA512 234256ed8e9e277557775d34b0aa77f3b0a3c40a715e52db1437f2ffd2a7d8eda2e12ef35963a918b3310f7244bba9b3755003a25b98ea6d29b6d4b322cddec7
 DIST fuse-3.2.3.tar.xz 1238628 BLAKE2B 07b073d0af9d8db3b8799d872225f0637351b99bafb5db11b45dab1173101669731de66215a31e2141cfe5aa6d467e87d469f432194ddf7b8d5eb8e10825d679 SHA512 f91ee4b24df64e62d0c50db0bc3807229cfde06da118c87826bc3ee01b41689ec93a96b026226e948e6d7904bb506dc1d8ffa83d29aa12ea7f17009f6060263e
-EBUILD fuse-2.9.7-r1.ebuild 1966 BLAKE2B e34936a30ec864d5cbd96365a0d0a03bee6dcc5ade7d7b4689e043be56994a2694d818a07e411e0221d30aeff7eb6d7309190e046d4d4df9e0588c0234df3ae1 SHA512 74025dca9b38d66b45752ca743edb0b5f1b5f8d0d28fd2ce93b84977f487cff4e5c98d87fffbb3a61a365042f2b80ccd75ac95b2fc43aa8624504fe0258834ea
-EBUILD fuse-2.9.7.ebuild 2217 BLAKE2B a132222d50317eeac24b49a92e2f381c5f6475e2b89fa5d92823363c726329a0b70de4595b07ea1abf32a3ef95d068ac58b5e18e4d8d86554f9dba407e4d879d SHA512 40735712f825b32f9db1078d78549be073db57329ffc243ef0cd46b8faf06fcb7961143d2779a8bc1ea8cdbfc0328110d9cc460f93e3eed8f51a58894d12287c
+EBUILD fuse-2.9.7-r1.ebuild 1955 BLAKE2B a5c2d8696efd1c19223710c9a92bdb1c8a94e0e6fd6c7c928a458c6cfebb8e82b06ecd7a5ced2167f733f1f7b2f0aef0389873120278823ab39ce206eafdb073 SHA512 550ea0d9c917e2ffb770eabf93e0df0284728b7f6719d54ab8cd0082ff8586d604253591eee6460759c480cbd80e9b85ff3f26d8851a3b4e03b5d7fc3c86c0d2
+EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23
 EBUILD fuse-3.2.1.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
 EBUILD fuse-3.2.2.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
 EBUILD fuse-3.2.3.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
diff --git a/sys-fs/fuse/fuse-2.9.7-r1.ebuild b/sys-fs/fuse/fuse-2.9.7-r1.ebuild
index 822f1b2592de..179face680f2 100644
--- a/sys-fs/fuse/fuse-2.9.7-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
diff --git a/sys-fs/fuse/fuse-2.9.7.ebuild b/sys-fs/fuse/fuse-2.9.7.ebuild
index 552bdfe7e681..9710703f803e 100644
--- a/sys-fs/fuse/fuse-2.9.7.ebuild
+++ b/sys-fs/fuse/fuse-2.9.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index ebb4d875dcdc..b6c5b29f1c20 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -61,5 +61,5 @@ EBUILD lvm2-2.02.145.ebuild 9633 BLAKE2B 73d08c486afd126faded9b1b0a080843dd941b7
 EBUILD lvm2-2.02.166-r2.ebuild 9835 BLAKE2B 002684c21e6c01a5abef9c5d8af3dd3ec772fd1bd52c4c1652cce32ee144100f74fe33c6a2a6a8bf43b02c465a5c9451928088980010fac36ab1e3cef3191c6f SHA512 19c4124879f5de8b179918d9b3576727a1e35dbf22cd90ce1ce0f17f35e00c540c1bb821702ead6de734093ec03445d130a3707ca9edc9caa02c13dab132909f
 EBUILD lvm2-2.02.166.ebuild 9665 BLAKE2B f6b5984ff34bc28a51426bdf38029623dc5758562b498ac0c324e9efc9ebcaffb9d952a1df328ff882ae463b9018d447c04a934cb71755ed2ae8a55d828417f4 SHA512 bd470eb2b113af3c1f8f3b09386e58db18a95bf113ad9353f68ded0dba0f17ff0ebb9b139c56ea81b2de6bc564f33935038f25f4a8dbc414323a81f26c9b8213
 EBUILD lvm2-2.02.173.ebuild 9926 BLAKE2B 5d6d1e95795def64b1f91d8ad52b091f9971802e54e4526eff16986319125ed49561598bede91f20702ece9c1db07a1cab558702b1d6369050de8168bdaa7cb6 SHA512 e25c41a2fb284ba759788538d975b2476047f64e4ad301665bfdb3c3075ccc32470085b449766e59085ef1690e9522c83b60b900a67f229b468a0c1c010b033b
-EBUILD lvm2-2.02.181.ebuild 9927 BLAKE2B 4e7c8cc07836d429ec3e7bc598ab2f71d712da47e10b9ec3129cd3c9d7b6d1821d020f52f14270bcd5100fb6e0cd3739d587bfb5c8bfeed9a3fc19bf113bdd90 SHA512 3159f12b97bd23ed02bd173b51bf842e19fc35bad7754e7fb87e39a920a7e3bfa9a8c304b3764b1d0e9c64ca7e3111b88540005903a3d4509d6a794e195ae431
+EBUILD lvm2-2.02.181.ebuild 10044 BLAKE2B eccbaefe8c4e18ededb7cb342101089f2d7bc54ed41624212df70b6f3237e773cf2c2e1d7004449503ab720c517611627425ad909be9ff580bd754fc454f5a3c SHA512 c6bb94fec0a38b342d10422229a6291227d2879b759a80decab58f54e19086fc5917da27036dc9ef111c5724e534dd3956eed24263889feabe6152d66d67aa36
 MISC metadata.xml 1397 BLAKE2B fb780193c777b248648d09cc4c0f287f07b64df79912a4c1c37b5c456f8fc8ea98470c03501619432bddb5df1e3f877178a0c7e630b295a01a3bfc27fa63520e SHA512 1ed97dbef323b6703097c20de99e9003c88663a887bcf87c9489baddfa180aa3d8645e4e60cd3eb3b9505603997ac3ab98a7ee96a813b77b9dc25862dd332d35
diff --git a/sys-fs/lvm2/lvm2-2.02.181.ebuild b/sys-fs/lvm2/lvm2-2.02.181.ebuild
index 1363c1d32cf3..9e8a0dfcb8fa 100644
--- a/sys-fs/lvm2/lvm2-2.02.181.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.181.ebuild
@@ -25,6 +25,9 @@ DEPEND_COMMON="
 		=sys-cluster/libdlm-3*
 	)
 
+	dev-libs/libaio[static-libs?]
+	static? ( dev-libs/libaio[static-libs] )
+	!static? ( dev-libs/libaio[static-libs?] )
 	readline? ( sys-libs/readline:0= )
 	sanlock? ( sys-cluster/sanlock )
 	systemd? ( >=sys-apps/systemd-205:0= )
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 9fbe16ef3807..2a08ae8e11e8 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,5 +1,5 @@
 AUX mtd-utils-1.5.2-sysmacros.patch 927 BLAKE2B 5ff3cba6a47443b747c272f535c983ccc4483fad4421044a988a212d8a4366c224279f3b0214725dfcef3b1d8d6a3f85d72b6461b91bce6303d55e9caa8a7cfd SHA512 e7334556ecfe57edc703a9b6c37535460774eb1990be497544101a77e7c1ff75ec9872b1d4dc3d9ffb94f4488371e0c800c3b2e15e75d2881588611018417ff8
 DIST mtd-utils-1.5.2.tar.gz 343843 BLAKE2B 7f6612c4b9185583e9bbc785f7f96b08b7897c4af0c442a6206a446dc25f3c2aae9670c9344fba09606f73b87c73a96150f77bd974c96abe475d204ba5c28068 SHA512 81eb5cf27814234af65409fe93798ec50d9f733978dc606bd33e63d98eb99afb3f988df47dc66a9368a11baee0a35fa1d0d6677af8c23428919e34bd11a25697
-EBUILD mtd-utils-1.5.2.ebuild 1575 BLAKE2B 06583c40625f29a9df869d06f761c1de2e7fb645d29964b14f774428c1856f5eabb8f64d003e006c4eff08323f7b51966ff3b94f2c97044e44a726fb60137e05 SHA512 f8975142ea2b6982400411925bec267634af85366e2a4931363441bd14ef927770ff145d5573d161683fce2bc40c52754dde9876a70e2ecb13a418ff82e043e0
-EBUILD mtd-utils-99999999.ebuild 1521 BLAKE2B 3eecf7ca5f92636fd562a57eda737672c70f452a9240259ae68589e819ac284c7ae30c0ab158938dfaa841fa91bfd130f5fa0eb42f609d043881c269441623e3 SHA512 67d013995ba1f2a7d537486c42a88cf42b5da3f533c3fbb7ead1bc7353c12163cf58677e04132f6dd720813602bf998c41d2e2a5dfe2cb0a346b48345cb6592e
+EBUILD mtd-utils-1.5.2.ebuild 1564 BLAKE2B de9628c6cff455da5ed55f2f5822cd561ac9a487e6b9510d3b7ece0ae26edece2d02045cbadae63c4e6e48421c0babb4b77bb2ebf076f3fb86c7170bc671c301 SHA512 934327b7a547dff08509bbf956a00eb22188d0a0bf1275bcf2c2b07b7a2a5faaefe64ce6665de31c8dfd74c835a10e7d9de9b9404630109e4dbaad51e8780410
+EBUILD mtd-utils-99999999.ebuild 1510 BLAKE2B 6b49689495715cb470e1c386dd0ab7006610aaed89935a2d9c75eae5b7c08a8566a89060bc9ab1d8da73ce18a5e8826b6bf7f2e724531d93103a298ad894f241 SHA512 8fd85aaed72cf2a59f783a366a01ba93f3929c15eb098500be0025a6a2e388db397c385a9d97293cba1b14913ae6a2d93f90be082d129312e9fc49601f95a5f8
 MISC metadata.xml 323 BLAKE2B d1d9d3f24dc9d2fe5790f0999f787a331b5b0f261b2bf73946841c8a7f40a3b7c1a8e7bd7e516eaae87f82210f4d558c11f3ff1a3f302b71bb98e993a59c421c SHA512 191d5a9dbe4c6a0a72815092a0668070ff39bc121b30a3e55abd894ca62fd3641a205662a23a6a87aeeedd8ab000e4d2d40bbba278acbc0f7d74c97d0571d0c1
diff --git a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild b/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
index 3aff08116584..0b91c6a378c0 100644
--- a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
@@ -19,7 +19,7 @@ else
 		MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
 		SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
 	fi
-	KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
diff --git a/sys-fs/mtd-utils/mtd-utils-99999999.ebuild b/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
index 2496e699834d..8354dce126cd 100644
--- a/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
@@ -19,7 +19,7 @@ else
 		MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
 		SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 08333ec15e6f..4f5e657a26b3 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -4,6 +4,6 @@ AUX ntfs3g-2016.2.22-CVE-2017-0358.patch 1169 BLAKE2B 47ee2ae7724f77d6c50e4eb816
 AUX ntfs3g-2016.2.22-sysmacros.patch 911 BLAKE2B a53765dc5cd4ae8320584167fbf202b50827e07f4599ab8572d434cc61110bb190854b24e567b210843002b74245e5a7f271ea4548cc52a0d3d893eb622702b2 SHA512 34768ef1ebf42b125cdc4d86937042f21b7146c4c76c1ed37e66e59a4bfaa863b54f7dbcca14a9d842782113e6ac70b2a96e62022dc2c8f717ec43c9985bf79f
 DIST ntfs-3g_ntfsprogs-2016.2.22.tgz 1264364 BLAKE2B 6028048d676372c062cda1cf9ee43f2c1f035d080dde1201746d994e705756ab219de8359b1f8708e83e11c0036cdc33339e54299aa433f383e698e425ff2fed SHA512 dbd36fadd2881db1d17fdbf5d2b4e50bbe11dc9dd0ad4917e7f8bc4032c2287346143756ce8754df0d46ce9209f2c0c41b626cad929d76a9bc881712c7101c15
 DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 BLAKE2B 4f12a6061ef0c116f26225eb3fb5cb84e469b63710115fbfb54fa3802ea94192afa973a553742818ff6849b72919069ec92aca2d4d6f58d8cabca1b0fefa3abe SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef
-EBUILD ntfs3g-2016.2.22-r2.ebuild 2461 BLAKE2B d1dce35bb7970bb4c338ec4f37ea4a653a8272eab6f550ee0efe86553d8f0f9c1f1479d647f5c0c0ad1e04b1e5583006539a5cbc776941d6541070c7aaa22835 SHA512 0e97a1235323d44ed6bb994e6160377f16641b15772a3ee84de12d671661a795db09b99d2c3f8dd82545d406a83b2f3465c898b4e7a84c7c5dadfbf56977ecb5
-EBUILD ntfs3g-2017.3.23-r1.ebuild 2371 BLAKE2B 97c63e80c8a04f5e4c0baa78c8735032eb834ff2554be8bc786fb7669dfe9f28e1652cffc5443d5ae00e9780c3063de4a64019677eaf7fc88919df6b1b493604 SHA512 91cc25780e73f4fcb65ddcb36eaa87c1a10261ad90708b0763ee8ee08f49f6f860a0487eeaf020b25365f2194c0823f20bbbcc3d9b3bc4d01931086803f7d67e
+EBUILD ntfs3g-2016.2.22-r2.ebuild 2450 BLAKE2B 8178b192162c011703272b7876b6b0b56a13698f2c673862789998b09f316c4cb06370a63a9cff9ab367562220284dfc38e614e80e27085a3e26615f4913cb14 SHA512 7a06505e8ca1d54b78bbe6da8975a69fcea297c36a74092bcd3259eacf3fd4cbaedceec5184c0b0e560f13141d6ca62692dc4a7a4e454090c844454a74adca0a
+EBUILD ntfs3g-2017.3.23-r1.ebuild 2360 BLAKE2B 4929f0847741acef18f7078d0f62246aada50f35312398e068ceb2438751aa34245dc0af5ddd1d06a85da8e8f084fd35c7beaf1380efd24fe6ce3f9b94d0a85d SHA512 3760806c53d47b38cd1b5416d76c1bdeb2854b1b831139ca86ef1de64de0933c8804e78a333f55751812c4a8bb1cc8c8757f002b3aa36181fba5ee43db7a5041
 MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85
diff --git a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
index 09ebc7f920b6..331e96e7c7bb 100644
--- a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/87"
-KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="!<sys-apps/util-linux-2.20.1-r2
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
index da14c1c0f871..fe01f8739983 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/88"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="!<sys-apps/util-linux-2.20.1-r2
diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest
index 3ecbcf61d71e..0ad6bfa58883 100644
--- a/sys-fs/squashfuse/Manifest
+++ b/sys-fs/squashfuse/Manifest
@@ -1,5 +1,5 @@
 DIST squashfuse-0.1.100.tar.gz 393548 BLAKE2B 642f0b00023f1914e6f4efd0e03c77d61c549eed0bff8f3128f415ece7c52d3f917e8856a1dccc3d1be06147ad0b80bdde79397c4f307bc316adb2224260b402 SHA512 e6a56354e71991ccbcbd2f9e6967f1f5a1056edbee286e6a6d6c35f777ed6e6494243633d070da700cf43a8bf7b56269087a0db1d4b2d45ed49f4830caad7927
 DIST squashfuse-0.1_p20130530.zip 70224 BLAKE2B 88fd88ced569793b82767b4cfb6d71c7039b262957362287648be47b86f5803abbef862595ec1dcf1bc7bb154dd4b1a65d49aa5c29eacfe9ade545d7a88da600 SHA512 1e2ba5a61cdc5eac3fcf13d5d2a55d0656ac247b057f7cff9ef5365eb59f52fa6159cd2ea73475627e62f53fab72c5d12819161e794c683d53059f7667a774f0
-EBUILD squashfuse-0.1.100.ebuild 932 BLAKE2B 1a764d8d283f788546b1b0ebdb7046360a231a4c2bb7704ccfa5bb479f7a10441f001676dea5d721c36938104d922a492ff40427bc45b9fe05fc2cb16854a266 SHA512 1fe0e00e2e3be609c25c03921c27ccd7a6b3ab2e2a066e1b4daed55f49d0e83aaaba0ef15a1a6fa4b9316efd14e049b39950369c1ef120cf2e9eeaa95d218204
-EBUILD squashfuse-0.1_p20130530.ebuild 1063 BLAKE2B ce94b9d40c60145c1008fe291b8791bb73edb7b323daba4aac117316ea9d6948ce93f9ac5c7b30f428310e2c0b750f54dd8e80f920744226f4062204fbc94191 SHA512 254a4c26c913f8930d6c31172c3900a31b1d67eb550ab18f70c2036d14568dc3d8a3dd811769955a59295b632e5208e9762772b273f90082b268f1ef232a0026
+EBUILD squashfuse-0.1.100.ebuild 921 BLAKE2B 81114f951588d6258e2193c7aa796b61fba21e23820c06f45695666e548f4e89514cd60fbc5ab3057486426962a2992dd7d34c29ffc6b0732da8c87142f7ce9a SHA512 55eb5d77c7adaad8a79b4866439b22c438f2bb7954d38a523b6c8969c88b9ab6501eaac7f1643db3b19a784fa0e79c6c29047443a52d0dae49f0704b80f46933
+EBUILD squashfuse-0.1_p20130530.ebuild 1052 BLAKE2B ec2a3ff3438522e1e2a1217ca0225be17a0bc7de63e2034eecd0a662fa7d33a9a8d67cd9a81356a6eeea78a01685ab1eb39773ad46f2473fd83f64ab33aad72a SHA512 93dc9dcac042fc8effce1fda3d04abba617cdba05c216217afd73559c6548afa624507a7425b0d62e2397310595da68ec79eb3776d1492c0f44bfd22d3a7a49d
 MISC metadata.xml 588 BLAKE2B 89e02c1b93c1a834c81fc6ffd3e6f859e8a37651b3d3f2b68995eb3ceb035b4c49ff66b160e35829dee4416f4bfb16dcea6fedaf21e6b305f5674e8e52ecd1d3 SHA512 359590ef302a574ac485f43cf78d3e618ce2562983fc21941961dc7624919ae8c88ae53be3ec19ed6e36f777d3665b133b2972c94d9b9b7829fdaeecc0b3710a
diff --git a/sys-fs/squashfuse/squashfuse-0.1.100.ebuild b/sys-fs/squashfuse/squashfuse-0.1.100.ebuild
index 3dec8258a43f..6e3a40b2e5df 100644
--- a/sys-fs/squashfuse/squashfuse-0.1.100.ebuild
+++ b/sys-fs/squashfuse/squashfuse-0.1.100.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vasi/squashfuse/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="lz4 lzma lzo +zlib"
 REQUIRED_USE="|| ( lz4 lzma lzo zlib )"
 
diff --git a/sys-fs/squashfuse/squashfuse-0.1_p20130530.ebuild b/sys-fs/squashfuse/squashfuse-0.1_p20130530.ebuild
index b99fe7b2a4f9..4c8d7fac4761 100644
--- a/sys-fs/squashfuse/squashfuse-0.1_p20130530.ebuild
+++ b/sys-fs/squashfuse/squashfuse-0.1_p20130530.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vasi/squashfuse/archive/${EGIT_COMMIT}.zip -> ${P}.z
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="lzma lzo +zlib"
 REQUIRED_USE="|| ( lzma zlib lzo )"
 
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 397f4bac7707..87a22d48e711 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -3,7 +3,7 @@ AUX udftools-2.0-sysmacros.patch 1203 BLAKE2B 87e9d5ce829584ff0dae366bc3c2b52bcc
 DIST udftools-1.1.tar.gz 656865 BLAKE2B 6e76251368c121ab07e02071bfddde5c4f4523cc858a7ffcc86063b48adbc03233fab18a3ff50b840fc603e7f48f386e15b4ca556046116d4b42f43c06927dc5 SHA512 9c415d1cae1d79d49b4f9e3e6881f0b44b31d59f6d722571badd78ee68c422899ee8b95caed0ac50e76c13d8ed118f58f79efe5cbf775438a163d68160a30742
 DIST udftools-1.3.tar.gz 447063 BLAKE2B ff23f23dd5b9753d9e4cba6e326d302346233ed0a836ccf35372e61ca1d7a5c14ff8f1d1505f2f9fba779f4379adf472b64ce60aa4ca0d3e51679ea863db2f0f SHA512 d67f74640cc600fbdf3d7a67caee1342c15507357e155c5e1066aa6f6b3e2667483107edd663eaed5ebb690c13337598a75c1955e69cbc782bd481af783837e7
 DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
-EBUILD udftools-1.1-r1.ebuild 664 BLAKE2B 83cc88c60000a72e00fcbfd8e65ebf00eee41d96945a7ab8498ac691f61025ea20c02f73f654b3df7c5a92af85c82f8ec88b5b1b72da2f6433a64e97e7522dca SHA512 96b9d3d58ed472e9f06de7041b6a379c66439165431435dafe17a7cd8d37796643048d41f2c7e0e219dc930b82fb848659fe13d054bee74fc958dbce026b233c
-EBUILD udftools-1.3-r1.ebuild 668 BLAKE2B 911f0dcb67cfd8fea0503ce0a5ed9369b955d2c67d20903b169465a7a8c053aa3a9486ba71af073b16a675630682df8e0dc6d9e01d9075bc754949a22dccb431 SHA512 67b23bdbd67de34bbfbd444807a8d6cf483d97cfaa6c11587ac86968be887fec4890a27b961f3b4eec0096497cd08622a29d203cf6c43e413bcc4a55612ca58c
-EBUILD udftools-2.0-r2.ebuild 593 BLAKE2B 0bf91e67c67d1bdf88073a2f1a65820bf06e5be862b3b7e03620329e48d92c0ece330b4e5b8792c28a754b5710f44952e061dbb26e10246010d3d2ea72387928 SHA512 f7c8ab17c9e8b3bf8f9ce3d754cce7de88cb9f2e901f5750200bbe0c61108872a21fb50cdb56d09d239805dbd40d2cdef499a01d81d705a2ae6352a5c0fcc629
+EBUILD udftools-1.1-r1.ebuild 653 BLAKE2B ed68769069dc6a293e3147a63189140aabf8bb390a043ecc765d037aa7333e7ac69cba4be2e11165994c2f1912f7330bcbc797ad22e54908709f9611c6e19a88 SHA512 4f61144a6d9cfe29da9a47651563091c512a61c2bd5d32765b2bfdc63db7f295fdc875a31142f93f93f48b024eb9577d241c802a1096496f969df3fe40f223a0
+EBUILD udftools-1.3-r1.ebuild 657 BLAKE2B c2b01c4850795634c69bf7441751499407a2c7e78e45586e336cedca182a9592002edd4539c72f4e8cbb14afe889a5eacda6508c182f1090fe7c879193489ca5 SHA512 98cf296af5d84b780c1c27b853cb17536233b2fdff65a211d675bdf0d58c85ef79a1f7ba964b24830f1c9cbf2c2a0ce173f4e7b9ab8f5e33a93f6c0305ba3d80
+EBUILD udftools-2.0-r2.ebuild 582 BLAKE2B 924dd09c20c835818b8a0ff17b27c7045e8cd733049fd6a7b1c72a330fa49e617b4977ed5aec783d3de611c802d5c84a81c0f6dae65906b7fcac45b37c5a2a46 SHA512 4cbf6c46dfb723b3d9ebb2107d361166aa03aa927e2d541614380d8f8c5f051c087cebac26529051599951cdf5c64e574b2918e2885e275842b3c7cf2d07158e
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/udftools-1.1-r1.ebuild b/sys-fs/udftools/udftools-1.1-r1.ebuild
index f0ef22a1e86d..47360a01354e 100644
--- a/sys-fs/udftools/udftools-1.1-r1.ebuild
+++ b/sys-fs/udftools/udftools-1.1-r1.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 ppc sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/udftools/udftools-1.3-r1.ebuild b/sys-fs/udftools/udftools-1.3-r1.ebuild
index cd7b7e75dada..514258b8870e 100644
--- a/sys-fs/udftools/udftools-1.3-r1.ebuild
+++ b/sys-fs/udftools/udftools-1.3-r1.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 ~ppc ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/udftools/udftools-2.0-r2.ebuild b/sys-fs/udftools/udftools-2.0-r2.ebuild
index 8f67101d3523..2e2f3c8b3eb4 100644
--- a/sys-fs/udftools/udftools-2.0-r2.ebuild
+++ b/sys-fs/udftools/udftools-2.0-r2.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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 7b143118de12..c1ba3c9db193 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -8,4 +8,4 @@ EBUILD zfs-kmod-0.7.9-r1.ebuild 4260 BLAKE2B f7645d67c23d7911832553b11e18c48a24a
 EBUILD zfs-kmod-0.7.9.ebuild 4053 BLAKE2B 3fd50c6fd61ea5074d30dc614d96e3536842b1d91e3d9857482e0f4e0c5e38d4b838c04008a8b2f160c2e89c8ea8938e02bb6fc8f8f67c1e98a89d19085eec89 SHA512 a8384a821aee26b7daae6548bfd60d64ce5d7bff00a963818c35cfefbf3215c559de402e6892964486252453f9cb60ace6131e798c556288b8c476b1f5808841
 EBUILD zfs-kmod-0.7.9999.ebuild 4112 BLAKE2B a5876296e76423f8d12f7ad5eb095c58b2147f92cdad8a69b476f8950e7c463502f145e4d5c2ca3d91fc905a5aed36a3d713e6f1b35ee34bf6d143cbe557b1d7 SHA512 7d3166cb609cea9432e4124f2848c736fee562ac7a1fd3ecb87af9915b458be17b7d6cf36b86d28c5ed8fdb62a021e8c0dcc018c1dc254fcc5e6a0ee5f78d51e
 EBUILD zfs-kmod-9999.ebuild 2754 BLAKE2B d52f0ccea482eed0d40aabba47a221a3b495f5526813fd82c69e25853d86784c89bc627cde0ab44dc752310abf01fd43f166eaca7319fa414e7f87bfcb5583f3 SHA512 2ebdf596169ba9b74f8fe9b7e759f951bad26b8fbb323fdc13847ec307be5df4816582dc18612a2a4ebf168cfa3c6c2548b9b79b66a789cc9a26e8ef94c9b413
-MISC metadata.xml 666 BLAKE2B 45ed040273833c94523c3531f36c739d0d482fbdba09cb229e6b0be80c3cfd2f124e1d90facc19c1109be3e19255f2428aeb14da106f2a39b59a0549704debbf SHA512 eea336c56df7d0b4e0f259ce88d837e2700a4733e1e70ec484ed4e3246abddb928f21f8e912822f778d626b962b092f803a0bf0ce1b812891d53d1a31f06cac9
+MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml
index bbbcb3977c70..f47155ec64df 100644
--- a/sys-fs/zfs-kmod/metadata.xml
+++ b/sys-fs/zfs-kmod/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Richard Yao</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>fearedbliss@gentoo.org</email>
-		<name>Jonathan Vasquez</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index c24b2f8ef3e7..5520d55164cc 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -11,4 +11,4 @@ EBUILD zfs-0.7.9-r1.ebuild 6272 BLAKE2B b6251a2b733340bcb9b178532b7f8d15855b8bff
 EBUILD zfs-0.7.9.ebuild 6075 BLAKE2B 2633bfdc2232aa66b23e968d91ece57f5deb1f169ca0c1bd6d6d08974eb34e20d0bffa7796587a4e35e3ae0d8888afc7d92d9cc43bc8788d47f02b35506a430f SHA512 bf07decf7af67adf64ea0f29e542bd3c747bd5f10a18b89e5534a53ad6506040bdbed4fcc8966946dd1398deb641a1551f83b41c8068ce12fd644487f7ec535c
 EBUILD zfs-0.7.9999.ebuild 5979 BLAKE2B abe028d1724141c23e6586c33513348fee0950a9a4b96700e0463fb57233b9bd1d51a4f7b70e8b7a04eb01b4d55f44cd520772170f82dcea622af71558015999 SHA512 9e1e26177d26a13ba5bd3ce07ad174798fa896502fbe0d5bf543508cc3fbeb4bc39358898f1c4f50fcc800d47326c158a22f557e79ee91d8d8b95d9f9e3fbc42
 EBUILD zfs-9999.ebuild 6220 BLAKE2B 57b8bdd353fd5c7c33b1000dd3f6bb34b148352bfb443621269c5120dcd991ecadecac6bfb775712006922d59eb00a47e555f612bdff540211f45eee46fa7fae SHA512 be0ed659bb8702bb6fa2aaaf37222c4e9a609fd926d5276b6dca4d46a4b4d0ed310778a3f169c1299e946e5ad9bbc5059016d564b3475acfd9b4ef8f9b500336
-MISC metadata.xml 866 BLAKE2B 61980bae647a4b495c9e57a58936d2a2043b2520944c06fba145c7ab19edca705232c96469d98c4ffe1df8197581a4f287060d7c86bcb245dcb4b27c7c484dbd SHA512 041cf4aa98e4ec5b5a30980a3bcfe7e9612194850ed490b15ebdc6ce21195bfe1bd4428b576d22da276101ecd33523ae247c3644e3db826aa6e20fbe2ba6a996
+MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml
index d3167065338f..0b1da3a015bf 100644
--- a/sys-fs/zfs/metadata.xml
+++ b/sys-fs/zfs/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Richard Yao</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>fearedbliss@gentoo.org</email>
-		<name>Jonathan Vasquez</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>