give userspace packages a more, userspace name

9 files changed, 16 insertions, 7 deletions

diff --git a/sys-kernel/spl/Manifest b/sys-fs/spl-utils/Manifest
index 197e6bb5..197e6bb5 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-fs/spl-utils/Manifest
diff --git a/sys-kernel/spl/spl-0.6.5.9.ebuild b/sys-fs/spl-utils/spl-utils-0.6.5.9.ebuild
index 96fa03f3..7c46f580 100644
--- a/sys-kernel/spl/spl-0.6.5.9.ebuild
+++ b/sys-fs/spl-utils/spl-utils-0.6.5.9.ebuild
@@ -4,7 +4,10 @@
 EAPI="5"
 inherit flag-o-matic autotools-utils
 
-SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
+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/"
@@ -16,6 +19,8 @@ IUSE="custom-cflags debug"
 
 RESTRICT="debug? ( strip ) test"
 
+S="${WORKDIR}/${MY_P}"
+
 COMMON_DEPEND="dev-lang/perl
 	virtual/awk"
 DEPEND="${COMMON_DEPEND}"
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"