Version bump to 0.6.4

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

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index b3116d4e43e2461ec77ca73420ec1258ba93c1c1..d40aa185088ddabde7525769843187013fb6d6c6 100644 (file)
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/zfs-kmod
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.56 2014/12/01 07:02:33 ryao Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.57 2015/04/27 13:54:20 ryao Exp $
+
+*zfs-kmod-0.6.4 (27 Apr 2015)
+
+  27 Apr 2015; Richard Yao <ryao@gentoo.org> +zfs-kmod-0.6.4.ebuild:
+  Version bump to 0.6.4
 
 *zfs-kmod-0.6.3-r1 (01 Dec 2014)
 

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index e3d24e91127a1fa252a6e0a3d4bf10e055f29aeb..10a7ab9f1ca44b76977b6cc3720b56d8bbcb0ba1 100644 (file)
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -29,6 +29,7 @@ DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea82109
 DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58
 DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f7b40b6675c4a56fc630a47e90d5280 SHA512 e2fa573c7b30a3811e9e1596d35b65f5d013ed5bac43e364b44ffab734398a3294979c152a80ec9a722611cc7c971aec217d8e1a37cc9240a3fa2dddb5b90e3b WHIRLPOOL f2da02d5c7d2385e7de1e858c31d299632ca864d422f0c94e5d3b8674d24beeb073ad2600698350306a9e70dbeef390f0e513d19c126502fceec18795c203d50
 DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe
+DIST zfs-0.6.4.tar.gz 1735736 SHA256 7f37aaaa1fc15201dde58bb84e0f191ccac462f19ffec0c889b6f6ed3f73a804 SHA512 cf47cbf5fa8dff75f5e9d81b323f5745d7b210266ba9e6ccab16bbf0e2b055aa1168bad94a77a4bc56c6fbe0391593f210bd4c74f7a8d0d99385ac4dd61e5622 WHIRLPOOL 1b0cc8a9727b57f2e63bd106cd94780002a068b31668b9dc103dbc0b48858a380d7c228f39f0526fc84b9d10aca1bd376ace0346a2ef4306a9d164c2d56606f1
 DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9
 DIST zfs-kmod-0.6.2-p3.tar.xz 45988 SHA256 4af06d1472f5d24e01d147b6fec5c78fbbd9739d1259bd3fbf57af66c99b9bcb SHA512 eddf67c0aa49d42f663f98dc721bac75e8d0521df5ae174cd6aeee0a935a71b49e06961404eb6c71a09cd239358868a2fe49de4f1d26776948f8fe7fc943165c WHIRLPOOL 5634a92f6f322f67edef95ad121b0b1699e520ca8beb05b3385dc7e20198dd45d337731bf7df69d1b1c552ed0b78d54b15bc9c9e76b694ae4c8d360892b9d764
 DIST zfs-kmod-0.6.2-p4.tar.xz 63984 SHA256 9167edc4be86e3fcda6b3c198e51f92ab0c95ac5baca11666c28029a628cdac9 SHA512 13e4ec415c35d2f268d89565745f5898c0943423577a2ba6714b3a069c5a80f244cd06dff91464f38dd4ed60673d1145ead080bb03a56d4be33e328f948ffa64 WHIRLPOOL 8c399ec67119ed4fbebb5599d00f888918678bc4e4ea369b4bdc5c75bfc90fc76396087624c8011de370a54ff103bccaa8922d05ac7ccebb2b3481bbbcf44b19
@@ -40,23 +41,24 @@ EBUILD zfs-kmod-0.6.2-r4.ebuild 3414 SHA256 abfd3a39d1bafe288474f2fd93191ea52615
 EBUILD zfs-kmod-0.6.2-r5.ebuild 3414 SHA256 e1351abb1a3ac482eee2d253271cb4364462aef43d6135fbc6f61e487d358441 SHA512 586a58fd1b0e6289d9e90ce134a4ea90d7280c2313f8ac0d2d1d8c30d698685ae7c90089671e438a2ce4ddeb9144c2edb73f35014e8f84e693f5524b77dd1d2e WHIRLPOOL 0baa387212abba6fb03770f4a4d9cd299171b0420a6fdac107aee76033fa3a0de928c2ade5cf16a09b480df2b3fdd4f46dc0ccf5bb8e0c767fb21e4a6cdbefd4
 EBUILD zfs-kmod-0.6.3-r1.ebuild 3887 SHA256 50939e69b08563e63110a77381cf85f92f7f9b3e3c8d1a647beeb16dfd823d67 SHA512 3324b67e80cc8e659ea4cbcb91b6d48e0ceafd20750c1f9fc2ad2700be6a5a439e526bb7b672ccf04b8889459952a953f3f8bf09068e9ea63b2233a0d4005e27 WHIRLPOOL e991bcdd73c74308e7062ae3f13e0dab2674767123c2066cb14f21506f11f7135942e3c8cfc10b38686c47d6b0b0e3a31a3d2cebd3dfeb58f2c57e4611824723
 EBUILD zfs-kmod-0.6.3.ebuild 3734 SHA256 58d2c0a1e46649cec42a0f225dde78e7666f3659170265353bce47ea6ff86fe9 SHA512 ad1ef62bf16d61a55a8cc9672ab6b3baa3f74ca68579b1458a4e0b1858b3e29d371e5289fa21443dca6305d2049c0984f63673806969bec256db8b31c56309c0 WHIRLPOOL 391374c76d95bfac3e4117ec5bc44aa13239cae2d6bbf5f8932593324288dd2abfb1cff0e84cf772173bc462fab4829f9e6402542c55a5462f7caef3d11d605b
+EBUILD zfs-kmod-0.6.4.ebuild 4100 SHA256 c6b16c5ebcf86d67db7e49cab8c31d67eeed459df7f5441058895510e0467c23 SHA512 fa8dd76fa98d4ecfba270e98fe3c1b8e73750a707cbd90b06368fa826a5c3bc2ef2a674bf30685b9aab3d0375646a1ccdae48c22bca3e78adb70369404fa0571 WHIRLPOOL ed89b94a59ef8560688fb1e03d7a357d92edf1355b33c4b04b942deb91b484e7130f7e39ae14b9693a34c647176bb092af62915102a7399fd7bb688ac6dcd1c8
 EBUILD zfs-kmod-9999.ebuild 3712 SHA256 0ad8ede2c6b11aa023f9cb39166fcccd6b67937568f09bf991e7a33b38a1d45c SHA512 12b53e87f412668df4b0cb3ea803d40a024f6183609ed9c6d6d2cec4325bf982b670ce7c7fb9cd0a1277135fe00132b05e6c2f720bcf2fe51aca48ec0012bf83 WHIRLPOOL 93c4ebc1eddf03ddb37cffa03d708f58f4aae76a4186b3f0422cc9eac0bbd653e92d427ccefbb0a7ab236369f1a38dd6df724c22999be26f2dadf30cbd723dbc
-MISC ChangeLog 16186 SHA256 237f33ee9ffba49466b1819f52cd19c1f36f32e0f153346e7d36f1cc91a14260 SHA512 17e78aa6c0dc7472e03a966b4cf84fb26919216d3cfe570e5ffff225088c2f9173c33bd8acf43c904a4afe248343e2757467c13fcbb468c1024d9b54ff27e563 WHIRLPOOL 2ed380472254292a6b9b0d6bfe2c9ee8f21047c68a82872fafefd8b22cbc54c8c71ef820781f9d3734016f995ae02ca8ff6009861d6f2158e19d27f8db80a0d6
+MISC ChangeLog 16311 SHA256 0977500ed9e5c123dfb362b58f8b8f24ec25a27b3792d6d0fbe5df27ea2efee7 SHA512 9d4be5cfe66c81c4b4adced2e121a0332abd8f37eaa85e40167970c9148debeb25936476e8a29df2d52622af99f74f49d9c2515ebb390438df897e878a8a12cb WHIRLPOOL ecaa7995614c84f9f7833e0dda4fd56cf13a05f2cc041b12f2ef9870498afe17dc39bce8dff282c77ab83bb86ecfe2715e32454bb518586e949a1b0c7cf03186
 MISC metadata.xml 346 SHA256 e4506ca3f73e0a7799675ddb48b546ce6e3754e912f77d7d32aefac860b3fb82 SHA512 13885781ec432fcaa913c6365b6101b899ba5cf72573b29eb56a0d567466f15edf43de61fd1cab357149c5ed2b73c8277d69a88589f5f3d8f9ae3ef671f9ad8a WHIRLPOOL 319e314874a770ba6ef2687056bb97d6aaf081b0014cf1f0d08c39d70f24adabd19f0b4b3ce61c00fb72dade7589c9821c4730508967e32ea32a2101f74a35d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUfBK5AAoJECDuEZm+6Exk2SoP/iFHEa64PuJx9oIYR4d1tyIW
