gentoo resync : 21.09.2018

21 files changed, 582 insertions, 41 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 71950baeb1c5..b27cab77acf6 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/archivemount/Manifest b/sys-fs/archivemount/Manifest
index 010f01568077..5d9f2d66639c 100644
--- a/sys-fs/archivemount/Manifest
+++ b/sys-fs/archivemount/Manifest
@@ -1,5 +1,3 @@
-DIST archivemount-0.8.10.tar.gz 131894 BLAKE2B 058fe86bf1b0b57499785bd10c9cae90b85622144c49a639d8c5c67a052f896d4c17471d8190d0229784b3e58856eb96619a2552f9227fc48c48f8465c7c1321 SHA512 85019bf5f79267f9df4b32e746ff61f112be59f842f36401c8e2013f7ad2c4d1cdd2d72afc356d24304c1772a7f974b9612b5f9fb5c8614aed8ee2467823e7c1
 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.12.ebuild 426 BLAKE2B da6ef1e07d016bf89f6fc52e1956f24098a4bf31363f0104edc33107645906f7657396dc4a3188b84268cae85912cc1e5dcfd59a7d2e46eee1d89f56ca150501 SHA512 24b8d47fd91fdbc37700fb858b62110edbb9fc5854328cc1a537a4e6a2f7df00f6d044704a42ec4ab29ffa171a5af7968a3228f8ef968310ee012555af5ba904
+EBUILD archivemount-0.8.12.ebuild 439 BLAKE2B 459325f4c9dde99930672c02072e3ff42518f779443f68f97210440baae45a0014dcfea556010674910005bcd7aacd0f5c34a972cd534bc8fc9b0c192227b5dd SHA512 2000bde5df7649811a70678cb2519a9b1b841bc1dbe33c525f6c68b8d4da0ce5870e01fdc4fb7bbc405f159366465736d5c282cce291c562ac042528d04f4a77
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/sys-fs/archivemount/archivemount-0.8.10.ebuild b/sys-fs/archivemount/archivemount-0.8.10.ebuild
deleted file mode 100644
index 7c97182dffb6..000000000000
--- a/sys-fs/archivemount/archivemount-0.8.10.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Mount archives using libarchive and FUSE"
-HOMEPAGE="http://www.cybernoia.de/software/archivemount/"
-SRC_URI="http://www.cybernoia.de/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-arch/libarchive:=
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/sys-fs/archivemount/archivemount-0.8.12.ebuild b/sys-fs/archivemount/archivemount-0.8.12.ebuild
index 7c97182dffb6..4030a1ec332c 100644
--- a/sys-fs/archivemount/archivemount-0.8.12.ebuild
+++ b/sys-fs/archivemount/archivemount-0.8.12.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 DESCRIPTION="Mount archives using libarchive and FUSE"
-HOMEPAGE="http://www.cybernoia.de/software/archivemount/"
-SRC_URI="http://www.cybernoia.de/software/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.cybernoia.de/software/archivemount.html"
+SRC_URI="https://www.cybernoia.de/software/archivemount/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index eedd6fd84a40..b3786c271591 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,6 +2,6 @@ DIST cryfs-0.9.7-spdlog.patch.xz 28204 BLAKE2B 0905971713b2d709aa34bfd11333a0aae
 DIST cryfs-0.9.7.tar.xz 970588 BLAKE2B b3d79ed44c2280ef34bafa5613f51918093686da9a4637987745bd9601817033049115754e235b9a9a0f2045401182bc9cb48291173df6571887e9dec3f73636 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b
 DIST cryfs-0.9.9.tar.xz 977928 BLAKE2B 927d5f61be99a6400cfd53de6291e14ae32f446d281485901e758341f138a2efdfb7385b6c205db6f865dc83f6fbd9ede8fd1bb5a7957fb242624d78d2523eaf SHA512 18f0ce954dc9958b52a77aac85d4d30d03409e4f88c27ec3e904a6014f5257e12fe47a4f3bb628f6ebf3b5aa8cb9d3a59e0aee76d83a3f6bdd4ef864b66898aa
 EBUILD cryfs-0.9.7.ebuild 2197 BLAKE2B 1adb3fb0ad71f63e39c1223d799d3dedcf94df6f089ffb5005fcfcc568445a12fedd6ec7d4108bcec73f35223ba9b1b0b1cdcfc1ff8a9441c186d961c44362d0 SHA512 9a8a7a593355f1b5d267e111ba968b4ebb578773db034230183dac95b51829a89962643a89876a71a11dd1242f2b3823fccb6b109744c8ed687b43798fab7386
