gentoo resync : 11.05.2018

17 files changed, 386 insertions, 151 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f495c6430830..edb0253c8864 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index ab6900f3b4d6..1c0176617d4f 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -4,7 +4,7 @@ AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a
 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 7208 BLAKE2B 845b3c538f77c1bbee8c74ae84fa58d5883bbe3e97e96e90c00dda74c8b24a2a28b676f8893269aba214c60e212104b3f28dfab4070bf3e1c9b022d46e7577ef SHA512 c3b94258f03fb86cdf2d1f0ca89a8496a23d43df1da865edeca4122dd259c0be8d0203be45ed37b00daeab91d4abf9805a82a2d1483ff94a2c197768884bbe5d
-EBUILD eudev-3.2.5.ebuild 7191 BLAKE2B 58532c776a4e25cbc9994f69686a746e600d948df58fa7f90074ab42e49373fe5bd4dae0686347e24ede2dc416cf85c1340499b4586c0315a130bd8334b3b556 SHA512 07990a1553f3b395dabdc638fe1c2ca5beaf2dad3ff5cb6800ea138229bc3dee5f2f9ea2a111cfd452172121cb27e9b34a647014b9b4e1792f1856843730f03c
+EBUILD eudev-3.2.5.ebuild 7188 BLAKE2B d2361c8fe050393e2e5a72a6cc1a3a8b511b3fb544a8b3546bab49923806bb77e15d7fb98774a15c4eb66766e3fe77076da063695f4bd94ae7abb954b9cdcff1 SHA512 df1a850655f16c12736fd023205ca6d78522afb55f15ffb7732bb4d4e2621c4a777f8bcc263b004775670566cd758ce9f395b245d0618303afae235a43e6c4a2
 EBUILD eudev-4.9999.ebuild 6488 BLAKE2B 2ceafba483af00e76edd7d07a92ecd6036a3e99723823384928731ec6080e3e86a0dddf548a4abc1da097d247e0c54842a0ac6c9d2a639d9715c6e1568ff28cc SHA512 95f43eda615a37307c25ad6dd1997070ff5efcc936752611546542b07a242ce1a4299f775758d7f480fcbf55d25da764bcc43e2c3f9f0c10fd9083c987aba9e8
 EBUILD eudev-9999.ebuild 7198 BLAKE2B 839f4305b8dde6aba52a463d0053928f63ac5d2ab4ecc773ffac442de82d1f52c7aa6839c95b57a04b8fd021be7d49566f05e039113f5c4b2e76851147756b0d SHA512 5f4652feb5a4aa3166471513405ee08e1b5bff7de05f29dffdb88b76a5eb841f52f557d18f2104e6e8e0834d1a2bb5f5b26bf3eab6ca1cecf782c409341929e9
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index 53390437fcef..26b5186f7216 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 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)"
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 0221e0334c10..3e4ef446ba6d 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -20,6 +20,7 @@ AUX lvm2-2.02.129-static-pkgconfig-libs.patch 3299 BLAKE2B a4495bfca4892036a03bc
 AUX lvm2-2.02.130-pthread-pkgconfig.patch 915 BLAKE2B a82e3283e633fbe0e47f4ea94f3c1e975dcf1c2e6cd1f93d16e4d08516d1f0f49f63227e42cac5bcf5ccec473c679098cdb114be22fb9432c38325fa96db4c43 SHA512 1e45ccb3bf824fd2f8276b4ca103e95960e401e793944af68a16929040015b42d601b09adbb8f01e833071d501440a20381fe263fd1884d8fb2e7d7f5463da6d
 AUX lvm2-2.02.139-dynamic-static-ldflags.patch 2874 BLAKE2B 2a0000761b65f79cef0bd1537b6cf99fecd86baa2cd7443eccedbd8e546c84185e99367f1e391e33cab081d7be9153abcfd53492a48d2988aad7fddf5f9705b6 SHA512 3486c6d0500f233cbedfe28a2c20f03e4a80301e011fa0fd41b3765eed71dc5e00c8f6f09d40c3702ea87e372db3e4dae64c32e4ffe45700bbbf137804b748fa
 AUX lvm2-2.02.145-mkdev.patch 4111 BLAKE2B 478c987c900c4ccfe3bb7d099b8af580f057ba6f4746644560c55e4e1a3894c617c31357e88525f728db005e8a882b2edf18576370d73eca026ee0563c02444a SHA512 f3953eb8bf73adc8d048edd2c560fad3c5afbfcee19ca354f06de2b10ea2e947c972cd180fa26cf0d3dc30b5aae8946e79faac3f3a1cfb6f31222244d308a588
