gentoo resync : 07.07.2018

16 files changed, 109 insertions, 36 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 3359a316fd87..c49d782ca908 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/archivemount/Manifest b/sys-fs/archivemount/Manifest
index 78f34e24a0db..010f01568077 100644
--- a/sys-fs/archivemount/Manifest
+++ b/sys-fs/archivemount/Manifest
@@ -1,5 +1,5 @@
 DIST archivemount-0.8.10.tar.gz 131894 BLAKE2B 058fe86bf1b0b57499785bd10c9cae90b85622144c49a639d8c5c67a052f896d4c17471d8190d0229784b3e58856eb96619a2552f9227fc48c48f8465c7c1321 SHA512 85019bf5f79267f9df4b32e746ff61f112be59f842f36401c8e2013f7ad2c4d1cdd2d72afc356d24304c1772a7f974b9612b5f9fb5c8614aed8ee2467823e7c1
-DIST archivemount-0.8.7.tar.gz 129305 BLAKE2B 653280dba569127c22de03b56f464e7a855c14ae5693888055b17433eb0d778c7304fb3911ba98ea745ddcb310c6a247e4b08dd3c2df9bd9d4b20e62a1acd994 SHA512 8869786b7fe6ef12eef2150c42a4e152e033a9387383a689a4e9ab4ead7548c11f9db8f19c62ef55ab858a6387b02af59741f39de3d600aee08ed4ddd0afe7c1
+DIST archivemount-0.8.12.tar.gz 131934 BLAKE2B f4fda78f3f91fa2586795807ef616fd8eb67e224d99bcdfbd80ec59b851770a5c914c25786a183ce0dc9e8cf35b628ecd56bd35b181f2b51b4eb7f0bb727839c SHA512 4ce9e7ec8585b07d5bf48df41cc4a1b4ba7fe2268864ec70c445a6b9c21237f267a19814f00c5ef5a940a90ebaa47c9626aff1dbbff6fbb22e2c260da666ccd9
 EBUILD archivemount-0.8.10.ebuild 426 BLAKE2B da6ef1e07d016bf89f6fc52e1956f24098a4bf31363f0104edc33107645906f7657396dc4a3188b84268cae85912cc1e5dcfd59a7d2e46eee1d89f56ca150501 SHA512 24b8d47fd91fdbc37700fb858b62110edbb9fc5854328cc1a537a4e6a2f7df00f6d044704a42ec4ab29ffa171a5af7968a3228f8ef968310ee012555af5ba904
-EBUILD archivemount-0.8.7.ebuild 424 BLAKE2B 04d38e36a1eed08d83d29f30b506c61b438f05142da08d129eb34b3b47b0d4a602cfa10226dbd2e349969c77b7ccbb3fcfc80e822435b0fa0f78ce22afc9cf47 SHA512 0431e9345894e1cd0720dc94cb7b6994332ffba082b5df956dc04f19492933d5b864bc4db7e5542c542bec8f6f9d2cac4a2f870a651818ec44b5a989ab16ee76
+EBUILD archivemount-0.8.12.ebuild 426 BLAKE2B da6ef1e07d016bf89f6fc52e1956f24098a4bf31363f0104edc33107645906f7657396dc4a3188b84268cae85912cc1e5dcfd59a7d2e46eee1d89f56ca150501 SHA512 24b8d47fd91fdbc37700fb858b62110edbb9fc5854328cc1a537a4e6a2f7df00f6d044704a42ec4ab29ffa171a5af7968a3228f8ef968310ee012555af5ba904
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/sys-fs/archivemount/archivemount-0.8.7.ebuild b/sys-fs/archivemount/archivemount-0.8.12.ebuild
index 012a3f1b3820..7c97182dffb6 100644
--- a/sys-fs/archivemount/archivemount-0.8.7.ebuild
+++ b/sys-fs/archivemount/archivemount-0.8.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Mount archives using libarchive and FUSE"
 HOMEPAGE="http://www.cybernoia.de/software/archivemount/"
