Update from Richard: Add missing dependencies, introduce USE flags to permit omission of ZFS Regression Test Suite and dracut module, add warning about lack of upstream support for x86, fix issue in ZFS Regression Test Suite.

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

3 files changed, 27 insertions, 3 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 20d7cf1ab2b9..a0df6e8f62d6 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.13 2012/02/27 05:36:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.14 2012/02/29 00:29:35 floppym Exp $
+
+  29 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml, zfs-9999.ebuild:
+  Update from Richard: Add missing dependencies, introduce USE flags to permit
+  omission of ZFS Regression Test Suite and dracut module, add warning about
+  lack of upstream support for x86, fix issue in ZFS Regression Test Suite.
 
   27 Feb 2012; Mike Gilbert <floppym@gentoo.org> zfs-9999.ebuild:
   Adjust dependencies.
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml
index 70466d54f57d..93137d2837e1 100644
--- a/sys-fs/zfs/metadata.xml
+++ b/sys-fs/zfs/metadata.xml
@@ -10,4 +10,8 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<use>
+		<flag name="dracut">Install dracut module</flag>
+		<flag name="test-suite">Install regression test suite</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 0d5bba859b01..a2028a761721 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.13 2012/02/27 05:36:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.14 2012/02/29 00:29:35 floppym Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
 LICENSE="CDDL GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="custom-cflags debug static-libs"
+IUSE="custom-cflags debug dracut test-suite static-libs"
 
 DEPEND="
 	>=sys-kernel/spl-${PV}
@@ -23,6 +23,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!sys-fs/zfs-fuse
+	sys-fs/udev
+	test-suite? (
+		sys-apps/gawk
+		sys-apps/util-linux
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
 "
 DEPEND+="
 	test? ( sys-fs/mdadm )
@@ -41,11 +51,14 @@ pkg_setup() {
 		BLK_DEV_LOOP"
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 	check_extra_config
+	use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do	not file bug reports."
 }
 
 src_prepare() {
 	# Workaround for hard coded path
 	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
+	# Workaround rename
+	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
 	autotools-utils_src_prepare
 }
 
@@ -77,4 +90,6 @@ src_test() {
 src_install() {
 	autotools-utils_src_install
 	gen_usr_ldscript -a uutil nvpair zpool zfs
+	use dracut || rm -rf "${ED}usr/share/dracut"
+	use test-suite || rm -rf "${ED}usr/libexec"
 }