Bump to 0.6.3

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

7 files changed, 329 insertions, 47 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index 8e9153d21b56..1ffc7a7ad456 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2014/06/08 17:13:57 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.48 2014/06/13 01:21:17 ryao Exp $
+
+*zfs-kmod-0.6.3 (13 Jun 2014)
+
+  13 Jun 2014; Richard Yao <ryao@gentoo.org> +zfs-kmod-0.6.3.ebuild,
+  zfs-kmod-9999.ebuild:
+  Bump to 0.6.3
 
   08 Jun 2014; Richard Yao <ryao@gentoo.org>
   -files/zfs-kmod-0.6.0_rc11-fix-32-bit-integer-size-mismatch.patch,
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index d04c9f4f8ba9..51da6074965c 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -27,6 +27,7 @@ DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535
 DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d
 DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b
 DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58
+DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe
 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
@@ -36,23 +37,24 @@ EBUILD zfs-kmod-0.6.1-r2.ebuild 4247 SHA256 99332fddd683857632399b83bda56e2018da
 EBUILD zfs-kmod-0.6.2-r3.ebuild 3414 SHA256 9c26a3f82a0002084d4b96082cc589eb52046e6793691f07ca9d6651e9a0b5aa SHA512 1431b2204e791e71dc75ff6929deedf0201858a428b1008397ccaf329d09df4dfe32b0a820fd5de2f45b896b3558a6da901b3e7633cc0f78bf3b99cb9d5ccd1c WHIRLPOOL 45bdaf81d82bcfd464171a88e726d8158f31408daa68317b04fc57af896fd729d6505dd6906abbd7c0cced0eaf06d47d3b457b0f6051c3bee25297c7aca97490
 EBUILD zfs-kmod-0.6.2-r4.ebuild 3414 SHA256 abfd3a39d1bafe288474f2fd93191ea5261562d5f9829ec1fa3fa85aab7cc08e SHA512 cfa0ad4bb57d90ed53912736245ec7478d8cead7e943294b862c71191b869b311f1afb252ecdbf98856f65c16738ef65701f542d85eca5988ece486fcb84861b WHIRLPOOL 7ea56465d15cc5d9240cd637c2fad4083f2001fd1163617291d1dc968d43d5630479e3ffdd60db655a66f1441649ba5a1d79b5551dab98d3b70bed41848c0367
 EBUILD zfs-kmod-0.6.2-r5.ebuild 3414 SHA256 e1351abb1a3ac482eee2d253271cb4364462aef43d6135fbc6f61e487d358441 SHA512 586a58fd1b0e6289d9e90ce134a4ea90d7280c2313f8ac0d2d1d8c30d698685ae7c90089671e438a2ce4ddeb9144c2edb73f35014e8f84e693f5524b77dd1d2e WHIRLPOOL 0baa387212abba6fb03770f4a4d9cd299171b0420a6fdac107aee76033fa3a0de928c2ade5cf16a09b480df2b3fdd4f46dc0ccf5bb8e0c767fb21e4a6cdbefd4
-EBUILD zfs-kmod-9999.ebuild 3484 SHA256 8e3d57e44b4e87b007fada2d50e4fb96704e53c1856a6d9b403c28089e39d82b SHA512 20e8da68c3de8ece9b031c46070e310c2bac66e4c1a994105c851310f083e26bf6ff70b8270fd86c1ad4c9b06bd2ec524e15cdc357475d5cbaf1cc32bc1fdc4d WHIRLPOOL 4b35c9291835242dc3621d77f62d8c991b8660418451b20399a42ac6b73b1a0b0059e211c60d3c98a0d48798ce8db64354a8c9108a7841587c4cfd29a899b125
-MISC ChangeLog 14202 SHA256 2eaceee82253d049c66091ba5132e00d2eaeb0e3b2edecbf497bdc5ad98e1f92 SHA512 3978bc30de8188e22bc804d0cb686712113d4404f57d2dba4fc5e37b82ab727770f9adbeb5cc2cce163eba712fe3f404bd06c957abcf1303d807fdcd88668793 WHIRLPOOL 1c6024e255d5c2b6f12720b86c9931e633e8c36530847602ba1bf9cb9333b5cd456b6e81d377531ba42873a0b0814028d94014abd2ae14fafdd0cacf5f7add6f
+EBUILD zfs-kmod-0.6.3.ebuild 3401 SHA256 e0ecbd7ed4f3bb37aa7d13a5e3c3c078af04166b0601dea7df7f958a1f9c554d SHA512 8d0ccc57e9d1effd23874d1e4c62ddf0137d2e0526fd71ce5cb82f4622fb9f4892dbdde7fd8224793a34bc58ef115a08cb56fa289b6cd30da0e68f56545e0445 WHIRLPOOL 8460ad5ed6465719fd7d8d761822cb22e7683424c1b052421fe58211b4fad990d4d0ca479453e482e8f0b30c247eebad08aee5f9099d67add9381657bac3bf26
+EBUILD zfs-kmod-9999.ebuild 3301 SHA256 3d845aa6fd0fa4ed7856da7016b05086fa5538757fc174ebd22f95872c445f14 SHA512 66bc01197c97b4c2a410fbbe172405c9cca86de401bea8a19486166ce3959d02636fed8e2909f488d1281521c57a71209e2cff2e56610716b55ef78455fed248 WHIRLPOOL 7fd193d41c62fae332e77658641eca1cbb9ff9f2ced8ee0177299157f3c07cdc9b598ae4ae4bf2d5a314d59477d27c9bf611b6e7e2eeb11bb0a73778cae65dc4
+MISC ChangeLog 14343 SHA256 87d8186cd097d769249f4421d38060b5bdb07f8412c790918ff8ecfea86de9e7 SHA512 43306382f35587ee44f6e22ef273680635f092f1ff5f1a9139712ee97cf121864a91312eb047147c3b801de05ee94922acc9a7995c109853e06c42ac5fafe738 WHIRLPOOL f93148b8442224fba1123f6c01b8a272ce3cb89a73be811947966c97c43ca18cfac3fca8ae66762119e0c5caf8fa70ebf0ec289727c8295795d75c7814d5cab1
 MISC metadata.xml 346 SHA256 e4506ca3f73e0a7799675ddb48b546ce6e3754e912f77d7d32aefac860b3fb82 SHA512 13885781ec432fcaa913c6365b6101b899ba5cf72573b29eb56a0d567466f15edf43de61fd1cab357149c5ed2b73c8277d69a88589f5f3d8f9ae3ef671f9ad8a WHIRLPOOL 319e314874a770ba6ef2687056bb97d6aaf081b0014cf1f0d08c39d70f24adabd19f0b4b3ce61c00fb72dade7589c9821c4730508967e32ea32a2101f74a35d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTlJnqAAoJECDuEZm+6ExkgPwP/ij50d7l2BZ+w7z8PcfQV1RL
-ud6xN+NCdbQ5Gft76RF3iVZx/GEn5ZdTVJKswoth7TKGY93osiB7WAkoeZV/OuTo
-BMwJvw9xKOBjfVDDXtxWVVEkUiEYJ/zo0zKWp7qMYwHTYkrq6HN0Q3YPihwvOQjt
-PbhaM1rNE4fIcs9M+Gp3CeJBBa56VbT9StbmNvZSODdZUcLwZ6ThYxHzZl4l+aiA
-zC/gOE4tAMw2+z1pZ99LSJTCWEeEkUjnWYI5pADK62aZNJaNTsa1CXvUEd+8zf0N
-ERoMV6IfOtTw+70wKrlOS4UboyfKGbFYdYZD1lgba7aZxifbDSEt+SaQrcSVHUJs
-S0baV6fFk7Ntg8aPq0YByJkrXsYZVfggvIYdvOetu8UQ67tuHJv3AA9HgnirJYph
-W0xee9r95cD27sEDVVASjIpy4sEm85rbLqUm0TYtV5jqGwdWt9xYID2yVwJlJUAt
-OwwNV1a1Yi1/FRnw2tQJFIhnrb+AYbK7H6nGduSQZZgm4qPJ/InF1DmUBRJKA3B/
-cmaRemereVjMQX/3/vPVc0I7X7B2rZrepkB0PvjnGhIWkli9wwva5o6xWZAhx49R
-F7ZMl9oS177lZKh19+mLQ+pZw9rKHq5PGVgrulgkfwUz1UKTXeLOhHfW3ZnQWCjk
-+BmO611zDgaq4Rh8lS3Y
-=xbfk
+iQIcBAEBCAAGBQJTmlICAAoJECDuEZm+6ExkkpwQAIkBbrfo6Posb0q0xvokj/F3
+RyoOGlO6Em9ypcFKpM7VE5LGOCpBm0ig6mrWaDl5V4JsqG6x4+6P9EOb0Gs3KCgJ
+SSMEsVEB70ySj9oFcWakdIa2ZTCTbf8iJ6eolnVYmJekend1bZAW2QEYP0NMbKlZ
+FRdRfJ4anxcVj2wys4Wq/Xz6jVDMnEFOXCZ3DIR4ZwchesAnRz6DjtgXyQewak34
+I7fBxCpi+8/m1JARunzxhT4f4b9ldmPvdk4jz+2PcabbUoEnH0rFHKgetiwJP3Ow
+p3zjsOS4Vad/435XRbxEvKRQu3V8Mk1SRgXN5dJJXTp0DTZhgWuNpbbe627djFnn
+tVnEcQDFxbhv9RlpdIC8h558j3Ot/L9w5lB0Zo5L8WjdoqF1i55bWKwqDEazBx6I
+7STYYELqpCDH3Z00iCGOJMHih6+WekqD2dQzBmrO0Xw8KFrCtdystg5VJTWB3SDd
+QsPD5MQ5765Mdmr+n5ao36tspD8eNDnDJv5Cy5vChyFbhSbhZeh8iFt1H9gxhXzb
+/pY1qMnTKPJNx6/64R2pTB0ukKugPN0HFYWdsfu+5eh8rtwT8U047O1cps3Ji46o
+ChCSc6/+004Ryh7JZ3zIpU0kLr5jll+dBcM6720AgRxTccpGLhlMOJbBjpdqbdov
+IHdAqRYrHkHXqowPsrzw
+=4/Nn
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild
new file mode 100644
index 000000000000..0093628a4002
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2014 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.3.ebuild,v 1.1 2014/06/13 01:21:17 ryao Exp $
+
+EAPI="4"
+
+AT_M4DIR="config"
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-2
+	MY_PV=9999
+	EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
+else
+	inherit eutils versionator
+	MY_PV=$(replace_version_separator 3 '-')
+	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz"
+	S="${WORKDIR}/zfs-zfs-${MY_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
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 3 15 || die "Linux 3.15 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
+	sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	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 features flags."
+	ewarn "If you upgrade your pools to make use of feature flags, you will lose"
+	ewarn "the ability to import them using older versions of ZFSOnLinux."
+	ewarn "Any new pools will be created with feature flag support and will"
+	ewarn "not be compatible with older versions of ZFSOnLinux. To create a new"
+	ewarn "pool that is backward compatible, use zpool create -o version=28 ..."
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 83064c9c8aa0..e2d3d622a17d 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.21 2014/05/22 21:39:35 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.22 2014/06/13 01:21:17 ryao Exp $
 
 EAPI="4"
 
@@ -17,8 +17,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz
-		http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p2.tar.xz"
+	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz"
 	S="${WORKDIR}/zfs-zfs-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
@@ -53,17 +52,21 @@ pkg_setup() {
 		ZLIB_INFLATE
 	"
 
-	use debug && CONFIG_CHECK="FRAME_POINTER
-	DEBUG_INFO"
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+	"
 
 	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD
-			DEVTMPFS"
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
 
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 12 || die "Linux 3.12 is the latest supported version."; }
+		{ kernel_is le 3 15 || die "Linux 3.15 is the latest supported version."; }
 
 	check_extra_config
 }
@@ -72,14 +75,6 @@ src_prepare() {
 	# Remove GPLv2-licensed ZPIOS unless we are debugging
 	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
 
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
-	fi
-
 	autotools-utils_src_prepare
 }
 
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 4132cf3300e1..1d86f024ac6c 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.81 2014/06/08 17:15:19 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.82 2014/06/13 01:21:31 ryao Exp $
+
+*zfs-0.6.3 (13 Jun 2014)
+
+  13 Jun 2014; Richard Yao <ryao@gentoo.org> +zfs-0.6.3.ebuild:
+  Bump to 0.6.3
 
   08 Jun 2014; Richard Yao <ryao@gentoo.org> -zfs-0.6.0_rc10-r4.ebuild,
   -zfs-0.6.0_rc11-r3.ebuild, -zfs-0.6.0_rc12-r3.ebuild:
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 18c5698db8f2..6834cf01ff2c 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -14,6 +14,7 @@ DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535
 DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d
 DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b
 DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58
+DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe
 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