@@ -12,6 +12,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="app-arch/libarchive:=
-	sys-fs/fuse"
+	sys-fs/fuse:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 6162007245d2..17b71bb54731 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -10,7 +10,7 @@ DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf
 DIST e2fsprogs-1.44.1.tar.gz 7534979 BLAKE2B 1d1dcdfebca41d62bb15e0b0464bcfc848b8c1379f89987f91a59093d497536ccd5e80be67419cad05daf694be1629774f881d026ef834e3a61b00dc64f3543b SHA512 acd612a5146e4a07aa7ab3ef1b38c3ef3f27120f65c519dd02d44e48e5814c86d013315eb30c4f08edecaef6f08f0ec0b91fa133ea9dbd769ee29be3f2ae17c9
 DIST e2fsprogs-1.44.2.tar.gz 7562398 BLAKE2B a828cb9f5f3ee1579a2c5b29ef0eaf0e5696e2bf27a639cf1bf27b8d334bbbd1d142588e53e359934338f2ec95d06343a42b7c2fbd44dd6e01b348958aae3189 SHA512 d416e14a69f3e2e4ea2f4563764c422cc63400bcd514ddb12ebda6456ef04cff523da215664ede1329183acc22246111016e1abd92ff604a23e015e066dd379a
 EBUILD e2fsprogs-1.43.6.ebuild 3792 BLAKE2B 6eed219723a8af06340afd9b2d483e663634ff96add9e073270c91ab4011b0fe531466d488b796d423f8b51d1440c7b09bdea5e33a03c6c41ad26483c4cfc2f0 SHA512 ac14f85a1926ce45994ddc07fd61ead5287341aa77826d28c6f350d9a2c0037629f3f239f0792458b9b448532850bf29bbe16059d6b7d2365a3e012433533c01
-EBUILD e2fsprogs-1.43.9.ebuild 3816 BLAKE2B 42f962c88bb1a798a0df0cc479f3ff265d28bf3a9c6122f682f8a98a89fa4c1d60e5972846ca67facd22a799f16b9d898db0b4df2d3018d564b8f8a59c2297d6 SHA512 2e2e1e21691938fb27d89369a5b05dbbcef7b0c7605e2f233cb7e664dfa71432b862890bb09acb51a65297a99efc14834bb58f625ddfd80e143f8cb9a138227b
+EBUILD e2fsprogs-1.43.9.ebuild 3815 BLAKE2B 5ff7acc3f08ec6c96730e18f5660b49f996e28cbca389f07997965220fbfec2501c97fcb8b6c50a2ce6ff8518515ad12cc9ecfda35eccc4739a4b8876313f6ac SHA512 0e2966f93d6bbaa2ce99af63fc2552f0bf931f3829a1d47be1e2e1a95a7bb2e99bb46add48e5733cdc09da9364bb7ff97f71353ee602fd30fd3a3140e17de47d
 EBUILD e2fsprogs-1.44.1.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
 EBUILD e2fsprogs-1.44.2.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
index 061b4e228339..aa04289c54f3 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 ~arm-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 95f5f8c74593..e7daf9f8d455 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,5 @@
 DIST ncdu-1.12.tar.gz 140596 BLAKE2B 5594d2d1e0b96eb7a1aa4a8461592e0298f0cd95a6ecb1cf18e09dc62fa1af9b7c8ac7f7ce4f7e5ec76ae1fe4702d9e47fc6d5e8410ac9bac86f444b02053792 SHA512 20620dd79d2af878442769e097f13806f64f23875dcb85ebccd573a3de43aba5663d496049b64015d13f9a79d624298032c008ef61dfb6f61d8b12902b8dca12
 DIST ncdu-1.13.tar.gz 143819 BLAKE2B 8ba489dab1cbafec5b1d9b437b44aa7aa5d79ed7b6938f7904465c4d3803390307bfdfed531641fa186873005ce7f0c37db058855ffcd4ce45888bfbffd03c3b SHA512 f1f417caa9bd9e9d9aa6311962b461e48301cf9eab5d0f57073e25df01f96ded05dd093627b95b43afc659ad99aed869efd4a98d723f5835b100747b5525a60c
 EBUILD ncdu-1.12.ebuild 432 BLAKE2B 188c880232163301bb308b4080f32b7b249c2f13c144dda7786d30bd4deca2cf332d3c72863f5cd2b11cee5a724bca4524db0db62aa371b70b8396707f09122f SHA512 3450a2c99c636046913074afc646e79292de567533c8c31fdb59f58d3dff179c4b3581d16dd45147113c25de63d6666071bd597356ea5593a351c3a7a711c476
