Version bump to 0.6.1

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

4 files changed, 158 insertions, 39 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index 73a9b96605b0..6eb5ae4d38cd 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.25 2013/03/24 00:02:31 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.26 2013/03/28 22:19:35 ryao Exp $
+
+*zfs-kmod-0.6.1 (28 Mar 2013)
+
+  28 Mar 2013; Richard Yao <ryao@gentoo.org> +zfs-kmod-0.6.1.ebuild,
+  zfs-kmod-9999.ebuild:
+  Version bump to 0.6.1
 
   24 Mar 2013; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.0_rc14-r5.ebuild,
   zfs-kmod-9999.ebuild:
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index a4ee54340db9..fa2e7e86202b 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -30,29 +30,31 @@ DIST zfs-0.6.0-rc11.tar.gz 2099538 SHA256 4701f9d32d3475650068d0c07b968f0de44310
 DIST zfs-0.6.0-rc12.tar.gz 2150456 SHA256 3eb85e4028480e9dd56e29eca0a4e71565c1501f0159c80a1b1ff961b6f137d6 SHA512 55f0d9ea9f085d78a4929250949449ec4329a71c00ecd6fe76322716b64dc1152d93a23bb8b18e4ba7e1fbd6110b170366763f730c1e5006998aee3870e3635e WHIRLPOOL ea8fbe2edb2e0029affed261916d10ef350129c496b71064d34749b805d83c1531d886a55802839bb4226e298719f708f6816ee5411626b431b1d506bbf10232
 DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535afefafde4aef0f112f8c833a09 SHA512 c9bbf1fb7f293a0f5b1247e17c411073994bf419d5f6c1b781efeeb4022f62851e8ea3cf7ee0330b0609bfe13b8084c48f00e942ce52323d706733cccf49699e WHIRLPOOL 97083a6f5d66addc9bc7b3cc3f7dd3bc1696980affbd4033d71cd09ecad413ffb666a8a185dfa2e4f20dd4003746ad61d12142f7a6556db5b34008716c933798
 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-kmod-0.6.0-rc12-p0.tar.xz 13400 SHA256 700f88edb1a31d3df63f7a5be84429c6b835ec4a01820ec25b96881c9796db7a SHA512 846eb064daf40c4f53e3924ef6f0d05761fd85480e3471360c8be2089c4ebb9999b2b128e03c0b852a14d5dfa24e3a108b3d3bca1d96a39fef7beab2dde92f91 WHIRLPOOL 636b77725b0355097c92080b97a9871aacf5683b8e4af2d22ea03d5eac23f032f52319b68f43bc78286e2519f63f3d5ea9f5cf7fab84b688703ffa5479140680
 EBUILD zfs-kmod-0.6.0_rc10-r2.ebuild 3212 SHA256 ba9a67250e05a9b5ddeae96e2380a9662b6c4b19232e09614e0c9f87250caafd SHA512 a89430b19815d6fdc159c24cedf7f0eaf0a8d4f5313304b71b6189134a48ad4d012d070c24d7a387269e34639394cfbf766dccedd25e7fc585c73b972b5acfc6 WHIRLPOOL 0e69f2ce2b121ac2244f0667df4be64eead24eda64372c9cde75e42621fc351b92ac54e858cac185289e373dff5d8cf3e1c4e9de002d0545aad90e33a412f69a
 EBUILD zfs-kmod-0.6.0_rc11-r3.ebuild 3294 SHA256 58d38c9911d914af3bd1a3b66aea1013a142835cc7aff166d4abd22dd0104450 SHA512 f59250f620d393cdbb02575429177d2c39bb726cf22659a38598178ef43f7430e7f7a88c8f7cb987ca970e18ef243f67f66de5bec537b34265bc3bedb3749a07 WHIRLPOOL 87f12a741de8de7fde9f83b9ab294eff5103116fbdd508b88be4139bc26533d293c941b98ddfc84fea5ce0c41227fef81fcc2eb1d316a0aaca8eec0a622eab21
 EBUILD zfs-kmod-0.6.0_rc12-r3.ebuild 2797 SHA256 92936462186f279a8d88b2d2b41e19b2864989726595bb3cefcefc6d2bf50a5f SHA512 760287c5c9895b0642afae851614ce3daf53bb79299e9a2883e5a0857495cfa9662f476b8e3fcb90c1232983e3ed4b671462417488d68584a97f3fce66b815bd WHIRLPOOL 349a9854e3c69299641f58a5f68f46d6676533c5a9008544d2414dccd987c1732be6bbf74a097d9143026f3193788684a9ac5b5e7523be3f69f98be57f7e3ec9
 EBUILD zfs-kmod-0.6.0_rc13-r4.ebuild 3002 SHA256 72e3ada5617297528c881a6938646de089994f70a0db5947349963134744345d SHA512 4f8c1618576d9bbb8959f38dfd8259a7ba4fb2951c19e1d139702e5d16a74d88b279fbea577cda21cef5a90b959b6f6685877f60514be2eb2cad88fe9b280401 WHIRLPOOL cd539f810e5053cd4ecd678ba9aee58d495aceeb3848890b1cb5b488789e53f4ec827cb93df627cf4ae008fbbadaa134cf140a55a49610c3ba9cedbe19426457
 EBUILD zfs-kmod-0.6.0_rc14-r5.ebuild 3629 SHA256 d0fcb2dbcbb269f674583017b01c99eac774ad7f433c517c1e1ae8c67b98d0ff SHA512 062af6eaec04f782c75da616acd766b7705e319f6cd9f2edb1cbc2d69ef0c681777eb8fc22446712097639b50f72b77ae962500c70801aa405c2060f1ad6609d WHIRLPOOL 60d39059c92636cb7fed4445b8ae0c827e3528bc597e877bd4edccc5a3eb70acb5258e349109f808f8f9743c09e0648f2aeb6c76da245345c3ca4eb4e8fb6341
