Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

20 files changed, 171 insertions, 665 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 457cf327deb4..ac91c8237da4 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index dfbb1850702a..444b74a5ae0e 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,5 +1,5 @@
 DIST exfat-utils-1.2.8.tar.gz 181121 BLAKE2B 679b7662d14d9caa26b6d0aff1007130f6d7ad7a3eb36238847f9cb735011fe69fb367e013126419b780ad1fa61c6ad1fdb163e8c5727c4dcff50db85959b7b2 SHA512 98acebf74fe5f5181098cdd880303d6c78d5aa88aa7a87d5371c887e4614536b19a24d48526b235de034fad26b68ddaf4f286b68b5963e95cc1cf7cee1c7b58c
 DIST exfat-utils-1.3.0.tar.gz 188943 BLAKE2B 07af437fc21ae2f7d99db778069135c7391554f964a05eb6df715bcb5135003ecdc1257c541a61e0c140bfcffbc0802dd4118413f8d11a175be3f8adf5f5b83f SHA512 e1c5b708f22e878d7521e3299866bba127145757e3620696ff11b18c8c7d4830522974e8ee4771234b70aa9718295d3433779cf34ca990e28ccc06cbf9325f7e
 EBUILD exfat-utils-1.2.8.ebuild 638 BLAKE2B 5de4958b72b4d8522ab9eed8e45f56fc74511ae09c3de7b75ab605b83a055cfbe40a3bda8b67676758e69dcd43335f10f81953f18166ebe89b6369fcb701e210 SHA512 322012c9bf1ad9281cb7d3319703bc9a3a3db6f79548a1edfb49e8ffd4cc0b176e71eefdde6e83a386e51ffd6ba337baa00fb053d6cf8bbc2fa53b97bdcb7975
-EBUILD exfat-utils-1.3.0.ebuild 616 BLAKE2B f535be90deb1e859ba9de6f01fbbe4ae4de6f3620a46fbe8e07d571eb0d49f3f32d4d742e03cd9b7e911eed0c8d95b785a4b36fb5e7e70f3283834c22de12613 SHA512 d001577a163476287aef69dc2273d0965e1edec2cc865052b965911e6e96a70ee1e37a4c09e3d62096326bd9a0d651659a139a523c54d4ce69163b047c547893
+EBUILD exfat-utils-1.3.0.ebuild 617 BLAKE2B 853b0c2959979a066e2d667824d055d12ae65918b31ad6d994ccb3d2de7f3493895496bbc6cbf8f285738386e889c1f271b2f526f1a247d4f9d8991fdf24175c SHA512 18ae81890262fecc7c524b9ebb99dce9534ad5b02d491bb4424a1659462cb21d90fde0f311f5603bc9ad95e24c8038ee2664c0b11c12b1194d179f7c55dd47fd
 MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9
