summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2012-08-22 07:32:18 +0000
committerRichard Yao <ryao@gentoo.org>2012-08-22 07:32:18 +0000
commitbd5255d74ad8eba908659d0fc41f12b9b0b90982 (patch)
treef7d1199da167942365f2c978c2df8ed38a634f24 /sys-fs/zfs
parentSplit kernel module into sys-fs/zfs-kmod (diff)
downloadgentoo-2-bd5255d74ad8eba908659d0fc41f12b9b0b90982.tar.gz
gentoo-2-bd5255d74ad8eba908659d0fc41f12b9b0b90982.tar.bz2
gentoo-2-bd5255d74ad8eba908659d0fc41f12b9b0b90982.zip
Add USE=kernel-builtin
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/zfs')
-rw-r--r--sys-fs/zfs/ChangeLog6
-rw-r--r--sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild6
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild6
3 files changed, 11 insertions, 7 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 3aba72855383..fdfbb6830ed4 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,10 @@
# 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.45 2012/08/22 07:31:11 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.46 2012/08/22 07:32:18 ryao Exp $
+
+ 22 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc10-r1.ebuild,
+ zfs-9999.ebuild:
+ Add USE=kernel-builtin
*zfs-0.6.0_rc10-r1 (22 Aug 2012)
diff --git a/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild
index 32d6f2804427..3ec1b54bcb14 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc10-r1.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-0.6.0_rc10-r1.ebuild,v 1.1 2012/08/22 07:31:11 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild,v 1.2 2012/08/22 07:32:18 ryao Exp $
EAPI="4"
@@ -26,7 +26,7 @@ HOMEPAGE="http://zfsonlinux.org/"
LICENSE="BSD-2 CDDL MIT"
SLOT="0"
-IUSE="custom-cflags +rootfs test-suite static-libs"
+IUSE="custom-cflags kernel-builtin +rootfs test-suite static-libs"
RESTRICT="test"
COMMON_DEPEND="
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
- =sys-fs/zfs-kmod-${PV}*
+ !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
!sys-fs/zfs-fuse
!prefix? ( sys-fs/udev )
test-suite? (
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 7b0cf54c993d..a2128c8cd810 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.35 2012/08/22 07:31:11 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.36 2012/08/22 07:32:18 ryao Exp $
EAPI="4"
@@ -26,7 +26,7 @@ HOMEPAGE="http://zfsonlinux.org/"
LICENSE="BSD-2 CDDL MIT"
SLOT="0"
-IUSE="custom-cflags +rootfs test-suite static-libs"
+IUSE="custom-cflags kernel-builtin +rootfs test-suite static-libs"
RESTRICT="test"
COMMON_DEPEND="
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
- =sys-fs/zfs-kmod-${PV}*
+ !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
!sys-fs/zfs-fuse
!prefix? ( sys-fs/udev )
test-suite? (