-EBUILD ncdu-1.13.ebuild 439 BLAKE2B da7ca27435bbb5160299696f5fb7fa5fe15a956dffe497b237a862a908575f299b6d7dea8576ac05bdc7723c3c809f068120aae76726e9ad12119bdef0a89e4e SHA512 846b8a1c0d194b72665aa87733fb764746d12a01c0b3b03632343aba1c6cf8a5859350da0b0c7741e47488a110c0f3241ee4ac426c46b9a03270bf17370a4371
-MISC metadata.xml 696 BLAKE2B 0cc9c34adb28ccaef9b9d4ec199bca3d69af1cc3623e12d84a39f0aa814613e044538e454315b99cdb8351c964c7735d78da0df99ba45645a309ee8ead06f3e5 SHA512 0ddc1f26fbaf2cf9e618bf5b607e11d100f197e98b9e13185173e7a00c5e0312e6b9753797eba8191d2c67f4006e442b210b8962f1c75055d1bc41ca556fcee7
+EBUILD ncdu-1.13.ebuild 437 BLAKE2B 762f15757e0beb237b5ae0708fc3fd0b11742ed8dcab0d695ae5732ebd13264c80d2c564d202d91988f74e40406beda7b61be189b7da13a5b763584f981e6dff SHA512 fbe604ab44f4dd62d0d7588cb7c5c48a803faecaea328d5e333c54bc81bbe6e880071be00854da6ad8d1c048c4490cc227175c157f44cc0e0c5a9e0a369df128
+MISC metadata.xml 580 BLAKE2B 02c4868a6afb6f72a6e8ce6b2f6310dc05f895f08783d1163601c79f0ffc913f7e8f92cdf4eb53156ab4afba573eb17d0bb5763b0bf6409632b10d948e9e2a1f SHA512 71aa0fba8e2f364b9f4a7da7d50ab86e5534518d84f8a26f08a5738655eb5f335de1da5b373dae93b21610881023b6197ca06cedb3c12f4b7f1a02850bf1729f
diff --git a/sys-fs/ncdu/metadata.xml b/sys-fs/ncdu/metadata.xml
index 1a0e0b638cb0..1dc620f7b66d 100644
--- a/sys-fs/ncdu/metadata.xml
+++ b/sys-fs/ncdu/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>wschlich@gentoo.org</email>
-    <name>Wolfram Schlich</name>
-  </maintainer>
-  <maintainer type="person">
     <email>xmw@gentoo.org</email>
     <name>Michael Weber</name>
   </maintainer>
@@ -16,3 +12,4 @@ your disk space going? Why is your home directory that large? ncdu can answer
 those questions for you in just a matter of seconds!
 </longdescription>
 </pkgmetadata>
