diff options
| author |   Richard Yao <ryao@gentoo.org> | 2012-08-31 18:07:26 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2012-08-31 18:07:26 +0000 |
| commit | f7476c6558970f849e3400abb4b95eec8780afb8 (patch) | |
| tree | b3559c1a1f6a367899450ea5afcba0612b912666 /sys-fs/zfs | |
| parent | Version bump. Remove old. (diff) | |
| download | gentoo-2-f7476c6558970f849e3400abb4b95eec8780afb8.tar.gz gentoo-2-f7476c6558970f849e3400abb4b95eec8780afb8.tar.bz2 gentoo-2-f7476c6558970f849e3400abb4b95eec8780afb8.zip | |
Do not permit ZFS to be used with GNU grep 2.13
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/zfs')
| -rw-r--r-- | sys-fs/zfs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild | 3 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog index 3c27f2e0d5bc..dd6fbaf110b6 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.47 2012/08/22 07:51:18 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.48 2012/08/31 18:07:26 ryao Exp $ + + 31 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc10-r1.ebuild, + zfs-9999.ebuild: + Do not permit ZFS to be used with GNU grep 2.13 22 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc10-r1.ebuild, zfs-9999.ebuild: 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 c1f1c87ddaeb..938fc8402fde 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.3 2012/08/22 07:51:18 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild,v 1.4 2012/08/31 18:07:26 ryao Exp $ EAPI="4" @@ -38,6 +38,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} + !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 6a1ade1dfb17..165d3daab502 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.37 2012/08/22 07:51:18 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.38 2012/08/31 18:07:26 ryao Exp $ EAPI="4" @@ -38,6 +38,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} + !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) |