From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6654D1383E0 for ; Thu, 1 Oct 2015 23:00:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AB4CE0870; Thu, 1 Oct 2015 23:00:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9B7AE0870 for ; Thu, 1 Oct 2015 23:00:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7231E33FE7D for ; Thu, 1 Oct 2015 23:00:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDC7E3DF for ; Thu, 1 Oct 2015 23:00:02 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1443740391.4d7de0583e56f17e06b96ec9c5bb4172fbc38e82.ryao@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-0.6.5.2-r1.ebuild sys-fs/zfs/zfs-0.6.5.2.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 4d7de0583e56f17e06b96ec9c5bb4172fbc38e82 X-VCS-Branch: master Date: Thu, 1 Oct 2015 23:00:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1f1096d5-b076-480b-a70e-5e970c5d9771 X-Archives-Hash: 47f03c433a600ef2c8193c42d59c1819 commit: 4d7de0583e56f17e06b96ec9c5bb4172fbc38e82 Author: Richard Yao clusterhq com> AuthorDate: Thu Oct 1 22:52:18 2015 +0000 Commit: Richard Yao gentoo org> CommitDate: Thu Oct 1 22:59:51 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7de058 sys-fs/zfs-0.6.5-r1: Fix OpenRC scripts https://github.com/zfsonlinux/zfs/pull/3800 Package-Manager: portage-2.2.20.1 Signed-off-by: Richard Yao gentoo.org> sys-fs/zfs/{zfs-0.6.5.2.ebuild => zfs-0.6.5.2-r1.ebuild} | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys-fs/zfs/zfs-0.6.5.2.ebuild b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild similarity index 97% rename from sys-fs/zfs/zfs-0.6.5.2.ebuild rename to sys-fs/zfs/zfs-0.6.5.2-r1.ebuild index 54dd341..83049e7 100644 --- a/sys-fs/zfs/zfs-0.6.5.2.ebuild +++ b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild @@ -86,6 +86,12 @@ pkg_setup() { } src_prepare() { +if [ ${PV} != "9999" ] + then + # Fix OpenRC scripts + epatch "${FILESDIR}/zfs-0.6.5-fix-openrc-scripts.patch" + fi + # Update paths sed -e "s|/sbin/lsmod|/bin/lsmod|" \ -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \