Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

12 files changed, 52 insertions, 25 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e95f6bee6549..0c59446b1864 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index 0ac8482539e3..ec0dc50d1ff0 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -1,5 +1,5 @@
 DIST bindfs-1.13.8.tar.gz 403296 BLAKE2B 38d5b298af6bd399c9b315fad8a0897ae785f8d4f963aad7d08024cf22eedc90c55e94d54fd7033a3343bb1ed3ab14b76b96ca6ce35b8799be4329ecee12ce44 SHA512 b0755ad5b91cd047942094d824c6a12a684b1c8bc990f4a28170a09283c0b11ab4d8c86ca65160802610e72f1c649d7249ed87e3e29410b210271c45b6846c11
 DIST bindfs-1.13.9.tar.gz 403698 BLAKE2B 71667e8f50320ac64c11fd1ddf2b5f59e9e2cdce0913ffdbf3d23b32368255ddd2650f6d5efeccdb9a03dc0f93710540d88a28a4ecb5f2e89dd83f59e86214de SHA512 7584577b289816a1ee514c4967893dcca69683b68b357d370c3a7accd39f96034f34d29751b66ef98ba35bb869498af4df813b0bdea805a42a38b47340f3d654
-EBUILD bindfs-1.13.8.ebuild 481 BLAKE2B 27a222315c1808348bb97ca4c363390308d7169952657894847b233593303bb6172f59b054a4967822ce36d75795d06b607d84d30d7697f6d9d02f2cafb037d6 SHA512 40782f3a98fb73bb97eb93700e9cb0442180d2f093040d9fcc0e0b579bf7066d472612b07cc70ee8ba680ae08cc0c49dad2da56935b292957a1502c3b5c05dc3
-EBUILD bindfs-1.13.9.ebuild 481 BLAKE2B 27a222315c1808348bb97ca4c363390308d7169952657894847b233593303bb6172f59b054a4967822ce36d75795d06b607d84d30d7697f6d9d02f2cafb037d6 SHA512 40782f3a98fb73bb97eb93700e9cb0442180d2f093040d9fcc0e0b579bf7066d472612b07cc70ee8ba680ae08cc0c49dad2da56935b292957a1502c3b5c05dc3
+EBUILD bindfs-1.13.8.ebuild 479 BLAKE2B d60205a65740f2ef4f38323078dd30752b6a48db64724a7b93cf0ae046825d99fca1bd858b19ddfb6a362b93cd438562378633da868511ed55780295df3db1e2 SHA512 c3261686c14c4a03d7442c6e2352e666cca1ae6b793e0437d1373c52cb67e7387014a969e36ad23cf9008058ece8395e5019e7c587255fc26890faa75aa376f9
+EBUILD bindfs-1.13.9.ebuild 479 BLAKE2B d60205a65740f2ef4f38323078dd30752b6a48db64724a7b93cf0ae046825d99fca1bd858b19ddfb6a362b93cd438562378633da868511ed55780295df3db1e2 SHA512 c3261686c14c4a03d7442c6e2352e666cca1ae6b793e0437d1373c52cb67e7387014a969e36ad23cf9008058ece8395e5019e7c587255fc26890faa75aa376f9
 MISC metadata.xml 432 BLAKE2B 8d4cfae65a05e718922b04a0e70d5dc9b22bea0339d6640015341b45b6a8c6d7c7d48a98290fcb2d0b039aab14a9feae1e6c527a7f483b421069174525d4e619 SHA512 1d22b2bad552a622edcebc9b52823a812f483588257c379077e1cc323bfffea67ed2802a3f62c9264cadf355ae3f96ab4705d005286c598f25447efe813fb06c