-GZL+wzm7+8CGdp4oBbE9DyCBdtkoID11ahbtg8X00V2XOWHLNjjKFbsDAaP0zjlz
-lWteh4YmmoYF6yfv2SK0ys1WpBqXug6Bj+yvdoK7qUTspdI185vYgX4J9JCe0434
-4iItRz1xFdb0bIC+D+FkYUZVl6/4L4E9IU/FtJlC+TuYgMOT6ijhZWqwpu6zxXNR
-eE8LAm/LViOLLa6suPtiY2j+fe7IPZ7eXUnODIiDdWyr+QoFhXVqJQuEnz7R60dn
-TBvCMI/FK5t5YH8BwILr1WxDskwEP4wJ1Opi13FTK1HIo4U/SzJvV02iRDUrERPy
-MBWMgT1JfybKjXFmXUiLwz5eUComxbfAr5c01Pmx82NXshYnwE9wvycK/pJewEJH
-znTj9yKblSqHoGMek1Ia0WWtR5ceoP5JLHeNe14lKs3Y7tfrhWd1NxRQeM2U9Wxx
-wvwV/hVHC01DjoZ+OEQMTLxXdWGCj1VtmkLdV2dbHmr7fXwmZ96W/azKcqhkmWvh
-rvquuWJwqLeTVPgAbqnalvYjm/GJTX7a/1/j0JS1CqSE4o+K0w0bk6MwQZT6D6uG
-zJFkKuJQ8R3IQt+iB7TIj0aY9cn8bbUSw1vt8L8MawW3NC6FTENQ6dRC5Hx3yz+m
-OxIhRVmOQ2ItPzqQB7ER
-=0b7K
+iQIcBAEBCAAGBQJVPj+oAAoJECDuEZm+6ExkjA8P/iOY3lP6L6now2FrmVV3vRFI
+U4BN++rHCfpIkK16XoP5l8eVDkYPhRv+x2Rw1ObknLDvyZLiViOe62NzYtoL1HOG
++UnTre9M48uUIOJbRwA7Q5gNE2GaXG5MLLemcpKGmZSpGg5uAos4TBXjaOqKvyfx
+GPvKnZMnxyUbe5LFjLf9n7sv1sQcZqvMaNiHMTN16NxHXYK1iqA+8JoDkmOje3+D
+X4pLkSDa4Yx0KCdPiHGOxGCGIpSftIn65KUIsnAD+Jan84283dSKaeee9zYbWdFP
+uDa4FE4BbBkkMNvRyV3yPEcOQand7ju3K0uInVziVAqM1HU8u9VEcGKENXSWgPwv
+psPiW8PmmGQkb+ly5T3BOCSqKw96VV88pcahQAnRWBOqojJbSx+HH6SVQo6PsnEt
+AonHA7lYCJarY80Lyp1N6zKWczkPXb8pafJ+cqkVKbfeNioCBJD4nLYKIBdQNGEf
+nSaWVHqBXTRF4UFJiYe8f6+uvO8u7GYzWMIL5Xmr6i9tBkKuUPcnWYICN/FZiQq/
+vfMXGhmTwpZihdK1MBYWOYUcfxko+jQw9GAKFNuT+oJ6ET/O/nIZBnjTGIiofwTS
+kH7DLYpGCe7T3AvL0XNU0pO/qB9uncEdcY+JTskHAUpSxcFxiEwQfVqGu1QG7gaM
+Dop4Qwvw53tjILJCLKgQ
+=K9ku
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.4.ebuild
new file mode 100644 (file)
index 0000000..d862e73
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.4.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.4.ebuild,v 1.1 2015/04/27 13:54:20 ryao Exp $
+
+EAPI="4"
+
+AT_M4DIR="config"
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
+if [ ${PV} == "9999" ] ; then
+       inherit git-2
+       EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+else
+       inherit eutils versionator
+       SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${PV}.tar.gz"
+       S="${WORKDIR}/zfs-zfs-${PV}"
+       KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="CDDL debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="debug? ( strip ) test"
+
+DEPEND="
+       =sys-kernel/spl-${PV}*
+       dev-lang/perl
+       virtual/awk
+"
+
+RDEPEND="${DEPEND}
+       !sys-fs/zfs-fuse
+"
+
+pkg_setup() {
+       linux-info_pkg_setup
+       CONFIG_CHECK="!DEBUG_LOCK_ALLOC
+               BLK_DEV_LOOP
+               EFI_PARTITION
+               IOSCHED_NOOP
+               MODULES
+               !PAX_KERNEXEC_PLUGIN_METHOD_OR
+               !PAX_RANDKSTACK
+               !PAX_USERCOPY_SLABS
+               ZLIB_DEFLATE
+               ZLIB_INFLATE
+       "
+
+       use debug && CONFIG_CHECK="${CONFIG_CHECK}
+               FRAME_POINTER
+               DEBUG_INFO
+               !DEBUG_INFO_REDUCED
+       "
+
+       use rootfs && \
+               CONFIG_CHECK="${CONFIG_CHECK}
+                       BLK_DEV_INITRD
+                       DEVTMPFS
+       "
+
+       kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+       [ ${PV} != "9999" ] && \
+               { kernel_is le 4 0 || die "Linux 4.0 is the latest supported version."; }
+
+       check_extra_config
+}
+
+src_prepare() {
+       # Remove GPLv2-licensed ZPIOS unless we are debugging
+       use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
+       # Set module revision number
+       [ ${PV} != "9999" ] && \
+               { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+       autotools-utils_src_prepare
+}
+
+src_configure() {
+       local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
+       use custom-cflags || strip-flags
+       filter-ldflags -Wl,*
+
+       set_arch_to_kernel
+       local myeconfargs=(${myeconfargs}
+               --bindir="${EPREFIX}/bin"
+               --sbindir="${EPREFIX}/sbin"
+               --with-config=kernel
+               --with-linux="${KV_DIR}"
+               --with-linux-obj="${KV_OUT_DIR}"
+               --with-spl="${EROOT}usr/src/${SPL_PATH}"
+               --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+               $(use_enable debug)
+       )
+
+       autotools-utils_src_configure
+}
+
+src_install() {
+       autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+       dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
+}
+
+pkg_postinst() {
+       linux-mod_pkg_postinst
+
+       # Remove old modules
+       if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
+       then
+               ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
+               ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
+               ewarn "Automatically removing old modules to avoid problems."
+               rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+               rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+       fi
+
+       if use x86 || use arm
+       then
+               ewarn "32-bit kernels will likely require increasing vmalloc to"
+               ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+       fi
+
+       ewarn "This version of ZFSOnLinux includes support for new feature flags"
+       ewarn "that are incompatible with ZFSOnLinux 0.6.3 and GRUB2 support for"
+       ewarn "/boot with the new feature flags is not yet available."
+       ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+       ewarn "Any new pools will be created with the new feature flags by default"
+       ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+       ewarn "create a newpool that is backward compatible, use "
+       ewarn "zpool create -o version=28 ..."
+       ewarn "Then explicitly enable older features. Note that the LZ4 feature has"
+       ewarn "been upgraded to support metadata compression and has not been"
+       ewarn "tested against the older GRUB2 code base. GRUB2 support will be"
+       ewarn "updated as soon as the GRUB2 developers and Open ZFS community write"
+       ewarn "GRUB2 patchese that pass mutual review."
+}

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index e334b27b07eeebdd55d4713542069df0d240fac6..d107fc7b0143278fa5c2f9b00ad9c2fd3593f4f4 100644 (file)
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.90 2015/04/08 18:27:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.91 2015/04/27 13:58:25 ryao Exp $
+
+*zfs-0.6.4 (27 Apr 2015)
+
+  27 Apr 2015; Richard Yao <ryao@gentoo.org> +files/zed, +zfs-0.6.4.ebuild:
+  Version bump to 0.6.4
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> zfs-0.6.2-r1.ebuild,
   zfs-0.6.2-r2.ebuild, zfs-0.6.2-r3.ebuild, zfs-0.6.2-r4.ebuild,

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 8186450d825422789cd89cb181efb889f416c02a..54ebe069aac6f56848e8e2ad464801f3a5435ede 100644 (file)
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX bash-completion 6203 SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515ea7ca3c1a401f831 SHA512 e7ccb7179c4c455c496daab192099d7553674b9505801e25a2ea8c67a1b4de15d68ac99b2c3347c1f3454f88ede7694f08da61c5d061f0577bb1594ca4a90f12 WHIRLPOOL 79dfdc9c80a707f6bb39bea51ec451c16b821886ce3e84c73a249313d991cf8019f0647b0fe439754fc1ad08cb294bf4c245955fdc4af30286a8afd61dba21ba
 AUX bash-completion-r1 11310 SHA256 b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e WHIRLPOOL b09558e80a96993c52915093c1c3f8488d0ef9294d2e401546c21998222f377e211ff368e18e8ba3b1dea7554a467cc3e32c882a1d872719d82f5e2c1ccd5848
+AUX zed 534 SHA256 64e4b7ffcf13def849aa5b60f050ddb4f0fe39c8613917e8eeb357a6002712cf SHA512 7ab4380cddad6856f32490165d473d2d360d4de815e4f0ae961d7a857f9e12757b231281b2c1def4a393091801a6de0e32b6ae214126177a3783d00aed093515 WHIRLPOOL 00f05d4e04721eeca8e801f998e48255c5093c5bb3c97ac7c572c7b9839d388f8cf6e0fa8d1aa4ee5b66ea55ea58dab57934ab352c47899724a5ca5d545a5e37
 AUX zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch 1159 SHA256 bd40a60408772cfe789bd0f055906cd2aebf43761adb2cb19ca6219c92c5f996 SHA512 aba0ee09e0070ee7472ffeb0274fdac1870e6a11390c110e9febd7240eb8465351355ce6b735d3f0a6ce2ce5bd167a4239ececc3dae33899df3b4f72c162f037 WHIRLPOOL 72635866ef46b592d257071d4902d36b95855850e40de0b6a6afc6ad416460ebdc5b2ece67d011a052895ab6ae9135d77622f7fb15f4cc0f3a6b96df6c2581d2
 AUX zfs-0.6.1-avoid-zdb-abort.patch 844 SHA256 651ece4a40b842c00d393d3f969435f733a987cc420f9a300ed2bd1c78e94dba SHA512 d976e0a829ddad680449d0a4d89a7130fb113668bf6766e3004df47a14620e26910e3d0f7cc2f8d5a7cef4a7ba3794ed36624d63ee6c577585d80964e931becf WHIRLPOOL fa47408a8116d5b72f322bbe878f2275febfca613e8718406ed566be23a4a8715113be66c1694c4272f6fc5c26aae78dbd2de31c095aa0cf95dbc7d13d276d4c
 AUX zfs-0.6.1-fix-gcc-4.8-warning.patch 1432 SHA256 2a2fb2a0b4960e7c616f4bb27a2a1ddf6dfcef30eb6b22ead20d70fe58055c1e SHA512 6063ad756aac5df4b850fb79630696f0616e3a906463bdce147b07383ed1cba47a60e02eac3cc2888fb92f9915e6ff8e28ca36c4e3d11cc9e65391c68a79d972 WHIRLPOOL 4d0432ca6468d44de7a870e03d20497eeb39b1e373d843862a695622b9d69e8eff6f3d52471b7756f80c9392ae12a797b6665c4d27f73710f67f0ee1aaafcbad
@@ -16,6 +17,7 @@ DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea82109
 DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58
 DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f7b40b6675c4a56fc630a47e90d5280 SHA512 e2fa573c7b30a3811e9e1596d35b65f5d013ed5bac43e364b44ffab734398a3294979c152a80ec9a722611cc7c971aec217d8e1a37cc9240a3fa2dddb5b90e3b WHIRLPOOL f2da02d5c7d2385e7de1e858c31d299632ca864d422f0c94e5d3b8674d24beeb073ad2600698350306a9e70dbeef390f0e513d19c126502fceec18795c203d50
 DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe
+DIST zfs-0.6.4.tar.gz 1735736 SHA256 7f37aaaa1fc15201dde58bb84e0f191ccac462f19ffec0c889b6f6ed3f73a804 SHA512 cf47cbf5fa8dff75f5e9d81b323f5745d7b210266ba9e6ccab16bbf0e2b055aa1168bad94a77a4bc56c6fbe0391593f210bd4c74f7a8d0d99385ac4dd61e5622 WHIRLPOOL 1b0cc8a9727b57f2e63bd106cd94780002a068b31668b9dc103dbc0b48858a380d7c228f39f0526fc84b9d10aca1bd376ace0346a2ef4306a9d164c2d56606f1
 DIST zfs-kmod-0.6.2-p0.tar.xz 8244 SHA256 84456e1d52c6d44cc377d131ee34c042c289d00f74e7a9b521d8ef82bdfcf369 SHA512 ff29830e44aeb537d82d2c34070a245271b51013131f9191d03ab35eff2b86559c4bdadd3cf21f7aa7bec07c3556ef712db9cca2beedd1288036c29d750567e2 WHIRLPOOL 62b9a920a832f5715a24c2a0cdc914a5e77700b0e8723df868b1bf8b8a7ecec6f7df14cb294dfb4f4f219cc8253615c594b609a117b57b576e1796b8042bfdc5
 DIST zfs-kmod-0.6.2-p1.tar.xz 15988 SHA256 0d5ee6d53f6ba694937a9c1f009a0c18519e56cfcd328e5a42a0486f967608e5 SHA512 77b4f167073fa1be2501889f6795972a370c90b58dca121c95c38d98b37fa092ad043e5ab447e677f2207da7119b9fd2c940990bec83118edf18daff2eccaa16 WHIRLPOOL 730347f5d6c7449f309f6b53cdbcbb77b94c35385cebdb5a953f851f01d26c87d615b8ef673a7346f8351e01237833e18ed2fc7cca78bb200e7537222b3e46e2
 DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9
@@ -32,25 +34,24 @@ EBUILD zfs-0.6.2-r5.ebuild 3673 SHA256 ec480568211aa302d3ddbce2625285f04bde7df1b
 EBUILD zfs-0.6.2.ebuild 3381 SHA256 58d26b5d4459f1734b5966c0b6fb0b120204806b012be3e9172563564494c511 SHA512 b9287d2f5cd0516f04862e9e08ae2c91c8b4a659d481bfa55c72bfdcc3cffe81860a6c36cf2e75315071570287eabc0b4f83e68406139681fcae0ca512f2e857 WHIRLPOOL e6e55182157da2becc9cec2859196899f1cdce21bc3d8d19bea115bedb72f18daaaadc334c9f85f84700991a095704008cf716d2efe34265935bbbb31fd5c0b2
 EBUILD zfs-0.6.3-r2.ebuild 3550 SHA256 fb126bd922551ce43ac38ccf98d67bed958bc8d7ee1e2a61f673675a607d67fd SHA512 7c3dfa742845594e405874cb75e090b098eae958e8cce8defaf8f144e4e9a0a6d11a58d7aea32c543807230f36dce01e776eebdea9733fab57faebd4bda1095c WHIRLPOOL df2196c9825f4cd6fec75500a7ebd313bc6c43fef28ee831344efe480c7db9701867c63522e3f91c5fc0635fa41dacf523f8f10a81a79555d6ed8077315e4787
 EBUILD zfs-0.6.3.ebuild 3396 SHA256 a80b8478e9f2b3dd4545fd6bec09eea72dbe7890be17d3489760488f88a41b89 SHA512 29f7ee6bd4ad2f3b1af9daac7eda786eb6cac27e7d74f1c81c3f801c486d20b0de0a4e108c60b88fbcb78f76de02e9b7a96aef6c27785fe15854f3552cbd3743 WHIRLPOOL 91764766bb1ada9b5ee4ee5dc87762939b06f435f94b8509c6169ed91f063fce0677eea3d372cb56ddd63c9f71bfe2a5672de84920bdde3d3a10c8080ec4c27d
+EBUILD zfs-0.6.4.ebuild 3421 SHA256 76e51dcda233332f9bc01dd9115adaaf44902df3f05ceefaae624c966b46fad2 SHA512 b12f6c1441b132d8cac7e13443a7d9492c355feb6b688b3af89227d377900ab6f23e879ab6f4d0e6c88af33bf51c086dea80e02792924422a666ff3c311d42c9 WHIRLPOOL 342e278f5a28c8294df25bd36c0327100b06a913065dcaa00c708e4abf33bd97f7339ce535d0db4e1035959f63afbd4d6cd4e492db8a34d419e05355c40f6800
 EBUILD zfs-9999.ebuild 3634 SHA256 ddf1dc0a8ac3a2426bd9c01505aaff02cb7bd1a8207462db80a29d6a798a8bb4 SHA512 db291f7971ddd71e0263fb4f3162231c16592f995f61a1097f1ad04cb2048fd4ff75798b53fd92ba9334030475b0c1323415601b38bf263d975f14bdd396bfa6 WHIRLPOOL cd7fb307a77a5a10d318935e058812a98d22e54e1c4bd97707882d219d47c66162a0123c5f53703c17203638580432b6caf5c1e62a78bad2a71350cba60e8731
-MISC ChangeLog 18201 SHA256 e026e80d64f5006682f8c0a6878efc950b5c48942f0cfca1ca2f2999d1bf7357 SHA512 0d7a8ea4d92e872691f9cd9fa920d149d193cc39efcdff52cadcd0af578c244c878b7f4353fb3533a486727c1e81b3967d59a984d7e8956c15def95a211baf5b WHIRLPOOL ae48d2164ab1ae2ceb715d63aff92490d25f309d897670530bc847180e60a6437b5c76c843bffb61636dbde7ec8ec6aa3e1959f1a99ccd6a2cef5f32374b8a1a
+MISC ChangeLog 18326 SHA256 60d0be68813b5ab389adab6bc2adb0074d5f6d09be9ea7a452df9e8a725873a1 SHA512 97d6ed238cafc13fb21b4f648f0fb92e9b8bfd0bcbaf96ff3e98f522c36e748789565775ea0ae3d6b5187393589b17c7028873854bc20f0fac1db5f4a1f9cda2 WHIRLPOOL 7ba23a93e39fc25e43fe72d3c3466a37449d98217a9e83eb06d7b43573dabb3a4f82be997a1f9a9ea5388389bed4719ee557f5472911beafbc2f6f6ee3512c1e
 MISC metadata.xml 546 SHA256 980db453ce3112b91daa26f61bbc8eec61d12d0998d0bf76a1308aecad499c42 SHA512 33e25501a30e8cb8e890c1dbf98f5d5264a7958f7d710d37d4ee36efbb318d0db23533fefd51ca419cdc6f72416c1d0cc4fd3b1e68a157dca14890d54f411df6 WHIRLPOOL c96639028769b95ba23db8e8e20d71f5894b1ecebd6d3e62effc610d48e2c55797fa3536dea6e654185f288dd8edb6a2a063829598703f0f0ca61aa02f995314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJXMbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZON1IQAJZsFAZufz0tbFHVvgoI/MWm
-Huwqs3EnASWYPYlAah93D7m9uGvy0H2A0ru7lQgYgy3Jwnc5PFWACKcxJEEN7tW5
-JYoUSEt3SbWZU7UUhCye65dHtn6Jdrm6j4sKho9rA0C2KLDgP603u0WfAz5Nw9Ee
-3Da5G+TIo8Pf0iOU17ulc7MWP1FtupGq5gJ5KzRw/0/t4nIOzh6akVo0iT50vI0O
-oLQczYO2y9PuJDXarSgQzIhWkJ2YlQ4JSSihX2UkNmEVMYNHdRI1nXrR0C15FqPp
-1SjOyWfrwzKsmYqasFf6aVe8K6qpPbaJzOO1QybyAXYvjMlQZSpPAGgtRxB0QODm
-ez/OiwtwOjnLlIDnKwn/qZ8u+qko86NPrkX3Pk/5K/sI2O95LAOnCKJJQ/yjyxds
-VlZ2uxTBY76GCgwa8De0RhCdhfvUHpoxABRAZ/IjuffIEdWVod7FV6aIEUhVoFWu
-/0a9L/fknYUVWeLM9DyrZljbLaZrPCFc6VUuOalJsaOorN3Nd8aJt1omY2v1iRbT
-gBnYXKEJxHWrFnOm6VZfLvAIBmWraDLLi4u8rzZID1E+qftdtUJGrADmuiZjxF9r
-JzJ7XH2ClqfhJAE1PGIL1trNiIm8UiA8iY/Bi8KzjkeJFoBBe3IB0HxtSMvvynBn
-wRaK+Z33jE7wpEEYtv1c
-=bRbv
+iQIcBAEBCAAGBQJVPkCcAAoJECDuEZm+6ExkvZEQAKs1G6nm7M7ViLdPt8jcl6w7
+KRBvMkQhf2l8X0TgQqy7qaz8LkCR1dUThJTpoy10miKlF77H/EuPCwxYyMULdFkx
+s1E4FCsfCvJg+3NzVOAe8Li8tjY7rEcr5A/W/zjuH4gF72TcvwN1CDqIm1sIEAjz
+bIKYtk2GJp467Irvh8Wxce/nrFFMwTnfwccyaa1uAapVulvGc/oPXXumr0tzKV4j
+8vmya7K7GIG01Pg15l4RoHPFnqGzWn7qaGuQ2XwLJ4QRpRUH+9iGppvx3rAv2acC
+N0c2FK5JsI5Wb/MNQWqk7VrNWTF/bR16tJMnAFfq2NxKrliO4lgNDdSqS4DxGybj
+nnZ4dc6ZzxfgAaXjeB/Om5aRnhivcTWE0npur+yZk7K0mQUa3s/25cGBALy/L4Bd
+rKq06l22sshLIWXRJXTcsY+BPZNHYMuHKwEEpQixHJfF1n5aVi2ZLs+VYmEBFyNG
+B+YaNb8wEL9imAtfBEASUow+sSsSKs/Xw+9tS/xxp7ddW/p29QiCn7M4yibbXIEe
+9+GPQL4mcoRkwoLKW/lRCfbSdIghvX1/HMB2P+qqNthJYWqNIk/uiHzRP7Mdx9Hf
+FkuEVMLUy24l69k7jj1zEdAqlA3Eoriq3kCHsJjmCx+A3ztWJcTJgh4ACebJpQkL
+q1pEK0yBKGD/FZrA7rd3
+=7kgp
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/zfs/files/zed b/sys-fs/zfs/files/zed
new file mode 100755 (executable)
index 0000000..3668878
--- /dev/null
+++ b/sys-fs/zfs/files/zed
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/files/zed,v 1.1 2015/04/27 13:58:25 ryao Exp $
+
+depend() {
+       need zfs
+}
+
+start() {
+       ebegin "Starting ZFS Event daemon"
+
+       checkpath -q -d -m 0755 /var/run/zed
+
+       start-stop-daemon --start -q \
+               --exec /sbin/zed -- -M \
+                       -p /var/run/zed/pid
+       eend $?
+
+}
+
+stop() {
+ebegin "Stopping ZFS Event daemon"
+       start-stop-daemon --stop -q --pidfile /var/run/zed/pid
+eend $?
+}

diff --git a/sys-fs/zfs/zfs-0.6.4.ebuild b/sys-fs/zfs/zfs-0.6.4.ebuild
new file mode 100644 (file)
index 0000000..698180d
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.4.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.4.ebuild,v 1.1 2015/04/27 13:58:25 ryao Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit python-r1
+
+AT_M4DIR="config"
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+if [ ${PV} == "9999" ] ; then
+       inherit git-2 linux-mod
+       EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+       inherit eutils versionator
+       MY_PV=$(replace_version_separator 3 '-')
+       SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
+       S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+       KEYWORDS="~amd64"
+fi
+
+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/"
+
+LICENSE="BSD-2 CDDL bash-completion? ( MIT )"
+SLOT="0"
+IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+       sys-apps/util-linux[static-libs?]
+       sys-libs/zlib[static-libs(+)?]
+       virtual/awk
+"
+DEPEND="${COMMON_DEPEND}
+       virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+       !=sys-apps/grep-2.13*
+       !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+       !sys-fs/zfs-fuse
+       !prefix? ( virtual/udev )
+       test-suite? (
+               sys-apps/util-linux
+               sys-devel/bc
+               sys-block/parted
+               sys-fs/lsscsi
+               sys-fs/mdadm
+               sys-process/procps
+               virtual/modutils
+               )
+       rootfs? (
+               app-arch/cpio
+               app-misc/pax-utils
+               !<sys-boot/grub-2.00-r2:2
+               )
+"
+
+pkg_setup() {
+       :
+}
+
+src_prepare() {
+       # Update paths
+       sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+               -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+               -e "s|/sbin/parted|/usr/sbin/parted|" \
+               -i scripts/common.sh.in
+
+       autotools-utils_src_prepare
+}
+
+src_configure() {
+       use custom-cflags || strip-flags
+       local myeconfargs=(
+               --bindir="${EPREFIX}/bin"
+               --sbindir="${EPREFIX}/sbin"
+               --with-config=user
+               --with-linux="${KV_DIR}"
+               --with-linux-obj="${KV_OUT_DIR}"
+               --with-udevdir="$(get_udevdir)"
+               --with-blkid
+               $(use_enable debug)
+       )
+       autotools-utils_src_configure
+
+       # prepare systemd unit and helper script
+       cat "${FILESDIR}/zfs.service.in" | \
+               sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+                       -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+               > "${T}/zfs.service" || die
+       cat "${FILESDIR}/zfs-init.sh.in" | \
+               sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+                       -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+               > "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+       autotools-utils_src_install
+       gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+       rm -rf "${ED}usr/lib/dracut"
+       use test-suite || rm -rf "${ED}usr/share/zfs"
+
+       use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+
+       exeinto /usr/libexec
+       doexe "${T}/zfs-init.sh"
+       systemd_dounit "${T}/zfs.service"
+       doinitd "${FILESDIR}/zed"
+}
+
+pkg_postinst() {
+
+       if ! use kernel-builtin && [ ${PV} = "9999" ]
+       then
+               einfo "Adding ${P} to the module database to ensure that the"
+               einfo "kernel modules and userland utilities stay in sync."
+               update_moduledb
+       fi
+
+       [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
+               || ewarn 'You should add zfs to the boot runlevel.'
+
+       if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]
+       then
+               einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+               rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+       fi
+
+}
+
+pkg_postrm() {
+       if ! use kernel-builtin && [ ${PV} = "9999" ]
+       then
+               remove_moduledb
+       fi
+}