+AUX lvm2-2.02.171-static-libm.patch 525 BLAKE2B 5cef02547acdfe24fb26cd96a0bd6eccb0c5cbc5ae79ed4aa0d52ad94391f5ddfede194484f2a9c00add07df7fe69e43f1d122c41c8fe05a91e86f797f4e9759 SHA512 498132b93e482739bd7bf11ee457b837843dee951b66fe268411e7aabcaad373c6c9a0d43083940c85348c506eda2d0d49a3aee205110388e18f9b58a6d6ef1a
 AUX lvm2-2.02.172-static-pkgconfig-libs.patch 3851 BLAKE2B 87789e011380ecb5336373e47266f3e4cd6d617ab68763418c488a8a7d0d5cb14bba5bbf2710d5f9c30a6f9dd947cfb929f98f7f0e54f38a6d338f8f22466e14 SHA512 15e031c22f96d3a12e985129ccfa24e91edbbf30741a8075f089ae22f482f9b0c41f39d3c92ba41dde34a7afb505e0816347d385a9eb5d7692ad63053aabe79d
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 BLAKE2B baf7010b5965f5c2b9a32ec812cb259cb3ceccea0d56e48d75e9f8e872634913f160fcfff0c2c77854ddfeaafb3b48bbca16d569041ab6f45aecb950f8e5bf4a SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c
@@ -54,7 +55,7 @@ EBUILD lvm2-2.02.145-r2.ebuild 9619 BLAKE2B 4461e5fee86d087e94fa8d64bbfe73f746eb
 EBUILD lvm2-2.02.145.ebuild 9633 BLAKE2B 73d08c486afd126faded9b1b0a080843dd941b73d5bdc3e3e95025d4626fc1932abd7e8a639c7173a140981c5f7aac6819ee841c893b86c1d1f2c74ab46429ce SHA512 950229bcccf673055c61b7c84b40db9ac8220a0f5de5cb8e623596944fe521ffefa50240435a03fcaf52cb8b9dde326b68e84e1b74d31396c91655d554be914a
 EBUILD lvm2-2.02.166-r2.ebuild 9768 BLAKE2B edb77874168616ba8dd58e3ed009d327c69501f433bb54186f584b2f8ea2ee54a3f0cde958ba7a522a4a6642aaa48ad374ecfaee32a69bb2d997c1afc3b32d29 SHA512 a146b1562961b4e5d5f2763da049c38d213370ef77316c6d533c4060e5a9f3c3711a45e16d849b9e72d6c91d5bc90d45f12c0ef71d7340540f5d4f41951b64ee
 EBUILD lvm2-2.02.166.ebuild 9604 BLAKE2B 33653c1fce1b23faa9ee71bdd8d6b31eaeae834b357f41340545eb8d34aad79723c24e88da49052ee928dc911c6c610450b082721f02a30d65056110934d6e92 SHA512 5a1340aeda463ed0abf23b7b9d87e2c2c8ee42306f78e0a3b739a2523fedabcdd5b635e4ba29ff5e81ff39ca60f698ff2d17522bc0f95bf0fcce6efb4e4c7d32
