Bump to 0.6.3

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

4 files changed, 165 insertions, 32 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
 }