version bump, Acked by ryao

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

3 files changed, 168 insertions, 19 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index fc60cdd4a1f6..f5736c51877e 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/zfs-kmod
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.59 2015/05/15 18:27:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.60 2015/07/12 14:20:22 dlan Exp $
+
+*zfs-kmod-0.6.4.2 (12 Jul 2015)
+
+  12 Jul 2015; Yixun Lan <dlan@gentoo.org> +zfs-kmod-0.6.4.2.ebuild:
+  version bump, Acked by ryao
 
   15 May 2015; Anthony G. Basile <blueness@gentoo.org>
   zfs-kmod-0.6.0_rc13-r4.ebuild, zfs-kmod-0.6.0_rc14-r5.ebuild,
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 2a74a78206e2..19c233e265bf 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX zfs-kmod-0.6.0_rc13-fix-invisible-snapshots.patch 1371 SHA256 f48710ba112304d994785b9fe29c973e4dbeaf4db5e73f0147e1e2ecf10cb9c4 SHA512 16828602d72f57a88dc1247e6107c61bb50db3a694f825eefa27d67aaa2cdc3ea0d6e0542d90e31ca399d4793261c2d9b8c304f3e6b55b6eeea7a95759e69539 WHIRLPOOL 87bc1890e099e97af4d57092ca5fabdccf2abe25bea73f0f8113b9ec587bf5f39e96ca1a1246dcad6827830e0535f19994576027863102325111f43c899ecd84
 AUX zfs-kmod-0.6.0_rc13-fix-recursive-reader.patch 1161 SHA256 f74db8f9704f35d460a1a2250993057d301710c065e553c688381e778fb8e320 SHA512 9a16107d448c90914e9e1fc767c68eba7fb3793c1a7b1e26182759d0b398d09641f51911981a1092e76223cd8a56724c634bc939e9f1fdc412cf4e469e1e9384 WHIRLPOOL ccd43c7610420c165ac19684217fc8d2aa6b5e95d3fa40dec651ea1bf145f9ec0463ff806f918678636d2658dc6c80946077d5773f7486e4d68c13ad3cb1960c
@@ -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.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5f7b9e2d643eb6576aa19015 SHA512 87a28997b8f9d36e189410171db583402418a55782b7b7f333993e98c5e17ccc4b6cd5825f38b904294c87e3dfdfb7748bd71cc371589c1358f16c942e0c18db WHIRLPOOL 1700de7da56311a7b608c99a821e2fa97a6145ccc88f3d8eff12f778421ba7b7b9cc5f5fbe5f1acd2ea2fd1db778c200a2ea961e3859a8fc89d80474894293f1
 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
@@ -41,26 +42,27 @@ EBUILD zfs-kmod-0.6.2-r4.ebuild 3435 SHA256 5c51456911ca008d993d96305c6ccdd0f80a
 EBUILD zfs-kmod-0.6.2-r5.ebuild 3435 SHA256 e0723793e5de5bc855b5098280d878cd7916638c2b91cc16f2408b49a4749c09 SHA512 271540b4134e89baa53e8f51a1b910cb3d501c7a980e614d2404cbca0cec4f60939e5e2ba06f7f07c6d27c43af8243dec71d66856c4d3117ef348ea4ef9b4308 WHIRLPOOL 6f14340b1177d6b12d875eb9202ad1cc12360ab1d8366036edff1938cf06333d8a3f28782405a20d365a182a245134d277f67e3d90e63054165015119ccb77aa
 EBUILD zfs-kmod-0.6.3-r1.ebuild 3908 SHA256 0b004ae7c5864b0a7dacccaab4bd92893bce40a9f9035016fef95d1e43226537 SHA512 dbbbc4daea08a350e3ca7e2f6cf40f8f71e4fa8dd5e529306e40f82507e370e718950bd145709ecef1040709f8b75a7d58700cb7a6e7e4ca01be627ff1955efa WHIRLPOOL b7e7b9847ebf59ae7df47cfd0b626af4c5db5971152f6d24606bddabec0044560b48d2837fb41600bf64e0ee45ec4d0692a30fdfb4ade8feee3c4592ff066a7d
 EBUILD zfs-kmod-0.6.3.ebuild 3755 SHA256 1ded1d69088937412261b277d9f43efcc8212c1381a885f0f19b347a3fde6298 SHA512 8db51967454410c871e943b457a3cf6feb17c4a9ade6b24fd86798a972b01bea3236bdc7455c81fe355fe105197ec4abc23a3e4813b13b7883c6cd49b1d0eec0 WHIRLPOOL da467f241b3bf11283f567ebea0f382d5f485ce662aaa5c8e11c35de745081419d88855de8b8c81f7fe22e6082b3126fe5afb3deeaf5df762048592d58fc48a9