-EBUILD lvm2-2.02.171.ebuild 9799 BLAKE2B 7acf943d96adb8989d259ff89bbaf8741ed5b9d8ba1ca9be2a08ec7071591d3c31902cc71fecd1feab0c35a6b270f2ec084818468fe44fca13191696de41941f SHA512 a2f6d9bb2c43acb986f9dc852d9243ed0762df1dea9159d1ec3dfa17652c8f9b97afa06871ed3bb36d57bfdb2a5821abcbf74256d6fd05b69cc157cbb9034488
-EBUILD lvm2-2.02.172.ebuild 9796 BLAKE2B 0bfce02edd0e2ebac9caba4140511d87b4d7d1383a2531c0e790709e22cffbe02d3a0e825fef7eba4044cf3054eaec92ac1b626002e97a1ea13a13912dc6a179 SHA512 0c652a30ea2547cec662942f642e9c54dd2be02f80f58f46dcaee3f4745044b78df424c809fd436648ddcaf9a97222d32c0c1bd8efd799e557e9b98d05d4f0af
-EBUILD lvm2-2.02.173.ebuild 9796 BLAKE2B 0bfce02edd0e2ebac9caba4140511d87b4d7d1383a2531c0e790709e22cffbe02d3a0e825fef7eba4044cf3054eaec92ac1b626002e97a1ea13a13912dc6a179 SHA512 0c652a30ea2547cec662942f642e9c54dd2be02f80f58f46dcaee3f4745044b78df424c809fd436648ddcaf9a97222d32c0c1bd8efd799e557e9b98d05d4f0af
+EBUILD lvm2-2.02.171.ebuild 9855 BLAKE2B c9ed62da556d3f0165daf864008de813622502cf35ed3d403d6c9535684684b3512975b7fba3cd47a3048ca1ed13eecd489820864b03629c8cab09407fe6bc6f SHA512 6c02e75cfda0bcfca75f000684cef95a5a75d660ced99b05627ec5ac2a3e1fb465b8aba4e1a10da9b7ab1099a93657b5713604096c345f6023eead92425f409e
+EBUILD lvm2-2.02.172.ebuild 9852 BLAKE2B 8a251dd367462db174bf68e71cc04fc0a78a73ceb2b71628a760354f7481a24fbe26bcf2305644304251aaa680da5834f4da80616c867e2ba6c67d6e26e081de SHA512 1eed4c5085e56a7fd766d399fb9ff4d22af52ce691f7af31905b333ddebce39aee8d6d635528d65b3a19d3d17fc13017a111aeef024d08fff928ae013171cd52
+EBUILD lvm2-2.02.173.ebuild 9852 BLAKE2B 8a251dd367462db174bf68e71cc04fc0a78a73ceb2b71628a760354f7481a24fbe26bcf2305644304251aaa680da5834f4da80616c867e2ba6c67d6e26e081de SHA512 1eed4c5085e56a7fd766d399fb9ff4d22af52ce691f7af31905b333ddebce39aee8d6d635528d65b3a19d3d17fc13017a111aeef024d08fff928ae013171cd52
 MISC metadata.xml 1397 BLAKE2B fb780193c777b248648d09cc4c0f287f07b64df79912a4c1c37b5c456f8fc8ea98470c03501619432bddb5df1e3f877178a0c7e630b295a01a3bfc27fa63520e SHA512 1ed97dbef323b6703097c20de99e9003c88663a887bcf87c9489baddfa180aa3d8645e4e60cd3eb3b9505603997ac3ab98a7ee96a813b77b9dc25862dd332d35
diff --git a/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch b/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch
new file mode 100644
index 000000000000..1cbf956db258
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch
@@ -0,0 +1,13 @@
+diff --git a/make.tmpl.in b/make.tmpl.in
+index a40eaaa15..7eea943aa 100644
+--- a/make.tmpl.in
++++ b/make.tmpl.in
+@@ -53,7 +53,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile
+ 
+ LIBS = @LIBS@
+ # Extra libraries always linked with static binaries
+-STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
++STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) $(M_LIBS)
+ DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
diff --git a/sys-fs/lvm2/lvm2-2.02.171.ebuild b/sys-fs/lvm2/lvm2-2.02.171.ebuild
index 63f12d1d8cde..fccd403cbc94 100644
--- a/sys-fs/lvm2/lvm2-2.02.171.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.171.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
 	"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
 	"${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
diff --git a/sys-fs/lvm2/lvm2-2.02.172.ebuild b/sys-fs/lvm2/lvm2-2.02.172.ebuild
index 4c21fcf3446e..0d9e8e6dc479 100644
--- a/sys-fs/lvm2/lvm2-2.02.172.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.172.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
 	"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
 	"${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