-EBUILD cryfs-0.9.9.ebuild 2418 BLAKE2B 44c4afa4e41810aed38fd6457c92b5795436110de8734f317ad734f3c0e4bacea8259eb54589c1ac0dfe498a6c96d489232fb44f8a4f39b2dd1f74202565c342 SHA512 0811d50ba9eb73da28d69cc26ed6a7b5b1709a5fe694941e6e38baa084acdbbd041645d7cb563c29987b2089d232918d1ac193dddcc90ede603b47a23f24ee3d
+EBUILD cryfs-0.9.9.ebuild 2417 BLAKE2B d5f9c9321de19cbb0530908a2b9970dbcbfbe07d2b5f5f8c57da963ca720511e4bfd6110160cc9da40358d0d61cb32fb1b25265a5c01817ecd3bea10d3d86cf8 SHA512 ca91031fe541d940f623353b4303c68a729790f4ef0a040a837c308eb70b0f6fec4983315b1ad99d4e5015740dd7e1f49d76f7121fbc943a92e7a92ec198ba5f
 EBUILD cryfs-9999.ebuild 2418 BLAKE2B 44c4afa4e41810aed38fd6457c92b5795436110de8734f317ad734f3c0e4bacea8259eb54589c1ac0dfe498a6c96d489232fb44f8a4f39b2dd1f74202565c342 SHA512 0811d50ba9eb73da28d69cc26ed6a7b5b1709a5fe694941e6e38baa084acdbbd041645d7cb563c29987b2089d232918d1ac193dddcc90ede603b47a23f24ee3d
 MISC metadata.xml 605 BLAKE2B cfbabba2fc835d75ab64ff6ea27f87639d27b0d8591d5d318e2c1768f68cb48a50995b7a96b045ba6da3491c4a50219a8a69de6a2efc28325b3bc852b4abf213 SHA512 e7b1aba09cebc2786c664b1f9dbbfeb7baff97536af721953c4eb2dc10d84c97e02277fa5c4532f8bb022a344731d6ea65be81cb3cc88c25d4dea70dcd6ce250
diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild
index 6501bc524cae..9891e7645f18 100644
--- a/sys-fs/cryfs/cryfs-0.9.9.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild
@@ -23,7 +23,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index bf21d0bd9374..4aba579bc582 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,10 +1,10 @@
 AUX 40-gentoo.rules 365 BLAKE2B ac97d87870286b489804d319bbc7ee6fdbc480d0cf811d422b25cc3466542f34e849c3c6aac29f55ad1fbcfebeb943b8782e146f803a0a945f65893300c83806 SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b
 AUX eudev-include-sysmacros-header.patch 4516 BLAKE2B 2c02cece2f2dfc48cff03696a04c854649c44caf30af3d77bae45ce29c3f8cee1d1bbfbe4194eef71f46fbd00c8e23d40f7be3a04ea3ae386ba6654f0256e4ce SHA512 29633fca7e348ef7e69fae7f0fc47a2155b20956dd396205c06032d356ea58269f5ce8e0277ed36aa7108385d0e244a311b53b9490c418c9180986e4742d623f
 AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88
-DIST eudev-3.1.5.tar.gz 1745524 BLAKE2B d030e78f8ef751ac1d677f50200898fb2089940a7d8a828080059fb6330012e615638e47ba21dd6b35fcf89248783d20e47387b8f009f7f4cc1f3fac203e6f58 SHA512 c5192e085ca4230aaac918e701989b712e5bda1558db31eb6ba635c17c4bdff398458d51cefbc5fb77a7c775ec1e04b1dbe019b8314cac3f43a5c1ae61521b5e
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
-EBUILD eudev-3.1.5.ebuild 7039 BLAKE2B 8c2f378a34cacf7e35634b2d60f3a7d73bcb28032f0c21d78782dcbd22ee4d44d321975ad19101dbfc26c6d9e73baf2ea2c9e36e013d30ea2337244bca985a2f SHA512 808ab5e3982ad269847d13d0d1835929a485b74f0de8eaa10fa460f06a088b329f1d0c78a8a9c83cf7c6b4f8da029c93da19e8f1ef02593032d27712cfee14fd
+DIST eudev-3.2.6.tar.gz 1892772 BLAKE2B 7705c1526b043cbef1efcf29c1728639e063845a5ee91b0ad22d43335dce34bf2ebbe4257ca024680759020d4120a8293f62cf8e112fb1191c35f0ec2f96b681 SHA512 874e7c51f4785e9030b09464fc7c1eb729968bec0ef1fda994ba75ce86f89efae5ca964b607d6f8d7c8a279b4c346716e7ba592233e4653f2090c943c438d930
 EBUILD eudev-3.2.5.ebuild 7019 BLAKE2B 39a12a772b0f543cf6c76a988d3c485423da493a695200d6e18a38916e3c1ce0442979549191683c5aee04efa0bbcbbb32e15d1f92381cffe41658438496d634 SHA512 271017380e0713c76126a8a34d53b974cbf657da1b0e31a4fe869cddc6327c992f722acc5f08bf9cc1f49f9d053867a9978cc42b4d481db0021dc8c12715d7fa
