Add modification to systemd init file: use RemainAfterExit=yes instead of true

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

7 files changed, 24 insertions, 286 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 47bfedcaac7e..0adb9497b239 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.66 2013/07/14 11:52:50 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.67 2013/07/14 12:16:09 ryao Exp $
+
+*zfs-0.6.1-r3 (14 Jul 2013)
+
+  14 Jul 2013; Richard Yao <ryao@gentoo.org> +zfs-0.6.1-r3.ebuild,
+  -zfs-0.6.1-r1.ebuild, -zfs-0.6.1-r2.ebuild, -zfs-0.6.1.ebuild,
+  files/zfs.service.in, zfs-9999.ebuild:
+  Add modification to systemd init file: use RemainAfterExit=yes instead of true
 
 *zfs-0.6.1-r2 (14 Jul 2013)
 
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index a97f9808d964..48541d54c51b 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX bash-completion 6203 SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515ea7ca3c1a401f831 SHA512 e7ccb7179c4c455c496daab192099d7553674b9505801e25a2ea8c67a1b4de15d68ac99b2c3347c1f3454f88ede7694f08da61c5d061f0577bb1594ca4a90f12 WHIRLPOOL 79dfdc9c80a707f6bb39bea51ec451c16b821886ce3e84c73a249313d991cf8019f0647b0fe439754fc1ad08cb294bf4c245955fdc4af30286a8afd61dba21ba
 AUX zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch 1159 SHA256 bd40a60408772cfe789bd0f055906cd2aebf43761adb2cb19ca6219c92c5f996 SHA512 aba0ee09e0070ee7472ffeb0274fdac1870e6a11390c110e9febd7240eb8465351355ce6b735d3f0a6ce2ce5bd167a4239ececc3dae33899df3b4f72c162f037 WHIRLPOOL 72635866ef46b592d257071d4902d36b95855850e40de0b6a6afc6ad416460ebdc5b2ece67d011a052895ab6ae9135d77622f7fb15f4cc0f3a6b96df6c2581d2
 AUX zfs-0.6.1-avoid-zdb-abort.patch 844 SHA256 651ece4a40b842c00d393d3f969435f733a987cc420f9a300ed2bd1c78e94dba SHA512 d976e0a829ddad680449d0a4d89a7130fb113668bf6766e3004df47a14620e26910e3d0f7cc2f8d5a7cef4a7ba3794ed36624d63ee6c577585d80964e931becf WHIRLPOOL fa47408a8116d5b72f322bbe878f2275febfca613e8718406ed566be23a4a8715113be66c1694c4272f6fc5c26aae78dbd2de31c095aa0cf95dbc7d13d276d4c
@@ -8,7 +5,7 @@ AUX zfs-0.6.1-fix-gcc-4.8-warning.patch 1432 SHA256 2a2fb2a0b4960e7c616f4bb27a2a
 AUX zfs-0.6.1-fix-zvol-initialization-r1.patch 4803 SHA256 36f778dc0fa3c3c7aa4f2383e9463a75c51da19a1a719018f729e9d42ffb52ed SHA512 bfe5ee1185fe044cbf758414b0c8bc4311de6b0502a6f0c6a8fecec71402376f0ab4aa7e798f870c262f54d77f6b84590cc2ae371ff4880dcd97b834ac443483 WHIRLPOOL 3932ef6eea9ed0f23146f980504540843b04a684d5c55cdb5aec60d9fdb18354d61e485b55f5a0f2561ed3e379accd6b3d3f7c39bdbc91bc0d3194546e75ec5e
 AUX zfs-0.6.1-gentoo-openrc-dependencies.patch 2416 SHA256 01b4def8e15eb8854d87529d4540b7b85c927b64e81112cecf13a5aa30c1bc31 SHA512 d4012fb14f3c599d763b6412c092b95d76297afd4d65b71a602485357505aa1fbdc7f5ad437b5634365311349f1a29adcc1dd0e7d20cb85802ce58c0dd393d3c WHIRLPOOL 9c4e3ece9773efc5ec99f9a453eca4656d8e64ac47735878313cddbae8a64ba34503c4a3dd206e658c47f1b9360d545e497838e455af90b87ae4a935d28172f6
 AUX zfs-init.sh.in 582 SHA256 820cbbfe881315a640ea398c0c7eac60d2eeb191f694ef69f3e8ea725a8de085 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461 WHIRLPOOL 3e9ec22a60a9ba4e71cfab74b25d5ad4aff1b64bfb210d31fc36d5a768527e8b692fe3a9712d9f6bfa8f08e03f7e92ed035a3d8bf4e360b22fa4a4e5b9e9d214