diff --git a/sys-fs/lvm2/lvm2-2.02.173.ebuild b/sys-fs/lvm2/lvm2-2.02.173.ebuild
index 4c21fcf3446e..0d9e8e6dc479 100644
--- a/sys-fs/lvm2/lvm2-2.02.173.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.173.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
 	"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
 	"${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
 	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index a0405cd90828..50dfd9b25f91 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,11 +1,6 @@
 AUX mtools-4.0.18-attr.patch 1804 BLAKE2B dee4d21870fd9f633ef8966513960b74a1fdaf61b23e38e10b77a6ccb5240ca31cf985f56becd05f1880b5389b77476a432937e00dc04b0d9478b6d85df73f60 SHA512 45bc3d5baa37c634b8f97d55251a7dec2f7062515529c0dec65572826ff2d7673f189c544fa73d164156823cd3ae78bcb664b3fb22e5eac34198fdfe45c9e244
 AUX mtools-4.0.18-locking.patch 5744 BLAKE2B 509462f40e2a832d1a04358972d606d29d6a0b5d7d095438d1c17bb8b7636aac382f9bb0055e669aed661a89bd6e018f1d88a588f0bddf701e5c0eb88449f94e SHA512 0698b5c5f5d4c22f3439a835c3bb6f73a90c3030073f3497fa04a8e29241af867f664f253b37299d69ca043858b55e7290aaab1fa6f751084a52e7812cae4170
 AUX mtools-4.0.18-memset.patch 877 BLAKE2B 5a331eb50cca56c64c135974b56bcc651e6f7498740cad8dc4c5121efe23802a228bb73e5f18ee20b0e3ef81ea6ebd78cc19e037556f0294519b54a84697f993 SHA512 1e8d697c1cd98a7fedaed96e6019b6af96bf5ed6633f50f7c45649555a27727d93ba828e2852f23fb633832902bdb93c23afacd7022c72adf5c4a146f5b8a1a8
-DIST mtools-4.0.15.tar.bz2 386339 BLAKE2B 9b93a5a4cd402b7a2c2fc7c9c4aa25d1548d0bef6f3801f8727a6312ca795142398de1c33f78fc992eb89637c4dbfb4a03d639e30bf56c88eadc2310451ab3ca SHA512 0ee4d060ffb95c0e5b0e859634bee50e056aaa7d3917fdbcc4fd8ca86710b1d93ef252bec588d5c010f2fb6081853e76338b966e4584e510728be4ec3113e0da
-DIST mtools-4.0.17.tar.bz2 412310 BLAKE2B 08edc8f18e5b6f8f35008f4b1de51726eeb4b92b8d39d40bc28299509069350cbe6f26ec9c575c062533154844258548149f3796e00d2a20a28912ab21a3fbe3 SHA512 0ad44bc9d7088d8a0edc648ac81fb4c9ea522c8d7561717f02475514186081050c283c0393bf32358b95ea60554713c26ea7e06074041d3fbdcaf642aec2e1ce
 DIST mtools-4.0.18.tar.bz2 420190 BLAKE2B 92fdf8b054287e3cb4eddb40c98f5ac4229a38473b633c25ab74a07a8a72d38c2767ae648a35cf0dac9dedfa2f7789afc4904a50e1328e2baa0a289d93b094fb SHA512 3981a4727aa4e2ec5c931201b236f52fcd1c9d55f888cb2fbdc5c4172402e2b229ede9a5005b972ffdad59bcb861e2fcc01404845e521116419079ae78239090
