From 6e188693400426a08d5cae43154294f3163c759f Mon Sep 17 00:00:00 2001
From: Richard Yao <ryao@gentoo.org>
Date: Sat, 24 Aug 2013 00:01:50 +0000
Subject: Sync zfs-0.6.2 and zfs-9999 ebuilds

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)
---
 sys-fs/zfs/ChangeLog        |  5 ++++-
 sys-fs/zfs/zfs-0.6.2.ebuild |  7 +++++--
 sys-fs/zfs/zfs-9999.ebuild  | 19 ++-----------------
 3 files changed, 11 insertions(+), 20 deletions(-)

(limited to 'sys-fs/zfs')

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 9977f7ed665e..3f6691ae66ec 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.69 2013/08/23 23:19:58 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.70 2013/08/24 00:01:50 ryao Exp $
+
+  24 Aug 2013; Richard Yao <ryao@gentoo.org> zfs-0.6.2.ebuild, zfs-9999.ebuild:
+  Sync zfs-0.6.2 and zfs-9999 ebuilds
 
 *zfs-0.6.2 (23 Aug 2013)
 
diff --git a/sys-fs/zfs/zfs-0.6.2.ebuild b/sys-fs/zfs/zfs-0.6.2.ebuild
index ad351da3c616..da623d17e0e7 100644
--- a/sys-fs/zfs/zfs-0.6.2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.2.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.2.ebuild,v 1.1 2013/08/23 23:19:58 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.2.ebuild,v 1.2 2013/08/24 00:01:50 ryao Exp $
 
-EAPI="4"
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-single-r1
 
 AT_M4DIR="config"
 AUTOTOOLS_AUTORECONF="1"
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 958855de5461..55a2dd57488e 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.46 2013/07/14 12:16:09 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.47 2013/08/24 00:01:50 ryao Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="http://zfsonlinux.org/"
@@ -68,21 +68,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Fix OpenRC dependencies
-		epatch "${FILESDIR}/${P}-gentoo-openrc-dependencies.patch"
-
-		# Make zvol initialization asynchronous
-		epatch "${FILESDIR}/${P}-fix-zvol-initialization-r1.patch"
-
-		# Use MAXPATHLEN to silence GCC 4.8 warning
-		epatch "${FILESDIR}/${P}-fix-gcc-4.8-warning.patch"
-
-		# Avoid zdb abort
-		epatch "${FILESDIR}/${P}-avoid-zdb-abort.patch"
-	fi
-
 	# Update paths
 	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
 		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
-- 
cgit v1.2.3-65-gdbad