-AUX zfs.service.in 335 SHA256 05200c23a6eb60698eadf4dea671c96adab349cc0d8539cb95cd96fcc98a5d1a SHA512 45251fd4ea945f8be770710f3833a97a123a6acd47aa5ba5458ec3518cb54420a3cdb63835f3c25d99c845f03b6e14c87dee525396fd7969eb3f6cf6e8266322 WHIRLPOOL 01ad25d8352e4ccd04351f46d18b185224a0386910a965ffda2e603b10d35777700f9396905737f19bc35d9629514fe5765cf3f410af8ca3b3d52261c4c47475
+AUX zfs.service.in 334 SHA256 a9db484e4087a814bdb24814895450c700246f1880fdfd4c29645bb7acd72f05 SHA512 f1066c8b06d2501be9c080a78bfd28ac7566a05bac5ddff7915836d083f8e791bbb2fd5e70a7633a0407762f12fd240d2ef049ed5244c4c4727e42f2332117e2 WHIRLPOOL 173449dcb7312c528d21eeb763936affc849f049e4b647d426296b3a35c5f0c86f056e4c0de7866c62a28344a8a734f42b34822fe5573f7873575be0434105b3
 DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761
 DIST zfs-0.6.0-rc11.tar.gz 2099538 SHA256 4701f9d32d3475650068d0c07b968f0de443103d73db315b4f328c296cd6a073 SHA512 4bd2fc3cd5eb89f64b7b92a16e416edb245b0a9b90b5e1aa3bd1560c7d568322de03fdb40ede2d8417b0b642bbf70a1e804d51e4537babbfa9c767271b701138 WHIRLPOOL c56034028fd7c21f516ceb268cc25eeedd129a2a7cb8c1615f43982a86bb4400e80ab74159c4fc5d24a79610e2c0935f54cbc33c447751f29cecec882bfef89e
 DIST zfs-0.6.0-rc12.tar.gz 2150456 SHA256 3eb85e4028480e9dd56e29eca0a4e71565c1501f0159c80a1b1ff961b6f137d6 SHA512 55f0d9ea9f085d78a4929250949449ec4329a71c00ecd6fe76322716b64dc1152d93a23bb8b18e4ba7e1fbd6110b170366763f730c1e5006998aee3870e3635e WHIRLPOOL ea8fbe2edb2e0029affed261916d10ef350129c496b71064d34749b805d83c1531d886a55802839bb4226e298719f708f6816ee5411626b431b1d506bbf10232
@@ -20,26 +17,7 @@ EBUILD zfs-0.6.0_rc11-r3.ebuild 2425 SHA256 91c81e66eb4cb7362810bc748d1cb05b2d51
 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-r1.ebuild 3017 SHA256 38794a4dcbd66db04260f501734da274e4738ab5b3cfa3b360f09c9437374e91 SHA512 950fd8c79e06ed42d474d13a7225cc7aae56923d67daf4dd194e5b98ffda70f6b5a7414190b5fcc8677794bf82b98ae2ad2205b6094d5285e42d3de32eff9b1c WHIRLPOOL 6cdba090ae21a0d47e55213ffe4b2a97fb58e67bd9e2c7d039d62007f5bd18a5ea061c05ab2c23a93716478250e938a981bdfdc2e5a51c7d5ef7c13d13382a13
