9 files changed, 72 insertions, 6 deletions
diff --git a/sys-fs/spl-utils/Manifest b/sys-fs/spl-utils/Manifest
new file mode 100644
index 00000000..197e6bb5
--- /dev/null
+++ b/sys-fs/spl-utils/Manifest
@@ -0,0 +1 @@
+DIST spl-0.6.5.9.tar.gz 594271 SHA256 d9ccd24786bb5a8616748a93a3c0b1270aa891175e2f5d726195b416f5c03b9c SHA512 356db95fcc93eb4ee298efc1ac25d38743572c539fc10b2d1533af861b4fd60804e61c3fb9f9bbad3d7a51cf123113b5b0bcbd49eba1bad7b1d8823d206022e8 WHIRLPOOL 6565a4939efaeba0cff75496ce9e8ea84b55da97fe47457ca33bcaf07aaa93a27dd410a9264b29539e65475029c0f0c612bc93b9fee4f97c7d6db9c92aab6a34
diff --git a/sys-fs/spl-utils/spl-utils-0.6.5.9.ebuild b/sys-fs/spl-utils/spl-utils-0.6.5.9.ebuild
new file mode 100644
index 00000000..7c46f580
--- /dev/null
+++ b/sys-fs/spl-utils/spl-utils-0.6.5.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit flag-o-matic autotools-utils
+
+MY_PN="spl"
+MY_P="${MY_PN}-${PV}"
+
+SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz"
+
+DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="custom-cflags debug"
+
+RESTRICT="debug? ( strip ) test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="dev-lang/perl
+	virtual/awk"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+DOCS=( AUTHORS DISCLAIMER )
+
+src_prepare() {
+	# Workaround for hard coded path
+	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
+		die "Cannot patch check.sh"
+
+	# splat is unnecessary unless we are debugging
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-redcore/" "${S}/META" || die "Could not set Redcore release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs-utils/Manifest
index 01dbebe5..01dbebe5 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs-utils/Manifest
diff --git a/sys-fs/zfs/files/bash-completion b/sys-fs/zfs-utils/files/bash-completion
index 1b9428bf..1b9428bf 100644
--- a/sys-fs/zfs/files/bash-completion
+++ b/sys-fs/zfs-utils/files/bash-completion
diff --git a/sys-fs/zfs/files/bash-completion-r1 b/sys-fs/zfs-utils/files/bash-completion-r1
index b1aded36..b1aded36 100644
--- a/sys-fs/zfs/files/bash-completion-r1
+++ b/sys-fs/zfs-utils/files/bash-completion-r1
diff --git a/sys-fs/zfs/files/zed b/sys-fs/zfs-utils/files/zed
index d46acfac..d46acfac 100644
--- a/sys-fs/zfs/files/zed
+++ b/sys-fs/zfs-utils/files/zed
diff --git a/sys-fs/zfs/files/zfs-init.sh.in b/sys-fs/zfs-utils/files/zfs-init.sh.in
index ed84585c..ed84585c 100644
--- a/sys-fs/zfs/files/zfs-init.sh.in
+++ b/sys-fs/zfs-utils/files/zfs-init.sh.in
diff --git a/sys-fs/zfs/files/zfs.service.in b/sys-fs/zfs-utils/files/zfs.service.in
index c390a480..c390a480 100644
--- a/sys-fs/zfs/files/zfs.service.in
+++ b/sys-fs/zfs-utils/files/zfs.service.in
diff --git a/sys-fs/zfs/zfs-0.6.5.9.ebuild b/sys-fs/zfs-utils/zfs-utils-0.6.5.9.ebuild
index aa4786f7..527ced05 100644
--- a/sys-fs/zfs/zfs-0.6.5.9.ebuild
+++ b/sys-fs/zfs-utils/zfs-utils-0.6.5.9.ebuild
@@ -6,7 +6,10 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
 
-SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
+MY_PN="zfs"
+MY_P="${MY_PN}-${PV}"
+
+SRC_URI="https://github.com/zfsonlinux/${MY_PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="http://zfsonlinux.org/"
@@ -14,12 +17,14 @@ HOMEPAGE="http://zfsonlinux.org/"
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="custom-cflags debug +rootfs test-suite static-libs"
+IUSE="debug +rootfs test-suite"
 
 RESTRICT="test"
 
-COMMON_DEPEND="sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="sys-apps/util-linux
+	sys-libs/zlib
 	virtual/awk"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
@@ -42,7 +47,7 @@ RDEPEND="${COMMON_DEPEND}
 		!<sys-boot/grub-2.00-r2:2
 		)
 	sys-fs/udev-init-scripts
-	~sys-kernel/spl-${PV}"
+	~sys-fs/spl-utils-${PV}"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
@@ -81,7 +86,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use custom-cflags || strip-flags
 	local myeconfargs=(
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"