diff --git a/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild b/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild
index 28ed15d5f792..b1883a7d7ed8 100644
--- a/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild
+++ b/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 
 src_install() {
 	default
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 2df13360f30c..982c7e8c8f08 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -5,5 +5,5 @@ DIST f2fs-tools-1.11.0.tar.gz 278795 BLAKE2B 8faefb1554283291ad2dc2b66800b88bbdc
 DIST f2fs-tools-1.12.0.tar.gz 286528 BLAKE2B ca2e17fa6c48905fc1905fdec865143a003260bd60f659cd9f6c427b371c39f4c869f7265dc198888adf7ef7d4d8ba7ed2a3733c52aab18277f5371cb2cb3be3 SHA512 3f1a914540f57f94bbdc33ad66ee0b02b26fe380b05f9209f226cb3df8e84e29aa4e8e91d77f52bf737915b2785d4b9723becf5a95d75e8821b2e107e991cbad
 EBUILD f2fs-tools-1.10.0.ebuild 829 BLAKE2B 33cb5076ad952162afc2b53506aa09370b28fd6c7942d7d800fc2f48506cb4fcf2db44f9e68ae58f70d95178a53c73b27cfe70aed1c5dc954d3e31e512aab70b SHA512 3319a0480393572701b4728268437cbc6490e84ee8f215425d663d2c314c42588b594869b6bf6ba87eb3a44947ef5d10ae9e0605942f1ed4f46d797769140a9f
 EBUILD f2fs-tools-1.11.0-r1.ebuild 824 BLAKE2B 888b9092f9f8b402ce3d549cc6c896877dd1b7b0c6fdea785092d3160929175bb26aee5e05def9c07a3edf3c39ce0b6670a08f7d2a50cd7dc87e71d7f73ea5c6 SHA512 0771171e56491746fb9703ac2c0d454d7bb35bf62fc4b7f031c2d7ed7c2fa207227950cd35741bd1967531f2dbb08d64bc00535441c67cb11decb875b5784912
-EBUILD f2fs-tools-1.12.0-r1.ebuild 862 BLAKE2B 02c0087976e8c385776decfae140346c857a6c7e071057eb3680cff615e66787f9416cba4e3a611166451971589fadf4fef9abfc43cc4d95535714d45abe351d SHA512 51aabee7f1d91b09426511be0c33967181109be7ea7d4ace44072879bfa8d31baf0c328452ccdffa9d4e0675750e27a2e6f7417bc7dc67e713125e07acc7b7e9
+EBUILD f2fs-tools-1.12.0-r1.ebuild 867 BLAKE2B af13be138ba8b337ed71f4a6846d246a721abd2249d4483c04b704906221f93a6ee7fb19fa57e8eca51d99fcbe191139ee6826443e27815391afe1ccb4770165 SHA512 0d354c1e000a05a995327ee897ebe331b52347db4403eea340700584757aef63a61fbd713b6a84c71e0b4c236f61ac4ba8c8320e5eef8948a545109765f01aa1
 MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild
index 3717d20a3636..52fc597dc549 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index 03f36eb742e0..85b648638a16 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -1,5 +1,5 @@
 DIST fuse-exfat-1.2.8.tar.gz 159588 BLAKE2B 929fb87ee75aa70ba68814763c085c76fa1e263451bc3cd388b67dc6e793383c8eede1ea754a55c7ce7f14b38b7ec40f503acd28b0709d1ef58b10cb977a1d58 SHA512 ce81f15121b9f21bdaaacb09bdeeccdc8d556585967b85f1ab57534a8da07ea45434541fc571069b5795bae0f2ba5f090bbe7a0d5881dd35de06b706abe6d395
 DIST fuse-exfat-1.3.0.tar.gz 161278 BLAKE2B 864eed57d5ae70eac03464899ac7c63f5d55254b61b69064592bb7ae04f6c164b8113c568946103c407867c1b53511bf2b88bd6b25cf75aa3a1a9a2a7d4f12ae SHA512 90d2b89322590199012b035b88ae01559f1824172793d9e7845603940e2807e788c687e4958f1ef76678bd214bb03671b91fd2537901b6d6acf2e8c525a3f1f3
 EBUILD fuse-exfat-1.2.8.ebuild 660 BLAKE2B 0312977cba4bc43838eefe3c0e2134f7de980dc2e37334c7ccb82cb10a2af2aa71d4c6de209ea7041cb9e8257f26f2e697ab41451fa716899ef45dc45ced26cd SHA512 e05ba0abcb4734cfd01d8910b724440a6e5ea415c726254bcaaa835caccadf3d5dfa9884e5dc4a4eaaf639ee121a7486ab60472920945b5d34fa5f08ddbe3079
-EBUILD fuse-exfat-1.3.0.ebuild 647 BLAKE2B 9ffd51655d126380b60b3e9bcae53ecb122b76074d48471a1cddc80e8eae1e327d278e3ee413d4bda2577d84f8ddb5ef9613a405fe7d4d43988745e461bf251d SHA512 c84b4c6dae2bb69ef9b64c1387871aa5756642f9102f1f907c028f4f3da8bd7b6c2d9de5ea89422fc342d9016f56239dcc35dd49db99dcbf280de561c704bdeb
+EBUILD fuse-exfat-1.3.0.ebuild 648 BLAKE2B 5daf5f418f314590df4e287cc5e40256f266c408be3bf16a7f0be70320169c95c8bdda9be7e77d909a9898f73b0a97e7aaa4a50bd3003ecefb4eef47512c195a SHA512 9f6b57a1a2a3fbe2f2c5172ce0f4fb04f612194610907c16fdec09d9cf4963f59b75c0476731f87e39d9e93e2d617f3c3b313f2c4070df94ad42713f1de46561
 MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
index 9b71ea2f5817..12b07aadcf40 100644
--- a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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 d670a1aca3bb..dab86e067cee 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -5,10 +5,8 @@ DIST fuse-2.9.7.tar.gz 661138 BLAKE2B 8e56cfa8634e919bfc4f9fa589074763bd8c272d51
 DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c06ba1f5b5756d27f5c32d3a0cc199d826b0c041118c5d2260ff023f58432a0d7b623807c0a4af4da7c34eff SHA512 0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d
-DIST fuse-3.4.2.tar.xz 1019864 BLAKE2B babb8454438b5c4a924e83112ee5c319c0fa37c544485265d9d91ff58ee22549aeabcfb53f8c30ee3fd984030ee2042099ab9bc6269875cc08c5048acb28740e SHA512 7519955d31566ac69454f5d44e95ccbe98d7719422ea8112cce6cc2138aef71a57f9fa1bc2a37212a0837938ec44e630f3adce0a4da153a030a5a46a06446de2
 EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23
 EBUILD fuse-2.9.8.ebuild 1942 BLAKE2B 160c38daa8321d980347079e0ab8677526c639e0d6f20b8fffaa481b7072146f1aced7f61cfc5ae05b483d7178beed551e6df44d5e319c9274a3c1c5cb530e58 SHA512 35efa56282f0a9a4aca7e284af1da587d6a5545439c50258ecc31c47159fa777c70400f28b4fd9c8392a39d1b43ba8c3c1935e0860d7689dc7ad40f5134e7da8
 EBUILD fuse-2.9.9.ebuild 1883 BLAKE2B 7cbd50df85e6eaea2e89b3e36bf819bba20cc1589dc2607bff8e2fe97155a7f1f6ae34b9589c3965e29dffd311682a259cbbd06bd9cce215121837b2c29022c0 SHA512 876c5d8760383847d59db3ceed3dcb074fe48e87ef4192cbb8bd586eac9e5e2becfd7a0a49a76cb213426e961ac2e353d9421865fb5801507e59a584a89da5e0
 EBUILD fuse-3.4.1.ebuild 1659 BLAKE2B fb830f40d7c535864111a02277aef8d51da505be9d497e09bf1d7e60c44831d13421261f24e4be82785aa275f78e3b7ba20f21d27fbe9edaed2fc33c5512c2b2 SHA512 d92104cda402f7497d2417012298558fcd532fdac41cdf8897c70a061c093a26aab04ac774f652c25e6d10e00ebd913bd8140502c8517c1a9df7d5b424407609
-EBUILD fuse-3.4.2.ebuild 1651 BLAKE2B a2f92916463994570422db3ac73c26363ee6551c9385e51f73d666c3a8fa5eaf762cc3bc4f0edcd37f74eebbf8511c2f19f9a1d66738fe9f581cfc5abb5e7f84 SHA512 94415c24288b1c08d44c220f8fd5fdf28631201941ef9c046a5e21784fda025ede2659c33b2846d1537dec1b9d0f389acb9cf1a4fe81af0ed494b5abe15b36ea
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-3.4.2.ebuild b/sys-fs/fuse/fuse-3.4.2.ebuild
deleted file mode 100644
index 80ef87425176..000000000000
--- a/sys-fs/fuse/fuse-3.4.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit meson multilib-minimal flag-o-matic udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-DEPEND="virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
-	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags -flto*
-
-	# passthough_ll is broken on systems with 32-bit pointers
-	cat /dev/null > example/meson.build || die
-}
-
-multilib_src_configure() {
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	${EPYTHON} -m pytest test || die
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# installed via fuse-common
-	rm -r "${ED}"/{etc,$(get_udevdir)} || die
-
-	# handled by the device manager
-	rm -r "${ED}"/dev || die
-
-	# manually install man pages to respect compression
-	rm -r "${ED}"/usr/share/man || die
-	doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 10ee50036a88..8d2c1bcf620b 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,3 +1,5 @@
+DIST loop-AES-v3.7m.tar.bz2 329763 BLAKE2B eed2590ed7b23dbb5ffb07143f8c89a693cfa8741337e7620b2c0e9a7426bf48a11a219f24996636000c07f3bbedabd75a3cf31d95ebb463b108919f9aea314a SHA512 22cdf301e12d185789fe00a5e5b750e33ae4280dc45c98e71193504b7b46899bb973a083ba526657a62c5e3ab641b3d2f03ebf28e424d50caedad2c7a5f87be5
 DIST loop-AES-v3.7n.tar.bz2 373901 BLAKE2B 5cac9bd55f35a6cf0c056a6a2e75a48f49c1d23b7ebe1821e10dab522508e64ed23e5993dbcc19dbdeaab6c315ee4e71c8ecc17d9da41a5ad0794abc92563d7e SHA512 d190561f92a47292285e44c728bf1fcf9b7dd9c54f970ebc11a2988686f409515687a22028187756baaa4622903564e2646971a63eba13557c6ce78dc1f0bb96
+EBUILD loop-aes-3.7m.ebuild 2035 BLAKE2B 0049c77cbf0acf349c1d5e380b7ac1072ab148acf6174e0ba14f070b55d722b6a8fcc7e7a47e1e37699dd254d124485ef5cfc04ff82ee14053441f62b90d8236 SHA512 964217043c2ed947f591836b51eb8e98a0cc0efa0d1e5673a737c31ea6190625f5b58ea44c27bdf7811e371d92fd1fa05d5b8577c83bb6b3fa167a30bb095ca4
 EBUILD loop-aes-3.7n.ebuild 2032 BLAKE2B 2218843eb73db2ed63c8e0f19be6a9f16c4084982067d6b153ca9d42688e5c3e1aa5118fe3a5720b5b5d175b20550d1250dcbf872acfff19d0a63b6d0dfccab0 SHA512 abd4f49db32d9808ccf1d4363e967bbd48cfd0db2390afd6ddb591b2540d44bb66233fad18cc7a0756cc91448a5abc20eaee24641b66bbded73fefb184859309
 MISC metadata.xml 633 BLAKE2B 364ea3f67381f2878af750cdf6da32980f96bad6f277d4cdc4c943e72a554e50e9c91fdce007a8ac63e3f9c715481740688b242947a8c19a25996b9f5621d726 SHA512 75e4ed0408d32a91012b03de7ac1f4ac4aac8a20ccc73ad612a9fe79e9046d79eee189e40692c13822e219b8ee35800b04fe36c88168be24248222c6ddd6193c
diff --git a/sys-fs/loop-aes/loop-aes-3.7m.ebuild b/sys-fs/loop-aes/loop-aes-3.7m.ebuild
new file mode 100644
index 000000000000..426c9f5d7fd7
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.7m.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${PN/aes/AES}-v${PV}"
+
+DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
+HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
+
+REPEND="app-crypt/loop-aes-losetup"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	CONFIG_CHECK="!BLK_DEV_LOOP"
+	MODULE_NAMES="loop(block::tmp-d-kbuild)"
+	BUILD_TARGETS="all"
+
+	BUILD_PARAMS=" \
+		V=1 \
+		LINUX_SOURCE=\"${KERNEL_DIR}\" \
+		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
+		USE_KBUILD=y MODINST=n RUNDM=n"
+	use cpu_flags_x86_aes && BUILD_PARAMS="${BUILD_PARAMS} INTELAES=y"
+	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
+	use cpu_flags_x86_padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
+
+	if use extra-ciphers; then
+		MODULE_NAMES="${MODULE_NAMES}
+			loop_blowfish(block::tmp-d-kbuild)
+			loop_serpent(block::tmp-d-kbuild)
+			loop_twofish(block::tmp-d-kbuild)"
+		BUILD_PARAMS="${BUILD_PARAMS} EXTRA_CIPHERS=y"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README
+	dobin loop-aes-keygen
+	doman loop-aes-keygen.1
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo
+	einfo "For more instructions take a look at examples in README at:"
+	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
+	einfo
+	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
+	einfo "you may want to consider using the aes-ni use flag. It will"
+	einfo "use your processors native AES instructions giving quite a speed"
+	einfo "increase."
+	einfo
+
+	ewarn
+	ewarn "Please consider using loop-aes-losetup package instead of"
+	ewarn "util-linux[loop-aes], it will enable all loop-aes services"
+	ewarn "without patching util-linux package"
+	ewarn
+	ewarn "In future only loop-aes-losetup will be available in portage"
+	ewarn
+}
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 1c21d207202f..4f5e657a26b3 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -2,12 +2,8 @@ AUX 99-ntfs3g.rules 51 BLAKE2B 11dd7b3deb9276b38be508ec3de5bdb79ceb5e272e24d5dab
 AUX ntfs3g-2014.2.15-no-split-usr.patch 1322 BLAKE2B efc71e28913d649484c1cf0d51dc34d8515cfba484a6a36a7cf158b142346255d403457ce0418148bbaa9e3e6e2cd494a509aa0c205ae944609844f4b9a04bc1 SHA512 232a1a7b84339c86758365564fce2058c3e652f833c6908245aa5f6f0e91d5c09cedcb978a1ebe62897c7288df4fe8671ba7085af403056742d897181e479e05
 AUX ntfs3g-2016.2.22-CVE-2017-0358.patch 1169 BLAKE2B 47ee2ae7724f77d6c50e4eb816a4558fc296990c2f65e56d40f71db642e75e2bb35aeb2d6880e3faf21f61d9c51619de003903dba93cb742170bf4df56d6e744 SHA512 223f7b4fcd962d3c2499787f9a32c09f35705de98d3d1c96677cea18c67f77f5a086b7839892cb25b62c9145b2543c02d5abca89a82cda2345d5f993d6a60131
 AUX ntfs3g-2016.2.22-sysmacros.patch 911 BLAKE2B a53765dc5cd4ae8320584167fbf202b50827e07f4599ab8572d434cc61110bb190854b24e567b210843002b74245e5a7f271ea4548cc52a0d3d893eb622702b2 SHA512 34768ef1ebf42b125cdc4d86937042f21b7146c4c76c1ed37e66e59a4bfaa863b54f7dbcca14a9d842782113e6ac70b2a96e62022dc2c8f717ec43c9985bf79f