+
diff --git a/sys-fs/ncdu/ncdu-1.13.ebuild b/sys-fs/ncdu/ncdu-1.13.ebuild
index 4869916dd664..71f698e8c142 100644
--- a/sys-fs/ncdu/ncdu-1.13.ebuild
+++ b/sys-fs/ncdu/ncdu-1.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 47d89f7403d5..9c037cdc6828 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,17 +1,19 @@
 AUX squashfs-tools-4.3-2gb.patch 961 BLAKE2B b178c5e225be9f1b74c8c28bce5f516d1195e9b6bb8f029c34efc6bee62deca5c0173afeadd930f09a8a2304f57223c0d78d24bee6a9d98d07825e748929b0cb SHA512 c45cad7822964ad4c74ea36fdd833fbfaf9e8e047726fa7a9517392bfa0b04a4de348bf3a511b071ac36d045c40cab0d8efeff054ebcd90b94f8508516b7dd71
 AUX squashfs-tools-4.3-aligned-data.patch 375 BLAKE2B e4964cd55bfa3f6026f6090c9e5fe97ddce2ad6efaf99920aa329a42f8cd54217bb918cc1e6678359ff0dd6d7d58361f5fe63cd2aa3254602878cae2e1673c5e SHA512 566e2ada5e86afc799cb0c52396179bedfbcc49349bc6eb43c048b96215b1638c3765f7c75c6fa35593d5a95a1111df7c29a143ee4a55eaf33a6663e9bfe1b25
 AUX squashfs-tools-4.3-extmatch.patch 3487 BLAKE2B df11e9bc8b991e50a94b4c8f8ffa3ddf25db0e2f911db3d4d2fbcbfec793f3d946eac8f4343a113ff6239454b280615e67f93f995c06af6cfe415f3ea330b124 SHA512 e034320ace6b992968d3f6776aeb0b94237619585e7fac195e917622b941bbfbddc62b625409f79fe7a1853ab58f76d6679c28320646b6883eb58183a3adfdea
-AUX squashfs-tools-4.3-local-cve-fix.patch 620 BLAKE2B 166fb66c8a7ed78f50092483c662adaee27b16535f0a2904c2614affabfda2796d8b72ce71aa67c804deb7802a43583ebdae9506b97f79b85c294261eb09adae SHA512 8e308217136f8b50bc89b49017ae706978d5c8a42a74deeef268e9aaaf6ae5785926da99711462374dfc98f2f193840b0e016b1845be1f9bad168047e4574367
+AUX squashfs-tools-4.3-local-cve-fix.patch 624 BLAKE2B 0f41cc2cbbbe7164a930f3f8a77d83f71bb9e10b6f279bb17c8c7c37313bdbbaafd687b02fc4c44788ac37326645f26291007efef6e8eedaaf1254afe10ba83a SHA512 bc61023a492d1440b184dff1a70ee6454ffd1b5e712b48efba7dd0763bd5e9c285e138f74b9cf7f9c038787bb133a14007a5b56ce4501e66dc7bee746c900a77
 AUX squashfs-tools-4.3-mem-overflow.patch 981 BLAKE2B 135d7a985ae0e795e2d24640599dbd1b32c66a1b851690b7960d0647ce624733113167b4290b6035bb9a459c19dc9bd25a9a3f1709062b7542184385fb43479c SHA512 00db6700ab7fbf7f71aa97b45ac9c629dc5e7b1731c3e3eb5c93a0891c1b0f79884df7b6a8672facd9104e9442448ba9657dd10b64d47d89abd1b9ae1969dc2e
 AUX squashfs-tools-4.3-musl.patch 688 BLAKE2B c5c7dc479fe50e581c7546265be622a88cca5973a56efc1ad2896034d5fe071461da2d947a1d9009fa354e49f668ee56b4cb900af1842be8dad34a51bdb4c8e9 SHA512 61fb8eaedc4e649eb8fb362150cf5faef2289cb42514300f63448d164a12c9b21539ae49f6dc0d78fa1e4a3be01b26cb9084cec7f0159fe026fc1caa19df18dd
 AUX squashfs-tools-4.3-sysmacros.patch 611 BLAKE2B eb4a634987a902329d1debcb992b5ed60e1b70feae03860b09267d76abfb19c817887e613b0cedc9d02e265c10f34f8b697e9f390fdb011d2931f13705b30804 SHA512 c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a
 AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec531c0165041af2777d914039671d228d426a2576ae06f6edf86886bd59e7a76fc3a6443337976d7c96b40a1c5dbd7ea8be SHA512 3899bb72cabeb296eb12fdd1c2e77e82a4354e58c91c69be918950c7fc88f56fbc0265c915b7363704579b710a69a35312fa9ab3d43236900774ae97efd473a8
 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae
