Linux 3.9 Support; Fix barrier regression on Linux 2.6.37 and later; Improve autotools checks; Install symlinks to make building lustre easier for the Gentoo Cluster team; dodoc miscellaneous documentation; Update github urls on older ebuilds to make repoman happy

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)

11 files changed, 309 insertions, 25 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index c896aed0c1e0..3afcaf69a5aa 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for sys-fs/zfs-kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.20 2013/02/16 22:12:55 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.21 2013/03/15 13:20:45 ryao Exp $
+
+*zfs-kmod-0.6.0_rc14-r4 (15 Mar 2013)
+*zfs-kmod-0.6.0_rc12-r3 (15 Mar 2013)
+*zfs-kmod-0.6.0_rc10-r2 (15 Mar 2013)
+*zfs-kmod-0.6.0_rc13-r4 (15 Mar 2013)
+*zfs-kmod-0.6.0_rc11-r3 (15 Mar 2013)
+
+  15 Mar 2013; Richard Yao <ryao@gentoo.org>
+  +files/zfs-kmod-0.6.0_rc14-flush-properly.patch,
+  +files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch,
+  +files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch,
+  +files/zfs-kmod-0.6.0_rc14-symlink-headers.patch,
+  +zfs-kmod-0.6.0_rc10-r2.ebuild, +zfs-kmod-0.6.0_rc11-r3.ebuild,
+  +zfs-kmod-0.6.0_rc12-r3.ebuild, +zfs-kmod-0.6.0_rc13-r4.ebuild,
+  +zfs-kmod-0.6.0_rc14-r4.ebuild, -zfs-kmod-0.6.0_rc10-r1.ebuild,
+  -zfs-kmod-0.6.0_rc11-r2.ebuild, -zfs-kmod-0.6.0_rc12-r2.ebuild,
+  -zfs-kmod-0.6.0_rc13-r3.ebuild, -zfs-kmod-0.6.0_rc14-r3.ebuild,
+  zfs-kmod-9999.ebuild:
+  Linux 3.9 Support; Fix barrier regression on Linux 2.6.37 and later; Improve
+  autotools checks; Install symlinks to make building lustre easier for the
+  Gentoo Cluster team; dodoc miscellaneous documentation; Update github urls on
+  older ebuilds to make repoman happy
 
 *zfs-kmod-0.6.0_rc14-r3 (16 Feb 2013)
 
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch
new file mode 100644
index 000000000000..fb4c7c35696c
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch
@@ -0,0 +1,42 @@
+diff --git a/config/kernel.m4 b/config/kernel.m4
+index 5623785..9d5aa46 100644
+--- a/config/kernel.m4
++++ b/config/kernel.m4
+@@ -16,7 +16,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
+ 	ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS
+ 	ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE
+ 	ZFS_AC_KERNEL_BDEV_PHYSICAL_BLOCK_SIZE
+-	ZFS_AC_KERNEL_BIO_EMPTY_BARRIER
+ 	ZFS_AC_KERNEL_BIO_FAILFAST
+ 	ZFS_AC_KERNEL_BIO_FAILFAST_DTD
+ 	ZFS_AC_KERNEL_REQ_FAILFAST_MASK
+diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c
+index cbf0a4d..e902a70 100644
+--- a/module/zfs/vdev_disk.c
++++ b/module/zfs/vdev_disk.c
+@@ -604,8 +604,6 @@
+ 	return __vdev_disk_physio(bdev, NULL, kbuf, size, offset, flags);
+ }
+ 
+-/* 2.6.24 API change */
+-#ifdef HAVE_BIO_EMPTY_BARRIER
+ BIO_END_IO_PROTO(vdev_disk_io_flush_completion, bio, size, rc)
+ {
+ 	zio_t *zio = bio->bi_private;
+@@ -646,13 +644,6 @@
+ 
+ 	return 0;
+ }
+-#else
+-static int
+-vdev_disk_io_flush(struct block_device *bdev, zio_t *zio)
+-{
+-	return ENOTSUP;
+-}
+-#endif /* HAVE_BIO_EMPTY_BARRIER */
+ 
+ static int
+ vdev_disk_io_start(zio_t *zio)
+-- 
+1.7.10
+
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch
new file mode 100644
index 000000000000..15d5af34d5c5
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch
@@ -0,0 +1,105 @@
+From d75af3c0ebb4e31ece087aeecfeff282cb6f1361 Mon Sep 17 00:00:00 2001
+From: Etienne Dechamps <etienne@edechamps.fr>
+Date: Sun, 24 Feb 2013 12:42:28 +0000
+Subject: [PATCH] Use -Werror for all kernel configure tests.
+
+As a matter of fact, we're already using -Werror for most tests because
+of a bug in kernel-bio-empty-barrier.m4 which sets -Werror without
+reverting it afterwards. This meant that all tests which ran after this
+one was using -Werror.
+
+This patch simply makes it clear that we're using -Werror and makes
+the code more readable and more predictable.
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #1317
+---
+ config/kernel-bio-empty-barrier.m4   |    1 -
+ config/kernel-bio-end-io-t-args.m4   |    3 ---
+ config/kernel-security-inode-init.m4 |    6 ------
+ config/kernel.m4                     |    2 +-
+ 4 files changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/config/kernel-bio-empty-barrier.m4 b/config/kernel-bio-empty-barrier.m4
+index 99549fe..fda16b3 100644
+--- a/config/kernel-bio-empty-barrier.m4
++++ b/config/kernel-bio-empty-barrier.m4
+@@ -4,7 +4,6 @@ dnl # Empty write barriers are now supported and we should use them.
+ dnl #
+ AC_DEFUN([ZFS_AC_KERNEL_BIO_EMPTY_BARRIER], [
+ 	AC_MSG_CHECKING([whether bio_empty_barrier() is defined])
+-	EXTRA_KCFLAGS="-Werror"
+ 	ZFS_LINUX_TRY_COMPILE([
+ 		#include <linux/bio.h>
+ 	],[
+diff --git a/config/kernel-bio-end-io-t-args.m4 b/config/kernel-bio-end-io-t-args.m4
+index ced4861..44e4826 100644
+--- a/config/kernel-bio-end-io-t-args.m4
++++ b/config/kernel-bio-end-io-t-args.m4
+@@ -9,8 +9,6 @@ dnl # to void.
+ dnl #
+ AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [
+ 	AC_MSG_CHECKING([whether bio_end_io_t wants 2 args])
+-	tmp_flags="$EXTRA_KCFLAGS"
+-	EXTRA_KCFLAGS="-Werror"
+ 	ZFS_LINUX_TRY_COMPILE([
+ 		#include <linux/bio.h>
+ 	],[
+@@ -25,5 +23,4 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [
+ 	],[
+ 		AC_MSG_RESULT(no)
+ 	])
+-	EXTRA_KCFLAGS="$tmp_flags"
+ ])
+diff --git a/config/kernel-security-inode-init.m4 b/config/kernel-security-inode-init.m4
+index c21588a..a62176d 100644
+--- a/config/kernel-security-inode-init.m4
++++ b/config/kernel-security-inode-init.m4
+@@ -7,8 +7,6 @@ dnl # security checks will just be skipped.
+ dnl #
+ AC_DEFUN([ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY], [
+ 	AC_MSG_CHECKING([whether security_inode_init_security wants 6 args])
+-	tmp_flags="$EXTRA_KCFLAGS"
+-	EXTRA_KCFLAGS="-Werror"
+ 	ZFS_LINUX_TRY_COMPILE([
+ 		#include <linux/security.h>
+ 	],[
+@@ -27,7 +25,6 @@ AC_DEFUN([ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY], [
+ 	],[
+ 		AC_MSG_RESULT(no)
+ 	])
+-	EXTRA_KCFLAGS="$tmp_flags"
+ ])
+ 
+ dnl #
+@@ -39,8 +36,6 @@ dnl # and the EVM xattr.
+ dnl #
+ AC_DEFUN([ZFS_AC_KERNEL_CALLBACK_SECURITY_INODE_INIT_SECURITY], [
+ 	AC_MSG_CHECKING([whether security_inode_init_security wants callback])
+-	tmp_flags="$EXTRA_KCFLAGS"
+-	EXTRA_KCFLAGS="-Werror"
+ 	ZFS_LINUX_TRY_COMPILE([
+ 		#include <linux/security.h>
+ 	],[
+@@ -57,5 +52,4 @@ AC_DEFUN([ZFS_AC_KERNEL_CALLBACK_SECURITY_INODE_INIT_SECURITY], [
+ 	],[
+ 		AC_MSG_RESULT(no)
+ 	])
+-	EXTRA_KCFLAGS="$tmp_flags"
+ ])
+diff --git a/config/kernel.m4 b/config/kernel.m4
+index 6d28074..5623785 100644
+--- a/config/kernel.m4
++++ b/config/kernel.m4
+@@ -488,7 +488,7 @@ AC_DEFUN([ZFS_LINUX_COMPILE_IFELSE], [
+ 	modpost_flag=''
+ 	test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage
+ 	AS_IF(
+-		[AC_TRY_COMMAND(cp conftest.c build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])],
++		[AC_TRY_COMMAND(cp conftest.c build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])],
+ 		[$4],
+ 		[_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])]
+ 	)
+-- 
+1.7.10
+
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch
new file mode 100644
index 000000000000..1dfef6117f1a
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch
@@ -0,0 +1,32 @@
+commit 3d8c9c9de0a5e1f1b496fcef2750a01a45860b04
+Author: Richard Yao <ryao@cs.stonybrook.edu>
+Date:   Mon Mar 4 15:52:11 2013 -0500
+
+    Linux 3.9 compat: Undefine GCC_VERSION
+    
+    The mainline kernel started defining GCC_VERSION with commit
+    torvalds/linux@3f3f8d2f48acfd8ed3b8e6b7377935da57b27b16. Unfortunately,
+    LZ4 also defines this macro, but the two defintions are incompatible. We
+    undefine GCC_VERSION in lz4.c to handle this.
+    
+    Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
+
+diff --git a/module/zfs/lz4.c b/module/zfs/lz4.c
+index b9850c0..8afaad1 100644
+--- a/module/zfs/lz4.c
++++ b/module/zfs/lz4.c
+@@ -243,6 +243,14 @@ lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
+ /* Disable restrict */
+ #define	restrict
+ 
++/*
++ * Linux : GCC_VERSION is defined as of 3.9-rc1, so undefine it.
++ * torvalds/linux@3f3f8d2f48acfd8ed3b8e6b7377935da57b27b16
++ */
++#ifdef GCC_VERSION
++#undef GCC_VERSION
++#endif
++
+ #define	GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+ 
+ #if (GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__)
\ No newline at end of file
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-symlink-headers.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-symlink-headers.patch
new file mode 100644
index 000000000000..04b47e67f255
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-symlink-headers.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 833bee6..c7780f8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -38,6 +38,8 @@ install-data-local:
+ 	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
+ 		$(INSTALL) -D $$instfile $$instdest/$$instfile; \
+ 	done
++	release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
++	ln -s zfs-$$release/$(LINUX_VERSION) $(DESTDIR)/usr/src/zfs;
+ endif
+ 
+ ctags:
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r2.ebuild
index 5c78fbe241c9..3c4a3016bf8d 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r1.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r2.ebuild,v 1.1 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
+	SRC_URI="mirror://github/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
 	S="${WORKDIR}/zfs-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
@@ -24,7 +24,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -83,8 +83,14 @@ src_prepare() {
 
 		# Cast constant for 32-bit compatibility
 		epatch "${FILESDIR}/${PN}-0.6.0_rc14-cast-const-for-32bit-compatibility.patch"
+
+		# Fix barrier regression on Linux 2.6.37 and later
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-flush-properly.patch"
 	fi
 
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
 	autotools-utils_src_prepare
 }
 
@@ -94,6 +100,7 @@ src_configure() {
 	local myeconfargs=(
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 		--with-config=kernel
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r3.ebuild
index ec90268b29d4..475bc49d5050 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r2.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r3.ebuild,v 1.1 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
+	SRC_URI="mirror://github/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
 	S="${WORKDIR}/zfs-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
@@ -24,7 +24,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -73,6 +73,7 @@ src_prepare() {
 
 		# Linux 3.6 Support
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-0-elevator-change.patch"
+
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-1.patch"
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-2.patch"
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-3.patch"
@@ -84,8 +85,14 @@ src_prepare() {
 
 		# Handle missing name length check in Linux VFS
 		epatch "${FILESDIR}/${PN}-0.6.0_rc14-vfs-name-length-compatibility.patch"
+
+		# Fix barrier regression on Linux 2.6.37 and later
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-flush-properly.patch"
 	fi
 
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
 	autotools-utils_src_prepare
 }
 
@@ -94,6 +101,7 @@ src_configure() {
 	set_arch_to_kernel
 	local myeconfargs=(
 		--bindir="${EPREFIX}/bin"
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 		--sbindir="${EPREFIX}/sbin"
 		--with-config=kernel
 		--with-linux="${KV_DIR}"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r3.ebuild
index 18e2919087df..a880af049331 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r2.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r3.ebuild,v 1.1 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
 	S="${WORKDIR}/zfs-${MY_PV}"
-	SRC_URI="https://github.com/downloads/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz
+	SRC_URI="mirror://github/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz
 		http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p0.tar.xz"
 	KEYWORDS="~amd64"
 fi
@@ -25,7 +25,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -75,8 +75,14 @@ src_prepare() {
 
 		# Handle missing name length check in Linux VFS
 		epatch "${FILESDIR}/${PN}-0.6.0_rc14-vfs-name-length-compatibility.patch"
+
+		# Fix barrier regression on Linux 2.6.37 and later
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-flush-properly.patch"
 	fi
 
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
 	autotools-utils_src_prepare
 }
 
@@ -95,6 +101,7 @@ src_configure() {
 }
 
 src_install() {
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 	autotools-utils_src_install
 }
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild
index 5d5d25d81b7b..756407937665 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r3.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r3.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild,v 1.1 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -24,7 +24,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -78,7 +78,14 @@ src_prepare() {
 
 		# Handle missing name length check in Linux VFS
 		epatch "${FILESDIR}/${PN}-0.6.0_rc14-vfs-name-length-compatibility.patch"
+
+		# Fix barrier regression on Linux 2.6.37 and later
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-flush-properly.patch"
 	fi
+
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
 	autotools-utils_src_prepare
 }
 
@@ -94,6 +101,7 @@ src_configure() {
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
 		$(use_enable debug)
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 	)
 	autotools-utils_src_configure
 }
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r4.ebuild
index 84d80baacce6..39797e8b7a36 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r3.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r3.ebuild,v 1.1 2013/02/16 22:12:55 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r4.ebuild,v 1.1 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -24,7 +24,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -56,12 +56,15 @@ pkg_setup() {
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 8 || die "Linux 3.8 is the latest supported version."; }
+		{ kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; }
 
 	check_extra_config
 }
 
 src_prepare() {
+	# Provide /usr/src/zfs symlink for lustre
+	epatch "${FILESDIR}/${P}-symlink-headers.patch"
+
 	if [ ${PV} != "9999" ]
 	then
 		# Cast constant for 32-bit compatibility
@@ -71,8 +74,21 @@ src_prepare() {
 		epatch "${FILESDIR}/${P}-vfs-name-length-compatibility.patch"
 
 		# Fix NULL pointer exception on hardened kernels, bug #457176
-		epatch 	"${FILESDIR}/${P}-improved-hardened-support.patch"
+		epatch "${FILESDIR}/${P}-improved-hardened-support.patch"
+
+		# Fix barrier regression on Linux 2.6.37 and later
+		epatch "${FILESDIR}/${P}-flush-properly.patch"
+
+		# Improve accuracy of autotools checks
+		epatch "${FILESDIR}/${P}-improved-autotools-checks.patch"
+
+		# Linux 3.9 Support
+		epatch "${FILESDIR}/${P}-linux-3.9-compat.patch"
 	fi
+
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
 	autotools-utils_src_prepare
 }
 
@@ -94,6 +110,7 @@ src_configure() {
 
 src_install() {
 	autotools-utils_src_install
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 }
 
 pkg_postinst() {
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index c152342dddbc..b86cd6766f45 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.9 2013/02/06 01:46:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.10 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -24,7 +24,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -56,23 +56,39 @@ pkg_setup() {
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 8 || die "Linux 3.8 is the latest supported version."; }
+		{ kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; }
 
 	check_extra_config
 }
 
 src_prepare() {
+	# Provide /usr/src/zfs symlink for lustre
+	epatch "${FILESDIR}/${P}-symlink-headers.patch"
+
 	if [ ${PV} != "9999" ]
 	then
-		# Fix regression where snapshots are not visible
-		epatch "${FILESDIR}/${P}-fix-invisible-snapshots.patch"
+		# Cast constant for 32-bit compatibility
+		epatch "${FILESDIR}/${P}-cast-const-for-32bit-compatibility.patch"
+
+		# Handle missing name length check in Linux VFS
+		epatch "${FILESDIR}/${P}-vfs-name-length-compatibility.patch"
+
+		# Fix NULL pointer exception on hardened kernels, bug #457176
+		epatch "${FILESDIR}/${P}-improved-hardened-support.patch"
 
-		# Fix deadlock involving concurrent `zfs destroy` and `zfs list` commands
-		epatch "${FILESDIR}/${P}-fix-recursive-reader.patch"
+		# Fix barrier regression on Linux 2.6.37 and later
+		epatch "${FILESDIR}/${P}-flush-properly.patch"
 
-		# Fix USE=debug build failure involving GCC 4.7
-		epatch "${FILESDIR}/${P}-gcc-4.7-compat.patch"
+		# Improve accuracy of autotools checks
+		epatch "${FILESDIR}/${P}-improved-autotools-checks.patch"
+
+		# Linux 3.9 Support
+		epatch "${FILESDIR}/${P}-linux-3.9-compat.patch"
 	fi
+
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
 	autotools-utils_src_prepare
 }
 
@@ -94,6 +110,7 @@ src_configure() {
 
 src_install() {
 	autotools-utils_src_install
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 }
 
 pkg_postinst() {
@@ -105,4 +122,10 @@ pkg_postinst() {
 		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
 	fi
 
+	ewarn "This version of ZFSOnLinux introduces support for features flags."
+	ewarn "If you upgrade your pools to make use of feature flags, you will lose"
+	ewarn "the ability to import them using older versions of ZFSOnLinux."
+	ewarn "Any new pools will be created with feature flag support and will"
+	ewarn "not be compatible with older versions of ZFSOnLinux. To create a new"
+	ewarn "pool that is backward compatible, use zpool create -o version=28 ..."
 }