diff --git a/sys-fs/bindfs/bindfs-1.13.8.ebuild b/sys-fs/bindfs/bindfs-1.13.8.ebuild
index 14f35b43597f..29e8f2b8b808 100644
--- a/sys-fs/bindfs/bindfs-1.13.8.ebuild
+++ b/sys-fs/bindfs/bindfs-1.13.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
-HOMEPAGE="https://bindfs.org/"
-SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
+HOMEPAGE="http://bindfs.org/"
+SRC_URI="http://bindfs.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/bindfs/bindfs-1.13.9.ebuild b/sys-fs/bindfs/bindfs-1.13.9.ebuild
index 14f35b43597f..29e8f2b8b808 100644
--- a/sys-fs/bindfs/bindfs-1.13.9.ebuild
+++ b/sys-fs/bindfs/bindfs-1.13.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
-HOMEPAGE="https://bindfs.org/"
-SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
+HOMEPAGE="http://bindfs.org/"
+SRC_URI="http://bindfs.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 189cf009d8b0..dd70b53a2581 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 3795 BLAKE2B e806ec2e72188d2e4c36b214ccac4ec18ae4e3f605e34de4a12e91935fce411d32e4caafbb0495e8d437b7700792a39447402b3e987b018354c0706b01db4573 SHA512 d2c1db96d10631d7bfa30daff720f712c423dc8bea2f2d869feb4c85b23fa368afbce0617632fabadc2085aeb33ea93f8973ec016826e29638c69e41f1bbecb3
-EBUILD e2fsprogs-1.43.9.ebuild 3819 BLAKE2B ee75fb0c5ebf29b3b0c5b02727aaa37871dc1e198290ff8720a9869f77b3e1eb7f73245d5010552a5453b672588db82f14d21bb36db32d6f9266afe16ce67321 SHA512 4201cf4befb19415acc970cdaabfcf6e575e1a0ee773877d5ac418f337c21b39dd253e938784535748a417aba2ace3b37e8055fa8c87581906cde721b442701c
+EBUILD e2fsprogs-1.43.9.ebuild 3820 BLAKE2B 8af84ab9babf5ad3f8de298b543e25cb24cfae45bf6fa5f8965c2618a5660be94dfdfe34b31ff20eb266a5107419c633a1e4c03236e71f81d58bcd9d0e913052 SHA512 4cc629109812f4d7716f256e1edd176f567e26e85bb356dfe35fa7190df1672cf3d9162603630df67f217a329d2863a61518702c22eccded68c9412b1e46e92f
 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 ee9eb962a0cb..45aa9b9ace6d 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/hfsutils/Manifest b/sys-fs/hfsutils/Manifest
index 8b81149c0b0a..4b5493838a5c 100644
--- a/sys-fs/hfsutils/Manifest
+++ b/sys-fs/hfsutils/Manifest
@@ -2,5 +2,5 @@ AUX hfsutils-3.2.6-errno.patch 377 BLAKE2B 1c3e45b7b5874e7a5d1798e47b846f1a53bf9
 AUX hfsutils-3.2.6-fix-tcl-8.6.patch 184 BLAKE2B e3efbab15a8cbcf4f642b83daf871da315136699123d06e4912047965351acbc44a3460dd56e5e5052351a6c6a7aa71312183cc65368b27065f8381268af496f SHA512 0868c22b49f5cae7602982f71a0ea8e9c1f4cd350a27b7bb8d810db8d1d4b2396358f410875e21cc2b0611d127960384dc152a93abc0ec63128efaaf5d81a0f2
 AUX largerthan2gb.patch 289 BLAKE2B abb2d405007a16382d5e6e997b0ed2c44fac241cdb4f66f14699306c26c6c4cf3f291a24a8900676648c62c54679a82afb38bb5041a672563fe9cc12638aa5ad SHA512 896b4c89e04b8d0ec6ac66d928a60ccbdab30fd6bb7196e747af91b0823f7875542bfb0c3264062dc9627493d859a6ef28571848fd5e82a73a460ef705bd5362
 DIST hfsutils-3.2.6.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
