Version bump to 0.6.2

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

3 files changed, 161 insertions, 15 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index fcf477508669..9977f7ed665e 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.68 2013/08/21 14:18:48 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.69 2013/08/23 23:19:58 ryao Exp $
+
+*zfs-0.6.2 (23 Aug 2013)
+
+  23 Aug 2013; Richard Yao <ryao@gentoo.org> +zfs-0.6.2.ebuild:
+  Version bump to 0.6.2
 
 *zfs-0.6.1-r4 (21 Aug 2013)
 
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index a066dddf1bcc..781564b5dfd7 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -15,29 +15,31 @@ DIST zfs-0.6.0-rc12.tar.gz 2150456 SHA256 3eb85e4028480e9dd56e29eca0a4e71565c150
 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-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58
 EBUILD zfs-0.6.0_rc10-r4.ebuild 2425 SHA256 43d49734f34c11cf4bb7f52ed60238f472a9d44f8571ecf5da5e3d0de866cbe3 SHA512 922b9e5a920da0cee6a3f02d55cfa2462f9f7d9d7783930075c642bebe981d3cbeaa7d510bff8867afdc63c9c089e598828688317c3d603f5580dc802c543a77 WHIRLPOOL f7451202156bef5884c7cf25e61bade72f4c1213e7aa95d1b455257bf421ca4e07a8130d4a9dad409def546f4c422ffd370d7b442a2561f2a60e7ad7d5c05894
 EBUILD zfs-0.6.0_rc11-r3.ebuild 2425 SHA256 91c81e66eb4cb7362810bc748d1cb05b2d515e6cf670fd9547761997bba71064 SHA512 1708af9529f0a7cc72c2d4f27ff7176d14842a5d7b5761ed9176fada6816a6f2d686c5997708f41a5ad634237aa5ecb68374045ad869848127a1ad0cdf2db93d WHIRLPOOL 86ef757aa5aac1d24eeb38d16eb87f5a4e34db02bdb3df74f5e884126fc90be2b4bb36c5cb5954908afa45d1d53d6c4857aed2c04e14f378c962586d458eb8f0
 EBUILD zfs-0.6.0_rc12-r3.ebuild 2425 SHA256 7ae28e9025453f623fdfddccbaba6d4f56448da1837df30fd4102babe853ae3c SHA512 d33c48ab59528413ffdba58aaaed0022d19a33cd402731c32ddf89ec043fb1552d57cc5a74d2c4efdc9bc2aa25140846c3ee1c80cf3b9d9f098cb54816d0e3ae WHIRLPOOL 59634e47aa9824b1397ea374433309928a71074d1cc7b415ff1fd125696cc8404e15e1f59091ec74acdab749a2a48b86cd0c3ff053dc70a12c6998b21c789eff
 EBUILD zfs-0.6.0_rc13-r2.ebuild 2767 SHA256 a01f304e92fd0fdb0c2d61d2924948a8184a31d6ff300d0b95cf10fdde20c4b7 SHA512 0c5280577004b38eab50beaa86d621e06eac648e7b5f9ba0af7e3522c9ea1ea9e12cb0ab4cf0a918c59bf919c9596ea23716be639a86a6bbc4ce3151d3cef744 WHIRLPOOL af66f26c293b926e52f729ef11fd5ac218c8a6ef78a73525a945fc843f9de2735ac65032a9a0c1a7b35f6d5bd083751c52e3301949212c2e284f67ef1afa33b7
 EBUILD zfs-0.6.0_rc14-r1.ebuild 2898 SHA256 94eec2441edd8094dad6bb73a576198fcb5c3221de9e4cff13193f86906897a3 SHA512 e948a46ab4560754896044411fb51b1188e601dca4cd9de56022b72ee6d8c942329813e71a9dadb9c9665d203c5d8dd04c1f9071472950eaead78898ed5826f1 WHIRLPOOL 84080714d51b18a663812115c16eb734f71ab2f02d5138a30dcc660a361caa198021ae46b744c35edd8b78edfcc3f9a2b5ece8fdf68b2ac26dae199eb76028a3
 EBUILD zfs-0.6.1-r4.ebuild 3733 SHA256 26dfaf61978ca7a74adf0cd5de815b348bf3a39fb553745bccdacbe0049af86a SHA512 6eba565e81c829c0c062f6b43795c3f937a012d794f164171b9f5a86a12d77f4c11bc8a0152a8151dd59175e584416e9cc02bb0b7b451e6864312d01cc324a4f WHIRLPOOL 5ae5fc47488e9724f4517c6e17508844ed13680491682aa301a4f944bae9bb95d870191ff5b751049193a5ca46939709b302a68d95cf8661d5bc4c305cf6cd14
+EBUILD zfs-0.6.2.ebuild 3330 SHA256 cdc357456b50941cf11145bf8b47bbfebd837caba5aca5607c3c176a56eea000 SHA512 49d9afffb9ac52240a9dadb29ef583ed96b0f668e63f34172b29ba553cbaaad1df4f9c6d758dc8ad561da257f4e11b060164294db6e486d7ad01253deea83be4 WHIRLPOOL d368a86f69aa53ae935176d2492c640a3695099f8a0adf3b0bf0f1dada79b68e75c9f2829d4fdb0f05880660717c2a90ae3b8062a00eef6d93cf845b2c72c2fb
 EBUILD zfs-9999.ebuild 3786 SHA256 790b6cd252a4f0bc4542ce1e6feb3f88d49ee4648b09dda23c1461d7a2b75f7f SHA512 78cb38d6e677653f177e27c496be4d72b2ff8be5ff086bdf739522b215ebbe1fbd97cecd20c86d52201dfa53b95e9e5a0b5004ce0538eea2c471793c75d40ef4 WHIRLPOOL 8f45dd6164bdb1efa2f20af0e2c98ec472282ae5ef3136a22eb8eaab8b246a37879fc2a528d107de073bf467ba3d4babf19edb1d4069e28c49f90f3280c02216
-MISC ChangeLog 13650 SHA256 5ab32df3649d944a3a095fb3db95fe945d769ed6f8582d3b8a08b02ce510a54d SHA512 a4bd3fddc7788b5af60d36f0e84c7c4ac75b7c8d8343ea74e47d99e78f3d5f1a6b8532371a050bfd9414c0fd009c5036519871bf210925a216c54c36ae59e22d WHIRLPOOL 7c2f40cf993ba5dc5b2a4727ca3726b6c2d57bc0c055eef88d8207749e8263eb32831f1ed8dead7eadf32470214ed17eeace6b16b3ae841f59eca8f76d6215a8
+MISC ChangeLog 13765 SHA256 99bb82ad397541cfec22b5a57496faf911fd0dbc85460f5adc4be193c78af3a2 SHA512 4d5c7692caf84d3fd13be7d722b40b743d0d28919795e6ac15a9cd88920864f871d2054dc80e31c1fe11c700a836b10fb02a9c3b043741ff622a17c1c4c381bd WHIRLPOOL fe270e1b1b06943ab413e91751c7b60a9f86a9af5822a56a18e435e13cc6398e4e8c895097ea8511fe3933513c6786419862e45574667035938608517ce600b3
 MISC metadata.xml 546 SHA256 980db453ce3112b91daa26f61bbc8eec61d12d0998d0bf76a1308aecad499c42 SHA512 33e25501a30e8cb8e890c1dbf98f5d5264a7958f7d710d37d4ee36efbb318d0db23533fefd51ca419cdc6f72416c1d0cc4fd3b1e68a157dca14890d54f411df6 WHIRLPOOL c96639028769b95ba23db8e8e20d71f5894b1ecebd6d3e62effc610d48e2c55797fa3536dea6e654185f288dd8edb6a2a063829598703f0f0ca61aa02f995314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSFMw8AAoJECDuEZm+6ExkXB0QAK3cDA0dXvTWbiZBi1Lb2cOP
-7s5AfkCkJVDaxhlcY0qZ0TMLzXf5eCxOVz1zAHQtdkXKcLe9IDmZh6a19R88bnPV
-PlNJ/mxQCn54gxnhYQ8TQ9cTCGGLHPd64nN4prlFmmVJliA+cvL/NghlHGJIuSvZ
-pY1P+oM5cP3FahjQ7W2qag/t9J0/lH1HlWYPtOwFqzYsQLIblTdOtJSD7XZ1QHVa
-/00BxDsImNazH4rs+f+7U23SlG7gXwO2Dv70o7uNVsM65OE720kFH22aBe3jOnk7
-nbg+LP4qvK9XJ2MlVElf9WUTX0l4+J9T/Qjoj7p+Kq4N4h5v9EE4eohG/h+7eoki
-4ELbCUuGJWBszxQuQLjDEgUc92KMWdyubm3E6NlPWi1CQjIF9o3kzRSWFqa8Bt3o
-C2Mdf/QrqK0DjUoLmtrUdGbu98wmGkPK++GYO41OAk3uJwuhb+5qQ5+jWqIDhdMf
-Iek5BpbO13Rf3DojjEu6YYntMd4/rLMGu+g0KlDxCgHvoouM/vM9CSIszjLM/MfP
-0rJxCrEvLewmR4R0w8ha86YkaFs+30R+4Tpmt3a7Nb9XaSjQoTuRWbesLqVwgryU
-qsTRd5V9OAC3Kiy8QmdXcQFgzta22BuSCaEh/zTrjYmrvSxBBP5QWuz7+Cg885su
-SbQyKpJ4AuLeHYwIztFj
-=mSA2
+iQIcBAEBCAAGBQJSF+4TAAoJECDuEZm+6Exkr0sP+QEGnKOizDFY3aRZayiWi28O
+E1kD6us8yjbxr0ljATB1O1izg+JCw2EoWdus9JvCEiCp0ja5wynKVmC/YSwIBNjq
+0unGi6gKQdElAjIS2qCQ/LR5OVAKL8fQbEsGyhQoMEs1hMkAftoKjBytOpFFksbD
+7tABlkvk2H9a3h0jIRDrAH+s1b5HsR5MvXnBbGiPSKzyovgr+XnNDleAWvMKOe6R
+jaT6CvQ4NY/t2YVqRcL6tmuekicu9dnxm5AKsoxQTVEAghs2IeQ122Qj8a9W4MF/
+FAYZkNyeYQ5vGt6HcXIa69LHynA0RIZAUE3WvEeLzVFlZC73NTbExi6azB8zdmj2
+mWvkYKdYpaOPxAKmic3inAaAf2Hisol0lHEf5qFkccwQw5rJ4s7+h+MDzuHLhPPc
+OqNC/1DkMW9adwdnBUuHXLqHEpd4BV9MrNcG5Zw/s6QzRTx9sTK3bUa3lnPVqPdB
+M46RiQAsP9LJSgCsiRfQtjUPAF9zu8e8O36YUEKBugRO+R7wDbvDtkGlhSojeaWq
+Uri/Lmfw1bjZLRlCggG1CMVRzGEdg/FVNv/1ktB+FZMd29iYnK3E71dly0B7fTax
+cFf5/6ZYYh0BDdhFwPImPlN2a5OzSK7YTjlV2SCbeaZ25coxaR7oVhSEaoLB0RKV
+p0r/1qDlbzOUvxAL+pjP
+=heK6
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/zfs-0.6.2.ebuild b/sys-fs/zfs/zfs-0.6.2.ebuild
new file mode 100644
index 000000000000..ad351da3c616
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.2.ebuild,v 1.1 2013/08/23 23:19:58 ryao Exp $
+
+EAPI="4"
+
+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 MIT"
+SLOT="0"
+IUSE="bash-completion custom-cflags kernel-builtin +rootfs selinux test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	selinux? ( sys-libs/libselinux )
+	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)"
+		$(use_with selinux)
+	)
+	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
+	rm -rf "${ED}usr/lib/dracut"
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	use bash-completion && newbashcomp "${FILESDIR}/bash-completion" 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
+}