-EBUILD mtools-4.0.15.ebuild 832 BLAKE2B ecf428ecd0841e31755b8990e130ad026d6502d6aec680ba921f8d4b3e6da578305ec3f3f7769e2ad3911d89e34219e5e49a3a37141dfc006efe329dbae32178 SHA512 9a108e56611864710598fb7d624305aa2f3efd4cf85dad7ee9a7a71f57645caf9604fc42295ae4c1f66fbe30bfb2494ba199b84b0336ac2e976e2b9be33c1ecf
-EBUILD mtools-4.0.17.ebuild 901 BLAKE2B 06c1ec452ac4fee02f17c9167c2f2d8814f3cb18452246cf9fbf6d6a8a1f1d9c985c1bc9f8b7fe80f4be841472da932107f23da4755fef4e0ed897ab772a34b1 SHA512 047da0fb150a4e9196bafc7731f4d6ea5456284923b64f9735c56f554c5692b677e4a16c7af91d2feec76fd2dd04b3d97617a03289bb5c38533782991c354246
-EBUILD mtools-4.0.18-r2.ebuild 1443 BLAKE2B e052a7c28cfd923440fe8a3d20ff904e14c4fd58dd0c1c416ac558129b3dc649bae16d218c0611972cf25631a5e5300a69110e9f4b81990084647580f334decd SHA512 dd92c3ba61242d36f5dcc2561e6bcf9cbf18b4ccba2967e848882c70af0de51dbadaae392f7c90de080ece123b555a44b3a9ee3e6b059b9685c230708e049046
-EBUILD mtools-4.0.18.ebuild 1080 BLAKE2B 5617ceabdfe6f8536cd94bb86aec543ed6f8ae81396291c661ec72a235aba12b27452b57fb87e8912d7d5394379ffa097e0223949f8c208d5a7bb10c7e8c2a52 SHA512 f777db7ae901411b303fe9259ad151b16145f1576fbf71429cf6242b1e10b9347943fdd38de3c995f95c34d1150d33e6377f276fde6b3a6c364a82eacf1e96d4
+EBUILD mtools-4.0.18-r2.ebuild 1442 BLAKE2B 7aaa093e1f1bbc4df2201b1c66044141914cbf49479cbac748026604ead012f986dc5228340448d60aa169023f6f5b7a2d5d826e19bf5e2618059ab8bacdc4af SHA512 32a807769bebeffad14f2a366e5536cb9b055f24cfa3a15508267eb88e4015f33713e8fa338078834942fcfc0d44ac22e15bb3265f45ab96420466ed4c1b77d5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mtools/mtools-4.0.15.ebuild b/sys-fs/mtools/mtools-4.0.15.ebuild
deleted file mode 100644
index ac63b4f3c75a..000000000000
--- a/sys-fs/mtools/mtools-4.0.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="http://mtools.linux.lu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="X"
-
-DEPEND="
-	X? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoconf #341443
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/mtools \
-		$(use_with X x)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-	insinto /etc/mtools
-	doins mtools.conf || die
-	dosed '/^SAMPLE FILE$/s:^:#:' /etc/mtools/mtools.conf # default is fine
-	dodoc README* Release.notes
-}
diff --git a/sys-fs/mtools/mtools-4.0.17.ebuild b/sys-fs/mtools/mtools-4.0.17.ebuild
deleted file mode 100644
index 126e15a993df..000000000000
--- a/sys-fs/mtools/mtools-4.0.17.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="http://mtools.linux.lu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X"
-
-DEPEND="
-	X? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Don't throw errors on existing directories
-	sed -i -e "s:mkdir:mkdir -p:" mkinstalldirs || die
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/mtools \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* Release.notes
-
-	insinto /etc/mtools
-	doins mtools.conf
-	# default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${D}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/mtools/mtools-4.0.18-r2.ebuild b/sys-fs/mtools/mtools-4.0.18-r2.ebuild
index 30aee0d41f12..2f563ba20434 100644
--- a/sys-fs/mtools/mtools-4.0.18-r2.ebuild
+++ b/sys-fs/mtools/mtools-4.0.18-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
diff --git a/sys-fs/mtools/mtools-4.0.18.ebuild b/sys-fs/mtools/mtools-4.0.18.ebuild
deleted file mode 100644
index 20531ff7b2d8..000000000000
--- a/sys-fs/mtools/mtools-4.0.18.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="http://mtools.linux.lu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
-IUSE="X elibc_glibc"
-
-DEPEND="
-	!elibc_glibc? ( virtual/libiconv )
-	X? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Don't throw errors on existing directories
-	sed -i -e "s:mkdir:mkdir -p:" mkinstalldirs || die
-}
-
-src_configure() {
-	# 447688
-	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/mtools \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* Release.notes
-
-	insinto /etc/mtools
-	doins mtools.conf
-	# default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 74e123e4c8e2..045c25feabc7 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,7 +1,9 @@
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35
+DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
 EBUILD zfs-kmod-0.6.5.11.ebuild 4074 BLAKE2B df23fa2f450b5d34c64999eab10444fe61fc1dd0b40a51eab9ebd3b0f5f5e4872ff527f1faca9cb7e5d35e98a1d298c492bd61010569c96aabf4e89592172415 SHA512 eced2fa76df06d6ee4755d56149c632a34c0ece67851991ce75c44a97b37668c3d3eebcbbfdddbec477476d41fe50bc2cb6cd6166269a2e4cc4cc92405c92c7b
 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.9999.ebuild 4133 BLAKE2B e4863fb198b74a1ba2417caca7d1d817d23423b8d8c1da2d65d422bb9c25e59ed6aff0fc15f7037529e491dee71f06b05252cc7305a9ae4b7383969692977f80 SHA512 2ae7acae2a3f4f8836dcbbe2e30773f966204e568bf4754fd0d7225052508ab9b0f90c8eab0974b1436472642cacf652da6e1db2216771f58c962a0f9a6a06a7
 EBUILD zfs-kmod-9999.ebuild 4092 BLAKE2B 9aff1a1edb78f8c445ae022c153cf8c8afd524c97e47542f74b11f6248642a638f81c03a6403376b6d92c51512abd9238806c81eec33acc52dc682706fd5191e SHA512 f8d8674dd7ff3692735f242c3634671a617ae0e2de6530dc380ea58292f9a6c9d5829f4b0548e677471224b2fe9796ba11ee069d2bf66bb5f9611a3acbcd4b2e
 MISC metadata.xml 554 BLAKE2B 3f2673ca745f69a68210ee7e14ef93037285807fb174aad38913c9478ce4f38459cb000ad46f9b6b37a62f3f13287fba9f646bdf55a3c6126704082ecb6294e6 SHA512 c5dbcf5b795510abbe6c6dbea53ea6b9a438f0b2b8f7af28ae3ec9d8816d51c6ee22938bfe7d222d5b451065b57447064fba59e93a9621f1132e3d27ef8d385b
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
new file mode 100644
index 000000000000..d71cf40662e3
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.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 16 || die "Linux 4.16 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 e1fe0f342080..f4655696bbda 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -3,8 +3,10 @@ AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c9
 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.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35
+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 6073 BLAKE2B 5ba2b9221ebf4dd4f483e531dc74d098bcfc633405204bd577a38d24ae92f9e9ee5d47e779097f31f424e1e0da8eff9ebc62c303d0a115810a557e856df5ba78 SHA512 9740c0a4dd42b6f82d7f6a09ffb399127e1b2d04bf211267908d1b918e0914a0443a9115b788d9300703ca8da68561a1d8c09d4f3ffd61a7c9fdd83775a5d24d
+EBUILD zfs-0.7.9.ebuild 6072 BLAKE2B d6e0f7400ea8c2d2bdb8d4826a52e80f0f43276478cc71f2cec03183936d25ddfdaaf92f409f3b9eae620c7b0d3f778dc5260bc74f1b8f79679df6117a4b4d33 SHA512 ad13f8e8aedabd0c72ac987e4057757b136d51de17a8f82ba9e9cff1505307d61699d534bba644b984c438083026af42f1b6276da3d8216db319b77c18be2320
 EBUILD zfs-0.7.9999.ebuild 5975 BLAKE2B 109e38dde8903a09eb8c3458fc36686c048c1309a46e7c63c21922fba71371078a97f8978798be72c34056bbe5ec39cb0d4503fcbaedc5c14fa61db651924d12 SHA512 f4c0afcd5606a381bff06783b8523f5dffe4610fd6108b3f020580ab89c58a522d633967471c14e8f6ced4b27cfbc7382f78eca0c18302a8ea8dee929ff9245f
 EBUILD zfs-9999.ebuild 6216 BLAKE2B 08da2b7ebfcaca96b298b47f2d544785d7852ea08e601d8e2de58b2a7c9bed30a90c6ba416b451aaf6ee2f577c0e7f4a0468ed3daa15330bf5560430d46bf461 SHA512 ce8ad3c9532a5ee4d9d358acb371bb33a6d4595acf77a23b88f39eeb46a85cc02c88e64c037655a5b0da77511f3a1563a8a91665bc26b021150accd3e6948991
 MISC metadata.xml 754 BLAKE2B 7fc8a5badf77174cc9d31bb1e83da53d910a18884897287bc3666066edcfc03ec6331c09cb7ff02767e14b17df03eddba74549feea61dd044c21a4133f4aa763 SHA512 647ffa3857be38b2aed7462d26bbb1d3ea50fc53068b6d973514fdbadf7164421dd2025165a592855b86a03754d968d36e503dcfafc99e3ed75ee7db3f62df3a
diff --git a/sys-fs/zfs/zfs-0.7.9.ebuild b/sys-fs/zfs/zfs-0.7.9.ebuild
new file mode 100644
index 000000000000..0dc01562153a
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.7.9.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} )
+
+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
+}