Gentoo Archives: gentoo-commits

From: Richard Yao <ryao@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
Date: Thu, 01 Oct 2015 23:00:12
Message-Id: 1443740391.4d7de0583e56f17e06b96ec9c5bb4172fbc38e82.ryao@gentoo
1 commit: 4d7de0583e56f17e06b96ec9c5bb4172fbc38e82
2 Author: Richard Yao <richard.yao <AT> clusterhq <DOT> com>
3 AuthorDate: Thu Oct 1 22:52:18 2015 +0000
4 Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 1 22:59:51 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7de058
7
8 sys-fs/zfs-0.6.5-r1: Fix OpenRC scripts
9
10 https://github.com/zfsonlinux/zfs/pull/3800
11
12 Package-Manager: portage-2.2.20.1
13 Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
14
15 sys-fs/zfs/{zfs-0.6.5.2.ebuild => zfs-0.6.5.2-r1.ebuild} | 6 ++++++
16 1 file changed, 6 insertions(+)
17
18 diff --git a/sys-fs/zfs/zfs-0.6.5.2.ebuild b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
19 similarity index 97%
20 rename from sys-fs/zfs/zfs-0.6.5.2.ebuild
21 rename to sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
22 index 54dd341..83049e7 100644
23 --- a/sys-fs/zfs/zfs-0.6.5.2.ebuild
24 +++ b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
25 @@ -86,6 +86,12 @@ pkg_setup() {
26 }
27
28 src_prepare() {
29 +if [ ${PV} != "9999" ]
30 + then
31 + # Fix OpenRC scripts
32 + epatch "${FILESDIR}/zfs-0.6.5-fix-openrc-scripts.patch"
33 + fi
34 +
35 # Update paths
36 sed -e "s|/sbin/lsmod|/bin/lsmod|" \
37 -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \