Sync zfs-0.6.2 and zfs-9999 ebuilds

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

4 files changed, 27 insertions, 36 deletions

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/Manifest b/sys-fs/zfs/Manifest
index 781564b5dfd7..f43ba9763716 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -22,24 +22,24 @@ EBUILD zfs-0.6.0_rc12-r3.ebuild 2425 SHA256 7ae28e9025453f623fdfddccbaba6d4f5644
 EBUILD zfs-0.6.0_rc13-r2.ebuild 2767 SHA256 a01f304e92fd0fdb0c2d61d2924948a8184a31d6ff300d0b95cf10fdde20c4b7 SHA512 0c5280577004b38eab50beaa86d621e06eac648e7b5f9ba0af7e3522c9ea1ea9e12cb0ab4cf0a918c59bf919c9596ea23716be639a86a6bbc4ce3151d3cef744 WHIRLPOOL af66f26c293b926e52f729ef11fd5ac218c8a6ef78a73525a945fc843f9de2735ac65032a9a0c1a7b35f6d5bd083751c52e3301949212c2e284f67ef1afa33b7
 EBUILD zfs-0.6.0_rc14-r1.ebuild 2898 SHA256 94eec2441edd8094dad6bb73a576198fcb5c3221de9e4cff13193f86906897a3 SHA512 e948a46ab4560754896044411fb51b1188e601dca4cd9de56022b72ee6d8c942329813e71a9dadb9c9665d203c5d8dd04c1f9071472950eaead78898ed5826f1 WHIRLPOOL 84080714d51b18a663812115c16eb734f71ab2f02d5138a30dcc660a361caa198021ae46b744c35edd8b78edfcc3f9a2b5ece8fdf68b2ac26dae199eb76028a3
 EBUILD zfs-0.6.1-r4.ebuild 3733 SHA256 26dfaf61978ca7a74adf0cd5de815b348bf3a39fb553745bccdacbe0049af86a SHA512 6eba565e81c829c0c062f6b43795c3f937a012d794f164171b9f5a86a12d77f4c11bc8a0152a8151dd59175e584416e9cc02bb0b7b451e6864312d01cc324a4f WHIRLPOOL 5ae5fc47488e9724f4517c6e17508844ed13680491682aa301a4f944bae9bb95d870191ff5b751049193a5ca46939709b302a68d95cf8661d5bc4c305cf6cd14
-EBUILD zfs-0.6.2.ebuild 3330 SHA256 cdc357456b50941cf11145bf8b47bbfebd837caba5aca5607c3c176a56eea000 SHA512 49d9afffb9ac52240a9dadb29ef583ed96b0f668e63f34172b29ba553cbaaad1df4f9c6d758dc8ad561da257f4e11b060164294db6e486d7ad01253deea83be4 WHIRLPOOL d368a86f69aa53ae935176d2492c640a3695099f8a0adf3b0bf0f1dada79b68e75c9f2829d4fdb0f05880660717c2a90ae3b8062a00eef6d93cf845b2c72c2fb
-EBUILD zfs-9999.ebuild 3786 SHA256 790b6cd252a4f0bc4542ce1e6feb3f88d49ee4648b09dda23c1461d7a2b75f7f SHA512 78cb38d6e677653f177e27c496be4d72b2ff8be5ff086bdf739522b215ebbe1fbd97cecd20c86d52201dfa53b95e9e5a0b5004ce0538eea2c471793c75d40ef4 WHIRLPOOL 8f45dd6164bdb1efa2f20af0e2c98ec472282ae5ef3136a22eb8eaab8b246a37879fc2a528d107de073bf467ba3d4babf19edb1d4069e28c49f90f3280c02216
-MISC ChangeLog 13765 SHA256 99bb82ad397541cfec22b5a57496faf911fd0dbc85460f5adc4be193c78af3a2 SHA512 4d5c7692caf84d3fd13be7d722b40b743d0d28919795e6ac15a9cd88920864f871d2054dc80e31c1fe11c700a836b10fb02a9c3b043741ff622a17c1c4c381bd WHIRLPOOL fe270e1b1b06943ab413e91751c7b60a9f86a9af5822a56a18e435e13cc6398e4e8c895097ea8511fe3933513c6786419862e45574667035938608517ce600b3
+EBUILD zfs-0.6.2.ebuild 3394 SHA256 22ed064f7c8cdd8de0bcf2da8befc26e7567b94ace27f870c780a59dc273e0a4 SHA512 f4d590f28affaf9d89b887b0ff553f2993bc894266921ae303f8665f61dc28dd1d64b0a2dcbca5a38bc8a8c35acd98a51b599d7a74380583b09f6be636fd07bd WHIRLPOOL 24eed04833fbfbcce2f7062f4a1396dbfc2bfd8ac55a7d03ad5214ac81315561d17eb35ddbda0f1f2348b75320e151662499f1b72cfa7bd7c46d6eaf563f2798
+EBUILD zfs-9999.ebuild 3394 SHA256 9a52683f558d26c4cab712a0ff4c201e751a1828edc478d2e0e6bcc1736d291b SHA512 6035997ddca4f5c181f09bc6a2c37a7f7fa43caf40ba28bce36922a6542dba7b243dfb506b2bade9624252377254ad8f0b420a6ab03d671f9bf2013f646c2f16 WHIRLPOOL d506b0385ca011db98427b763183edd3f46cc914c9a616963f64c6fc1ac08a0362e7ad8dc18bbdfd622fbbcf5c08fc49126e064595682c29c1955dc28464e2d2
+MISC ChangeLog 13884 SHA256 a8d1d977f58dee119cc3cbac222006e02b4ef0dde78968e29c9874d4ba46a5bb SHA512 f6bcc8730db080033a0363b89ee12b7d6f42cbccc7a06ff470a1d006bbd2089edf506fb859559893af8b528789af1cd2dd70d17fbfb6b35f169f628fe29c31ff WHIRLPOOL 06e69363895ef99bc2c7851509eb358e6715aad7767d0913bd03aa289ff3299981440d08841c357fb3cd8b9f8d6fb73e6fa441a3b9d9aad18cef9d20efc37e5d
 MISC metadata.xml 546 SHA256 980db453ce3112b91daa26f61bbc8eec61d12d0998d0bf76a1308aecad499c42 SHA512 33e25501a30e8cb8e890c1dbf98f5d5264a7958f7d710d37d4ee36efbb318d0db23533fefd51ca419cdc6f72416c1d0cc4fd3b1e68a157dca14890d54f411df6 WHIRLPOOL c96639028769b95ba23db8e8e20d71f5894b1ecebd6d3e62effc610d48e2c55797fa3536dea6e654185f288dd8edb6a2a063829598703f0f0ca61aa02f995314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSF+4TAAoJECDuEZm+6Exkr0sP+QEGnKOizDFY3aRZayiWi28O
-E1kD6us8yjbxr0ljATB1O1izg+JCw2EoWdus9JvCEiCp0ja5wynKVmC/YSwIBNjq
-0unGi6gKQdElAjIS2qCQ/LR5OVAKL8fQbEsGyhQoMEs1hMkAftoKjBytOpFFksbD
-7tABlkvk2H9a3h0jIRDrAH+s1b5HsR5MvXnBbGiPSKzyovgr+XnNDleAWvMKOe6R
-jaT6CvQ4NY/t2YVqRcL6tmuekicu9dnxm5AKsoxQTVEAghs2IeQ122Qj8a9W4MF/
-FAYZkNyeYQ5vGt6HcXIa69LHynA0RIZAUE3WvEeLzVFlZC73NTbExi6azB8zdmj2
-mWvkYKdYpaOPxAKmic3inAaAf2Hisol0lHEf5qFkccwQw5rJ4s7+h+MDzuHLhPPc
-OqNC/1DkMW9adwdnBUuHXLqHEpd4BV9MrNcG5Zw/s6QzRTx9sTK3bUa3lnPVqPdB
-M46RiQAsP9LJSgCsiRfQtjUPAF9zu8e8O36YUEKBugRO+R7wDbvDtkGlhSojeaWq
-Uri/Lmfw1bjZLRlCggG1CMVRzGEdg/FVNv/1ktB+FZMd29iYnK3E71dly0B7fTax
-cFf5/6ZYYh0BDdhFwPImPlN2a5OzSK7YTjlV2SCbeaZ25coxaR7oVhSEaoLB0RKV
-p0r/1qDlbzOUvxAL+pjP
-=heK6
+iQIcBAEBCAAGBQJSF/fnAAoJECDuEZm+6ExktmcP/iUcuK/JULxKjS8RFRlUxIKC
+oAfRNDlNh8g31jnzixY+c38/A5WI7FrkMHAcLh+2jJ1QPAmG78ZhYyRYpGgpgD6/
+OWZodxjBvaSo2ILx9wq8Td9Z+NtTdcRWBcruZ04veKAIRL91PZmFSOCz5aIQLdR2
+kKQsb2bzHineRdJ1ej/gee7hPL4wP3QtufXhUuzvbkuy1TiCNMyNW2/Aoqm5EIZa
+vOsL9cIwhONZLqkLlTWUtlLwOxYeGUNO3ufkR8MU89hUC5Vl+/0LJRWDhRn3A23W
+4ffibpfYTvQX08eTMkPQH0IHm/aMniOBDnPOtwTacAadXSvFz5h12rfJv+AhDfVR
+yj8yTpWA5o/Hghd4MtyO6L6QVzat1YgNxfxF40rIOPUdNmhBf3d7e41fOzI/FTHV
+UYs3k/AeT3tBbz30EALdd3nUFQbGK9ThgJs6hcHxWNvpJRju2nVaoV/18+JrmBOM
+3gzW4YYMLjWcVWoXVhMQve48fKPqLWU8JexT2YeOmQ+sBSB+4AqAX2GaLpokFmVa
+bCkcPef7jjwrWjbfBcZRDPbUwd7+5vmAs+t0cPzuJVj4+JSn6rs1VB33bJuyi5+L
+/Cu7Eb0IWWJHlCDubiMQby2/4jnebO0CIusVH4Y7eaQkK14AMR4JrTUhyNVRF3dZ
+FJp9cm/IkADq3f/EQtAY
+=0CY/
 -----END PGP SIGNATURE-----
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|" \