@@ -28,23 +29,24 @@ EBUILD zfs-0.6.2-r3.ebuild 3656 SHA256 f2ebce59db5b3310c56e71b3a5230a09ad4b3fb19
 EBUILD zfs-0.6.2-r4.ebuild 3684 SHA256 66f4e6eea43083fd3162aa7a3a0134a0dcb09b4b89c65002158ce9661ff2aa1d SHA512 b9b550177afcd0cae70661f63fca6f4a69eb0fc6aab1a11130706700797e4857d304fd086dc0b80c0c57fbfbcbb397c09319aaa8fcd2b355905aa05b0db458a1 WHIRLPOOL 062a887933463c1109ee252a2a4f45d6a5b32fd7d191ffa26911530605f21a306ad5778e18083d9af6b19c85f8634b9c3c84e6c99a97ced3404ecc73a670eefb
 EBUILD zfs-0.6.2-r5.ebuild 3684 SHA256 b4f0cf9ea3b45dc9fa2f6487f798668eb9ac303a38b380198d0f4150cbda12ad SHA512 8cb120b253e21a2b07d34d613c8db10352c5ca6edfeabdd999d6584a25e342f3ec5471e1b097528bf78e6291b71f741776c36e0de052f632920eae0a6580d718 WHIRLPOOL 10ed18a29d53d70bb610260976f994e666eba2b0d4b696a8218febda076fb865232709adb69aaa63a81bf7dd3b1943a9071ae14ffcf540471cb967217d59e033
 EBUILD zfs-0.6.2.ebuild 3392 SHA256 18fcdc47bdbefdbc086b6fd6db8ca48d21560b1fa9ef0c1c3e5e64fc70802832 SHA512 a6405759c13611573dc04efa373bf9c1d33804dcb0977a598b0da775616b741e64d5ad25ab31a857117058b453ed7f3f617c92d27510506e323aeacfb9c64c75 WHIRLPOOL c19a40880679bda65244bfacc96ee3153b05903917d1f6dcfbb1d0bbc93e16a2307c37fbb4585b3d758fd187d0a5d419fbc9974d2198e1e476bc314e2e4b8cc3
+EBUILD zfs-0.6.3.ebuild 3407 SHA256 2d4112e451c9106827e4c5ad3cd13b94e3f72f3f02e134150fb53a0c81264f68 SHA512 63e84a80b82cb0eb2f07267a6cd39c3433f3338769809736b031303207bb4bbb105081c5caec86c38c11d609fc8e1dd361b8fdcbd902ae32c39e3219120c55c8 WHIRLPOOL b04c178cc50f1dca350d72b3b4a83f7f7e59c3f355d7ad827e2a17db23c53813dcb5045ad497e97888e04480640715b89fe21b362e9bdb17c1c9acb226af1889
 EBUILD zfs-9999.ebuild 3690 SHA256 0d18bedacb05e73b4b09d8887430cd8efa99aa327d464b8784e124194dcfe57f SHA512 c4f640f41d25e83c8bd16f15ba69f5cc3c28650797fcb9bb8a4906c0d9fdf84e6de989b7039dde7a1179661ca712fd2f94f8f8777e978f81385c328e11d5f9ca WHIRLPOOL fefae63e71c1a8381fea72d06b99ba8a70a9b8698ab2204a9b5e33700a75cf6e8156e50485f18aa575f7af327542765a1ad57b86ec6ade4c7e6bc1bdf0de49a3
-MISC ChangeLog 16384 SHA256 5888c6fa3d35d3aa4333b9b4dd31636cb6c5ef5c3a429ab4f4aa86df00c097e0 SHA512 d1224f1dd2798e0430ae922ed4e420ab562c4b2a28afadf1563d43c8363de3f9000e680fef0b695df4c7064438a21686e68668b6294c1525450b3d9a4dfa17f2 WHIRLPOOL a60a10cae7d97d56e5629d4ceffe98945f177cef69096677480765480c9324d743ab711eddce4514ea1fab1e89c04b031d806d898fa1a2d4a5446e6ec14eb614
+MISC ChangeLog 16491 SHA256 db3f0f2abaeee90a5b137959d72518fe826f524c6baa411b9f4034dca1eed067 SHA512 371bb0f1c56ea3b4bb6c88573cebbc82b1f0b5e0b3a6210d128637d6ad707791918e01163e7ec2ddc47f9b797845b00d619e6d97875d645562744ffd0404e493 WHIRLPOOL fd2c3e936bf7d423ade0b0009aa63580cef2d80bc87748f24723411f71896fd284471ae149a0656db6582bf63691dca23b65315e1f393d322b58bf390b8191da
 MISC metadata.xml 546 SHA256 980db453ce3112b91daa26f61bbc8eec61d12d0998d0bf76a1308aecad499c42 SHA512 33e25501a30e8cb8e890c1dbf98f5d5264a7958f7d710d37d4ee36efbb318d0db23533fefd51ca419cdc6f72416c1d0cc4fd3b1e68a157dca14890d54f411df6 WHIRLPOOL c96639028769b95ba23db8e8e20d71f5894b1ecebd6d3e62effc610d48e2c55797fa3536dea6e654185f288dd8edb6a2a063829598703f0f0ca61aa02f995314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTlJo7AAoJECDuEZm+6ExktrMP/R6zeK8miy6M1040IsEs7NoK