-AUX ntfs3g-2017.3.23-big-sectors.patch 11378 BLAKE2B 47e47a6c1370af864aa7e700e56c8db1c190ae80bd3ed1ceeeb6952a143c2c7d640580d3586a088c7307893f3509884401cf2b7c4395ce8e536246ae3ae923e5 SHA512 e23b1e3eeeb3397e42c1a09afe8b261d5193df3fd521434b64aad80fe0c6fbbf78199b92659cbd76b6c802d77e708a81e86f1d2d97b464a5c854ef821ac722a1
-AUX ntfs3g-2017.3.23-check-mftmirr.patch 554 BLAKE2B 9c7ab2b705df38089dc0413b8132ea08ccfec34001470dfc8fb926ccdaddece6f7047cef29a9073a59f7a63da8f86e01dde9f8c9e482ae932a1dd860b940bffd SHA512 b6b4eb4c6c71b944a8a30b5da69fed97eec3b3e404c180f2c3434c402d3cf5b68aa7a4deaf74b74c11230c02ffd0ce41c96fa49f9874a0105e3219821431647f
-AUX ntfs3g-2017.3.23-full-clusters.patch 2206 BLAKE2B 5e11e3a1f3e51cf46c09c2e83033429d3ca900b4531dee419afe742efa2285793a57f968a042725d06cd139980010f99e2e7e240d892838fb7ea67682fa834dc SHA512 dbcc69018fea460882d644b3c1b794eaf1580ca6e9edbdd9a9590bbb6333dae0fedb50878c010908e3e7c7a08e0d443e95f0f7144aad78f2f89c51e92d777523
 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 2450 BLAKE2B 8178b192162c011703272b7876b6b0b56a13698f2c673862789998b09f316c4cb06370a63a9cff9ab367562220284dfc38e614e80e27085a3e26615f4913cb14 SHA512 7a06505e8ca1d54b78bbe6da8975a69fcea297c36a74092bcd3259eacf3fd4cbaedceec5184c0b0e560f13141d6ca62692dc4a7a4e454090c844454a74adca0a
 EBUILD ntfs3g-2017.3.23-r1.ebuild 2360 BLAKE2B 4929f0847741acef18f7078d0f62246aada50f35312398e068ceb2438751aa34245dc0af5ddd1d06a85da8e8f084fd35c7beaf1380efd24fe6ce3f9b94d0a85d SHA512 3760806c53d47b38cd1b5416d76c1bdeb2854b1b831139ca86ef1de64de0933c8804e78a333f55751812c4a8bb1cc8c8757f002b3aa36181fba5ee43db7a5041