+EBUILD eudev-3.2.6.ebuild 7024 BLAKE2B 133a13098ed4b315f96c921d83032a1843d6b9e28d942bfe3aaf209c7795286590522501cd4113d5862d68860b8c63bfac71c1facc4f586779a910bed3010bd6 SHA512 5c0071d81018fe7c1fdca5e4ef4e0085752ad92eb1045f88cb01282a46c823a29884f2fae479a5445ff83836bec7c7af741abbb4bfa7eaf22cadcf2789938679
 EBUILD eudev-4.9999.ebuild 6314 BLAKE2B cb761cf1b967faf8d5ea170beafd0218a8be85d7f599107ee1977f77bae167d86840e7842da4bc6435a984df25470bd6fd10f263df1a326ec97f47799e38d6f5 SHA512 300f700e4ee4e117af85609d64847007b422b9a0ea7a75cb4cfb08882b4da38687d8a498cfdd36d4b1cd0f44e5eda773d24eb1085281fe302a30f978987dd0a2
 EBUILD eudev-9999.ebuild 7024 BLAKE2B 133a13098ed4b315f96c921d83032a1843d6b9e28d942bfe3aaf209c7795286590522501cd4113d5862d68860b8c63bfac71c1facc4f586779a910bed3010bd6 SHA512 5c0071d81018fe7c1fdca5e4ef4e0085752ad92eb1045f88cb01282a46c823a29884f2fae479a5445ff83836bec7c7af741abbb4bfa7eaf22cadcf2789938679
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.2.6.ebuild
index 0efff72af441..9cd4b44b46cc 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.6.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 KV_min=2.6.39
 
-inherit autotools eutils linux-info multilib multilib-minimal user
+inherit autotools linux-info multilib multilib-minimal user
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -84,9 +84,7 @@ src_prepare() {
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
-	epatch "${FILESDIR}"/${PN}-include-sysmacros-header.patch
-
-	epatch_user
+	eapply_user
 	eautoreconf
 }
 