-F/jQVSVcarSRfUinrQzzMP3SXM+ogtFh+yyfioRjHq5PzcLgUyiUVooo5AVjWZRV
-5QggADOwlB00RxiLJ7PWvSOCjA49JKEf1BzelrfOGHZHT6Or2HP1izFghsxp+BN2
-tpyCpZkmhpHjVtG0HjLotVPAc2a0qDlgR+NBtsFCrFvMweS7rK+pd+Qf7VCdKfjF
-T+2NIr0aH146gCoaY6D2rqYJdulnyBaGiuYiYrSqq2rZqJ4vxsB7qFlrcP91gthr
-wJ3wK/5oR7g5H+P9mSQpR7K+2Ad4WTZNCCDX2Xx9wK12U4ixu2I9lwjWnOIryewt
-22QudzzcNjYQ4BwE2NQ9nJVquH3JPsa6SU38kx7n/7Nsgr8lVNru33KFY9lLBpvU
-p4rux9FkAvqJggfNuSCzS8QS97NfynJf9nW/wzNkjEZ2/2sm5cUt6AVkKd9zZtim
-lgJdBNDXiK6LaMqo3MhHDsaqMNpZGieB0GCPkMX3wR7nsMjLbxkzACwjC3IN4lK2
-fizV4tNycgumMoFW5tEbNkFIHnQRxN77LxogekysJoeEKpwFhD38EKXfwM0BuBU4
-9Tpcf4NpvjWQE1Qs2zViFPLIhHeKZWKwM1n9OORE65A7o91lZ2zrs4aU3B+eqB+c
-xWb+/lp0p7h4c4y+tH50
-=gNhm
+iQIcBAEBCAAGBQJTmlIPAAoJECDuEZm+6ExkhSgP/05JwBmH2ViJ6/Tm5I8NgZ7J
+f/kNsjN1hu2rNoFCVxGiisspPgR8o2ainV1Csj1vflMD80J1ZPRGOuSDu/5kBuet
+MN3B9AmYgacIugsqW5xhCxv/bclDvkRmDfnzfizpi3TTN68U6+nLwQTnGKrbMWWa
+mVCb5WpRR5Mzk+td97o1jwQpt2hJaNokTPeds29yJ+ssyTaFAxSUNaQZOiTDPv7S
++uZ2ysJQ3CVdjSK8ryrzboCa4N5e8z5QpKPgAodKWwpXV1Q3xmMJVLw6wr80mrr+
+eyiBp1/GT9I+qQP13dNte3pXJGOM27k2w6V4wqHzg+/UOGpjR7EH0KClSuahGnr6
+DjVItI0yObkL6saNviW0OJXuOJcn8symzGh82Vad0Dm+FuXcbnu6Do32cke36Kwj
+pLv66OX0kyy3IebYQTkFq5QQD0nbAWP6TQFMQT0uFMkZJcj0dusmz7xUhfrf3efO
+nqNXmJl4F2cp1ITgHKmJWygndqyXUyrsPqPfPFOCPP4ovRZ/t+Dh++CFtTr8rEva
+KCcJTFqqcOalRM4kvgftyOLCKia2rWt9UPIT4Nax9O+o+KJu2Zmjz/sa8ym3O+Qs
+nIpCiOqvUfeSXRjDWZiLf0bVv6cLUie/sjBus67NyWeVgSFnFEfAT76pzRK45v/x
+Ud5LZ1RVvihC8fSUT+f4
+=fPgI
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/zfs-0.6.3.ebuild b/sys-fs/zfs/zfs-0.6.3.ebuild
new file mode 100644
index 000000000000..5f1dcabbec85
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.3.ebuild,v 1.1 2014/06/13 01:21:31 ryao Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+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="$(udev_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"
+}
+
+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
+}