-EBUILD zfs-kmod-9999.ebuild 3504 SHA256 ffea50d0fd9417ab111d70617bdc5321703a727c274a7563581fe9d57a770be5 SHA512 02a0395de46b3698df223107819f58619fe8802b2f114a34a88f1c05858b5a455d599d7719113391ad5f43c858c9fa141c2cb048602983aa2f29d2733a7ba10a WHIRLPOOL 17e5b0e9e36ccf4108c40ba497d9cf59222d48c3c71a2c2ecef04f6e72f5e57fbd1e1362d83a970ccc13568474e771113a30d0ee5bd8d7807a9a43dbfd68d6dd
-MISC ChangeLog 7980 SHA256 ba4822e2f4c69a069c0615767aa889f7df8406dc6526732409dd65db951dd9e4 SHA512 71b95447dde72404afeae7f7ff54e6730887b77b13793d3686ac8787daf28afda1e13d3b98dcf62a175d8c0f6a4c31c443630e8845df4480fec070e3e093a8c6 WHIRLPOOL ea4bd9fc29e9044ed4ab5eef84dc1a58b5bb45942bed7d84bf8759d503924f0d5b3ac5cde308e212ca632264f288f6ac5c8283d6b640d7c26e3c837afa541969
+EBUILD zfs-kmod-0.6.1.ebuild 3304 SHA256 f3bb0f41c839786265f1bbfbc116566f61bdef63c1042d492fa726f5499e989c SHA512 a46a9633e1dd8bebd3f504136947d7bb48e803b0cedae1cf987356352b2897d7ff8e7effe0dcf28029cdb12fa42ac94727f7ca12e4f3522f0a4da20a9c915acb WHIRLPOOL badf16af1afee342b86c9cf304fc85878dd346d47ede966907f105c279603eb87bab9ac429652b60b8cae2495efe39e539e27f7e0508e5af1b143941ba85bff0
+EBUILD zfs-kmod-9999.ebuild 3304 SHA256 d9c3fd9f3e8cfa9c0d747b176b7390233eb9abd4a05aad34682c2dbfd9b4127d SHA512 2c11471206c1257ec4af7a5a070e530465a84e40364db9547c6885fe2be3721778a078715e19174e6e861cad086c87dcd7fdeb41d77185f3b50e4c2e125cb4ed WHIRLPOOL 37e37aea6550d8c1028ea379a77812ed63409f90e9fffb8322c52f9a69447d3a89b0eadf8bc2ab7c2849508348ac0b0b6617f3b879deacec88409917e3c5101c
+MISC ChangeLog 8129 SHA256 370b8fee7a96f9b4005c8bfc4109877e49e493e54dfe43427914dc928aff802c SHA512 98a27673094588b8368ef42638bc972fcf5b4ea91180b9d62309530eb07bcc8baced70d0b6ca7047db9a56159da6decee30f044cfefb369559508d4333576b59 WHIRLPOOL b3695b51a6c86e83cf02db52b88e92454bd802ab4149987196787c1d132c8bb8243231982cac0a2263a57fbea26b74af23478a004d093094823bd7f830314eea
 MISC metadata.xml 346 SHA256 e4506ca3f73e0a7799675ddb48b546ce6e3754e912f77d7d32aefac860b3fb82 SHA512 13885781ec432fcaa913c6365b6101b899ba5cf72573b29eb56a0d567466f15edf43de61fd1cab357149c5ed2b73c8277d69a88589f5f3d8f9ae3ef671f9ad8a WHIRLPOOL 319e314874a770ba6ef2687056bb97d6aaf081b0014cf1f0d08c39d70f24adabd19f0b4b3ce61c00fb72dade7589c9821c4730508967e32ea32a2101f74a35d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRTkKEAAoJECDuEZm+6ExkKe4P/2p3ys56SpdB/5BAB3Nfafko
-3lottKUem3JqCSLRR28Zu8yD2HcRXZYvzQWIqPcAwjix4sTcFSfTgBunrl0ZS395
-W7zzyEA9RxiU89zhbXwYn/qetXGnS3alRL4sHBZP9V2T5ZDzbVxWheVlmBiWQgLS
-4bCoS78Ujlq4/04H57lhsAOsZJSmyGj5DDQW9aw2v+9A7bK0TOWrWvhDXTicvkWW
-NuVAzluXQxezwPdIN9WfIMxuvVSyfJZoHTKy9t0iALGYNmeE2UwCUC5eHM7zWayh
-l3KvOEqpCiUP8Wo/MXbLKrMo1LQOyqmHmGtHxOY6Qbeyoo5qcyctliepj5XUAUiG
-mDA9zqM/FZ4flBg2skiPVpf/YVnwvvbO1GoHxdn2fpP8I+djI628KURRuvyMEprW
-K4tbv/MbPcrLecBGbWPmDzqm8q4g402uTtvOVT6vL2P70R53CFzXbGp2Rn+JA9Iv
-DMsCV4s2JMnDGx2k+VBe1ruAQv6NyaAjTpIv4NMOiqFoifQOvS/lxNCy07yYZiOn
-8BPaIcGrkj3D0tU4Cjh82defOy1SWPJScbCbTEKtYXlaAabIgRdknw26UZFWXN7l
-FA4UTnN8cdiAX15Bnj1rtaBku5248RoQ0iFihgiZmCsdj2qDf3lThhZy4ap5QJrd
-Ub0QaDABO3Kfofqt/bfY
-=859h
+iQIcBAEBCAAGBQJRVMHlAAoJECDuEZm+6Exkv2oQAKBbbdurhk4xyWSo0GyoWsY+
+vgfbP6tKdtmAfpVt9lxJ3NpY6jVmyHalW7+KNiBt+pcpp9vA9tUYjm0U9hPAbVMi
+jhrj9QVSVfd70mgRpsnAVZT2PXELftlL3fgOpLDgPlieGLtHJcgr7jPq8YwNcIGS
+bpHUbBDrvcir1RPf/VoTkUqWZpR2hVlYt8H5xVyIMMCiKXBZ77y9XHClPfxQRqeZ
+kmt7UMW89+sZ6HHMdDZS7Sz6vwYVfMplXxaeCSsr8kU71NtOqShl4su4r6y6wKk6
+OzzG7OrGok1IF3qEx3xw5majLUtbu3+BTgyOrB++ugYgxd6NPjZzb/SINXAc5yo0
+7Jh71vpaUoZsXxgCGh+V6aHEx9z/+ka6IZl9o9vt2z15/J29q4Db7Kt0anQEIX54
+xsIe5DZxNxaMe5QBMiesfsx4naSsJv8YR9DaLaVeI7hT0tORGgiYfMuKAYzHML3e
+gK2d0pbF/0zURYa0X4NYaGTbmmDjA9AyWrf1uFHIkaYARcnTHP73dkLw+lIgED5B
+k+V/Po/4KTEu7uGCry9/f/UpLajbXH28X13X8uA0pn2bsLjSRLBwyOfy1Xv3fY95
+oo5NliTm9izeMZTzRvteEPuqVxSGCIqLGej1wA+s9P2ctDgTWhpKciCkHEDGEuT4
+wWv+MJsnHR6Jk++zP6cx
+=F3uD
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.1.ebuild
new file mode 100644
index 000000000000..9827fd9f81c3
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2013 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.1.ebuild,v 1.1 2013/03/28 22:19:35 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="test"
+
+DEPEND="
+	=sys-kernel/spl-${PV}*
+	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 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 9 || die "Linux 3.9 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"
+
+	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
+
+	# Provide /usr/src/zfs symlink for lustre
+	dosym "$(basename $(echo "${ED}/usr/src/zfs-"*))/${KV_FULL}" /usr/src/zfs
+}
+
+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 b9fb690f4b20..cb79a8a3341e 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-2013 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.13 2013/03/24 00:02:31 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.14 2013/03/28 22:19:35 ryao Exp $
 
 EAPI="4"
 
@@ -64,27 +64,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Cast constant for 32-bit compatibility
-		epatch "${FILESDIR}/${P}-cast-const-for-32bit-compatibility.patch"
-
-		# Handle missing name length check in Linux VFS
-		epatch "${FILESDIR}/${P}-vfs-name-length-compatibility.patch"
-
-		# Fix NULL pointer exception on hardened kernels, bug #457176
-		epatch "${FILESDIR}/${P}-improved-hardened-support.patch"
-
-		# Fix barrier regression on Linux 2.6.37 and later
-		epatch "${FILESDIR}/${P}-flush-properly.patch"
-
-		# Improve accuracy of autotools checks
-		epatch "${FILESDIR}/${P}-improved-autotools-checks.patch"
-
-		# Linux 3.9 Support
-		epatch "${FILESDIR}/${P}-linux-3.9-compat.patch"
-	fi
-
 	# Remove GPLv2-licensed ZPIOS unless we are debugging
 	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
 
@@ -118,13 +97,23 @@ src_install() {
 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 introduces support for features flags."
+	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"