+EBUILD zfs-kmod-0.6.4.2.ebuild 4101 SHA256 7b965e14df90a11c6bce9cdfc9f92fb307a5ad39b7ca4bea6179d4a3bb713ebc SHA512 773482a5c962f8492a98495dbe725bfa42ed75528ca019e6b05637b6e52a9fdd66ce3b8851638bda6730b0a11c8619db0f3148ddb7b2cd111b0f46ee3e396bfc WHIRLPOOL 96cb05276072e1bdd7dbf82aa109dc03cb36e494d71791b675b3de0005ef1e55fcafb8b8b75548faf565d93aef35fd69f01cf88319475c0c1e2ee219170ea29c
 EBUILD zfs-kmod-0.6.4.ebuild 4103 SHA256 abf60d19900c7e607288d233d250ed21cfbf6802c516253e0fd9de81a6eddabe SHA512 563c3c844a88223750551c82e91b6af6f780ca31008c00776b1f5d5f84fa51b43205f803edbebe21a04d6a5cafbf7f4f354fd56aabae16125f6cc2967dcd8927 WHIRLPOOL affdfdc16670e348d90f73dc742f317f1d0b24b9529ada4afa259e8b707013c847a759e0e855dd645dab7dbaaeaa9236d09af956c3b9773394ef95e815d6336b
 EBUILD zfs-kmod-9999.ebuild 3733 SHA256 672d7da1342cecf42653078e985350ca5eecf6213c67f3d028ae9082bec94809 SHA512 527c932b44f44136dada592f1e7f481f4b5fe6a4995a42f62608f6b4182f9972e1f265bc1efd307fd5bcc3b15dae82c4227ebfdcab4e62d11efee62642126d25 WHIRLPOOL dd52e67c85602749c4e04350500a3ec56cd507a1cab04a6c7440d18c689f8b2c92cc156096cc2c4c58ccaecbb2e6384cf83f1d12a65c724d9001a0e2d92400db
-MISC ChangeLog 16804 SHA256 ce227c96cbaac07aff100ddf5b352ecc6c0ddf207d7e679397af0d86beeb3f05 SHA512 95a14c5cc4f743370aefcd583910dd7d90b7a871673f5c78fecf915f97aa00983675be361e2f17bc349161fbd63892ae6877d70d6d85e2c105591f4f97d046af WHIRLPOOL 4ff7f242ae3420b4467ff4dce4212597cf09e1709935295887aa679f244ca0b09194065622964da9dd3f88926ace56a569e94e4a5bcb202fc699415e968f6c3f
+MISC ChangeLog 16933 SHA256 89d5a825a2672a9bdfa80e330ee43b42647a668f99508f790194413281547a7b SHA512 bc5bd8d6142f87671b7071e179f49dfe09e5568a0e33f104581b774fa74dec3c7703334813eb3c7523279eb47f0e5d50dc5c75a98be133d590b1d3a70825504c WHIRLPOOL 144b1a9de57037e52b0358c3da70b0ab6032920c4f8879c1ad2079dab449670a84779df0ec2ce85ededc9d03d17ee96e2266aa0d4cb8b97d6dd63811a7359e4c
 MISC metadata.xml 425 SHA256 6a0f97de9df642691e3bc91b410b2c8e554f1f5a24f5b9a6270548f0df0457ea SHA512 e49bf8037b2e7457c606e7f0ee2094c3af974b7d2458e2d0e3c271c8d3f0be051e81fd2bd6578a780fdfc9ee09598f3332461cdc60e7b70197cc899cec1fea17 WHIRLPOOL f8c9c194ed07f34b5a64a35bebd0ca96cb11509678e05818bca318c68f9ef3ff5361cf8995ff553898feba9fe3db71bf57243244d82606a08c9c6141015f530e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfysXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJoIQAKIGdxPojkuMpiX0sZAY4yo6
-Gi4oDoKZ+cvVqFZTXDb8Q71y/VrBKqD9mynoDpdi62OASz9e5t6+4OgGjhqUgJGz
-Xias1hQx92Z7Kwd87CnKUBB+5YyEf+Qbwh3pBIB/WNfgP3tJjqA3FLOLBRm8kNs7
-XTvA+7k/toZYneMgDlcGA5TXAzrfO9ppEb174HMBnaWPJkAejmS9iWJ4QC/fTXB9
-xCnhg4ZMlWJREoaWNjc4shq0Nem4IBKgF6vZ9G/F/Q982m4WLccQI2/jiQkfvwX2
-e1kgc/lHnqZnzGEUQi0lSyauVBpOOydEKJN9FKl3hOBCOs852RhVW58O+uynalJQ
-e65fRhTRbWrx8nSoYpTKwBU1Vx0psn6WE3JA0geQzZEIIzwZQUrxLdKYTWNMwq1I
-BL6L1NBklqNtFcpAgyYK/hLl35fuUX4Y8QPXV/XbHoYePsgT6pdLFXjatm3XAkzg
-EB8mZx70cMjpQgsC1+nUlVKpW4kYbVArT363hlM8SnA60tmtEA+h+0awYPrzgw0c
-7AyA/ad1L5E1h9sI2SA9dbNAW/ZAetPJB7w2mDUFBpa+2ZMM3bSxHHJ5qMwxWXVM
-Q92+9I2UJ79XZKUswe6XXUiYzL3OyoZlCPa21yshxCDCoHkeikxf147Ucpdvc9Mf
-w/ZGrUIyQ+YA/qXxeTjv
-=Q2Ku
+iQJ8BAEBCABmBQJVoug/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtL74P/i18lMflDLivgwGbGDBD/BbN
+AbYnDU0fcNH+DWXQVQ+3Lvcssf0Ca30EuHUbQzsv2kfQq+8YSzulhZrEDcGilI2I
+KlyvBgKipXYgz7/vtVFdcczKUurg/PSlfitJM/FVoQlxUiHbfcpscsMDjPMSPa9M
+G2AGzPQYXxFW0pgTfkyyE/7gim/yXHJVG5CCjYz26j3AIyVFXLjkNUrwvDui3T7u
+Dafa7re0qFy+CHXGRMWak1L1qY/K+In/g2CEOSB3tXJyjnSHikdpjrMZybfkm6Md
+JAsv8zS2wbXM/o0+dLh8rcrpkFnpOTxLwNIHaC0YFC5JiNBbI4wHGr49g6g4R021
+sayCRdn3GZ4FDNa4sq5fPnePFPWUnzMmcNAJHHAMXmRXuLBJ2jNUczSL+zxmlsOz
+lLtKNC7PTr5CWD+cWzRQiKJlPW9Y39r7/irwgEP78ctJWivUf88j3QTsoMukthoS
+f75a9Ypnmb6Z/9kuHxIBC4DIs1w0ffNbZwkE7yEWJ4klfLcUNy8yjj32U5eM/0YM
+hlvqpXZTii3X3s7mWIiSuGz8LrzKNQl/8caC+/ol2I0c0UKfkwwremo/qbuERx/q
+s3oaTc8jPdMg4o1DUT57QOPiGQPYe86r01U6pfHvjcx3q/aODH04Q6lhg7tM6NxG
+1IAMIC+x3ELKsgDC1pCC
+=/dtn
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild
new file mode 100644
index 000000000000..7fe395923d04
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild
@@ -0,0 +1,142 @@
+# 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.2.ebuild,v 1.1 2015/07/12 14:20:22 dlan 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 ~arm ~ppc ~ppc64"
+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_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."
+}