-EBUILD hfsutils-3.2.6-r5.ebuild 1067 BLAKE2B b98f6591ec0bff3cf78652497ac5141ab5b77e447b113d5f6f797f6891a3f3a18ac3a294df1f28a2684582a8f774a62953bab4d0985e3522575816ee761a4b16 SHA512 6afabb87d4de717bd31a521ef383a36cab72a7475a597690b63fc5759159c5972aba4753e935c21ad788c34cc1e1d62a12ed8c1605f584db87c091d4791ab064
+EBUILD hfsutils-3.2.6-r5.ebuild 1066 BLAKE2B 63ec6db4620952d94248bd24867d602ccb0b7be6720ced04b02f48673d1ae79308fdb3c664213ae4cf16c3bd363180a0f1009be34646d09c98ff1cec607ba45d SHA512 adaa4a6ce01b305f1d0d2a85b20f9f1effeed7825c3bd34834675c7c0d345c4a95279cf9b43cbf17373d54ea86851d7410b17ce88e192103e299b9d7984d847f
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild
index 1d19c5f6f8e0..e6aad9cbc5b6 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="HFS FS Access utils"
-HOMEPAGE="https://www.mars.org/home/rob/proj/hfs/"
+HOMEPAGE="http://www.mars.org/home/rob/proj/hfs/"
 SRC_URI="ftp://ftp.mars.org/pub/hfs/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 4d66694bad3d..045c25feabc7 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,9 +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 4067 BLAKE2B 9ef7ef08382771987aa2c71ffe917c9321744f935f74da1553ed88a4732399c16522c70b069fd51082ee3c6c540d71038cd888a690530aa5b554958460a74c80 SHA512 eca5ec333c7dcf5a4815e6eeb8ef9c9f4449ccc1746b3100aee9042b824c0175c491a4d34726864eb80fb3be55c3bc8e8c2d860948ffb7cfd5417857d7723384
+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 4112 BLAKE2B 8de7c6141fb29223abb3dfa371af43135b876e4791ec2ea140624f2b105efbee1eef37ec8059adfe147d0bce81ed9968a4921395ada10dac8a2a14059ca4ec48 SHA512 57af0f45a19b938e0aff46e1f7628fd4a81dcc41e32a2e6a345f5901ea9d10cd8a797873bb2c338d58c502007cf54e8ff378da2a4c7746ae5061a66caa5b58b3
-EBUILD zfs-kmod-9999.ebuild 2754 BLAKE2B e3f6c8f5420724380a1a355c64650c70e808400e59dd2f09d882f81f8afb4484d46c37b477744e9efcdd99a6b2ad75065d54794f900f0ff45000b2dac4c5d92c SHA512 4591269a50de3e4c4a0a14e86bf3489d8f2898c34a9c173cda78cc97bd524f374bd11484c71854a635791ba3eae0d357730332ba1c91d204ef2636260c8d292a
+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.6.5.11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild
index 1c08101e1cac..c84a92c9e28a 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild
@@ -42,7 +42,7 @@ pkg_setup() {
 	linux-info_pkg_setup
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
-		!REISER4_FS
+		!CONFIG_REISER4_FS
 		EFI_PARTITION
 		IOSCHED_NOOP
 		MODULES
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild
index 75ba206896f1..8a1354857fe4 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild
@@ -43,6 +43,7 @@ pkg_setup() {
 	linux-info_pkg_setup
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
+		!CONFIG_REISER4_FS
 		EFI_PARTITION
 		IOSCHED_NOOP
 		MODULES
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 370cba95127a..1b30e443205f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -18,37 +18,35 @@ 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 GPL-2+"
+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
-	!sys-kernel/spl
 "
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-DOCS=( AUTHORS COPYRIGHT NOTICE META README.md )
+DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
 
 pkg_setup() {
 	linux-info_pkg_setup
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_RANDSTRUCT
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
+		!CONFIG_REISER4_FS
 		EFI_PARTITION
 		IOSCHED_NOOP
-		KALLSYMS
 		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
 		ZLIB_DEFLATE
 		ZLIB_INFLATE
 	"
@@ -68,7 +66,7 @@ pkg_setup() {
 	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."; }
+		{ kernel_is le 4 13 || die "Linux 4.13 is the latest supported version."; }
 
 	check_extra_config
 }
@@ -85,6 +83,7 @@ src_prepare() {
 }
 
 src_configure() {
+	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
 	use custom-cflags || strip-flags
 	filter-ldflags -Wl,*
 
@@ -95,6 +94,8 @@ src_configure() {
 		--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)
 	)
 
@@ -117,4 +118,29 @@ pkg_postinst() {
 		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."
 }