-EBUILD ntfs3g-2017.3.23-r2.ebuild 2794 BLAKE2B 00c1b7e33e335b1ce3a325f14b80650be7adca757b9574f17689cca3460dcdd7d5223987048830076c23de3c318ae0eb0a78c23837568214f1677814de9ee52a SHA512 528946f6a0fbec94fe8aa07e6a8add8c53aff6820c9b2d002c0a5dcba091509ddf1370bbcc388b5f393786da5d5861f59ae63b0a9e9b48562b9b831e01752581
 MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-big-sectors.patch b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-big-sectors.patch
deleted file mode 100644
index 1cb8bb6c46c0..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-big-sectors.patch
+++ /dev/null
@@ -1,379 +0,0 @@
---- a/libntfs-3g/bootsect.c.ref	2017-03-23 10:42:44.000000000 +0100
-+++ b/libntfs-3g/bootsect.c	2018-05-07 09:11:13.004710800 +0200
-@@ -38,6 +38,7 @@ 
- #include <errno.h>
- #endif
- 
-+#include "param.h"
- #include "compat.h"
- #include "bootsect.h"
- #include "debug.h"
-@@ -61,6 +62,7 @@ 
- {
- 	u32 i;
- 	BOOL ret = FALSE;
-+	u16 sectors_per_cluster;
- 
- 	ntfs_log_debug("Beginning bootsector check.\n");
- 
-@@ -83,15 +85,27 @@ 
- 	case 1: case 2: case 4: case 8: case 16: case 32: case 64: case 128:
- 		break;
- 	default:
--		ntfs_log_error("Unexpected sectors per cluster value (%d).\n",
--			       b->bpb.sectors_per_cluster);
--		goto not_ntfs;
-+		if ((b->bpb.sectors_per_cluster < 240)
-+		    || (b->bpb.sectors_per_cluster > 249)) {
-+			if (b->bpb.sectors_per_cluster > 128)
-+				ntfs_log_error("Unexpected sectors"
-+					" per cluster value (code 0x%x)\n",
-+					b->bpb.sectors_per_cluster);
-+			else
-+				ntfs_log_error("Unexpected sectors"
-+					" per cluster value (%d).\n",
-+					b->bpb.sectors_per_cluster);
-+			goto not_ntfs;
-+		}
- 	}
- 
- 	ntfs_log_debug("Checking cluster size.\n");
--	i = (u32)le16_to_cpu(b->bpb.bytes_per_sector) * 
--		b->bpb.sectors_per_cluster;
--	if (i > 65536) {
-+	if (b->bpb.sectors_per_cluster > 128)
-+		sectors_per_cluster = 1 << (256 - b->bpb.sectors_per_cluster);
-+	else
-+		sectors_per_cluster = b->bpb.sectors_per_cluster;
-+	i = (u32)le16_to_cpu(b->bpb.bytes_per_sector) * sectors_per_cluster;
-+	if (i > NTFS_MAX_CLUSTER_SIZE) {
- 		ntfs_log_error("Unexpected cluster size (%d).\n", i);
- 		goto not_ntfs;
- 	}
-@@ -171,7 +185,7 @@ 
- int ntfs_boot_sector_parse(ntfs_volume *vol, const NTFS_BOOT_SECTOR *bs)
- {
- 	s64 sectors;
--	u8  sectors_per_cluster;
-+	u16  sectors_per_cluster;
- 	s8  c;
- 
- 	/* We return -1 with errno = EINVAL on error. */
-@@ -186,7 +200,10 @@ 
- 	 * below or equal the number_of_clusters) really belong in the
- 	 * ntfs_boot_sector_is_ntfs but in this way we can just do this once.
- 	 */
--	sectors_per_cluster = bs->bpb.sectors_per_cluster;
-+	if (bs->bpb.sectors_per_cluster > 128)
-+		sectors_per_cluster = 1 << (256 - bs->bpb.sectors_per_cluster);
-+	else
-+		sectors_per_cluster = bs->bpb.sectors_per_cluster;
- 	ntfs_log_debug("SectorsPerCluster = 0x%x\n", sectors_per_cluster);
- 	if (sectors_per_cluster & (sectors_per_cluster - 1)) {
- 		ntfs_log_error("sectors_per_cluster (%d) is not a power of 2."
---- a/ntfsprogs/mkntfs.8.in.ref	2017-03-23 10:42:44.000000000 +0100
-+++ b/ntfsprogs/mkntfs.8.in	2018-05-07 09:11:13.014132400 +0200
-@@ -132,7 +132,7 @@ 
- .TP
- \fB\-c\fR, \fB\-\-cluster\-size\fR BYTES
- Specify the size of clusters in bytes. Valid cluster size values are powers of
--two, with at least 256, and at most 65536 bytes per cluster. If omitted,
-+two, with at least 256, and at most 2097152 bytes (2MB) per cluster. If omitted,
- .B mkntfs
- uses 4096 bytes as the default cluster size.
- .sp
---- a/ntfsprogs/mkntfs.c.ref	2017-03-23 10:42:44.000000000 +0100
-+++ b/ntfsprogs/mkntfs.c	2018-05-07 09:11:13.035522300 +0200
-@@ -6,7 +6,7 @@ 
-  * Copyright (c) 2002-2006 Szabolcs Szakacsits
-  * Copyright (c) 2005      Erik Sornes
-  * Copyright (c) 2007      Yura Pakhuchiy
-- * Copyright (c) 2010-2014 Jean-Pierre Andre
-+ * Copyright (c) 2010-2018 Jean-Pierre Andre
-  *
-  * This utility will create an NTFS 1.2 or 3.1 volume on a user
-  * specified (block) device.
-@@ -119,6 +119,7 @@ 
- #	endif
- #endif
- 
-+#include "param.h"
- #include "security.h"
- #include "types.h"
- #include "attrib.h"
-@@ -287,7 +288,7 @@ 
- 	ntfs_log_info("Copyright (c) 2002-2006 Szabolcs Szakacsits\n");
- 	ntfs_log_info("Copyright (c) 2005      Erik Sornes\n");
- 	ntfs_log_info("Copyright (c) 2007      Yura Pakhuchiy\n");
--	ntfs_log_info("Copyright (c) 2010-2014 Jean-Pierre Andre\n");
-+	ntfs_log_info("Copyright (c) 2010-2018 Jean-Pierre Andre\n");
- 	ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
- }
- 
-@@ -3719,11 +3720,11 @@ 
- 		/*
- 		 * For huge volumes, grow the cluster size until the number of
- 		 * clusters fits into 32 bits or the cluster size exceeds the
--		 * maximum limit of 64kiB.
-+		 * maximum limit of NTFS_MAX_CLUSTER_SIZE.
- 		 */
- 		while (volume_size >> (ffs(vol->cluster_size) - 1 + 32)) {
- 			vol->cluster_size <<= 1;
--			if (vol->cluster_size > 65535) {
-+			if (vol->cluster_size >= NTFS_MAX_CLUSTER_SIZE) {
- 				ntfs_log_error("Device is too large to hold an "
- 						"NTFS volume (maximum size is "
- 						"256TiB).\n");
-@@ -3744,15 +3745,18 @@ 
- 				"to, or larger than, the sector size.\n");
- 		return FALSE;
- 	}
--	if (vol->cluster_size > 128 * (u32)opts.sector_size) {
-+		/* Before Windows 10 Creators, the limit was 128 */
-+	if (vol->cluster_size > 4096 * (u32)opts.sector_size) {
- 		ntfs_log_error("The cluster size is invalid.  It cannot be "
--				"more that 128 times the size of the sector "
-+				"more that 4096 times the size of the sector "
- 				"size.\n");
- 		return FALSE;
- 	}
--	if (vol->cluster_size > 65536) {
-+	if (vol->cluster_size > NTFS_MAX_CLUSTER_SIZE) {
- 		ntfs_log_error("The cluster size is invalid.  The maximum "
--			"cluster size is 65536 bytes (64kiB).\n");
-+			"cluster size is %lu bytes (%lukiB).\n",
-+			(unsigned long)NTFS_MAX_CLUSTER_SIZE,
-+			(unsigned long)(NTFS_MAX_CLUSTER_SIZE >> 10));
- 		return FALSE;
- 	}
- 	vol->cluster_size_bits = ffs(vol->cluster_size) - 1;
-@@ -4387,6 +4391,7 @@ 
- 	u8 *sd;
- 	FILE_ATTR_FLAGS extend_flags;
- 	VOLUME_FLAGS volume_flags = const_cpu_to_le16(0);
-+	int sectors_per_cluster;
- 	int nr_sysfiles;
- 	int buf_sds_first_size;
- 	char *buf_sds;
-@@ -4639,8 +4644,11 @@ 
- 	 * already inserted, so no need to worry about these things.
- 	 */
- 	bs->bpb.bytes_per_sector = cpu_to_le16(opts.sector_size);
--	bs->bpb.sectors_per_cluster = (u8)(g_vol->cluster_size /
--			opts.sector_size);
-+	sectors_per_cluster = g_vol->cluster_size / opts.sector_size;
-+	if (sectors_per_cluster > 128)
-+		bs->bpb.sectors_per_cluster = 257 - ffs(sectors_per_cluster);
-+	else
-+		bs->bpb.sectors_per_cluster = sectors_per_cluster;
- 	bs->bpb.media_type = 0xf8; /* hard disk */
- 	bs->bpb.sectors_per_track = cpu_to_le16(opts.sectors_per_track);
- 	ntfs_log_debug("sectors per track = %ld (0x%lx)\n",
---- a/ntfsprogs/ntfsclone.c.ref	2017-03-23 10:42:44.000000000 +0100
-+++ b/ntfsprogs/ntfsclone.c	2018-05-07 09:11:38.245007100 +0200
-@@ -3,7 +3,7 @@ 
-  *
-  * Copyright (c) 2003-2006 Szabolcs Szakacsits
-  * Copyright (c) 2004-2006 Anton Altaparmakov
-- * Copyright (c) 2010-2016 Jean-Pierre Andre
-+ * Copyright (c) 2010-2018 Jean-Pierre Andre
-  * Special image format support copyright (c) 2004 Per Olofsson
-  *
-  * Clone NTFS data and/or metadata to a sparse file, image, device or stdout.
-@@ -71,6 +71,7 @@ 
-  */
- #define NTFS_DO_NOT_CHECK_ENDIANS
- 
-+#include "param.h"
- #include "debug.h"
- #include "types.h"
- #include "support.h"
-@@ -270,7 +271,6 @@ 
- 
- #define LAST_METADATA_INODE	11
- 
--#define NTFS_MAX_CLUSTER_SIZE	65536
- #define NTFS_SECTOR_SIZE	  512
- 
- #define rounded_up_division(a, b) (((a) + (b - 1)) / (b))
-@@ -393,7 +393,7 @@ 
- 		   "Efficiently clone, image, restore or rescue an NTFS Volume.\n\n"
- 		   "Copyright (c) 2003-2006 Szabolcs Szakacsits\n"
- 		   "Copyright (c) 2004-2006 Anton Altaparmakov\n"
--		   "Copyright (c) 2010-2016 Jean-Pierre Andre\n\n");
-+		   "Copyright (c) 2010-2018 Jean-Pierre Andre\n\n");
- 	fprintf(stderr, "%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home);
- 	exit(0);
- }
-@@ -756,7 +756,7 @@ 
- 
- static void copy_cluster(int rescue, u64 rescue_lcn, u64 lcn)
- {
--	char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */
-+	char *buff;
- 	/* vol is NULL if opt.restore_image is set */
- 	s32 csize = le32_to_cpu(image_hdr.cluster_size);
- 	BOOL backup_bootsector;
-@@ -783,6 +783,10 @@ 
- 		}
- 	}
- 
-+	buff = (char*)ntfs_malloc(csize);
-+	if (!buff)
-+		err_exit("Not enough memory");
-+
- // need reading when not about to write ?
- 	if (read_all(fd, buff, csize) == -1) {
- 
-@@ -858,6 +862,7 @@ 
- 		perr_printf("Write failed");
- #endif
- 	}
-+	free(buff);
- }
- 
- static s64 lseek_out(int fd, s64 pos, int mode)
-@@ -995,7 +1000,11 @@ 
- 				 struct progress_bar *progress, u64 *p_counter)
- {
- 	s64 i;
--	char buff[NTFS_MAX_CLUSTER_SIZE];
-+	char *buff;
-+
-+	buff = (char*)ntfs_malloc(csize);
-+	if (!buff)
-+		err_exit("Not enough memory");
- 
- 	memset(buff, 0, csize);
- 
-@@ -1004,6 +1013,7 @@ 
- 			perr_exit("write_all");
- 		progress_update(progress, ++(*p_counter));
- 	}
-+	free(buff);
- }
- 
- static void restore_image(void)
-@@ -1492,7 +1502,7 @@ 
- 
- static void copy_wipe_mft(ntfs_walk_clusters_ctx *image, runlist *rl)
- {
--	char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */
-+	char *buff;
- 	void *fd;
- 	s64 mft_no;
- 	u32 mft_record_size;
-@@ -1522,6 +1532,10 @@ 
- 		clusters_per_set = mft_record_size/csize;
- 		records_per_set = 1;
- 	}
-+	buff = (char*)ntfs_malloc(mft_record_size);
-+	if (!buff)
-+		err_exit("Not enough memory");
-+
- 	mft_no = 0;
- 	ri = rj = 0;
- 	wi = wj = 0;
-@@ -1554,6 +1568,7 @@ 
- 		}
- 	}
- 	image->current_lcn = current_lcn;
-+	free(buff);
- }
- 
- /*
-@@ -1566,7 +1581,7 @@ 
- 
- static void copy_wipe_i30(ntfs_walk_clusters_ctx *image, runlist *rl)
- {
--	char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */
-+	char *buff;
- 	void *fd;
- 	u32 indx_record_size;
- 	u32 csize;
-@@ -1595,6 +1610,10 @@ 
- 		clusters_per_set = indx_record_size/csize;
- 		records_per_set = 1;
- 	}
-+	buff = (char*)ntfs_malloc(indx_record_size);
-+	if (!buff)
-+		err_exit("Not enough memory");
-+
- 	ri = rj = 0;
- 	wi = wj = 0;
- 	if (rl[ri].length)
-@@ -1627,6 +1646,7 @@ 
- 		}
- 	}
- 	image->current_lcn = current_lcn;
-+	free(buff);
- }
- 
- static void dump_clusters(ntfs_walk_clusters_ctx *image, runlist *rl)
---- a/ntfsprogs/ntfsresize.c.ref	2017-03-23 10:42:44.000000000 +0100
-+++ b/ntfsprogs/ntfsresize.c	2018-05-07 09:11:13.076883400 +0200
-@@ -59,6 +59,7 @@ 
- #include <fcntl.h>
- #endif
- 
-+#include "param.h"
- #include "debug.h"
- #include "types.h"
- #include "support.h"
-@@ -243,8 +244,6 @@ 
- #define DIRTY_INODE		(1)
- #define DIRTY_ATTRIB		(2)
- 
--#define NTFS_MAX_CLUSTER_SIZE	(65536)
--
- static s64 rounded_up_division(s64 numer, s64 denom)
- {
- 	return (numer + (denom - 1)) / denom;
-@@ -404,7 +403,7 @@ 
- 	printf("Copyright (c) 2002-2005  Anton Altaparmakov\n");
- 	printf("Copyright (c) 2002-2003  Richard Russon\n");
- 	printf("Copyright (c) 2007       Yura Pakhuchiy\n");
--	printf("Copyright (c) 2011-2016  Jean-Pierre Andre\n");
-+	printf("Copyright (c) 2011-2018  Jean-Pierre Andre\n");
- 	printf("\n%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home);
- }
- 
-@@ -1849,9 +1848,13 @@ 
- static void copy_clusters(ntfs_resize_t *resize, s64 dest, s64 src, s64 len)
- {
- 	s64 i;
--	char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */
-+	char *buff;
- 	ntfs_volume *vol = resize->vol;
- 
-+	buff = (char*)ntfs_malloc(vol->cluster_size);
-+	if (!buff)
-+		perr_exit("ntfs_malloc");
-+
- 	for (i = 0; i < len; i++) {
- 
- 		lseek_to_cluster(vol, src + i);
-@@ -1875,6 +1878,7 @@ 
- 		resize->relocations++;
- 		progress_update(&resize->progress, resize->relocations);
- 	}
-+	free(buff);
- }
- 
- static void relocate_clusters(ntfs_resize_t *r, runlist *dest_rl, s64 src_lcn)
---- a/include/ntfs-3g/param.h.ref	2017-03-23 10:42:44.000000000 +0100
-+++ b/include/ntfs-3g/param.h	2018-05-07 09:11:13.088302600 +0200
-@@ -40,6 +40,13 @@ 
- };
- 
- /*
-+ *		Parameters for formatting
-+ */
-+
-+		/* Up to Windows 10, the cluster size was limited to 64K */
-+#define NTFS_MAX_CLUSTER_SIZE 2097152 /* Windows 10 Creators allows 2MB */
-+
-+/*
-  *		Parameters for compression
-  */
- 
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-check-mftmirr.patch b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-check-mftmirr.patch
deleted file mode 100644
index f56eadc882f9..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-check-mftmirr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libntfs-3g/volume.c.ref	2017-03-23 10:42:44.000000000 +0100
-+++ b/libntfs-3g/volume.c	2017-12-20 08:11:51.842424300 +0100
-@@ -959,7 +959,8 @@
- 		vol->mftmirr_size = l;
- 	}
- 	ntfs_log_debug("Comparing $MFTMirr to $MFT...\n");
--	for (i = 0; i < vol->mftmirr_size; ++i) {
-+		/* Windows 10 does not update the full $MFTMirr any more */
-+	for (i = 0; (i < vol->mftmirr_size) && (i < FILE_first_user); ++i) {
- 		MFT_RECORD *mrec, *mrec2;
- 		const char *ESTR[12] = { "$MFT", "$MFTMirr", "$LogFile",
- 			"$Volume", "$AttrDef", "root directory", "$Bitmap",
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-full-clusters.patch b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-full-clusters.patch
deleted file mode 100644
index 7d2496d372d5..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-full-clusters.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/ntfsprogs/ntfsclone.c	2018-05-16 18:46:47.114964000 +0200
-+++ b/ntfsprogs/ntfsclone.c	2018-07-16 14:03:20.273809100 +0200
-@@ -776,6 +776,10 @@ 
- 
- 		/* possible partial cluster holding the backup boot sector */
- 	backup_bootsector = (lcn + 1)*csize >= full_device_size;
-+	buff = (char*)ntfs_malloc(csize);
-+	if (!buff)
-+		err_exit("Not enough memory");
-+
- 	if (backup_bootsector) {
- 		csize = full_device_size - lcn*csize;
- 		if (csize < 0) {
-@@ -783,10 +787,6 @@ 
- 		}
- 	}
- 
--	buff = (char*)ntfs_malloc(csize);
--	if (!buff)
--		err_exit("Not enough memory");
--
- // need reading when not about to write ?
- 	if (read_all(fd, buff, csize) == -1) {
- 
-@@ -1507,6 +1507,7 @@ 
- 	s64 mft_no;
- 	u32 mft_record_size;
- 	u32 csize;
-+	u32 buff_size;
- 	u32 bytes_per_sector;
- 	u32 records_per_set;
- 	u32 clusters_per_set;
-@@ -1524,15 +1525,18 @@ 
- 		/*
- 		 * Depending on the sizes, there may be several records
- 		 * per cluster, or several clusters per record.
-+		 * Anyway, full clusters are needed for rescuing bad ones.
- 		 */
- 	if (csize >= mft_record_size) {
- 		records_per_set = csize/mft_record_size;
- 		clusters_per_set = 1;
-+		buff_size = csize;
- 	} else {
- 		clusters_per_set = mft_record_size/csize;
- 		records_per_set = 1;
-+		buff_size = mft_record_size;
- 	}
--	buff = (char*)ntfs_malloc(mft_record_size);
-+	buff = (char*)ntfs_malloc(buff_size);
- 	if (!buff)
- 		err_exit("Not enough memory");
- 
-@@ -1585,6 +1589,7 @@ 
- 	void *fd;
- 	u32 indx_record_size;
- 	u32 csize;
-+	u32 buff_size;
- 	u32 bytes_per_sector;
- 	u32 records_per_set;
- 	u32 clusters_per_set;
-@@ -1601,16 +1606,19 @@ 
- 		/*
- 		 * Depending on the sizes, there may be several records
- 		 * per cluster, or several clusters per record.
-+		 * Anyway, full clusters are needed for rescuing bad ones.
- 		 */
- 	indx_record_size = image->ni->vol->indx_record_size;
- 	if (csize >= indx_record_size) {
- 		records_per_set = csize/indx_record_size;
- 		clusters_per_set = 1;
-+		buff_size = csize;
- 	} else {
- 		clusters_per_set = indx_record_size/csize;
- 		records_per_set = 1;
-+		buff_size = indx_record_size;
- 	}
--	buff = (char*)ntfs_malloc(indx_record_size);
-+	buff = (char*)ntfs_malloc(buff_size);
- 	if (!buff)
- 		err_exit("Not enough memory");
- 
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
deleted file mode 100644
index fb67e549b9c8..000000000000
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info udev toolchain-funcs libtool
-
-MY_PN=${PN/3g/-3g}
-MY_P=${MY_PN}_ntfsprogs-${PV}
-
-DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
-HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
-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 ~x86-linux"
-IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
-
-RDEPEND="!<sys-apps/util-linux-2.20.1-r2
-	!sys-fs/ntfsprogs
-	ntfsdecrypt? (
-		>=dev-libs/libgcrypt-1.2.2:0
-		>=net-libs/gnutls-1.4.4
-	)
-	external-fuse? (
-		>=sys-fs/fuse-2.8.0:0
-	)
-"
-DEPEND="${RDEPEND}
-	sys-apps/attr
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS ChangeLog CREDITS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2014.2.15-no-split-usr.patch
-	"${FILESDIR}"/${PN}-2016.2.22-sysmacros.patch #580136
-	# Fedora fixes
-	"${FILESDIR}"/${PN}-2017.3.23-check-mftmirr.patch
-	"${FILESDIR}"/${PN}-2017.3.23-big-sectors.patch
-	"${FILESDIR}"/${PN}-2017.3.23-full-clusters.patch
-)
-
-pkg_setup() {
-	if use external-fuse && use kernel_linux; then
-		if kernel_is lt 2 6 9; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	# Keep the symlinks in the same place we put the main binaries.
-	# Having them in / when all the progs are in /usr is pointless.
-	sed -i \
-		-e 's:/sbin:$(sbindir):g' \
-		{ntfsprogs,src}/Makefile.in || die #578336
-	# Note: patches apply to Makefile.in, so don't run autotools here.
-	elibtoolize
-}
-
-src_configure() {
-	# disable hd library until we have the right library in the tree and
-	# don't links to hwinfo one causing issues like bug #602360
-	tc-ld-disable-gold
-	econf \
-		--prefix="${EPREFIX}"/usr \
-		--exec-prefix="${EPREFIX}"/usr \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable debug) \
-		--enable-ldscript \
-		--disable-ldconfig \
-		$(use_enable acl posix-acls) \
-		$(use_enable xattr xattr-mappings) \
-		$(use_enable ntfsdecrypt crypto) \
-		$(use_enable ntfsprogs) \
-		$(use_enable ntfsprogs quarantined) \
-		--without-uuid \
-		--without-hd \
-		--enable-extras \
-		$(use_enable static-libs static) \
-		--with-fuse=$(usex external-fuse external internal)
-}
-
-src_install() {
-	default
-
-	use suid && fperms u+s /usr/bin/${MY_PN}
-	# Not needed with the link of mount.ntfs being created, causes
-	# issues like bug #635080
-#	udev_dorules "${FILESDIR}"/99-ntfs3g.rules
-	dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 4f1628f1d234..29b7dd68e75e 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -11,12 +11,16 @@ AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec5
 DIST squashfs-tools_4.3-11.debian.tar.xz 27108 BLAKE2B 948a69f79fbec6af2467a56457410253676d693e1d67efef034f85523c17e6db6d85f1f9e9b2f8ae391ac5783d37b7d2cdb3434acee96c19880bbf6a5b771e40 SHA512 ef22436a6da925f8ac0c61ae4450b4cc9a87930b456035dd2588c3edf0d7530cd1a9d1e7bde90c9462e39687a9a8d0caedea5f181cd2414e4caa8af1d3965b0a
 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae
 DIST squashfs-tools_4.3-7.debian.tar.xz 19612 BLAKE2B 7894b6fa27e7e46aec82b680a1ce521c895436ccb1cafcfd3d95e09f56546e08539a7c152854ee14e9516e217339617d25e68c0cc1a4c41b3bdd689caeefa94a SHA512 88df37e0c13483c5591f925156628b3ae27279f56d2453f7f1f82558da1bc3338e23e9481d704b785a40846c6dedc6b0a0e1dd2ea70fe26ea2f1e855fd6d6fdf
+DIST squashfs3.2-r2.tar.gz 314764 BLAKE2B 55d2f38572263c4b1ec704ed7a07794400e904e260e316e399511851d35ab0f7e1834eba605e8739d1b8f6b5a56512570d36196d21743d05842e958b3d80e368 SHA512 983f1fa966c15fb4929eaaf2d88401aac72f6d04e8c5523bd46397bc28928ff13b638e0e96bc09650627449c37f6a654ffa727445f1e9ca13cdc9de4fc43012f
+DIST squashfs3.4.tar.gz 352660 BLAKE2B f48b1f0399d3fde75b8f625fa4130d04772ed9e6d8dc179e7105a7770a5bd211a7aa5c7d5d621efedc54707b37a622351efa65291c03cd84d049ec4a1094773a SHA512 5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe
 DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc06184ad7e8cb9cd08b14854164da8d2ecc64694d44085c46bcfa3aaa85939c97820415345053f7956af04066fdb SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79
 EBUILD squashfs-tools-3.2_p2-r1.ebuild 1021 BLAKE2B 7e3485fdb797f12e782736b21ee4b675ab9436eaf65a60391004d2eb69a3e24d26a3dfa35c6a0b902b203e01d2d5ce036c34c9d95677b20392578f7431c9c187 SHA512 d4b88eabdf7792ffb35369821b8ed5c1083228794bcbdabd34026662307e0dcf35f743d2a26693404ac150ab8e1500bb6ec02353ee061aa167d526dfadfc1ff4
+EBUILD squashfs-tools-3.2_p2.ebuild 953 BLAKE2B a4d1a831009bf68138e760847c6e964737db11c64e18e135b5ee5aa0335d8981d72bd2f39740769a847391e1efca36a7f012f07a2ce20deef71daef58bfd0b21 SHA512 989198cdeb688add1cd826743ab55b7ff33f0de87bf8338e4d6d14882dc79452ebf54fc393a41365e10efa22da1e0e0643f2ea50f4c4fabc8ab969517845f129
 EBUILD squashfs-tools-3.4-r1.ebuild 1005 BLAKE2B cb55eca250959a6e9fd91eab43f989711047bf524f90ee19f8decc364237ef735bd0dadb233dad17c8b0ffd97464a8a6156b5fae019779ed0c42630b09d8e1b8 SHA512 7db000e02f9d9a9a32fd33fb90299852be6a075c9c1954c9a34bca2ead534014177f9de959341ceab5d7948bc80898af3517043bd245294a7fda799b65092875
+EBUILD squashfs-tools-3.4.ebuild 937 BLAKE2B 77ce02b82aae8aae9a5e64b7c4e28e416d70bf92f1ce2d4b017eb3a3a9bd257e7355176c149668a85f757ddb66f017543b55f366782b2ad7c1bd8f01a0921689 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
 EBUILD squashfs-tools-4.3_p11-r1.ebuild 2261 BLAKE2B 621d709448cb692443f1719d2337b6f1e275d70c381aa07291aba2cd9e9c06b04ec1fb30770567983cf8d14034586e56373c09a7e239e41e1e74a03dc6859101 SHA512 d1f85f6eb6fc21d2da1ef708d8a823de71f6e014196cbd9f97ffc93a2c9dc87b87244b7a841529bb1939c244c914d45239619ca1162ac4124c267b2fe8aaebf8
 EBUILD squashfs-tools-4.3_p11.ebuild 2169 BLAKE2B efc0e6110c461d7a36415f782e07d2b5f6681b2ac5271c185c62a573bb5c1df36d18bf967fccdb959851c5de3518fd433022b8aa59f3cd6ce5c59fb43812b58f SHA512 78315a8b0617dcaff29805f05b0245b32e86665a3c3e554e7545219800776bccdf03e3a5b05794c64e6938ad22187cd2e81f96222f6103ad69d222d3b9c3f77b
-EBUILD squashfs-tools-4.3_p7.ebuild 2093 BLAKE2B b692a9a1fb451510186b693621d07a069721efee7440268a8bff0d21e8b83ba46b4e500f7f3a9ec62820c1dd80268efb66dde19f4f47f174f4c0a1cbdf3c7e18 SHA512 bb30e815378cc01e6f399c1cb5e8971fabcb9ea5cf48f9bfc2cdda180e18f0c9a9a8548391ca6d43e1064f9dfa420843b4a54dd7b481fda197ae52632a73f64e
+EBUILD squashfs-tools-4.3_p7.ebuild 2094 BLAKE2B 284c6aff0004705ea2fb2bfd09f621a4eb842c717a27e3115cdb805060591dd4984e04d762b97b429438f1ab775e94d385c80b35fcb09fe15ce978e70a2e6917 SHA512 1609df86a2048663b4dc65d3bed09fe939c2f4f2b6bd6583f7ded002016d3c67f3410ac964f950333f67437a266b1c13ba9e2643c1bd7040edca00b7b572e7dc
 EBUILD squashfs-tools-9999.ebuild 1657 BLAKE2B ad5692c2f5cc0ab9a33b47cfcba96361a26fd07ea36d2f8ca23826deedc563978ae74aeb52884806db45b531f3b9b9c6691b2462ae7546e27be8188683c0b484 SHA512 2a90c73888a9f7295ba19a884eabf52d97b562741f015df5bf6a712ea7bbc18c39af6c03c57735a60462e3cca83d4ed1c8a5951eb87789d9d1c06bf708dc5257
 MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
new file mode 100644
index 000000000000..33c9be8386ec
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+MY_PV=${PV/_p/-r}
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3.0" # squashfs filesystem version
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
+
+src_prepare() {
+	sed -i \
+		-e 's:-O2:$(CFLAGS):' \
+		-e '/-lz/s:$: $(LDFLAGS):' \
+		Makefile || die
+
+	echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	newbin mksquashfs mksquashfs-${SLOT}
+	newbin unsquashfs unsquashfs-${SLOT}
+	cd ..
+	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2
+}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
new file mode 100644
index 000000000000..ef2cd80bfd22
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+MY_PV=${PV/_p/-r}
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3.1" # squashfs filesystem version
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
+
+src_prepare() {
+	sed -i \
+		-e 's:-O2:$(CFLAGS):' \
+		-e '/-lz/s:$: $(LDFLAGS):' \
+		Makefile || die
+
+	sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	newbin mksquashfs mksquashfs-${SLOT}
+	newbin unsquashfs unsquashfs-${SLOT}
+	cd ..
+	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README
+}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
index fb27b8b6e9da..8565685e580a 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="debug lz4 lzma lzo static xattr +xz"
 
 LIB_DEPEND="