-EBUILD zfs-0.6.1-r2.ebuild 3725 SHA256 ed454273ae807ddaf329eb371fbd1616220781144dab09d093cf2f123454adb7 SHA512 d6639467dcb62b03a5832f30914d5bfb44049f81ee8aae876735556b2d0b4a93a0eb32f6c33c4fe22167002fc4f8868d2a4662e5fa7083ab5c70320ca476e453 WHIRLPOOL 92d169bd337b67e2b37cde90886fa2421127bcb4fe050fcab6ea28f608af445f9b7d21b3d224a7394e597b8ff7b156c87325e2d55a4a564bfbc13789386aec00
-EBUILD zfs-0.6.1.ebuild 2787 SHA256 0d14acc8d1e636d2ef2135f49c48699a906767518402c5b899e61fcb8c06f77e SHA512 f32c75e8f29597015bb84c9b86e4afc59050fdd864dadcf73f7e033748bfe1fd8d571082688ae842d580bcdf61806c4a7896b22e8ccc035ac1caba1ff24fdc7d WHIRLPOOL fb20aa638bae357562c01e6aef319ccea970753c9148a36a484a5c252e9b1c905db10461a0e9d1ef217a6ac9f2989dcc090814359f593cc4f7d8e8228de1baa5
-EBUILD zfs-9999.ebuild 3510 SHA256 99e3cc3519e4d4913ed2cac611e10a8898376bc7a4325d2eb59a974db18ec23b SHA512 645aa7377a1e2c075fc85e2cba90f1f4513187d67674435f8786a3bed58677212728747700e6d7c755dd212f88e3e72c36ae05d061c464dadc0880aa1156609a WHIRLPOOL b9355980fd1c92ee55aa4659912a64f7763b8db17baf180664a3b73770ed954024a30c9e646115c6762bb61da395fc8f105ae324c8f10cd9f4561770db0092a1
-MISC ChangeLog 13208 SHA256 928b17b7e378e2a080838fb33a4fe8151d1203a2a43ef30b4072b1cbb526373b SHA512 3f599de923f88a368f4209f24bd9ba7307701733008cff58093ee35b889f8b10eb1b93b29dae5b3a47b34303b057689b8d323fcca791595a1b68f83756662503 WHIRLPOOL c57897038a0549f036d7a2249512723807ff3a87871f65934d77de56738d715cb6fa95b4f9bd4458910917f33ba01dd28148f3d38fe9e2e400d6ef82db8b0552
+EBUILD zfs-0.6.1-r3.ebuild 3725 SHA256 82cbddd2bf34aa4fd251b604244cba06229e29017a0ab49b0ac2ea043d4a98ee SHA512 f36f3263ec9734f25a3b0c20c70d93a13bbaa04ded375a6e2c5bf74873d5c36e3838c7c1c4820b645c1be9f1c189b296de7bcd09ca19c95be6b20cf22635d1d0 WHIRLPOOL 00b80843548d3f10beb1a3e5385f061ee4b7a3614bc63028a1e56de82196fbd21c0680b0ec978963ff4d5c900049795a92b5d1085bab519df364f9847676f13e
+EBUILD zfs-9999.ebuild 3786 SHA256 790b6cd252a4f0bc4542ce1e6feb3f88d49ee4648b09dda23c1461d7a2b75f7f SHA512 78cb38d6e677653f177e27c496be4d72b2ff8be5ff086bdf739522b215ebbe1fbd97cecd20c86d52201dfa53b95e9e5a0b5004ce0538eea2c471793c75d40ef4 WHIRLPOOL 8f45dd6164bdb1efa2f20af0e2c98ec472282ae5ef3136a22eb8eaab8b246a37879fc2a528d107de073bf467ba3d4babf19edb1d4069e28c49f90f3280c02216
+MISC ChangeLog 13492 SHA256 18c934f964dac10c983391286feb32c1c277b79f5ac480fde763f27b86865d99 SHA512 289caf0f17a3bd785edbd84915b5e3c4834d4ce1bf701f9a556081bc53693c86311e0f67e9fcac9a4e0caa9c6052650040df268c1d770e1505981085c9655305 WHIRLPOOL df9a3472ce58bda3830f2830a6ed8c039179ccb67821d557ca8f4b2328e975445ead4a4f0d45f59a1e554287e816e91c784bea40afc0146440c7960e40afb387
 MISC metadata.xml 546 SHA256 980db453ce3112b91daa26f61bbc8eec61d12d0998d0bf76a1308aecad499c42 SHA512 33e25501a30e8cb8e890c1dbf98f5d5264a7958f7d710d37d4ee36efbb318d0db23533fefd51ca419cdc6f72416c1d0cc4fd3b1e68a157dca14890d54f411df6 WHIRLPOOL c96639028769b95ba23db8e8e20d71f5894b1ecebd6d3e62effc610d48e2c55797fa3536dea6e654185f288dd8edb6a2a063829598703f0f0ca61aa02f995314
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCAAGBQJR4pEVAAoJECDuEZm+6ExkyGAP/0QhxJY1dwbkJzopL3SR+02W
-42219pw81NV584zJyCfBrftRleLlDyPSuz/D83Yk+drdE9SbYKwUSWclWMQXYSDp
-X5duFef2yYsJuZFRmppcuyNWtx52mX8YfB7pZncJgTJ74WnBiTAQUDHX5HgjOSAU
-QtVC9SMa+F9+WIyfDFULV9BCmbFyrAOLpXomfasW1H1N9HtQ9BamvaBy0IDLvNZW
-CyL2pPpk/PY5dRbSTBqDYsL+NmIuLTrnD2SOSLgI4AeeKPZnVCB4CJdCLPOxdMjv
-x9uUV8I/ZFsYiYILw6frInhSyiQSUEP0ngi7mYNis1ZcUjCOardT4mSO0+l31KEC
-Ds/AbnYGlCb57mj356Oo7x6X9JLVfgsgZ/DsvkvEs/BjOW7OFKaBTiwkr0P+cWRM
-2S6m6imWfd90owMTtKjLVVKzcA0kUrtZzPUygL7KlyG9/OnXnJEQ49FBA8gZn71j
-KNXxgcAXwTYjaen67vnWIcZrOdeXp3sYpR2np/CBUpK0GEMTivVi33aLE59QImzE
-cugPrucW2RfsC8NhJ+Wf7Hm2vpVufpfEP+MzSX8qliBczAytuGQKiYTLu3/1n3r7
-HIZhvu9p2huZI44ENG9G5pL1+1GL8yoD1Aa+U5GW8wOL8Im73JpYd4588lQkY9UT
-JDwXI4UEVGc41Uf4qd9o
-=VNI6
------END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/files/zfs.service.in b/sys-fs/zfs/files/zfs.service.in
index 4e510a8f4d21..c390a480708e 100644
--- a/sys-fs/zfs/files/zfs.service.in
+++ b/sys-fs/zfs/files/zfs.service.in
@@ -5,7 +5,7 @@ After=systemd-udev-settle.target local-fs.target
 
 [Service]
 Type=oneshot
