Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

4 files changed, 39 insertions, 12 deletions

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."
 }