@@ -104,19 +102,19 @@ multilib_src_configure() {
 		DBUS_LIBS=' '
 		--with-rootprefix=
 		--with-rootrundir=/run
-		--libdir=/usr/$(get_libdir)
-		--with-rootlibexecdir=/lib/udev
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-rootlibexecdir="${EPREFIX}"/lib/udev
 		--enable-split-usr
 		--enable-manpages
 		--disable-hwdb
-		--exec-prefix=/
+		--exec-prefix="${EPREFIX}"
 	)
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
 	# that means all options only apply to native_abi
 	if multilib_is_native_abi; then
 		econf_args+=(
-			--with-rootlibdir=/$(get_libdir)
+			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
 			$(use_enable introspection)
 			$(use_enable kmod)
 			$(use_enable static-libs static)
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index d1248e30e441..380364a2c83e 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,7 +1,9 @@
 AUX f2fs-tools-1.10.0-fibmap-include-config_h.patch 401 BLAKE2B 83b0888b5892111165134b858e79bd7b68d3f1f2f66e67745b75e2ab5510f003969a60e8e8d148aba23c2e1b2167d184e20f8acdbbf5dd40cfacc773e9a4f1fc SHA512 d1ccb17c15267a42e64b1760410f1ff5ffeca8bc1545afacd7723e0a86ef7172df63dfbe85c9395f6c2d1b0651dc40bea991b9c30445badde4a1256fa58e6627
 AUX f2fs-tools-1.6.1-sysmacros.patch 1555 BLAKE2B a7cf99912c969492ae6d7d6f2db6bda30caf2fa750530b52543d7b4f5d38acb349d87ac2ec839d86fc32afe172ff989450593e5ce55b3c3eea54f69a32c7e23e SHA512 10e3f473f21d00126fc570ad82f9f6218ed1fba7eb0fe24947c4e67186f82db09fa7563c10ccb74398652f41cda4753afa31d8140cdcb003ce0da0f71bc64415
 DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c7766908bfdbca9f6da7aa134b4a3b5cf2bda3c2e380b3fab46afdda0be9181ae5fe85ed9d085f816a1ff96e847e2a836 SHA512 e6e9fc10bd8051db86880c415ceb50900bf0cc919f1d9fe39026b5320de7c93cbcc1d817fab73130817042ed551fc5fd55ef9b589caeca9fca63fd3098f7a853
+DIST f2fs-tools-1.11.0.tar.gz 278795 BLAKE2B 8faefb1554283291ad2dc2b66800b88bbdcf07dcb1896a206fd56d52eaa19761c6b008a4961bcec12843a96d2df1744bb5394b4f7bf3830315f4bd3180850e8d SHA512 a69fbd01826909576634f40343293addae3a9c3be09bf8210e2abc1ae12f385fe24dd71c623d14a0a15a81d12f404f193981caaadacbd663bc1502de9a8f7fb7
 DIST f2fs-tools-1.6.1.tar.xz 282152 BLAKE2B f8535a5415e012834b749bba2123151d8a39c8fa757905c45be20478d6a795ff64dfbcf0cf9679f2bd70cb1d92717d8df70efb4beb4d749677a6c8758ebdde0e SHA512 108327042079d9e864899a20f2dd94019be1b957fd7ffa295af097c5b93a5065ea9c36de9bae83f84a6412ac496340849fc44de041e24461a2919073eed15cf2
-EBUILD f2fs-tools-1.10.0.ebuild 794 BLAKE2B 2a6f2e7c5bd8e825c1b9ba45b454fd02001dc9324590eb9c8b450e65b9bd1aed7eb598b155bdda0eb54973b28425377686948fedcbca1f069758e096968f3d24 SHA512 6805eb1111e399101fb26b00a61784f203edbe8dbdc79ca3ae9a162c47f6e5a0ba1a07b3f5bc6bda6997a0153fa63d77ffe289e971a49fa9be6395b80eefb5b8
+EBUILD f2fs-tools-1.10.0.ebuild 793 BLAKE2B 12709b039f39428c328ecfc39055d508617288e0158fe3b326434d4be5dd0d41200fc1ece256fcf17707d25a526e35b510dbcad5fbbe851ec344295fac05a4d5 SHA512 75345e6cea51e4615823552ac860b4beaa47732f653487805c977b7a85b080366147e412ebcf498e1e6454a3dbb94d8f469bad096ebe9d32969694349e7d0153
+EBUILD f2fs-tools-1.11.0-r1.ebuild 787 BLAKE2B 44e10e6e57bca8c3844886bd46dce89c8f1466665bc445f2c160c45eea112842288464edbcc7743557688a1010c61eb3d31ab6b88ebef311188251f82cb2346a SHA512 0579edf3680740c3f6cce1c3d50153ee40ccad3132423a6dd195ccb5ec15e4ce7ef60d36f96381310783e88e89dd8064b77583eaaadc764c35ee93dd776bea50
 EBUILD f2fs-tools-1.6.1.ebuild 737 BLAKE2B fd513f95c8c154cf24f3cf74483a7c0c9fb6094780234c6eda83af63ae66c9c7d059bf0aec26e902aff8c782ae44fdcbc9989852450d07b0b99d21b9fda12225 SHA512 a303cc13d4fee5657d93008d9d189dfcfed920bc80e6f4e383d751e29f83745659ee23d8917abddc733a1f2ed66d991c8b9a10aa93ac2134e7e164899a789d22
-MISC metadata.xml 332 BLAKE2B 0a1956b4d2ecff68b31aff44a40fbab8c11ef95fe0becf8c2262300e73b8b52b3c9cef814ec78a56dc5f39e243a3f746e87b20100ff118f3d3713bcee4faa13b SHA512 bc1094f4316330324f30e1fc02c2ec4c4ac3a4201b3d6203dc24845bcbcd194a2c762b39399aef2f42d9df0064ca75c84495e49832b8fd02038bfba7a177ac7b
+MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild
index 3c47afa76c5c..cdaf7d86f3fa 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild
new file mode 100644
index 000000000000..700844feff8d
--- /dev/null
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	#This is required to install to /sbin, bug #481110
+	econf \
+		--bindir="${EPREFIX}"/sbin \
+		--disable-static \
+		$(use_with selinux)
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/f2fs-tools/metadata.xml b/sys-fs/f2fs-tools/metadata.xml
index e2b7d573df60..29868c7358cb 100644
--- a/sys-fs/f2fs-tools/metadata.xml
+++ b/sys-fs/f2fs-tools/metadata.xml
@@ -5,6 +5,10 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">f2fs-tools</remote-id>
 	</upstream>
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 455edbaa7500..48c16a7fa6a8 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -12,6 +12,7 @@ AUX quota-4.03-no_rpc.patch 2338 BLAKE2B fed1a0cc6864921a26b1d70cb73dc1162a49a16
 AUX quota-4.03-noldap_linking.patch 2714 BLAKE2B 8fa02b091086b79719cf4e864f348e4ef3757205fcd975ae610849c51939cf69797f472f8eabbe2d56a9cc596641d6f6adf4b65464ed81166be72192adf9741f SHA512 93617ac00731e9a1e29807c386fb86d5a7c3c646698f7d4faa7837fe363d08a31c96ccb37564b210f8d15e9f331dc6495feac189b2f834c3aff85c0e6e811735
 AUX quota-4.03-repqouta_F_option_arg.patch 947 BLAKE2B 22e9811eaaf02816cf61375967c4332f9cb4f4019a051a50166bbc3c96f7737a62ab3d23b5fb5556175b727b9302f6c8f86ed4bace4cc0929dbdc975ac8341f6 SHA512 14bf1dd782861640c4beef0621166006c083266ca0dccfa51d0ee889553b809c6652de82e75710ac961eef3e6fb47d2c528b7111bdefabcbac7967951ec62ac9
 AUX quota-4.03-respect_docdir.patch 586 BLAKE2B 83f5d5010ba8a43f07a465b2398ae7db0a2f69af06c95cad9bec368b923c727c03a5d5eda18967a74a06f10b101d874608bc4a351ba47462082dab596441905b SHA512 16feff00e236ac6b652b095fe84fa2fa357c849a85124c92ec32c9a22ae487b2a6f49ea4118f0a665cad27756aeec7e775a42014d2e2408ecefcacb1d60231de
+AUX quota-4.04-Listen-on-a-TCP-socket.patch 2432 BLAKE2B cfc2d9d3e8200e0974ee98cf35600185e7331d659117fc4bc0c4f141523475af9c7625dd6b9754199357af212043591089727e7bb9234808aad75c61c345cff6 SHA512 3f6a567a271333d01b4aa81e90fa0fd68a32c7888813c8bd86f5847ad7d8b8f8575370ede313b9e5c922bcb81e1cca3211c18b4ac97a2dcbfca00e282f9fab11
 AUX quota-4.04-glibc226.patch 983 BLAKE2B 7d4dd586fb6731d62e8c442d849b33b537e3e93719261ac42889d8de04199286a1ac2a0a0ba32acc174573883288821797d291e33b2b4b57c7fb66e6cab07c90 SHA512 90bcfb9fbb881602cb01000cea691016e6c7c99a5d2fc22b114615fec9ef4752c07253eaeaf80023e6f0768ab95429aac10772f6d12547c43eba4300877f89b9
 AUX quota.confd 359 BLAKE2B 37d0cf75f96ca4ccd2d9be1ac3def62a3ac409873cfad33e1fafc515875e587a3ab3f869fd078994bef3174e70c10ce0311a307a808b3469cac73c7f3e8f1883 SHA512 3253b69932332eff2944753f687d780d651dc2b21b524b7055164b91292c13c346cd46443bd58267b239f72fd8918a7e113eec62871573ee94e33df5eb3c82f8
 AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b77d2b16adb36dcdd9e510cb7bd15444b1ae8b606d607cc1ebaa10afb064b052d31ed780afbd SHA512 6a0536285bb340779cf4989060ed5a10c9c4a24a48d334174cd84cd54938d042f7a4047f837f96fc7a3c88a1d20317f662c984bd88c00b32cbf48302ba82a529
@@ -20,4 +21,5 @@ DIST quota-4.03.tar.gz 564352 BLAKE2B b474be79576fd2db7ad5f7c4e93d665fca19004727
 DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad
 EBUILD quota-4.03.ebuild 1961 BLAKE2B 306162b56dabbb3796c8e5f62c5f1bf675905a1c723a0d9ba34bc7c72b02880f8ab7aa87b9be271b86b19f9396b95514f5f627bec97641599fd9f7e01a35ba85 SHA512 be1868451e07ecdc03dd204357d61a84851801d5426eee81a9c5590f998e54ebf5cb1f7ffee73260d43f82efdbfe439942f633397c70ae4ca83b6b082ef174a8
 EBUILD quota-4.04-r1.ebuild 1597 BLAKE2B 1bf5b4269b3fb2a7dfef5407dd2d0be2ad7f1cf730b0b59f6bdc6eddf5a5d9c595013cd4b98c90711da2aa4fb8f04319922d1a37eb4cc7b283728b3ff027f116 SHA512 72dab78bee71c09181e85855d38f79318b952b48aaca910edaf27b018c827b7ab106631662e67616c13ed8de8427d9730f515305d3479e6fbb07712463702784
+EBUILD quota-4.04-r2.ebuild 1654 BLAKE2B d58cc6c0090826d59dbbce6a55c26096bc4d625380b4fac34c67559dd2f3541e09082e2d7836c35707e750d8c4ee6643975458080dbe5c6179acb6d4488ac278 SHA512 817525a07312a932d471a948515068addbc44489459584ca7b5d12ef73301a6f76c06677d388e77ac0d1ad51871bf79ba22afc006055183736053c235aa16027
 MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e
diff --git a/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch b/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch
new file mode 100644
index 000000000000..cf1bd4aad32f
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch
@@ -0,0 +1,77 @@
+From 31ecd29b3b3f51145fd78f63087c10e9fcadf999 Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved@redhat.com>
+Date: Tue, 22 May 2018 12:41:59 +0200
+Subject: [PATCH] Listen on a TCP socket
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+rpc.rquotad spins in libtirpc's rendezvous_request() on accepting TCP
+connections because the polled TCP socket is not listening:
+
+poll([{fd=4, events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=5,
+  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=6,
+  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=7,
+  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}], 4, -1) = 2 ([{fd=5,
+  revents=POLLHUP}, {fd=7, revents=POLLHUP}])
+accept(5, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
+accept(7, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
+
+The polled descriptors are:
+
+rpc.rquot 21981 root    4u  IPv4 80449159      0t0      UDP *:rquotad
+rpc.rquot 21981 root    5u  sock      0,9      0t0 80449162 protocol: TCP
+rpc.rquot 21981 root    6u  IPv6 80449165      0t0      UDP *:rquotad
+rpc.rquot 21981 root    7u  sock      0,9      0t0 80449168 protocol: TCPv6
+
+That results into a high CPU usage just after staring rpc.rquotad
+process.
+
+This patch adds a listen() call to svc_create_sock()
+routine which is needed with libtirpc version of svc_tli_create()
+as well as a needed IPv6 setsockopt().
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ svc_socket.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/svc_socket.c b/svc_socket.c
+index 8a44604..d2e3abf 100644
+--- a/svc_socket.c
++++ b/svc_socket.c
+@@ -118,6 +118,15 @@ static int svc_create_sock(struct addrinfo *ai)
+ 		return -1;
+ 	}
+ 
++	if (ai->ai_family == AF_INET6) {
++		if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
++				&optval, sizeof(optval)) < 0) {
++			errstr(_("Cannot set IPv6 socket options: %s\n"), strerror(errno));
++			close(fd);
++			return -1;
++		}
++	}
++
+ 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) < 0) {
+ 		errstr(_("Cannot set socket options: %s\n"), strerror(errno));
+ 		close(fd);
+@@ -129,6 +138,15 @@ static int svc_create_sock(struct addrinfo *ai)
+ 		close(fd);
+ 		return -1;
+ 	}
++
++	if (ai->ai_protocol == IPPROTO_TCP) {
++		if (listen(fd, SOMAXCONN) < 0) {
++			errstr(_("Cannot listen to address: %s\n"), strerror(errno));
++			close(fd);
++			return -1;
++		}
++	}
++
+ 	return fd;
+ }
+ 
+-- 
+2.14.3
+
diff --git a/sys-fs/quota/quota-4.04-r2.ebuild b/sys-fs/quota/quota-4.04-r2.ebuild
new file mode 100644
index 000000000000..a6080157d8e6
--- /dev/null
+++ b/sys-fs/quota/quota-4.04-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Linux quota tools"
+HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
+SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap netlink nls rpc tcpd"
+
+RDEPEND="
+	ldap? ( >=net-nds/openldap-2.3.35 )
+	netlink? (
+		sys-apps/dbus
+		dev-libs/libnl:3
+	)
+	rpc? (
+		net-nds/rpcbind
+		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
+		net-libs/libtirpc
+		net-libs/rpcsvc-proto
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glibc226.patch"
+	"${FILESDIR}/${P}-Listen-on-a-TCP-socket.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX%/}/usr/share/doc/${PF}"
+		$(use_enable nls)
+		$(use_enable ldap ldapmail)
+		$(use_enable netlink)
+		$(use_enable rpc)
+		$(use_enable rpc rpcsetquota)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/* README.* Changelog
+
+	insinto /etc
+	insopts -m0644
+	doins warnquota.conf quotatab
+
+	newinitd "${FILESDIR}"/quota.rc7 quota
+	newconfd "${FILESDIR}"/quota.confd quota
+
+	if use rpc ; then
+		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		insopts -m0644
+		doins "${FILESDIR}"/ldap-scripts/quota.schema
+
+		exeinto /usr/share/quota/ldap-scripts
+		doexe "${FILESDIR}"/ldap-scripts/*.pl
+		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
+	fi
+}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 80f406ab0f67..bfcee3789e3f 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -7,6 +7,6 @@ DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4b
 DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400
 DIST xfsprogs-4.18.0.tar.xz 1214480 BLAKE2B 78db41319e53be1f03b66f85ecc7c50e0c6658fa3fd8ddd8539bac04e656614a5cb54dc930a324d9df6afe4024c2be10259b903e1ca0ccd0ffb340e7410692c2 SHA512 0629400f8824620138928a7d72908b7a852408814238a55e11d6eb3b2da42cd56273960430d3ea729a9bce95f605d225607940d4728b68c468c39eb5a9a590be
 EBUILD xfsprogs-4.14.0.ebuild 2655 BLAKE2B 8aa62f0b2a4aecaebf4842edf8c636f0dddee92b2635ff8355f26e6cd95ff5b328e613e325463cb3dc22d1a7dad376b0ff3ef8840da0bfa9e9dbf775ee8a7d9d SHA512 a9bd435a3d8ec8f6ca2c3b1408cff7eb5c8f5bfeba876d4fad81c7ec6bf1f2cb35c2380badea5fc556ac386f933c8764521cfa35fa5c8ce5e2cd2f3bec57bd22
-EBUILD xfsprogs-4.17.0-r1.ebuild 2883 BLAKE2B d1769b5d8204941b5f74048f0566c7e3d26d3f3d1e4ba3e370e1ce624125062105cc81f1b86fe79650ecaf3400566ea67d9a7fe3d72463e26873f4782400c578 SHA512 df3a71d39bd233cd83599203fc2aff47ca2d6aca60f926abd45f2f5ed4a4740929a14e55e025aed6b8e45bbcf18d96181f4ca480d1d56b5aac03c5370e5d09a8
+EBUILD xfsprogs-4.17.0-r1.ebuild 2880 BLAKE2B 3383295cbdd67ceafdb14af6e57b12f0e090f3ca9d97ff418c2fc314bd6a39a53423457db18825275de162990f689a80d69f308f54943d9664f5d1652b9c0c4c SHA512 bec7dda7404dcd6854290ea91fd76840339c16b6a01918dd8f0690ae74135db00f63098d4d16807e68c56b1ea829e2ca93cdc4ed118a53cdee7a43946daa3d8b
 EBUILD xfsprogs-4.18.0.ebuild 2887 BLAKE2B e17dfa5a76155525edf9a5bfae7ddf2d869a8c16a846bc5e2db122c327b3214a9ce59b91429eed89f5cc179fe7549c796933640ac85c8072dc97e40037068f39 SHA512 8599b45f034314a0e9f48e97551bf4d8efbbc50aa2b72a86975ee5788362c507d904b45a69eeacc9b31eabbe80177f0d7ed7d3600de6c9024519dd7ea5da48c6
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
index 88d7ff41547d..e13414de1dad 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="icu libedit nls readline static static-libs"
 REQUIRED_USE="static? ( static-libs )"
 
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index c1ba3c9db193..eac981d4698d 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,8 +1,10 @@
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
+DIST zfs-0.7.11.tar.gz 6561125 BLAKE2B ee579aa01272d5565fe78ae6074dc1acdd34c8e9a26838462aea937132c322b0fb915c4dadec230560d586db2b2af129735ed6b5e41def4183c9c7ed456ca7aa SHA512 b53c92de2c2542a1b0189368e4b298e93bea13aec8ba415559e86bfc01a9c7deaf436e694aa047ef8a302c79224f96edd150ea93a57eb88c9e26d054cf7ccd2b
 DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35
 DIST zfs-0.7.9-r1-patches.tar.xz 10920 BLAKE2B 50a0b8533061b5eecc103179e6fd51499d87f1c3b331b0629efa29a5a7d405c03448db2245fed9389d149cc83021a2c263bc2f02133a5fdd11b088516c353fff SHA512 a9e8c04bf7449b0a63420202b2f6dd8a6aea96ac57e5925c2ca0223f662210f42316ada25aa6113103909de8c9976945828cdb91a6ff9932f282c01316d7b3ec
 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.11.ebuild 4054 BLAKE2B ec46bbca877ab416e1f76be19e1d7079e8b4b9c56be99a9764ae8f0954bb4d9d211125b4ce8fbba5cf99f9c28c970cb08ff1a5e2bcac9d00624e5f38b4193f7e SHA512 4fd54989c70143e8f418e592c18dd0396d1bc61eed1bdcd7329a0a17c1647839f44593f07c460b3439baf99dd965a501bc3305c7efb7ebfeae4f46a9df6ad8c8
 EBUILD zfs-kmod-0.7.8.ebuild 4053 BLAKE2B f678c78a5e4c13c2e6339c8b859ae396d62a1403a895b3a53677f5999f63ff08c608e382c51b7bde0e7a4e092eddbca90d84ab808a105a7923a81cd6d18815d0 SHA512 863030a139ca6f7cb0e4a8dbe870fe6123782b74b8ec0e4353ee3020512922663b11fc3b374206a52fcbcf114ccfb9002ba5a895398981e562ef09f4f5b87db6
 EBUILD zfs-kmod-0.7.9-r1.ebuild 4260 BLAKE2B f7645d67c23d7911832553b11e18c48a24a3db7011ef3a57fa4e3f81ac09fe4dce82ba898c350f936bc36f4ee964f95a8123f73096af2f375b2707cb6612976f SHA512 729413f563f6cdc3e8986ea58a5ebe17fa3a0e66a801b1bffff5da72732d52341e15b5f469010cbbd37c48cc835333b872ad569fb03f6113a6f4b498a4b37c5a
 EBUILD zfs-kmod-0.7.9.ebuild 4053 BLAKE2B 3fd50c6fd61ea5074d30dc614d96e3536842b1d91e3d9857482e0f4e0c5e38d4b838c04008a8b2f160c2e89c8ea8938e02bb6fc8f8f67c1e98a89d19085eec89 SHA512 a8384a821aee26b7daae6548bfd60d64ce5d7bff00a963818c35cfefbf3215c559de402e6892964486252453f9cb60ace6131e798c556288b8c476b1f5808841
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild
new file mode 100644
index 000000000000..55ffb4104560
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+if [ ${PV} == "9999" ]; then
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
+	S="${WORKDIR}/zfs-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="CDDL debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="debug? ( strip ) test"
+
+DEPEND="
+	=sys-kernel/spl-${PV}*
+	dev-lang/perl
+	virtual/awk
+"
+
+RDEPEND="${DEPEND}
+	!sys-fs/zfs-fuse
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		IOSCHED_NOOP
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 4 18 || die "Linux 4.18 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(${myeconfargs}
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-spl="${EROOT}usr/src/${SPL_PATH}"
+		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+		$(use_enable debug)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+
+	if use x86 || use arm
+	then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	ewarn "This version of ZFSOnLinux includes support for new feature flags"
+	ewarn "that are incompatible with previous versions. GRUB2 support for"
+	ewarn "/boot with the new feature flags is not yet available."
+	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+	ewarn "Any new pools will be created with the new feature flags by default"
+	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+	ewarn "create a newpool that is backward compatible wih GRUB2, use "
+	ewarn
+	ewarn "zpool create -d -o feature@async_destroy=enabled "
+	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+	ewarn "	-o feature@spacemap_histogram=enabled"
+	ewarn "	-o feature@enabled_txg=enabled "
+	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+	ewarn "	..."
+	ewarn
+	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+	ewarn "developers do a tag or the Gentoo developers find time to backport"
+	ewarn "support from GRUB2 HEAD."
+}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 5520d55164cc..56939af3bee6 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -2,10 +2,12 @@ AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc
 AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461
 AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
+DIST zfs-0.7.11.tar.gz 6561125 BLAKE2B ee579aa01272d5565fe78ae6074dc1acdd34c8e9a26838462aea937132c322b0fb915c4dadec230560d586db2b2af129735ed6b5e41def4183c9c7ed456ca7aa SHA512 b53c92de2c2542a1b0189368e4b298e93bea13aec8ba415559e86bfc01a9c7deaf436e694aa047ef8a302c79224f96edd150ea93a57eb88c9e26d054cf7ccd2b
 DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35
 DIST zfs-0.7.9-r1-patches.tar.xz 10920 BLAKE2B 50a0b8533061b5eecc103179e6fd51499d87f1c3b331b0629efa29a5a7d405c03448db2245fed9389d149cc83021a2c263bc2f02133a5fdd11b088516c353fff SHA512 a9e8c04bf7449b0a63420202b2f6dd8a6aea96ac57e5925c2ca0223f662210f42316ada25aa6113103909de8c9976945828cdb91a6ff9932f282c01316d7b3ec
 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.11.ebuild 6076 BLAKE2B 009692da11e3e401e9e99c7019e9b85ca1b198e71628f01448546677c7a1fb9912beea017bfa394b69c53528e72d552295674d8886a80eac7ae677daaff25982 SHA512 b082ee5b2dfb0bfe8ed44221866a5d1e3ba0ce551a1cd5cffd9d9b338852dd35a7167bf7002dbc605cd023cc82ad0943dc4c95723a99484c2e610d7f4ba7f74f
 EBUILD zfs-0.7.8.ebuild 6077 BLAKE2B ad6ee3799f34bc32a9d9fc888e4fef0f07a7e154a4ad606e8c686cba21a0cf24d0c7052dfc37ffa7d682be0f6c8f821b9f31c5587e3ea3f77395fa126cd1cede SHA512 b81ca8c889d00bd881aade2cebf999f3a09f7482ffa8eebaf63156c890bdeff796a20794605e4d3a0b615da84281393dacc855cb409aee293d00091e3d938430
 EBUILD zfs-0.7.9-r1.ebuild 6272 BLAKE2B b6251a2b733340bcb9b178532b7f8d15855b8bff2cd0e649433baca199beef7e9741b756f28ae5cf0c6e5c2e5c568bcaef5c7aa1ee2c69793683880f5db66b90 SHA512 ff8a1ff75c7f03f49b77677bc73a8578fb9a1fc62b2ab4a4791e00c745bba954b4e27c3d663b61c39cf43103d7052834b16fc057ed9639174a3c1a0218ef7a8a
 EBUILD zfs-0.7.9.ebuild 6075 BLAKE2B 2633bfdc2232aa66b23e968d91ece57f5deb1f169ca0c1bd6d6d08974eb34e20d0bffa7796587a4e35e3ae0d8888afc7d92d9cc43bc8788d47f02b35506a430f SHA512 bf07decf7af67adf64ea0f29e542bd3c747bd5f10a18b89e5534a53ad6506040bdbed4fcc8966946dd1398deb641a1551f83b41c8068ce12fd644487f7ec535c
diff --git a/sys-fs/zfs/zfs-0.7.11.ebuild b/sys-fs/zfs/zfs-0.7.11.ebuild
new file mode 100644
index 000000000000..50e655774144
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.7.11.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3 linux-mod
+	AUTOTOOLS_AUTORECONF="1"
+	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"
+fi
+
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	net-libs/libtirpc
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+	!sys-fs/zfs-fuse
+	!prefix? ( virtual/udev )
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		!<sys-kernel/genkernel-3.5.1.1
+		!<sys-kernel/genkernel-next-67
+		!<sys-kernel/bliss-initramfs-7.1.0
+		!<sys-kernel/dracut-044-r1
+		)
+	sys-fs/udev-init-scripts
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [ ] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+
+	# prepare systemd unit and helper script
+	cat "${FILESDIR}/zfs.service.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs.service" || die
+	cat "${FILESDIR}/zfs-init.sh.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+	bashcomp_alias zfs zpool
+
+	exeinto /usr/libexec
+	doexe "${T}/zfs-init.sh"
+	systemd_dounit "${T}/zfs.service"
+}
+
+pkg_postinst() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
+	then
+		einfo 'The zfs boot script has been split into the zfs-import,'
+		einfo 'zfs-mount and zfs-share scripts.'
+		einfo
+		einfo 'You had the zfs script in your boot runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the three'
+		einfo 'scripts that replace it have been configured to start.'
+		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
+		einfo 'runlevel while the zfs-share script is in the default runlevel.'
+
+		rm "${EROOT}etc/runlevels/boot/zfs"
+		ln -snf "${EROOT}etc/init.d/zfs-import" \
+			"${EROOT}etc/runlevels/boot/zfs-import"
+		ln -snf "${EROOT}etc/init.d/zfs-mount" \
+			"${EROOT}etc/runlevels/boot/zfs-mount"
+		ln -snf "${EROOT}etc/init.d/zfs-share" \
+			"${EROOT}etc/runlevels/default/zfs-share"
+	else
+		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
+			einfo "You should add zfs-share to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/default/zed" ]
+	then
+		einfo 'The downstream OpenRC zed script has replaced by the upstream'
+		einfo 'OpenRC zfs-zed script.'
+		einfo
+		einfo 'You had the zed script in your default runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the zfs-zed'
+		einfo 'script that replaced it has been configured to start.'
+
+		rm "${EROOT}etc/runlevels/boot/zed"
+		ln -snf "${EROOT}etc/init.d/zfs-sed" \
+			"${EROOT}etc/runlevels/default/zfs-zed"
+	else
+		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
+	fi
+
+	systemd_reenable zfs-zed.service
+	systemd_reenable zfs-import-cache.service
+	systemd_reenable zfs-import-scan.service
+	systemd_reenable zfs-mount.service
+	systemd_reenable zfs-share.service
+	systemd_reenable zfs-import.target
+	systemd_reenable zfs.target
+	systemd_reenable zfs.service
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		remove_moduledb
+	fi
+}