[gentoo-commits] proj/sci:master commit in: sys-fs/zfs/

["Alexey Shvetsov" <alexxy@gentoo.org>]

commit:     1e371cdd8cf7e43c531834be505e255d941328df
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 15:51:11 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon May  2 15:51:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1e371cdd

Small fixes for zfs

(Portage version: 2.2.0_alpha30/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-fs/zfs/zfs-0.6.0_rc3.ebuild |   15 ++++++++++++++-
 sys-fs/zfs/zfs-9999.ebuild      |   17 +++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
index ffbd90a..a7316c7 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND="
 		>=sys-devel/spl-${PV}
-		>=virtual/linux-sources-2.6.32
+		>=virtual/linux-sources-2.6
 		"
 RDEPEND="
 		!sys-fs/zfs-fuse
@@ -27,6 +27,17 @@ RDEPEND="
 
 S="${WORKDIR}/${P/_/-}"
 
+pkg_setup() {
+	linux-mod_pkg_setup
+	kernel_is gt 2 6 32 || die "Your kernel is too old. ${CATEGORY}/${PN} need 2.6.32 or newer."
+	linux_config_exists || die "Your kernel sources are unconfigured."
+	if linux_chkconfig_present PREEMPT; then
+		eerror "${CATEGORY}/${PN} doesn't currently work with PREEMPT kernel."
+		eerror "Please look at bug https://github.com/behlendorf/zfs/issues/83"
+		die "PREEMPT kernel"
+	fi
+}
+
 src_prepare() {
 	epatch 	"${FILESDIR}/${PN}-0.6.0-includedir.patch"
 	eautoreconf
@@ -51,4 +62,6 @@ src_install() {
 	emake DESTDIR="${D}" install || die 'emake install failed'
 	newinitd "${FILESDIR}/zfs.initd" zfs
 	keepdir /var/lock/zfs
+	# Drop unwanted files
+	rm -rf "${D}/usr/src" || die "removing unwanted files die"
 }

diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index bb45a87..5625db6 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -9,7 +9,7 @@ AT_M4DIR=./config  # for aclocal called by eautoreconf
 
 EGIT_REPO_URI="http://github.com/behlendorf/zfs.git"
 
-inherit git eutils autotools linux-mod
+inherit autotools eutils git linux-mod
 
 DESCRIPTION="Native ZFS for Linux"
 HOMEPAGE="http://wiki.github.com/behlendorf/zfs/"
@@ -22,12 +22,23 @@ IUSE=""
 
 DEPEND="
 		>=sys-devel/spl-${PV}
-		>=virtual/linux-sources-2.6.32
+		>=virtual/linux-sources-2.6
 		"
 RDEPEND="
 		!sys-fs/zfs-fuse
 		"
 
+pkg_setup() {
+	linux-mod_pkg_setup
+	kernel_is gt 2 6 32 || die "Your kernel is too old. ${CATEGORY}/${PN} need 2.6.32 or newer."
+	linux_config_exists || die "Your kernel sources are unconfigured."
+	if linux_chkconfig_present PREEMPT; then
+		eerror "${CATEGORY}/${PN} doesn't currently work with PREEMPT kernel."
+		eerror "Please look at bug https://github.com/behlendorf/zfs/issues/83"
+		die "PREEMPT kernel"
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch
 	eautoreconf
@@ -52,4 +63,6 @@ src_install() {
 	emake DESTDIR="${D}" install || die 'emake install failed'
 	newinitd "${FILESDIR}/zfs.initd" zfs
 	keepdir /var/lock/zfs
+	# Drop unwanted files
+	rm -rf "${D}/usr/src" || die "removing unwanted files die"
 }