+DIST squashfs-tools_4.3-6.debian.tar.xz 19060 BLAKE2B 4fc28fae1da2bd1bfbf774acd4f4b29e382760078efd16c655a9178633a58e1ab15fb0203a626dc6353df8ff6860f7da5f9369fd920cf773dd53f8b90cffe13c SHA512 e2f64cdcfe01696980a45d4d6ec50e82626cb3e25e8c98d63b68c9754f519171fcfc4586b4ef88104e28275e1daf94a23f5b7dd08d37fe6e8417b054954de1e7
 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.ebuild 953 BLAKE2B a4d1a831009bf68138e760847c6e964737db11c64e18e135b5ee5aa0335d8981d72bd2f39740769a847391e1efca36a7f012f07a2ce20deef71daef58bfd0b21 SHA512 989198cdeb688add1cd826743ab55b7ff33f0de87bf8338e4d6d14882dc79452ebf54fc393a41365e10efa22da1e0e0643f2ea50f4c4fabc8ab969517845f129
 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-9999.ebuild 1694 BLAKE2B 144090bb2f985e8504d70bac3a4937a428666ba369a65497bba43a7cf52aa09f6fe1b512796b970b736f5928aa406b3106689b5d3c90a70276504493e25bab82 SHA512 b364a908e175482bb48ce6106d706b766aee3d3953e2fffa03b0a83b5ca3098d92e79e2034f31e120b856b99f9d3e1bd98cb50114a50f8cb2cb3502e080e6c10
+EBUILD squashfs-tools-4.3_p6.ebuild 2102 BLAKE2B aff4d868da046f29a32d4a8c3b741bb4a6a443d1c8778e1ea3f0d2f35cd29f47d9f86060d51c8be1b0a34ef386338e958eeb9cd55328c7022559cb50539f755e SHA512 5bbe36316133880a5f4ef71f5edf6b0aa90a61e87f71f227de655a5c261996c6a9760e8672d3a39168a8b9e8f8f95b0fbd127ff30de43c7aad29ebb403fbc586
+EBUILD squashfs-tools-9999.ebuild 1627 BLAKE2B 0110dda14ddddc8ae01127b016df014d10a1fe278a12580469c352b0b7da70ff9a1aee7fbf4906ba6cf1908b7d0a8d0a4566e14a1ea6f540d8f8cb69e3c5d46d SHA512 5b285f492107a3de0302a5ea6c00382c667f0e69429bcd52ec906272c3e6ad1e15db0018b7ef5f3a5317383a0f5209cad59388a9f9eb42a30452e5204a9a7af3
 MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch
index 7637f67cd591..dca6ab68e676 100644
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch
@@ -6,8 +6,8 @@ Date:   Wed Jun 24 14:27:31 2015 -0500
 
 Update printf formats to match datatypes after CVE patch
 