-RemainAfterExit=true
+RemainAfterExit=yes
 ExecStartPre=/sbin/modprobe zfs
 ExecStartPre=/usr/bin/test -c /dev/zfs
 ExecStart=/usr/libexec/zfs-init.sh
diff --git a/sys-fs/zfs/zfs-0.6.1-r1.ebuild b/sys-fs/zfs/zfs-0.6.1-r1.ebuild
deleted file mode 100644
index 8d5ae020fae0..000000000000
--- a/sys-fs/zfs/zfs-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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.1-r1.ebuild,v 1.2 2013/05/29 01:12: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
-
-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() {
-	if [ ${PV} != "9999" ]
-	then
-		# Fix OpenRC dependencies
-		epatch "${FILESDIR}/${P}-gentoo-openrc-dependencies.patch"
-	fi
-
-	# 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
-}
-
-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
-
-}
-
-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
-}
diff --git a/sys-fs/zfs/zfs-0.6.1-r2.ebuild b/sys-fs/zfs/zfs-0.6.1-r3.ebuild
index 3aef5bcc5f8e..f3ac208b7d73 100644
--- a/sys-fs/zfs/zfs-0.6.1-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.1-r3.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/zfs-0.6.1-r2.ebuild,v 1.1 2013/07/14 11:52:50 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.1-r3.ebuild,v 1.1 2013/07/14 12:16:09 ryao Exp $
 
 EAPI="4"
 
diff --git a/sys-fs/zfs/zfs-0.6.1.ebuild b/sys-fs/zfs/zfs-0.6.1.ebuild
deleted file mode 100644
index 8beaa09e191c..000000000000
--- a/sys-fs/zfs/zfs-0.6.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.1.ebuild,v 1.1 2013/03/28 22:19:57 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
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags 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="$(udev_get_udevdir)"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	gen_usr_ldscript -a uutil nvpair zpool zfs
-	rm -rf "${ED}usr/share/dracut"
-	use test-suite || rm -rf "${ED}usr/libexec"
-
-	newbashcomp "${FILESDIR}/bash-completion" zfs
-
-}
-
-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
-}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 8195b497c509..958855de5461 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-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/zfs-9999.ebuild,v 1.45 2013/07/14 11:52:50 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.46 2013/07/14 12:16:09 ryao Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -72,6 +72,15 @@ src_prepare() {
 	then
 		# Fix OpenRC dependencies
 		epatch "${FILESDIR}/${P}-gentoo-openrc-dependencies.patch"
+
+		# Make zvol initialization asynchronous
+		epatch "${FILESDIR}/${P}-fix-zvol-initialization-r1.patch"
+
+		# Use MAXPATHLEN to silence GCC 4.8 warning
+		epatch "${FILESDIR}/${P}-fix-gcc-4.8-warning.patch"
+
+		# Avoid zdb abort
+		epatch "${FILESDIR}/${P}-avoid-zdb-abort.patch"
 	fi
 
 	# Update paths