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/ChangeLog b/sys-fs/zfs/ChangeLog
index 92228646c6b1..abece3da388e 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.92 2015/05/15 18:29:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.93 2015/07/12 14:11:02 dlan Exp $
+
+*zfs-0.6.4.2 (12 Jul 2015)
+
+  12 Jul 2015; Yixun Lan <dlan@gentoo.org> +zfs-0.6.4.2.ebuild:
+  version bump, ACKed by ryao
 
   15 May 2015; Anthony G. Basile <blueness@gentoo.org> zfs-0.6.0_rc13-r2.ebuild,
   zfs-0.6.0_rc14-r1.ebuild, zfs-0.6.1-r4.ebuild, zfs-0.6.2-r1.ebuild,
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index aac6d0306043..dd514a9c6055 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX bash-completion 6203 SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515ea7ca3c1a401f831 SHA512 e7ccb7179c4c455c496daab192099d7553674b9505801e25a2ea8c67a1b4de15d68ac99b2c3347c1f3454f88ede7694f08da61c5d061f0577bb1594ca4a90f12 WHIRLPOOL 79dfdc9c80a707f6bb39bea51ec451c16b821886ce3e84c73a249313d991cf8019f0647b0fe439754fc1ad08cb294bf4c245955fdc4af30286a8afd61dba21ba
 AUX bash-completion-r1 11310 SHA256 b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e WHIRLPOOL b09558e80a96993c52915093c1c3f8488d0ef9294d2e401546c21998222f377e211ff368e18e8ba3b1dea7554a467cc3e32c882a1d872719d82f5e2c1ccd5848
@@ -17,6 +17,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-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
@@ -34,26 +35,27 @@ EBUILD zfs-0.6.2-r5.ebuild 3692 SHA256 a1d41be4963ae4c6bd95332f40c4d9e358ca09eda
 EBUILD zfs-0.6.2.ebuild 3400 SHA256 e07855d16f6c84541c868f8a4ed4c3a6658baddddb916a7b918bb301a31252e3 SHA512 4dcf6e0fa90e1645b2241ebf3eb3bb1f96286f696e0522f66d9bae0126aad11105408916c8b7543cd19871eb2dcaac99ed74040e51805394dec28d12f8297a97 WHIRLPOOL c0ff5817ff1e363039ecaaa8f35081eb66fea3d9853e0ec9616db080bfb633b01b460fab75c2609e278fcbcbd001c346779f6a6cfd897dfb10fc2cfa48e1b1b9
 EBUILD zfs-0.6.3-r2.ebuild 3569 SHA256 ff6cdd2b25bf37cfe39fd25224fdbf8b720922725879151ddbc698ea574d7a9c SHA512 97a66bba813a8230ce59f092810e23214fb616f4792639f14e854fa219d6ed9f65ae0f0ded5ff109f6f7ec4f389d25861af30ed98291c815d457bc3649e6a7d7 WHIRLPOOL 2f1fcec1d0ea8d8691671e3ade170e770dd85224d739fd903637f6b4cb0dac3ab6da2d20c54580c9373ff6fc16a853fd781dd8eb3fce05ea2ccc38eea4760866
 EBUILD zfs-0.6.3.ebuild 3415 SHA256 86efac3bcf9793b46603ffba93eff897b39afa02fd29264ffd26240f02a05497 SHA512 eb791faa999c9b7d911a1c4aa8c21af927ddcf8b6f1d64c51b229f88983992378059ca485f1c582f02448f5302cfe386f617248d6075da9da8ced0586349d298 WHIRLPOOL d36af38cfcb378424181e6c223d96918cfcf0b3c81f2f906d4204a153cf925e78e98a8d7c154b209d57019bdf1c1b65b5d4ffe478edfcdd8e5a0bce150cf7fb6
+EBUILD zfs-0.6.4.2.ebuild 3361 SHA256 c04736d5d9e9b8f6e13fb987b7d5fdf8fdc29d42c9f76691f6ca9eec0984f46e SHA512 6d621b1251de9302c804407f0a16539e35f7644cf346cf9c8063752ed05933686bf5d9669009180d8f1091851ce3b23c13d21712d7ebf158018e9fef24246662 WHIRLPOOL c7e651969e2bf82b7738b75df779755fe231790dedaf8112dd3d5d831ca238fd6f113be68d71b82be33d87b8a312906cdd6c7d483ea099928f4ca2611601c347
 EBUILD zfs-0.6.4.ebuild 3442 SHA256 68619536766aacb25862801c572f6c0e8e0381cf6f6377212cd15ab83ef3fa97 SHA512 55fd46fc1b4d3dd5d30be5bd5da99de3a8f3aecb51738b414326b96ff9c35f15672fb393616ddfdf867d0671cc0d36ed1d908b61921df8b1326911b637e13bd6 WHIRLPOOL bfd18aba2fc67333456f87037b351d377d74213394985fc7dd242af0f0f69f22d0b736cbc6fe6f4885948c0efc320960bae578f41dd466dabf34f6e470418c9e
 EBUILD zfs-9999.ebuild 3653 SHA256 ddc807a4569b0cbc88ba9af1cb62561022b5d3e5b217b37c42710c5db8594c94 SHA512 9cc55986310b98e0a780f9a0c5722f5766ae4833ceea79957cda33b0b4918993ffa536d2baa1c771841697b3f255490b8ef9a4b09883c169126f309505ee7717 WHIRLPOOL 55a67706862e3e9bb5a922ca30d50ca09fb902618414c3940124537cc86f009386c487169515580985395d2ba260f60dd1d26c56d48dd3ff7d118e5d114a8c94
-MISC ChangeLog 18711 SHA256 df09db66d3237bf6fc53a43b650b69c0251ac88de1dae5c319f9aab6582950c1 SHA512 cab1a350c700d5e8b3a6cb4aa0464f61b07eb8d46e0d2d84804ee6e53958f5d3030940743c9d755253551c9d4d808213ba680ff13b7dbd1e205874de48d3916b WHIRLPOOL dfec3e840df73201ed7172325c9235e6af391dd1a0b41d64160ed7d20bcc8920d8d27af3b19101010f19113333a7f58c9619fd95409006327d6433059340e800
+MISC ChangeLog 18830 SHA256 7f41619c4b08e5b8b3ae44c559697bd9bc197e15e0d38ebc0ec53db841da8c3b SHA512 9702f0d5415f0acf1f5c3d3e84233bf8ddad6019acbe36d6803764814596e97180d1888882a00afb5ac17ea142cbf80bde207af2e92de79ad3c171989b3f9079 WHIRLPOOL 7a014a294a8404d0ec5952f90e4455b900a91220c1482db34d726d17f0a5a33ad0cb00620aedd185271565108d5ea0e8c57f8cd0fb978a2aa50b643549f423e6
 MISC metadata.xml 625 SHA256 91235677af8e28683d4626c068c20b3b5d62b2f6418b18f0436c65be0332a1fb SHA512 dc8e180dcf947e99c9aea2f8f12570675b4e1e420ab25cb22cf5e92e7f162d704bcfce56d7e989d95973372e040f9be05ec4b953ca7a7f057e8d93fca67c4b86 WHIRLPOOL 80d4329620a50f8dd5ca2a4acc5bd92d31d8e4fd6b8f972394d95b018698da22fcbb907ef67aaea0f74f881340a626080abe669693ba6b6a1eb2069d60929e2b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfysIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi1qsP/3713GtncTZNdh7R8lLbO1Or
-5pIe0qVKrFlHKQNs90edK7TEgmDFV/mimbQLaibQkOwI6W65+P3BOd/X0+M89kNx
-M4mbHtgvgymUqpMKPk9ddh4wETLVWn/YdFTTS6lLhM1EcPbHBKXozKEyABjgj9Xi
-1CgKMtZLphQkm4M9F/bFZdTXtUkCGybzdPukdcBBZRBoZ0QdI8ZiLouZffchYN2O
-SAx/B5Q2IwwMaLxAhTRB1T0boxrFXJKYReeNWVcEse1qUUGOe97UuPkYq7Ux+8/E
-kYYrDWlZoEWx/nY2TVH0NfAWHsf0DSw2GZSK5v4H6hs9k4i7MzvQpVyJemktgfQx
-V2KW3FqdhNsTq0NagaLbubfPMFv3gai/Lc/nI4jBUpEA/nC0H2plngP6FkqDCWUa
-IegN71qCx053CGf+uAwM6YQlW+L9kYcvgQ2bYBHVC8QqM+/teaxCsEJSD6oblOft
-3vc9AQftkMY8YCxOkpCr6Ub0FEGitOIbA1n4WzoTD1LwmUJ9npN7lwk92l7e43cD
-/E/CTMF5s3fmxTMbqvXdxClXcGDNUQaco+4dYW2NeKofsgJ+ThXZLh+4WfjwCU3L
-UFtec3mVlF6UFuRw0Aii19/JZVgf+gwxW/GCxrIngYdo/pQEeI3p6xtPjOK54MPR
-1TPXZB5O2MWtKrONNqIF
-=LHoY
+iQJ8BAEBCABmBQJVouYLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvt5dAP/i8wKys1q8KjHtVANEa4D8o/
+WT0mgpMgJFrV3usGFyJs2So5B5CeeMFfwgF9vaenoCixHQLgAPS70f040dOQ1Ccq
+oeRxMqnMGjqQQFX2H8kjoACAsIqxYEqwAv8Pkc926E+aZ9SF6vJOyEoFAzp1pO4u
+si32oO6IhcwAXZsoSNx1vCq8xRlqUPnZ9OkVHmvFeY+aprc27J4Hf1Ac4hRI+2Lc
+P8JTQ7s+xYqT+8AS2HBM/2PFqhruJwOfzJozRtCg4iSn4Ibz5pjcL15Out9EysqG
+kxZg/jJGbxZAaRBdbovOMkLlRKyDzLxd6I9QXWMffrxUUs+hfhYt+ZrFkfZdG1sx
+D4wy7RwQMWkvi8/E4XR1iNMq1babd+Tjx9AmfMmYNq2UuJYqjvmvkxSNMinu7dVd
+lv1cH6NybscfxjmMyHIbcGfk0/m6MMZ8wLvvJ0CYM/G0umydZRuFKMTEwYfR32CF
+LW8dHh9uBebXQuqgs3W9E6v1yPL8s5iTvaHdWAIZHeiTbug4ZYLQz/h0OKp0+ZPj
+Ocq+Ety8efOe75RyjnbpJjRfnLUqfXIfya96+JW/t5FsFErUv5//7wLqfCAdZPwC
+PiFDG4yeDMkwG4aE2E1QpB2mMoYgSwcnHEPLYaCMzHL4qXHomJIojK6HOSCW17R6
+xxgaHAjeSt+gX9u0Wlr8
+=FyZD
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/zfs-0.6.4.2.ebuild b/sys-fs/zfs/zfs-0.6.4.2.ebuild
new file mode 100644
index 000000000000..8070b6314ddc
--- /dev/null
+++ b/sys-fs/zfs/zfs-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/zfs-0.6.4.2.ebuild,v 1.1 2015/07/12 14:11:02 dlan Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+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
+	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+	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="$(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"
+	doinitd "${FILESDIR}/zed"
+}
+
+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
+}