---- squashfs-tools/unsquash-4.c
-+++ squashfs-tools/unsquash-4.c
+--- a/squashfs-tools/unsquash-4.c
++++ b/squashfs-tools/unsquash-4.c
 @@ -35,7 +35,7 @@
  	size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments);
  	long long *fragment_table_index;
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p6.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p6.ebuild
new file mode 100644
index 000000000000..1209603f28d9
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net"
+SRC_URI="
+	mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+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="
+	sys-libs/zlib[static-libs(+)]
+	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
+	lz4? ( app-arch/lz4[static-libs(+)] )
+	lzma? ( app-arch/xz-utils[static-libs(+)] )
+	lzo? ( dev-libs/lzo[static-libs(+)] )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+	xz? ( app-arch/xz-utils[static-libs(+)] )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-sysmacros.patch
+	"${FILESDIR}"/${P/_p*}-aligned-data.patch
+	"${FILESDIR}"/${P/_p*}-local-cve-fix.patch
+	"${FILESDIR}"/${P/_p*}-mem-overflow.patch
+	"${FILESDIR}"/${P/_p*}-extmatch.patch
+	"${FILESDIR}"/${P/_p*}-musl.patch
+)
+
+S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
+
+src_prepare() {
+	eapply -p2 "${WORKDIR}"/debian/patches/*.patch
+	eapply -p2 ${PATCHES[@]}
+	eapply_user
+}
+
+use10() { usex $1 1 0 ; }
+
+src_configure() {
+	# restore GNU89 inline semantics to
+	# emit function symbols, bug 595290
+	append-cflags -std=gnu89
+
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		LZMA_XZ_SUPPORT=$(use10 lzma)
+		LZO_SUPPORT=$(use10 lzo)
+		LZ4_SUPPORT=$(use10 lz4)
+		XATTR_SUPPORT=$(use10 xattr)
+		XZ_SUPPORT=$(use10 xz)
+	)
+
+	tc-export CC
+	use debug && append-cppflags -DSQUASHFS_TRACE
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake "${EMAKE_SQUASHFS_CONF[@]}"
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs
+	cd ..
+	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
+	doman "${WORKDIR}"/debian/manpages/*.[0-9]
+}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index c06d73d05088..11c0570d7f45 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
@@ -1,29 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-inherit eutils git-r3 toolchain-funcs flag-o-matic
-
-DEB_VER="3"
+inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
 HOMEPAGE="http://squashfs.sourceforge.net"
-EGIT_REPO_URI="
-	https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
-"
-
+EGIT_REPO_URI="https://github.com/plougher/squashfs-tools"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug lz4 lzma lzo static xattr +xz zstd"
+KEYWORDS=""
 
 LIB_DEPEND="
-	sys-libs/zlib[static-libs(+)]
 	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
 	lz4? ( app-arch/lz4[static-libs(+)] )
 	lzma? ( app-arch/xz-utils[static-libs(+)] )
 	lzo? ( dev-libs/lzo[static-libs(+)] )
+	sys-libs/zlib[static-libs(+)]
 	xattr? ( sys-apps/attr[static-libs(+)] )
 	xz? ( app-arch/xz-utils[static-libs(+)] )
 	zstd? ( app-arch/zstd[static-libs(+)] )
@@ -66,8 +60,6 @@ src_compile() {
 }
 
 src_install() {
-	cd "${WORKDIR}"/${P}/${PN} || die
-	dobin mksquashfs unsquashfs
-	cd .. || die
+	dobin "${WORKDIR}"/${P}/${PN}/{mksquashfs,unsquashfs}
 	dodoc CHANGES README RELEASE-README RELEASE-READMEs/*
 }
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 0f53543af960..42eeddb54e02 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -3,7 +3,7 @@ DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7e
 DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
 EBUILD zfs-kmod-0.6.5.11.ebuild 4067 BLAKE2B 9ef7ef08382771987aa2c71ffe917c9321744f935f74da1553ed88a4732399c16522c70b069fd51082ee3c6c540d71038cd888a690530aa5b554958460a74c80 SHA512 eca5ec333c7dcf5a4815e6eeb8ef9c9f4449ccc1746b3100aee9042b824c0175c491a4d34726864eb80fb3be55c3bc8e8c2d860948ffb7cfd5417857d7723384
 EBUILD zfs-kmod-0.7.8.ebuild 4053 BLAKE2B f678c78a5e4c13c2e6339c8b859ae396d62a1403a895b3a53677f5999f63ff08c608e382c51b7bde0e7a4e092eddbca90d84ab808a105a7923a81cd6d18815d0 SHA512 863030a139ca6f7cb0e4a8dbe870fe6123782b74b8ec0e4353ee3020512922663b11fc3b374206a52fcbcf114ccfb9002ba5a895398981e562ef09f4f5b87db6
-EBUILD zfs-kmod-0.7.9.ebuild 4054 BLAKE2B 31c851b48ef27afe5e61bfa7ad58886db39a2ab617a79b5fd47a6032e603e60592a70956a8b3054ea9e5b96dcd3de8dc3a1d8a9675b66d063012779c2e80d831 SHA512 7d3ecd5f918c45242d569f094ccee38d319d0acee8eca375374ed2128662e264f44e772487d813517ce519ac8077fbffb974ccb7d8e929bb7b35b696cd8e3eff
+EBUILD zfs-kmod-0.7.9.ebuild 4053 BLAKE2B f678c78a5e4c13c2e6339c8b859ae396d62a1403a895b3a53677f5999f63ff08c608e382c51b7bde0e7a4e092eddbca90d84ab808a105a7923a81cd6d18815d0 SHA512 863030a139ca6f7cb0e4a8dbe870fe6123782b74b8ec0e4353ee3020512922663b11fc3b374206a52fcbcf114ccfb9002ba5a895398981e562ef09f4f5b87db6
 EBUILD zfs-kmod-0.7.9999.ebuild 4112 BLAKE2B 8de7c6141fb29223abb3dfa371af43135b876e4791ec2ea140624f2b105efbee1eef37ec8059adfe147d0bce81ed9968a4921395ada10dac8a2a14059ca4ec48 SHA512 57af0f45a19b938e0aff46e1f7628fd4a81dcc41e32a2e6a345f5901ea9d10cd8a797873bb2c338d58c502007cf54e8ff378da2a4c7746ae5061a66caa5b58b3
 EBUILD zfs-kmod-9999.ebuild 2754 BLAKE2B e3f6c8f5420724380a1a355c64650c70e808400e59dd2f09d882f81f8afb4484d46c37b477744e9efcdd99a6b2ad75065d54794f900f0ff45000b2dac4c5d92c SHA512 4591269a50de3e4c4a0a14e86bf3489d8f2898c34a9c173cda78cc97bd524f374bd11484c71854a635791ba3eae0d357730332ba1c91d204ef2636260c8d292a
 MISC metadata.xml 666 BLAKE2B 45ed040273833c94523c3531f36c739d0d482fbdba09cb229e6b0be80c3cfd2f124e1d90facc19c1109be3e19255f2428aeb14da106f2a39b59a0549704debbf SHA512 eea336c56df7d0b4e0f259ce88d837e2700a4733e1e70ec484ed4e3246abddb928f21f8e912822f778d626b962b092f803a0bf0ce1b812891d53d1a31f06cac9
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
index d71cf40662e3..c8153afff87b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
@@ -10,7 +10,7 @@ if [ ${PV} == "9999" ]; then
 else
 	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
 	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 566a734829b8..3d059619dcc4 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,7 +6,7 @@ DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7e
 DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
 EBUILD zfs-0.6.5.11-r2.ebuild 6069 BLAKE2B ab5867191417827b34a1350c62d76ad51cb47fe4a7a5acb58d559a0556bc4e1b324439a0c5746afe1bd1260e152f451d63b941f29f8f3562df24eb0bf57dc454 SHA512 97f819fb3f48a31b70f4a0b85f7856eb9ad5edbd72f2aa59e6d6d77c625a5207c9d75c7c063257fe52861f83e92d7e0f5abc6ba3935172c0f5517f8c5daa20e3
 EBUILD zfs-0.7.8.ebuild 6077 BLAKE2B ad6ee3799f34bc32a9d9fc888e4fef0f07a7e154a4ad606e8c686cba21a0cf24d0c7052dfc37ffa7d682be0f6c8f821b9f31c5587e3ea3f77395fa126cd1cede SHA512 b81ca8c889d00bd881aade2cebf999f3a09f7482ffa8eebaf63156c890bdeff796a20794605e4d3a0b615da84281393dacc855cb409aee293d00091e3d938430
-EBUILD zfs-0.7.9.ebuild 6076 BLAKE2B 009692da11e3e401e9e99c7019e9b85ca1b198e71628f01448546677c7a1fb9912beea017bfa394b69c53528e72d552295674d8886a80eac7ae677daaff25982 SHA512 b082ee5b2dfb0bfe8ed44221866a5d1e3ba0ce551a1cd5cffd9d9b338852dd35a7167bf7002dbc605cd023cc82ad0943dc4c95723a99484c2e610d7f4ba7f74f
+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
diff --git a/sys-fs/zfs/zfs-0.7.9.ebuild b/sys-fs/zfs/zfs-0.7.9.ebuild
index 50e655774144..e8cc8f1940dd 100644
--- a/sys-fs/zfs/zfs-0.7.9.ebuild
+++ b/sys-fs/zfs/zfs-0.7.9.ebuild
@@ -10,7 +10,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
 else
 	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev