sys-fs/zfs (and friends): zfs version cleanup

Package-Manager: Portage-2.3.12, Repoman-2.3.3

73 files changed, 1 insertions, 9544 deletions

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index e0e567ab3459..2cd835aea367 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,24 +1,4 @@
-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
-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.5.10.tar.gz 2597676 SHA256 90a0ca76667076e9f58776216cb761f68761eb0192f8b0c45893f84cabc6f27e SHA512 822004d11a1a7c0e258cce049bfee0248dd1ac225a922c1e4a25c8593f23e9b1d7aa4a45a1122f6904025ea0a8c7f4884ec4ab353bfa9c734aedb0969b8d6eb4 WHIRLPOOL 87596a0e89afd3b7da1476c996c87491ee3962f0accd0c1a50d9cd9ab4dd49b3c1c71e14c6eeeddfc53db9bba665bc525ef9580da8082b1e4426bce54ee83401
 DIST zfs-0.6.5.11.tar.gz 2521959 SHA256 136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 WHIRLPOOL 867f6b22726ca13e43a5ff7a832610bbfd44e6c367bd314a20a7f0a03364b1c3bda1d7b3d7c3502e08249b8d8d9e8034e93d0200abb70f793352f7689e19deac
-DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634
-DIST zfs-0.6.5.3-patches-p3.tar.xz 88736 SHA256 031cd97765f890d9b78e1a5746cbd2a3ce06c7208693ec75c0b47324ac67b97a SHA512 8f17cc6e02a35828a57a7c2a437d9d18a41203b6e3f9e154b2ab863296b64596dc827afeeb0f993e37f47881d0f2ed4834f270d0ba843ab84b21c491cc352576 WHIRLPOOL 20f69c0a936bb612d5e3b551d4bf904aca3aff6d885d72f67f3b14cd720094ec13e383032ee4e322b0e81017d8ffcfafb47bf07f273badef34f7210d687ddacc
-DIST zfs-0.6.5.3.tar.gz 2524218 SHA256 49e6f9760ea172cb756f7357e4bcb90ee0293028540a68d62ed087724276131f SHA512 325cb91b7ddbcd6aa0bb9fc41eb0099dbb047a4e32d096fd414799729ef68cbc9c2e15714092eff8044a681af4ab552bd9ac1949cc673c6c5c3de1a23d9895ec WHIRLPOOL 957c3a75bb11befd4b74583883f2f11f717deb6bda368939b342049e809aa191a9ee8d1e709eaddc2a831418c7fdb5e763f918ff56d45f03baf4569ef8a4a070
 DIST zfs-0.6.5.4-patches-p1.tar.xz 64004 SHA256 83877d9b7c629730838325fd5b16bcb54259520e200f0539de9b8edfdcee9403 SHA512 9203356b43bdad2ed78c946af8c95c9fc4d2996b41a09a3b1f5a8657d2742ac69d10b4a87d443db497d591878cf7a70ebb19762b0df135ee25f4e8d2ed6ad71f WHIRLPOOL ff5788356d6a85608d22ea2c010a799464922614204c7eea06b57930a44ee876e596a053a773205de0543d36c04337d60c32594939e8e64d3022906c51c4d4e6
 DIST zfs-0.6.5.4.tar.gz 2506470 SHA256 780862ec2301ccace412a324787e9df762cff6046e73e2ac0ebdce9e2bd59b0f SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01 WHIRLPOOL eacd2ec09afdbc3f6d946583116296fadcd7d0dea5158c89f82f6d0b02e0cbf075712015bfa5f321ae5815cf86af13b39ce93e5026e6a00da58d9ddb04d12320
-DIST zfs-0.6.5.6.tar.gz 2561093 SHA256 c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff SHA512 94c55a50f0f9a90ce07a45dc72bb2730b2a41373ab5a12845df00ef38bb22e4a80ab2fb6e31a9c3a45e51516cdea441bb9da1d0acf71f2f88b38c7c3e9e995b0 WHIRLPOOL 6fcbe473bfce90f800989bac506fa6d4cf5662ad9ca617a477f1251c1625de906495a45759d6190e5a24dcf05f2ed3dd7ea1c0b2f243165a60e5efd098082935
-DIST zfs-0.6.5.7.tar.gz 2537816 SHA256 4a9e271bb9a6af8d564e4d5800e4fff36224f1697b923a7253659bdda80dc590 SHA512 559b826ae1a176217b92d8407729e2c5feeffb117dc9affaa8c9c2134d996b6c3cbe095f7a0c4666c9b131742491f1304eeb292e13e0df0b6d001fa620568af2 WHIRLPOOL bf2e0865de35496cc995738ddde34df797b0c5047c0dd17e5b755803ef16e7c16f8ba89927106a1f6131c2f75a6749c31a72dff95fc0fee186b308c50ce0b4f4
-DIST zfs-0.6.5.8.tar.gz 2521921 SHA256 d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84 SHA512 e5b53a9531b865e7c650892c0deb1ee81db086a33538cd667a087a8a8d33a0ad93a30ae5e800096abfc4dc8ed00843da924230082e204fb7543dd401ef41fcde WHIRLPOOL 623bf8ee51d59dcd1842bf41ccf19c2eb6813fb1e88dea1ea1c6f1388c11484b798546bdcb94500735a0e9e5f9099a4df43308760b353b5b62ff56af035f88bd
-DIST zfs-0.6.5.9.tar.gz 2610650 SHA256 b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f SHA512 6e175f32421cf0f9e13429f12f0fac0564dc7059ab076831d0ebc4f6a17412160ca3526ebdf894bc7666e82580355b08701dd01c411d3177f82e7330b4529a37 WHIRLPOOL 149d730a26363b50691363b314669756d218c4a16e6d06e319c2b0866c5f8ed6e2da2396a516297c127d3343d51d78072d8b7371e3f4d327d30fa43c90be5cd3
-DIST zfs-0.6.5.tar.gz 1816180 SHA256 542121940122c922c9d21a2bb39bca4e4a9db2f6bbfd2e576630840e256d4c82 SHA512 58480ee9b0780f1f21d12504abc226be3e6df1939214f6a8f245315d1fa0b9da56b3a744df26426ee78f13684a4ca288df6dddc50f8f91d9d0b4c542980a9c53 WHIRLPOOL fdb5580ec8d4abe57069ce453c1d91225019758ecf5d31856a7897ac7e4b51c6a8ae3258e822f684fbd70a0a7d7410c65c37a569f37d132767522118c587cc24
-DIST zfs-0.7.0.tar.gz 6714094 SHA256 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2 SHA512 6e6cbf54399fc85b74b76a6ceb3f30e94903f755fe6386fccc56b5e6d307a907759e4b62acec5d32e8383ef1083423eaff8dee2b0ef01a99459171a42b47d217 WHIRLPOOL 74687be4220bab51f18fdd3c047400c4261acf16f38086c2485f5cb9d79af87f5adfafced92860b021814aece7446cb18e9ca310a363b90c6bac39343b72a4b6
-DIST zfs-0.7.1.tar.gz 6376234 SHA256 231b104979ddacfeb1889e1dec175337276e7b3b109d40656089744b5caf3ef6 SHA512 64b0a3b5eeaf09ce824e3e029880a8e5dcb3e4567d1fb2fa24c89d8e55fee1ebe2d2f3a9f77d5468cc5637074e27d5ba7696b566829c93fd69c610b288200a37 WHIRLPOOL 700c83aadca96578ae8d6a9795f91c0c25b69afcc6ec6c02141daafcbcd550ae413438e96c4821c5c90816e0e29366ecfc3e7289623f14c255722c37d9f9a7f6
-DIST zfs-0.7.2.tar.gz 6389699 SHA256 f75f4d8bbb8241e3d06321b53914e53fa22d1ccc8be89819b578b46e5d3e5cf4 SHA512 fd10350b3ba5906b8d4968cee4f9febcc475b49e7d5499209566f7cfa39f29c4c2c1a4bae0698ce98244fa66657e7956a8c170de1e5f13b1bc05d2861d2c7722 WHIRLPOOL b1e270bddf9d34a6d60a9f3d80f767d6a19a7c2ae5b51d3fe83fb28432e267d494cd5b4f003b6049a074e8bf65fa9179793dec0b40f366cea493f7993dd3d19d
 DIST zfs-0.7.3.tar.gz 6393145 SHA256 cb8fc606835d3f91471e49aca31a6a0a71733b1cbe74fa510e0fe0efa670fe51 SHA512 fe116fd787050f7bc099fe3ed5335c2d18711e5e665af5be13b3971939258e036e273432e80106e704f037d1f6e3114b12e26b01f97b575723f8bd46acdcbf61 WHIRLPOOL 4a7442898bd8855c24c8cdbd8d58b02dfb41ba5e55096ad20afb61c9a2903fd5aa7808fa525dfaaa20bd85ab05e1f44828f8c557ee15c7f2b5dd1174b1810e63
-DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-invisible-snapshots.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-invisible-snapshots.patch
deleted file mode 100644
index 2daf211c7744..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-invisible-snapshots.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1c50c992bafd96773dc3950d382a89806df8cc9c Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 9 Jan 2013 11:09:06 -0800
-Subject: [PATCH] Revert "Avoid ELOOP on auto-mounted snapshots"
-
-This reverts commit 7afcf5b1da83549bfba70a61fae7a00eaa63c2b0 which
-accidentally introduced a regression with the .zfs snapshot directory.
-While the updated code still does correctly mount the requested
-snapshot.  It updates the vfsmount such that it references the
-original dataset vfsmount.  The result is that the snapshot itself
-isn't visible.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Issue #816
----
- module/zfs/zpl_ctldir.c |    7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/module/zfs/zpl_ctldir.c b/module/zfs/zpl_ctldir.c
-index a2d8fa9..7dfaf6e 100644
---- a/module/zfs/zpl_ctldir.c
-+++ b/module/zfs/zpl_ctldir.c
-@@ -357,13 +357,6 @@
- 		return ERR_PTR(error);
- 
- 	/*
--	 * Ensure path->dentry points to the dentry for the root of the
--	 * newly-mounted snapshot, otherwise this function may be called
--	 * repeatedly which can lead to an incorrect ELOOP error return.
--	 */
--	follow_up(path);
--
--	/*
- 	 * Rather than returning the new vfsmount for the snapshot we must
- 	 * return NULL to indicate a mount collision.  This is done because
- 	 * the user space mount calls do_add_mount() which adds the vfsmount
--- 
-1.7.10
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-recursive-reader.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-recursive-reader.patch
deleted file mode 100644
index 7d0263f31901..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-fix-recursive-reader.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c
-index 21fdd08..872d44a 100644
---- a/module/zfs/dsl_dataset.c
-+++ b/module/zfs/dsl_dataset.c
-@@ -20,7 +20,7 @@
-  */
- /*
-  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-- * Copyright (c) 2011 by Delphix. All rights reserved.
-+ * Copyright (c) 2012 by Delphix. All rights reserved.
-  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
-  */
- 
-@@ -4158,9 +4220,13 @@ struct dsl_ds_releasearg {
- 		dsl_dataset_t *snap;
- 		uint64_t used, comp, uncomp;
- 
--		err = dsl_dataset_hold_obj(dp, snapobj, FTAG, &snap);
--		if (err != 0)
--			break;
-+		if (snapobj == new->ds_object) {
-+			snap = new;
-+		} else {
-+			err = dsl_dataset_hold_obj(dp, snapobj, FTAG, &snap);
-+			if (err != 0)
-+				break;
-+		}
- 
- 		if (snap->ds_phys->ds_prev_snap_txg ==
- 		    oldsnap->ds_phys->ds_creation_txg) {
-@@ -4189,7 +4255,8 @@ struct dsl_ds_releasearg {
- 		 * was not a snapshot of/before new.
- 		 */
- 		snapobj = snap->ds_phys->ds_prev_snap_obj;
--		dsl_dataset_rele(snap, FTAG);
-+		if (snap != new)
-+			dsl_dataset_rele(snap, FTAG);
- 		if (snapobj == 0) {
- 			err = EINVAL;
- 			break;
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-gcc-4.7-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-gcc-4.7-compat.patch
deleted file mode 100644
index 9f31ecc82307..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc13-gcc-4.7-compat.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 37f000c5aa76613e644cf3e5b1ec7bd2df6f7451 Mon Sep 17 00:00:00 2001
-From: Ned Bass <bass6@llnl.gov>
-Date: Wed, 26 Dec 2012 14:56:41 -0800
-Subject: [PATCH] Fix gcc array subscript above bounds warning
-
-In a debug build, certain GCC versions flag an array bounds warning in
-the below code from dnode_sync.c
-
-    } else {
-            int i;
-            ASSERT(dn->dn_next_nblkptr[txgoff] < dnp->dn_nblkptr);
-            /* the blkptrs we are losing better be unallocated */
-            for (i = dn->dn_next_nblkptr[txgoff];
-                i < dnp->dn_nblkptr; i++)
-                    ASSERT(BP_IS_HOLE(&dnp->dn_blkptr[i]));
-
-This usage is in fact safe, since the ASSERT ensures the index does
-not exceed to maximum possible number of block pointers. However gcc
-can't determine that the assignment 'i = dn->dn_next_nblkptr[txgoff];'
-falls within the array bounds so it issues a warning.  To avoid this,
-initialize i to zero to make gcc happy but skip the elements before
-dn->dn_next_nblkptr[txgoff] in the loop body.  Since a dnode contains
-at most 3 block pointers this overhead should be negligible.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #950
----
- module/zfs/dnode_sync.c |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/module/zfs/dnode_sync.c b/module/zfs/dnode_sync.c
-index af636dc..f2dda86 100644
---- a/module/zfs/dnode_sync.c
-+++ b/module/zfs/dnode_sync.c
-@@ -666,9 +666,10 @@
- 			int i;
- 			ASSERT(dn->dn_next_nblkptr[txgoff] < dnp->dn_nblkptr);
- 			/* the blkptrs we are losing better be unallocated */
--			for (i = dn->dn_next_nblkptr[txgoff];
--			    i < dnp->dn_nblkptr; i++)
--				ASSERT(BP_IS_HOLE(&dnp->dn_blkptr[i]));
-+			for (i = 0; i < dnp->dn_nblkptr; i++) {
-+				if (i >= dn->dn_next_nblkptr[txgoff])
-+					ASSERT(BP_IS_HOLE(&dnp->dn_blkptr[i]));
-+			}
- #endif
- 		}
- 		mutex_enter(&dn->dn_mtx);
--- 
-1.7.10
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch
deleted file mode 100644
index 13189244c69a..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From dd26aa535b395735ca61ea2a3e618aded45eb05e Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Mon, 4 Feb 2013 16:35:54 -0800
-Subject: [PATCH] Cast 'zfs bad bloc' to ULL for x86
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Explicitly case this value to an unsigned long long for 32-bit
-systems to inform the compiler that a long type should not be
-used.  Otherwise we get the following compiler error:
-
-  dmu_send.c:376: error: integer constant is too large for
-  ‘long’ type
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
----
- module/zfs/dmu_send.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
-index 0cf3c4a..921c3d7 100644
---- a/module/zfs/dmu_send.c
-+++ b/module/zfs/dmu_send.c
-@@ -373,7 +373,7 @@
- 				for (ptr = abuf->b_data;
- 				    (char *)ptr < (char *)abuf->b_data + blksz;
- 				    ptr++)
--					*ptr = 0x2f5baddb10c;
-+					*ptr = 0x2f5baddb10cULL;
- 			} else {
- 				return (EIO);
- 			}
--- 
-1.7.10
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch
deleted file mode 100644
index fb4c7c35696c..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index 5623785..9d5aa46 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -16,7 +16,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
- 	ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS
- 	ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE
- 	ZFS_AC_KERNEL_BDEV_PHYSICAL_BLOCK_SIZE
--	ZFS_AC_KERNEL_BIO_EMPTY_BARRIER
- 	ZFS_AC_KERNEL_BIO_FAILFAST
- 	ZFS_AC_KERNEL_BIO_FAILFAST_DTD
- 	ZFS_AC_KERNEL_REQ_FAILFAST_MASK
-diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c
-index cbf0a4d..e902a70 100644
---- a/module/zfs/vdev_disk.c
-+++ b/module/zfs/vdev_disk.c
-@@ -604,8 +604,6 @@
- 	return __vdev_disk_physio(bdev, NULL, kbuf, size, offset, flags);
- }
- 
--/* 2.6.24 API change */
--#ifdef HAVE_BIO_EMPTY_BARRIER
- BIO_END_IO_PROTO(vdev_disk_io_flush_completion, bio, size, rc)
- {
- 	zio_t *zio = bio->bi_private;
-@@ -646,13 +644,6 @@
- 
- 	return 0;
- }
--#else
--static int
--vdev_disk_io_flush(struct block_device *bdev, zio_t *zio)
--{
--	return ENOTSUP;
--}
--#endif /* HAVE_BIO_EMPTY_BARRIER */
- 
- static int
- vdev_disk_io_start(zio_t *zio)
--- 
-1.7.10
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch
deleted file mode 100644
index 15d5af34d5c5..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From d75af3c0ebb4e31ece087aeecfeff282cb6f1361 Mon Sep 17 00:00:00 2001
-From: Etienne Dechamps <etienne@edechamps.fr>
-Date: Sun, 24 Feb 2013 12:42:28 +0000
-Subject: [PATCH] Use -Werror for all kernel configure tests.
-
-As a matter of fact, we're already using -Werror for most tests because
-of a bug in kernel-bio-empty-barrier.m4 which sets -Werror without
-reverting it afterwards. This meant that all tests which ran after this
-one was using -Werror.
-
-This patch simply makes it clear that we're using -Werror and makes
-the code more readable and more predictable.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #1317
----
- config/kernel-bio-empty-barrier.m4   |    1 -
- config/kernel-bio-end-io-t-args.m4   |    3 ---
- config/kernel-security-inode-init.m4 |    6 ------
- config/kernel.m4                     |    2 +-
- 4 files changed, 1 insertion(+), 11 deletions(-)
-
-diff --git a/config/kernel-bio-empty-barrier.m4 b/config/kernel-bio-empty-barrier.m4
-index 99549fe..fda16b3 100644
---- a/config/kernel-bio-empty-barrier.m4
-+++ b/config/kernel-bio-empty-barrier.m4
-@@ -4,7 +4,6 @@ dnl # Empty write barriers are now supported and we should use them.
- dnl #
- AC_DEFUN([ZFS_AC_KERNEL_BIO_EMPTY_BARRIER], [
- 	AC_MSG_CHECKING([whether bio_empty_barrier() is defined])
--	EXTRA_KCFLAGS="-Werror"
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/bio.h>
- 	],[
-diff --git a/config/kernel-bio-end-io-t-args.m4 b/config/kernel-bio-end-io-t-args.m4
-index ced4861..44e4826 100644
---- a/config/kernel-bio-end-io-t-args.m4
-+++ b/config/kernel-bio-end-io-t-args.m4
-@@ -9,8 +9,6 @@ dnl # to void.
- dnl #
- AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [
- 	AC_MSG_CHECKING([whether bio_end_io_t wants 2 args])
--	tmp_flags="$EXTRA_KCFLAGS"
--	EXTRA_KCFLAGS="-Werror"
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/bio.h>
- 	],[
-@@ -25,5 +23,4 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [
- 	],[
- 		AC_MSG_RESULT(no)
- 	])
--	EXTRA_KCFLAGS="$tmp_flags"
- ])
-diff --git a/config/kernel-security-inode-init.m4 b/config/kernel-security-inode-init.m4
-index c21588a..a62176d 100644
---- a/config/kernel-security-inode-init.m4
-+++ b/config/kernel-security-inode-init.m4
-@@ -7,8 +7,6 @@ dnl # security checks will just be skipped.
- dnl #
- AC_DEFUN([ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY], [
- 	AC_MSG_CHECKING([whether security_inode_init_security wants 6 args])
--	tmp_flags="$EXTRA_KCFLAGS"
--	EXTRA_KCFLAGS="-Werror"
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/security.h>
- 	],[
-@@ -27,7 +25,6 @@ AC_DEFUN([ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY], [
- 	],[
- 		AC_MSG_RESULT(no)
- 	])
--	EXTRA_KCFLAGS="$tmp_flags"
- ])
- 
- dnl #
-@@ -39,8 +36,6 @@ dnl # and the EVM xattr.
- dnl #
- AC_DEFUN([ZFS_AC_KERNEL_CALLBACK_SECURITY_INODE_INIT_SECURITY], [
- 	AC_MSG_CHECKING([whether security_inode_init_security wants callback])
--	tmp_flags="$EXTRA_KCFLAGS"
--	EXTRA_KCFLAGS="-Werror"
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/security.h>
- 	],[
-@@ -57,5 +52,4 @@ AC_DEFUN([ZFS_AC_KERNEL_CALLBACK_SECURITY_INODE_INIT_SECURITY], [
- 	],[
- 		AC_MSG_RESULT(no)
- 	])
--	EXTRA_KCFLAGS="$tmp_flags"
- ])
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index 6d28074..5623785 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -488,7 +488,7 @@ AC_DEFUN([ZFS_LINUX_COMPILE_IFELSE], [
- 	modpost_flag=''
- 	test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage
- 	AS_IF(
--		[AC_TRY_COMMAND(cp conftest.c build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])],
-+		[AC_TRY_COMMAND(cp conftest.c build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag) >/dev/null && AC_TRY_COMMAND([$3])],
- 		[$4],
- 		[_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])]
- 	)
--- 
-1.7.10
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-hardened-support.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-hardened-support.patch
deleted file mode 100644
index 03ee65ef9d4a..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-hardened-support.patch
+++ /dev/null
@@ -1,473 +0,0 @@
-From ead579050140bfa010d06f6e0fea3f680c781b38 Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@cs.stonybrook.edu>
-Date: Thu, 14 Feb 2013 18:54:04 -0500
-Subject: [PATCH] Eliminate runtime function pointer modifications in
- autotools checks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-PaX/GrSecurity patched kernels implement a dialect of C that relies on a
-GCC plugin for enforcement. A basic idea in this dialect is that
-function pointers in structures should not change during runtime.
-This causes code that modifies function pointers at runtime to fail to
-compile in many instances. The autotools checks rely on whether or
-not small test cases compile against a given kernel. Some
-autotools checks assume some default case if other cases fail. When one
-of these autotools checks tests a PaX/GrSecurity patched kernel by
-modifying a function pointer at runtime, the default case will be used.
-
-Early detection of such situations is possible by relying on compiler
-warnings, which are compiler errors when --enable-debug is used.
-Unfortunately, very few people build ZFS with --enable-debug. The more
-common situation is that these issues manifest themselves as runtime
-failures in the form of NULL pointer exceptions.
-
-Previous patches that addressed such issues with PaX/GrSecurity
-compatibility largely relied on rewriting autotools checks to avoid
-runtime function pointer modification or the addition of PaX/GrSecurity
-specific checks. This patch takes the previous work to its logical
-conclusion by eliminating the use of runtime function pointer
-modification. This permits the removal of PaX-specific autotools checks
-in favor of ones that work across all supported kernels.
-
-This should resolve issues that were reported to occur with
-PaX/GrSecurity-patched Linux 3.7.5 kernels on Gentoo Linux.
-
-https://bugs.gentoo.org/show_bug.cgi?id=457176
-
-We should be able to prevent future regressions in PaX/GrSecurity
-compatibility by ensuring that all changes to ZFSOnLinux avoid runtime
-function pointer modification. At the same time, this does not solve the
-issue of silent failures triggering default cases in the autotools
-check, which is what permitted these regressions to become runtime
-failures in the first place. This will need to be addressed in a future
-patch.
-
-Reported-by: Marcin Mirosław <bug@mejor.pl>
-Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
----
- config/kernel-bdev-block-device-operations.m4 |   21 +++----
- config/kernel-bio-end-io-t-args.m4            |    6 +-
- config/kernel-create-nameidata.m4             |   12 ++--
- config/kernel-dentry-operations.m4            |    6 +-
- config/kernel-dirty-inode.m4                  |    8 +--
- config/kernel-fallocate.m4                    |   37 +++--------
- config/kernel-fsync.m4                        |   84 ++++---------------------
- config/kernel-lookup-nameidata.m4             |    9 +--
- config/kernel-mkdir-umode-t.m4                |    7 ++-
- config/kernel-shrink.m4                       |   21 +++----
- 10 files changed, 62 insertions(+), 149 deletions(-)
-
-diff --git a/config/kernel-bdev-block-device-operations.m4 b/config/kernel-bdev-block-device-operations.m4
-index 28c3032..1674af0 100644
---- a/config/kernel-bdev-block-device-operations.m4
-+++ b/config/kernel-bdev-block-device-operations.m4
-@@ -7,24 +7,21 @@ AC_DEFUN([ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS], [
- 	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/blkdev.h>
--	],[
--		int (*blk_open) (struct block_device *, fmode_t) = NULL;
--		int (*blk_release) (struct gendisk *, fmode_t) = NULL;
--		int (*blk_ioctl) (struct block_device *, fmode_t,
--		                  unsigned, unsigned long) = NULL;
--		int (*blk_compat_ioctl) (struct block_device *, fmode_t,
--                                         unsigned, unsigned long) = NULL;
--		struct block_device_operations blk_ops = {
-+
-+		int blk_open (struct block_device *bdev, fmode_t mode) { return 0; }
-+		int blk_release (struct gendisk *g, fmode_t mode) { return 0; }
-+		int blk_ioctl (struct block_device *bdev, fmode_t mode,
-+		                  unsigned x, unsigned long y) { return 0; }
-+		int blk_compat_ioctl (struct block_device * bdev, fmode_t mode,
-+                                         unsigned x, unsigned long y) { return 0; }
-+		static struct block_device_operations blk_ops __attribute__ ((unused)) = {
- 			.open		= blk_open,
- 			.release	= blk_release,
- 			.ioctl		= blk_ioctl,
- 			.compat_ioctl	= blk_compat_ioctl,
- 		};
-+	],[
- 		
--		blk_ops.open(NULL, 0);
--		blk_ops.release(NULL, 0);
--		blk_ops.ioctl(NULL, 0, 0, 0);
--		blk_ops.compat_ioctl(NULL, 0, 0, 0);
- 	],[
- 		AC_MSG_RESULT(struct block_device)
- 		AC_DEFINE(HAVE_BDEV_BLOCK_DEVICE_OPERATIONS, 1,
-diff --git a/config/kernel-bio-end-io-t-args.m4 b/config/kernel-bio-end-io-t-args.m4
-index ced4861..fe5707a 100644
---- a/config/kernel-bio-end-io-t-args.m4
-+++ b/config/kernel-bio-end-io-t-args.m4
-@@ -13,11 +13,9 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [
- 	EXTRA_KCFLAGS="-Werror"
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/bio.h>
-+		void wanted_end_io(struct bio * bio, int x) { return; }
- 	],[
--		void (*wanted_end_io)(struct bio *, int) = NULL;
--		bio_end_io_t *local_end_io __attribute__ ((unused));
--
--		local_end_io = wanted_end_io;
-+		bio_end_io_t *local_end_io __attribute__ ((unused)) = wanted_end_io;
- 	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_2ARGS_BIO_END_IO_T, 1,
-diff --git a/config/kernel-create-nameidata.m4 b/config/kernel-create-nameidata.m4
-index 100f077..c779715 100644
---- a/config/kernel-create-nameidata.m4
-+++ b/config/kernel-create-nameidata.m4
-@@ -5,18 +5,18 @@ AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [
- 	AC_MSG_CHECKING([whether iops->create() takes struct nameidata])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
--	],[
- 		#ifdef HAVE_MKDIR_UMODE_T
--		int (*inode_create) (struct inode *,struct dentry *,
--		                     umode_t, struct nameidata *) = NULL;
-+		int inode_create (struct inode *inode ,struct dentry *dentry,
-+		                     umode_t umode, struct nameidata *nidata) { return 0; }
- 		#else
--		int (*inode_create) (struct inode *,struct dentry *,
--		                     int, struct nameidata *) = NULL;
-+		int inode_create (struct inode *inode,struct dentry *dentry,
-+		                     int umode, struct nameidata * nidata) { return 0; }
- 		#endif
--		struct inode_operations iops __attribute__ ((unused)) = {
-+		static struct inode_operations iops __attribute__ ((unused)) = {
- 			.create		= inode_create,
- 		};
- 	],[
-+	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_CREATE_NAMEIDATA, 1,
- 		          [iops->create() operation takes nameidata])
-diff --git a/config/kernel-dentry-operations.m4 b/config/kernel-dentry-operations.m4
-index dfbea7d..b89c51d 100644
---- a/config/kernel-dentry-operations.m4
-+++ b/config/kernel-dentry-operations.m4
-@@ -5,12 +5,12 @@ AC_DEFUN([ZFS_AC_KERNEL_D_REVALIDATE_NAMEIDATA], [
- 	AC_MSG_CHECKING([whether dops->d_revalidate() takes struct nameidata])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/dcache.h>
--	],[
--		int (*revalidate) (struct dentry *, struct nameidata *) = NULL;
--		struct dentry_operations dops __attribute__ ((unused)) = {
-+		int revalidate (struct dentry *dentry, struct nameidata *nidata) { return 0; }
-+		static struct dentry_operations dops __attribute__ ((unused)) = {
- 			.d_revalidate		= revalidate,
- 		};
- 	],[
-+	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_D_REVALIDATE_NAMEIDATA, 1,
- 		          [dops->d_revalidate() operation takes nameidata])
-diff --git a/config/kernel-dirty-inode.m4 b/config/kernel-dirty-inode.m4
-index 2ededf1..86e3425 100644
---- a/config/kernel-dirty-inode.m4
-+++ b/config/kernel-dirty-inode.m4
-@@ -8,11 +8,11 @@ AC_DEFUN([ZFS_AC_KERNEL_DIRTY_INODE_WITH_FLAGS], [
- 	AC_MSG_CHECKING([whether sops->dirty_inode() wants flags])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
-+		void dirty_inode (struct inode * a, int b) { return; }
-+		static struct super_operations sops __attribute__ ((unused)) = {
-+			.dirty_inode = dirty_inode,
-+		};
- 	],[
--		void (*dirty_inode) (struct inode *, int) = NULL;
--		struct super_operations sops __attribute__ ((unused));
--
--		sops.dirty_inode = dirty_inode;
- 	],[
- 		AC_MSG_RESULT([yes])
- 		AC_DEFINE(HAVE_DIRTY_INODE_WITH_FLAGS, 1,
-diff --git a/config/kernel-fallocate.m4 b/config/kernel-fallocate.m4
-index 6ac5ae6..0041ef2 100644
---- a/config/kernel-fallocate.m4
-+++ b/config/kernel-fallocate.m4
-@@ -5,12 +5,12 @@ AC_DEFUN([ZFS_AC_KERNEL_FILE_FALLOCATE], [
- 	AC_MSG_CHECKING([whether fops->fallocate() exists])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
--	],[
--		long (*fallocate) (struct file *, int, loff_t, loff_t) = NULL;
--		struct file_operations fops __attribute__ ((unused)) = {
--			.fallocate = fallocate,
-+		long test_fallocate(struct file *file, int mode, loff_t offset, loff_t len) { return 0; }
-+		static const struct file_operations fops __attribute__ ((unused)) = {
-+			.fallocate = test_fallocate,
- 		};
- 	],[
-+	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists])
- 	],[
-@@ -25,34 +25,14 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_FALLOCATE], [
- 	AC_MSG_CHECKING([whether iops->fallocate() exists])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
--	],[
--		long (*fallocate) (struct inode *, int, loff_t, loff_t) = NULL;
--		struct inode_operations fops __attribute__ ((unused)) = {
--			.fallocate = fallocate,
-+		long test_fallocate (struct inode *inode, int mode, loff_t offset, loff_t len) { return 0; }
-+		static const struct inode_operations fops __attribute__ ((unused)) = {
-+			.fallocate = test_fallocate,
- 		};
- 	],[
--		AC_MSG_RESULT(yes)
--		AC_DEFINE(HAVE_INODE_FALLOCATE, 1, [fops->fallocate() exists])
--	],[
--		AC_MSG_RESULT(no)
--	])
--])
--
--dnl #
--dnl # PaX Linux 2.6.38 - 3.x API
--dnl #
--AC_DEFUN([ZFS_AC_PAX_KERNEL_FILE_FALLOCATE], [
--	AC_MSG_CHECKING([whether fops->fallocate() exists])
--	ZFS_LINUX_TRY_COMPILE([
--		#include <linux/fs.h>
--	],[
--		long (*fallocate) (struct file *, int, loff_t, loff_t) = NULL;
--		struct file_operations_no_const fops __attribute__ ((unused)) = {
--			.fallocate = fallocate,
--		};
- 	],[
- 		AC_MSG_RESULT(yes)
--		AC_DEFINE(HAVE_FILE_FALLOCATE, 1, [fops->fallocate() exists])
-+		AC_DEFINE(HAVE_INODE_FALLOCATE, 1, [fops->fallocate() exists])
- 	],[
- 		AC_MSG_RESULT(no)
- 	])
-@@ -65,5 +45,4 @@ dnl #
- AC_DEFUN([ZFS_AC_KERNEL_FALLOCATE], [
- 	ZFS_AC_KERNEL_FILE_FALLOCATE
- 	ZFS_AC_KERNEL_INODE_FALLOCATE
--	ZFS_AC_PAX_KERNEL_FILE_FALLOCATE
- ])
-diff --git a/config/kernel-fsync.m4 b/config/kernel-fsync.m4
-index ca00d93..9ac0c79 100644
---- a/config/kernel-fsync.m4
-+++ b/config/kernel-fsync.m4
-@@ -4,11 +4,11 @@ dnl #
- AC_DEFUN([ZFS_AC_KERNEL_FSYNC_WITH_DENTRY], [
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
-+		int test_fsync (struct file *f, struct dentry *dentry, int x) { return 0; }
-+		static const struct file_operations fops __attribute__ ((unused)) = {
-+			.fsync = test_fsync,
-+		};
- 	],[
--		int (*fsync) (struct file *, struct dentry *, int) = NULL;
--		struct file_operations fops __attribute__ ((unused));
--
--		fops.fsync = fsync;
- 	],[
- 		AC_MSG_RESULT([dentry])
- 		AC_DEFINE(HAVE_FSYNC_WITH_DENTRY, 1,
-@@ -23,11 +23,11 @@ dnl #
- AC_DEFUN([ZFS_AC_KERNEL_FSYNC_WITHOUT_DENTRY], [
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
-+		int test_fsync (struct file *f, int x) { return 0; }
-+		static const struct file_operations fops __attribute__ ((unused)) = {
-+			.fsync = test_fsync,
-+		};
- 	],[
--		int (*fsync) (struct file *, int) = NULL;
--		struct file_operations fops __attribute__ ((unused));
--
--		fops.fsync = fsync;
- 	],[
- 		AC_MSG_RESULT([no dentry])
- 		AC_DEFINE(HAVE_FSYNC_WITHOUT_DENTRY, 1,
-@@ -42,68 +42,11 @@ dnl #
- AC_DEFUN([ZFS_AC_KERNEL_FSYNC_RANGE], [
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
-+		int test_fsync (struct file *f, loff_t a, loff_t b, int c) { return 0; }
-+		static const struct file_operations fops __attribute__ ((unused)) = {
-+			.fsync = test_fsync,
-+		};
- 	],[
--		int (*fsync) (struct file *, loff_t, loff_t, int) = NULL;
--		struct file_operations fops __attribute__ ((unused));
--
--		fops.fsync = fsync;
--	],[
--		AC_MSG_RESULT([range])
--		AC_DEFINE(HAVE_FSYNC_RANGE, 1,
--			[fops->fsync() with range])
--	],[
--	])
--])
--
--dnl #
--dnl # PaX Linux 2.6.x - 2.6.34 API
--dnl #
--AC_DEFUN([ZFS_AC_PAX_KERNEL_FSYNC_WITH_DENTRY], [
--	ZFS_LINUX_TRY_COMPILE([
--		#include <linux/fs.h>
--	],[
--		int (*fsync) (struct file *, struct dentry *, int) = NULL;
--		file_operations_no_const fops __attribute__ ((unused));
--
--		fops.fsync = fsync;
--	],[
--		AC_MSG_RESULT([dentry])
--		AC_DEFINE(HAVE_FSYNC_WITH_DENTRY, 1,
--			[fops->fsync() with dentry])
--	],[
--	])
--])
--
--dnl #
--dnl # PaX Linux 2.6.35 - Linux 3.0 API
--dnl #
--AC_DEFUN([ZFS_AC_PAX_KERNEL_FSYNC_WITHOUT_DENTRY], [
--	ZFS_LINUX_TRY_COMPILE([
--		#include <linux/fs.h>
--	],[
--		int (*fsync) (struct file *, int) = NULL;
--		file_operations_no_const fops __attribute__ ((unused));
--
--		fops.fsync = fsync;
--	],[
--		AC_MSG_RESULT([no dentry])
--		AC_DEFINE(HAVE_FSYNC_WITHOUT_DENTRY, 1,
--			[fops->fsync() without dentry])
--	],[
--	])
--])
--
--dnl #
--dnl # PaX Linux 3.1 - 3.x API
--dnl #
--AC_DEFUN([ZFS_AC_PAX_KERNEL_FSYNC_RANGE], [
--	ZFS_LINUX_TRY_COMPILE([
--		#include <linux/fs.h>
--	],[
--		int (*fsync) (struct file *, loff_t, loff_t, int) = NULL;
--		file_operations_no_const fops __attribute__ ((unused));
--
--		fops.fsync = fsync;
- 	],[
- 		AC_MSG_RESULT([range])
- 		AC_DEFINE(HAVE_FSYNC_RANGE, 1,
-@@ -117,7 +60,4 @@ AC_DEFUN([ZFS_AC_KERNEL_FSYNC], [
- 	ZFS_AC_KERNEL_FSYNC_WITH_DENTRY
- 	ZFS_AC_KERNEL_FSYNC_WITHOUT_DENTRY
- 	ZFS_AC_KERNEL_FSYNC_RANGE
--	ZFS_AC_PAX_KERNEL_FSYNC_WITH_DENTRY
--	ZFS_AC_PAX_KERNEL_FSYNC_WITHOUT_DENTRY
--	ZFS_AC_PAX_KERNEL_FSYNC_RANGE
- ])
-diff --git a/config/kernel-lookup-nameidata.m4 b/config/kernel-lookup-nameidata.m4
-index 5e30be4..20b8cca 100644
---- a/config/kernel-lookup-nameidata.m4
-+++ b/config/kernel-lookup-nameidata.m4
-@@ -5,13 +5,14 @@ AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [
- 	AC_MSG_CHECKING([whether iops->lookup() takes struct nameidata])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
--	],[
--		struct dentry * (*inode_lookup) (struct inode *,struct dentry *,
--		                     struct nameidata *) = NULL;
--		struct inode_operations iops __attribute__ ((unused)) = {
-+		struct dentry * inode_lookup (struct inode * inode,
-+			struct dentry * dentry, struct nameidata * nidata)
-+			{ return NULL; }
-+		static struct inode_operations iops __attribute__ ((unused)) = {
- 			.lookup		= inode_lookup,
- 		};
- 	],[
-+	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_LOOKUP_NAMEIDATA, 1,
- 		          [iops->lookup() operation takes nameidata])
-diff --git a/config/kernel-mkdir-umode-t.m4 b/config/kernel-mkdir-umode-t.m4
-index dd5d94b..ce8aa8f 100644
---- a/config/kernel-mkdir-umode-t.m4
-+++ b/config/kernel-mkdir-umode-t.m4
-@@ -10,12 +10,13 @@ AC_DEFUN([ZFS_AC_KERNEL_MKDIR_UMODE_T], [
- 	AC_MSG_CHECKING([whether iops->create()/mkdir()/mknod() take umode_t])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
--	],[
--		int (*mkdir) (struct inode *,struct dentry *,umode_t) = NULL;
--		struct inode_operations iops __attribute__ ((unused)) = {
-+		int mkdir (struct inode * inode, struct dentry * dentry, umode_t umode)
-+			{ return 0; }
-+		static struct inode_operations iops __attribute__ ((unused)) = {
- 			.mkdir = mkdir,
- 		};
- 	],[
-+	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_MKDIR_UMODE_T, 1,
- 		    [iops->create()/mkdir()/mknod() take umode_t])
-diff --git a/config/kernel-shrink.m4 b/config/kernel-shrink.m4
-index ea748c9..ce4b965 100644
---- a/config/kernel-shrink.m4
-+++ b/config/kernel-shrink.m4
-@@ -8,15 +8,14 @@ AC_DEFUN([ZFS_AC_KERNEL_SHRINK], [
- 	AC_MSG_CHECKING([whether super_block has s_shrink])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
--	],[
--		int (*shrink)(struct shrinker *, struct shrink_control *sc)
--			__attribute__ ((unused)) = NULL;
--		struct super_block sb __attribute__ ((unused)) = {
-+		int shrink(struct shrinker * s, struct shrink_control *sc) { return 0; }
-+		static struct super_block sb __attribute__ ((unused)) = {
- 			.s_shrink.shrink = shrink,
- 			.s_shrink.seeks = DEFAULT_SEEKS,
- 			.s_shrink.batch = 0,
- 		};
- 	],[
-+	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_SHRINK, 1, [struct super_block has s_shrink])
- 
-@@ -29,13 +28,12 @@ AC_DEFUN([ZFS_AC_KERNEL_NR_CACHED_OBJECTS], [
- 	AC_MSG_CHECKING([whether sops->nr_cached_objects() exists])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
--	],[
--		int (*nr_cached_objects)(struct super_block *)
--			__attribute__ ((unused)) = NULL;
--		struct super_operations sops __attribute__ ((unused)) = {
-+		int nr_cached_objects(struct super_block * sb) { return 0; }
-+		static struct super_operations sops __attribute__ ((unused)) = {
- 			.nr_cached_objects = nr_cached_objects,
- 		};
- 	],[
-+	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_NR_CACHED_OBJECTS, 1,
- 			[sops->nr_cached_objects() exists])
-@@ -48,13 +46,12 @@ AC_DEFUN([ZFS_AC_KERNEL_FREE_CACHED_OBJECTS], [
- 	AC_MSG_CHECKING([whether sops->free_cached_objects() exists])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
--	],[
--		void (*free_cached_objects)(struct super_block *, int)
--			__attribute__ ((unused)) = NULL;
--		struct super_operations sops __attribute__ ((unused)) = {
-+		void free_cached_objects(struct super_block * sb, int x) { return; }
-+		static struct super_operations sops __attribute__ ((unused)) = {
- 			.free_cached_objects = free_cached_objects,
- 		};
- 	],[
-+	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_FREE_CACHED_OBJECTS, 1,
- 			[sops->free_cached_objects() exists])
--- 
-1.7.10
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch
deleted file mode 100644
index 1dfef6117f1a..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 3d8c9c9de0a5e1f1b496fcef2750a01a45860b04
-Author: Richard Yao <ryao@cs.stonybrook.edu>
-Date:   Mon Mar 4 15:52:11 2013 -0500
-
-    Linux 3.9 compat: Undefine GCC_VERSION
-    
-    The mainline kernel started defining GCC_VERSION with commit
-    torvalds/linux@3f3f8d2f48acfd8ed3b8e6b7377935da57b27b16. Unfortunately,
-    LZ4 also defines this macro, but the two defintions are incompatible. We
-    undefine GCC_VERSION in lz4.c to handle this.
-    
-    Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
-
-diff --git a/module/zfs/lz4.c b/module/zfs/lz4.c
-index b9850c0..8afaad1 100644
---- a/module/zfs/lz4.c
-+++ b/module/zfs/lz4.c
-@@ -243,6 +243,14 @@ lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
- /* Disable restrict */
- #define	restrict
- 
-+/*
-+ * Linux : GCC_VERSION is defined as of 3.9-rc1, so undefine it.
-+ * torvalds/linux@3f3f8d2f48acfd8ed3b8e6b7377935da57b27b16
-+ */
-+#ifdef GCC_VERSION
-+#undef GCC_VERSION
-+#endif
-+
- #define	GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
- 
- #if (GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__)
\ No newline at end of file
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch
deleted file mode 100644
index 5f9f6525e73c..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7f235381a0e501df55ebe2de10b69124e928d175 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Mon, 11 Feb 2013 12:55:24 -0800
-Subject: [PATCH] Add explicit MAXNAMELEN check
-
-It turns out that the Linux VFS doesn't strictly handle all cases
-where a component path name exceeds MAXNAMELEN.  It does however
-appear to correctly handle MAXPATHLEN for us.
-
-The right way to handle this appears to be to add an explicit
-check to the zpl_lookup() function.  Several in-tree filesystems
-handle this case the same way.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Issue #1279
----
- module/zfs/zpl_inode.c |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
-index e406288..8c8ec24 100644
---- a/module/zfs/zpl_inode.c
-+++ b/module/zfs/zpl_inode.c
-@@ -41,6 +41,9 @@
- 	struct inode *ip;
- 	int error;
- 
-+	if (dlen(dentry) > ZFS_MAXNAMELEN)
-+		return ERR_PTR(-ENAMETOOLONG);
-+
- 	crhold(cr);
- 	error = -zfs_lookup(dir, dname(dentry), &ip, 0, cr, NULL, NULL);
- 	ASSERT3S(error, <=, 0);
--- 
-1.7.10
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-zfs_arc_memory_throttle_disable.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-zfs_arc_memory_throttle_disable.patch
deleted file mode 100644
index 81ec15f3e6c7..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-zfs_arc_memory_throttle_disable.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 546c978bbd3f132a88609cab15ec0e954eaa62b8 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Thu, 21 Feb 2013 12:14:44 -0800
-Subject: [PATCH] Enable zfs_arc_memory_throttle_disable by default
-
-The zfs_arc_memory_throttle_disable module option was introduced
-by commit 0c5493d47059f25ce9dbf20c9fe87655f55102a1 to resolve a
-memory miscalculation which could result in the txg_sync thread
-spinning.
-
-When this was first introduced the default behavior was left
-unchanged until enough real world usage confirmed there were no
-unexpected issues.  We've now reached that point.  Linux's
-direct reclaim is working as expected so we're enabling this
-behavior by default.
-
-This helps pave the way to retire the spl_kmem_availrmem()
-functionality in the SPL layer.  This was the only caller.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Issue #938
----
- module/zfs/arc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/module/zfs/arc.c b/module/zfs/arc.c
-index 09924db..b7499ee 100644
---- a/module/zfs/arc.c
-+++ b/module/zfs/arc.c
-@@ -189,7 +189,7 @@
- int zfs_arc_grow_retry = 0;
- int zfs_arc_shrink_shift = 0;
- int zfs_arc_p_min_shift = 0;
--int zfs_arc_memory_throttle_disable = 0;
-+int zfs_arc_memory_throttle_disable = 1;
- int zfs_disable_dup_eviction = 0;
- int zfs_arc_meta_prune = 0;
- 
--- 
-1.8.1.5
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-arc-read-panic.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-arc-read-panic.patch
deleted file mode 100644
index 00ec1057efa1..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-arc-read-panic.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3db3ff4a787acf068b122562fb5be5aecec2611f Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@gentoo.org>
-Date: Tue, 2 Jul 2013 00:07:15 -0400
-Subject: [PATCH] Use MAXPATHLEN instead of sizeof in snprintf
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This silences a GCC 4.8.0 warning by fixing a programming error
-caught by static analysis:
-
-../../cmd/ztest/ztest.c: In function ‘ztest_vdev_aux_add_remove’:
-../../cmd/ztest/ztest.c:2584:33: error: argument to ‘sizeof’
-  in ‘snprintf’ call is the same expression as the destination;
-  did you mean to provide an explicit length?
-  [-Werror=sizeof-pointer-memaccess]
-  (void) snprintf(path, sizeof (path), ztest_aux_template,
-                                 ^
-
-Signed-off-by: Richard Yao <ryao@gentoo.org>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #1480
----
- cmd/ztest/ztest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
-index b38d7b1..93a5f1e 100644
---- a/cmd/ztest/ztest.c
-+++ b/cmd/ztest/ztest.c
-@@ -2581,7 +2581,7 @@ enum ztest_object {
- 		zs->zs_vdev_aux = 0;
- 		for (;;) {
- 			int c;
--			(void) snprintf(path, sizeof (path), ztest_aux_template,
-+			(void) snprintf(path, MAXPATHLEN, ztest_aux_template,
- 			    ztest_opts.zo_dir, ztest_opts.zo_pool, aux,
- 			    zs->zs_vdev_aux);
- 			for (c = 0; c < sav->sav_count; c++)
--- 
-1.8.1.6
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-getdents.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-getdents.patch
deleted file mode 100644
index ce7d5c0494d9..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-getdents.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8f1e11b6105bf46a4258958eb3dcae2ab21ed8b2 Mon Sep 17 00:00:00 2001
-From: Caleb James DeLisle <calebdelisle@lavabit.com>
-Date: Tue, 16 Apr 2013 05:23:39 -0400
-Subject: [PATCH] Remove .readdir from zpl_file_operations table
-
-The zpl_readdir() function shouldn't be registered as part of
-the zpl_file_operations table, it must only be part of the
-zpl_dir_file_operations table.  By removing this callback
-the VFS will now correctly return ENOTDIR when calling
-getdents() on a file.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #1404
----
- module/zfs/zpl_file.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c
-index 9c27b7f..db6a72c 100644
---- a/module/zfs/zpl_file.c
-+++ b/module/zfs/zpl_file.c
-@@ -446,7 +446,6 @@
- 	.llseek		= generic_file_llseek,
- 	.read		= zpl_read,
- 	.write		= zpl_write,
--	.readdir	= zpl_readdir,
- 	.mmap		= zpl_mmap,
- 	.fsync		= zpl_fsync,
- #ifdef HAVE_FILE_FALLOCATE
--- 
-1.8.1.6
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-txg_quiesce-deadlock.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-txg_quiesce-deadlock.patch
deleted file mode 100644
index 8513e78882b1..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-txg_quiesce-deadlock.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 57f5a2008e2e6acf58934cf43c5fdca0faffa73e Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Thu, 25 Apr 2013 16:29:22 -0700
-Subject: [PATCH] Fix txg_quiesce thread deadlock
-
-A deadlock was accidentally introduced by commit e95853a which
-can occur when the system is under memory pressure.  What happens
-is that while the txg_quiesce thread is holding the tx->tx_cpu
-locks it enters memory reclaim.  In the context of this memory
-reclaim it then issues synchronous I/O to a ZVOL swap device.
-Because the txg_quiesce thread is holding the tx->tx_cpu locks
-a new txg cannot be opened to handle the I/O.  Deadlock.
-
-The fix is straight forward.  Move the memory allocation outside
-the critical region where the tx->tx_cpu locks are held.  And for
-good measure change the offending allocation to KM_PUSHPAGE to
-ensure it never attempts to issue I/O during reclaim.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Issue #1274
----
- module/zfs/dsl_pool.c |  2 +-
- module/zfs/txg.c      | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c
-index 704f034..771b265 100644
---- a/module/zfs/dsl_pool.c
-+++ b/module/zfs/dsl_pool.c
-@@ -143,7 +143,7 @@
- {
- 	txg_history_t *th, *rm;
- 
--	th = kmem_zalloc(sizeof(txg_history_t), KM_SLEEP);
-+	th = kmem_zalloc(sizeof(txg_history_t), KM_PUSHPAGE);
- 	mutex_init(&th->th_lock, NULL, MUTEX_DEFAULT, NULL);
- 	th->th_kstat.txg = txg;
- 	th->th_kstat.state = TXG_STATE_OPEN;
-diff --git a/module/zfs/txg.c b/module/zfs/txg.c
-index c7c3df3..7c820af 100644
---- a/module/zfs/txg.c
-+++ b/module/zfs/txg.c
-@@ -367,6 +367,13 @@
- 	tx->tx_open_txg++;
- 
- 	/*
-+	 * Now that we've incremented tx_open_txg, we can let threads
-+	 * enter the next transaction group.
-+	 */
-+	for (c = 0; c < max_ncpus; c++)
-+		mutex_exit(&tx->tx_cpu[c].tc_lock);
-+
-+	/*
- 	 * Measure how long the txg was open and replace the kstat.
- 	 */
- 	th = dsl_pool_txg_history_get(dp, txg);
-@@ -376,13 +383,6 @@
- 	dsl_pool_txg_history_add(dp, tx->tx_open_txg);
- 
- 	/*
--	 * Now that we've incremented tx_open_txg, we can let threads
--	 * enter the next transaction group.
--	 */
--	for (c = 0; c < max_ncpus; c++)
--		mutex_exit(&tx->tx_cpu[c].tc_lock);
--
--	/*
- 	 * Quiesce the transaction group by waiting for everyone to txg_exit().
- 	 */
- 	start = gethrtime();
--- 
-1.8.1.6
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-1.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-1.patch
deleted file mode 100644
index b4801708ae35..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From f706421173c571371afff5e2a2ee0784c5e3f95d Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 17 Apr 2013 13:07:36 -0700
-Subject: [PATCH] Correctly return ERANGE in getxattr(2)
-
-According to the getxattr(2) man page the ERANGE errno should be
-returned when the size of the value buffer is to small to hold the
-result.  Prior to this patch the implementation would just truncate
-the value to size bytes.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #1408
----
- module/zfs/zpl_xattr.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
-index c03764f..a7e38e6 100644
---- a/module/zfs/zpl_xattr.c
-+++ b/module/zfs/zpl_xattr.c
-@@ -225,6 +225,11 @@
- 		goto out;
- 	}
- 
-+	if (size < i_size_read(xip)) {
-+		error = -ERANGE;
-+		goto out;
-+	}
-+
- 	error = zpl_read_common(xip, value, size, 0, UIO_SYSSPACE, 0, cr);
- out:
- 	if (xip)
-@@ -263,9 +268,12 @@
- 	if (!size)
- 		return (nv_size);
- 
--	memcpy(value, nv_value, MIN(size, nv_size));
-+	if (size < nv_size)
-+		return (-ERANGE);
-+
-+	memcpy(value, nv_value, nv_size);
- 
--	return (MIN(size, nv_size));
-+	return (nv_size);
- }
- 
- static int
--- 
-1.8.1.6
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-2.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-2.patch
deleted file mode 100644
index bb4b1c4a3a34..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-xattr-behavior-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0377189b884fab7db02a95088e05712c7cf336f7 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 8 May 2013 09:20:04 -0700
-Subject: [PATCH] Only check directory xattr on ENOENT
-
-When SA xattrs are enabled only fallback to checking the directory
-xattrs when the name is not found as a SA xattr.  Otherwise, the SA
-error which should be returned to the caller is overwritten by the
-directory xattr errors.  Positive return values indicating success
-will also be immediately returned.
-
-In the case of #1437 the ERANGE error was being correctly returned
-by zpl_xattr_get_sa() only to be overridden with ENOENT which was
-returned by the subsequent unnessisary call to zpl_xattr_get_dir().
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #1437
----
- module/zfs/zpl_xattr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
-index a7e38e6..eb2c00d 100644
---- a/module/zfs/zpl_xattr.c
-+++ b/module/zfs/zpl_xattr.c
-@@ -288,7 +288,7 @@
- 
- 	if (zsb->z_use_sa && zp->z_is_sa) {
- 		error = zpl_xattr_get_sa(ip, name, value, size);
--		if (error >= 0)
-+		if (error != -ENOENT)
- 			goto out;
- 	}
- 
--- 
-1.8.1.6
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfs_sb_teardown-NULL-pointer-deref.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfs_sb_teardown-NULL-pointer-deref.patch
deleted file mode 100644
index e59c869eed04..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfs_sb_teardown-NULL-pointer-deref.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From ab68b6e5db29abcd20c0c7b12a8c2fa570031c8b Mon Sep 17 00:00:00 2001
-From: Tim Chase <tim@chase2k.com>
-Date: Mon, 24 Jun 2013 22:03:56 -0500
-Subject: [PATCH] Fix zfs_sb_teardown/zfs_resume_fs NULL dereference
-
-Fix a pair of conditions in which a concurrent umount can cause
-NULL pointer dereferences:
-
-* zfs_sb_teardown - prevent a NULL dereference by not calling
-                    dmu_objset_pool with a null z_os.
-
-* zfs_resume_fs - don't try to unmount with a null z_os.  This
-                  change makes the ZoL code more consistent
-                  with both Illumos and FreeBSD.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #1543
----
- module/zfs/zfs_vfsops.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
-index e618f2b..602c332 100644
---- a/module/zfs/zfs_vfsops.c
-+++ b/module/zfs/zfs_vfsops.c
-@@ -1056,10 +1056,12 @@
- 	}
- 
- 	/*
--	 * Drain the iput_taskq to ensure all active references to the
-+	 * If someone has not already unmounted this file system,
-+	 * drain the iput_taskq to ensure all active references to the
- 	 * zfs_sb_t have been handled only then can it be safely destroyed.
- 	 */
--	taskq_wait(dsl_pool_iput_taskq(dmu_objset_pool(zsb->z_os)));
-+	if (zsb->z_os)
-+		taskq_wait(dsl_pool_iput_taskq(dmu_objset_pool(zsb->z_os)));
- 
- 	/*
- 	 * Close the zil. NB: Can't close the zil while zfs_inactive
-@@ -1480,10 +1482,11 @@
- 
- 	if (err) {
- 		/*
--		 * Since we couldn't reopen zfs_sb_t, force
--		 * unmount this file system.
-+		 * Since we couldn't reopen zfs_sb_t or, setup the
-+		 * sa framework, force unmount this file system.
- 		 */
--		(void) zfs_umount(zsb->z_sb);
-+		if (zsb->z_os)
-+			(void) zfs_umount(zsb->z_sb);
- 	}
- 	return (err);
- }
--- 
-1.8.1.6
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfsctl_expire_snapshot-deadlock.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfsctl_expire_snapshot-deadlock.patch
deleted file mode 100644
index 7cca7d1137c8..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zfsctl_expire_snapshot-deadlock.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 76351672c222f28ea1b681097a9eff58a6791555 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Thu, 11 Jul 2013 14:11:32 -0700
-Subject: [PATCH] Fix zfsctl_expire_snapshot() deadlock
-
-It is possible for an automounted snapshot which is expiring to
-deadlock with a manual unmount of the snapshot.  This can occur
-because taskq_cancel_id() will block if the task is currently
-executing until it completes.  But it will never complete because
-zfsctl_unmount_snapshot() is holding the zsb->z_ctldir_lock which
-zfsctl_expire_snapshot() must acquire.
-
----------------------- z_unmount/0:2153 ---------------------
-  mutex_lock                <blocking on zsb->z_ctldir_lock>
-  zfsctl_unmount_snapshot
-  zfsctl_expire_snapshot
-  taskq_thread
-
-------------------------- zfs:10690 -------------------------
-  taskq_wait_id             <waiting for z_unmount to exit>
-  taskq_cancel_id
-  __zfsctl_unmount_snapshot
-  zfsctl_unmount_snapshot   <takes zsb->z_ctldir_lock>
-  zfs_unmount_snap
-  zfs_ioc_destroy_snaps_nvl
-  zfsdev_ioctl
-  do_vfs_ioctl
-
-We resolve the deadlock by dropping the zsb->z_ctldir_lock before
-calling __zfsctl_unmount_snapshot().  The lock is only there to
-prevent concurrent modification to the zsb->z_ctldir_snaps AVL
-tree.  Moreover, we're careful to remove the zfs_snapentry_t from
-the AVL tree before dropping the lock which ensures no other tasks
-can find it.  On failure it's added back to the tree.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Chris Dunlap <cdunlap@llnl.gov>
-Closes #1527
----
- module/zfs/zfs_ctldir.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
-index 4fa530b..168f853 100644
---- a/module/zfs/zfs_ctldir.c
-+++ b/module/zfs/zfs_ctldir.c
-@@ -732,7 +732,11 @@ struct inode *
- 	sep = avl_find(&zsb->z_ctldir_snaps, &search, NULL);
- 	if (sep) {
- 		avl_remove(&zsb->z_ctldir_snaps, sep);
-+		mutex_exit(&zsb->z_ctldir_lock);
-+
- 		error = __zfsctl_unmount_snapshot(sep, flags);
-+
-+		mutex_enter(&zsb->z_ctldir_lock);
- 		if (error == EBUSY)
- 			avl_add(&zsb->z_ctldir_snaps, sep);
- 		else
-@@ -767,7 +771,11 @@ struct inode *
- 	while (sep != NULL) {
- 		next = AVL_NEXT(&zsb->z_ctldir_snaps, sep);
- 		avl_remove(&zsb->z_ctldir_snaps, sep);
-+		mutex_exit(&zsb->z_ctldir_lock);
-+
- 		error = __zfsctl_unmount_snapshot(sep, flags);
-+
-+		mutex_enter(&zsb->z_ctldir_lock);
- 		if (error == EBUSY) {
- 			avl_add(&zsb->z_ctldir_snaps, sep);
- 			(*count)++;
--- 
-1.8.1.6
-
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zvol-initialization-r1.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zvol-initialization-r1.patch
deleted file mode 100644
index b1e7d3736db0..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-fix-zvol-initialization-r1.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff --git a/module/zfs/spa.c b/module/zfs/spa.c
-index e986e92..65f78b7 100644
---- a/module/zfs/spa.c
-+++ b/module/zfs/spa.c
-@@ -64,6 +64,7 @@
- #include <sys/zfs_ioctl.h>
- #include <sys/dsl_scan.h>
- #include <sys/zfeature.h>
-+#include <sys/zvol.h>
- 
- #ifdef	_KERNEL
- #include <sys/bootprops.h>
-@@ -2856,6 +2857,7 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy,
- 	spa_load_state_t state = SPA_LOAD_OPEN;
- 	int error;
- 	int locked = B_FALSE;
-+	int firstopen = B_FALSE;
- 
- 	*spapp = NULL;
- 
-@@ -2879,6 +2881,8 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy,
- 	if (spa->spa_state == POOL_STATE_UNINITIALIZED) {
- 		zpool_rewind_policy_t policy;
- 
-+		firstopen = B_TRUE;
-+
- 		zpool_get_rewind_policy(nvpolicy ? nvpolicy : spa->spa_config,
- 		    &policy);
- 		if (policy.zrp_request & ZPOOL_DO_REWIND)
-@@ -2953,6 +2957,11 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy,
- 		mutex_exit(&spa_namespace_lock);
- 	}
- 
-+#ifdef _KERNEL
-+	if (firstopen)
-+		zvol_create_minors(spa->spa_name);
-+#endif
-+
- 	*spapp = spa;
- 
- 	return (0);
-@@ -4010,6 +4019,10 @@ spa_import(const char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags)
- 	mutex_exit(&spa_namespace_lock);
- 	spa_history_log_version(spa, LOG_POOL_IMPORT);
- 
-+#ifdef _KERNEL
-+	zvol_create_minors(pool);
-+#endif
-+
- 	return (0);
- }
- 
-diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
-index 1226b2c..a9184a1 100644
---- a/module/zfs/zfs_ioctl.c
-+++ b/module/zfs/zfs_ioctl.c
-@@ -1268,9 +1268,6 @@ zfs_ioc_pool_import(zfs_cmd_t *zc)
- 			error = err;
- 	}
- 
--	if (error == 0)
--		zvol_create_minors(zc->zc_name);
--
- 	nvlist_free(config);
- 
- 	if (props)
-diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
-index 43a7bb6..e35c91b 100644
---- a/module/zfs/zvol.c
-+++ b/module/zfs/zvol.c
-@@ -1215,6 +1215,9 @@ zvol_alloc(dev_t dev, const char *name)
- 
- 	zv = kmem_zalloc(sizeof (zvol_state_t), KM_SLEEP);
- 
-+	spin_lock_init(&zv->zv_lock);
-+	list_link_init(&zv->zv_next);
-+
- 	zv->zv_queue = blk_init_queue(zvol_request, &zv->zv_lock);
- 	if (zv->zv_queue == NULL)
- 		goto out_kmem;
-@@ -1248,9 +1251,6 @@ zvol_alloc(dev_t dev, const char *name)
- 	    sizeof (rl_t), offsetof(rl_t, r_node));
- 	zv->zv_znode.z_is_zvol = TRUE;
- 
--	spin_lock_init(&zv->zv_lock);
--	list_link_init(&zv->zv_next);
--
- 	zv->zv_disk->major = zvol_major;
- 	zv->zv_disk->first_minor = (dev & MINORMASK);
- 	zv->zv_disk->fops = &zvol_ops;
-@@ -1561,30 +1561,36 @@ zvol_init(void)
- {
- 	int error;
- 
-+	list_create(&zvol_state_list, sizeof (zvol_state_t),
-+	            offsetof(zvol_state_t, zv_next));
-+	mutex_init(&zvol_state_lock, NULL, MUTEX_DEFAULT, NULL);
-+
- 	zvol_taskq = taskq_create(ZVOL_DRIVER, zvol_threads, maxclsyspri,
- 		                  zvol_threads, INT_MAX, TASKQ_PREPOPULATE);
- 	if (zvol_taskq == NULL) {
- 		printk(KERN_INFO "ZFS: taskq_create() failed\n");
--		return (-ENOMEM);
-+		error = -ENOMEM;
-+		goto out1;
- 	}
- 
- 	error = register_blkdev(zvol_major, ZVOL_DRIVER);
- 	if (error) {
- 		printk(KERN_INFO "ZFS: register_blkdev() failed %d\n", error);
--		taskq_destroy(zvol_taskq);
--		return (error);
-+		goto out2;
- 	}
- 
- 	blk_register_region(MKDEV(zvol_major, 0), 1UL << MINORBITS,
- 	                    THIS_MODULE, zvol_probe, NULL, NULL);
- 
--	mutex_init(&zvol_state_lock, NULL, MUTEX_DEFAULT, NULL);
--	list_create(&zvol_state_list, sizeof (zvol_state_t),
--	            offsetof(zvol_state_t, zv_next));
-+	return (0);
- 
--	(void) zvol_create_minors(NULL);
-+out2:
-+	taskq_destroy(zvol_taskq);
-+out1:
-+	mutex_destroy(&zvol_state_lock);
-+	list_destroy(&zvol_state_list);
- 
--	return (0);
-+	return (error);
- }
- 
- void
-diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh
-index 141348c..281166c 100755
---- a/scripts/zconfig.sh
-+++ b/scripts/zconfig.sh
-@@ -264,8 +264,9 @@ test_4() {
- 	zconfig_zvol_device_stat 0 ${POOL_NAME} ${FULL_ZVOL_NAME} \
- 	    ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 9
- 
--	# Load the modules, wait 1 second for udev
-+	# Load the modules, list the pools to ensure they are opened
- 	${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 10
-+	${ZPOOL} list &>/dev/null
- 
- 	# Verify the devices were created
- 	zconfig_zvol_device_stat 10 ${POOL_NAME} ${FULL_ZVOL_NAME} \
-diff --git a/udev/rules.d/90-zfs.rules.in b/udev/rules.d/90-zfs.rules.in
-index 52e1d63..a2715d2 100644
---- a/udev/rules.d/90-zfs.rules.in
-+++ b/udev/rules.d/90-zfs.rules.in
-@@ -1,4 +1,4 @@
--SUBSYSTEM!="block", GOTO="zfs_end"
-+SUBSYSTEM!="block|misc", GOTO="zfs_end"
- ACTION!="add|change", GOTO="zfs_end"
- 
- ENV{ID_FS_TYPE}=="zfs", RUN+="/sbin/modprobe zfs"
-@@ -7,4 +7,6 @@ ENV{ID_FS_TYPE}=="zfs_member", RUN+="/sbin/modprobe zfs"
- KERNEL=="null", SYMLINK+="root"
- SYMLINK=="null", SYMLINK+="root"
- 
-+SUBSYSTEM=="misc", KERNEL=="zfs", RUN+="@sbindir@/zpool list"
-+
- LABEL="zfs_end"
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-linux-3.10-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-linux-3.10-compat.patch
deleted file mode 100644
index 90755a1a527f..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.1-linux-3.10-compat.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-commit a1d9543a39942be56879ca9338078afc77c25cea
-Author: Chris Dunlop <chris@onthe.net.au>
-Date:   Mon Jun 3 16:58:52 2013 +1000
-
-    3.10 API change: block_device_operations->release() returns void
-    
-    Linux kernel commit torvalds/linux@db2a144 changed the return type
-    of block_device_operations->release() to void.  Detect the expected
-    prototype and defined our callout accordingly.
-    
-    Signed-off-by: Chris Dunlop <chris@onthe.net.au>
-    Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-    Closes #1494
-
-diff --git a/config/kernel-bdev-block-device-operations.m4 b/config/kernel-bdev-block-device-operations.m4
-index 8b5e0a3..faacc19 100644
---- a/config/kernel-bdev-block-device-operations.m4
-+++ b/config/kernel-bdev-block-device-operations.m4
-@@ -10,7 +10,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS], [
- 
- 		int blk_open(struct block_device *bdev, fmode_t mode)
- 		    { return 0; }
--		int blk_release(struct gendisk *g, fmode_t mode) { return 0; }
- 		int blk_ioctl(struct block_device *bdev, fmode_t mode,
- 		    unsigned x, unsigned long y) { return 0; }
- 		int blk_compat_ioctl(struct block_device * bdev, fmode_t mode,
-@@ -19,7 +18,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS], [
- 		static const struct block_device_operations
- 		    bops __attribute__ ((unused)) = {
- 			.open		= blk_open,
--			.release	= blk_release,
-+			.release	= NULL,
- 			.ioctl		= blk_ioctl,
- 			.compat_ioctl	= blk_compat_ioctl,
- 		};
-diff --git a/config/kernel-block-device-operations-release-void.m4 b/config/kernel-block-device-operations-release-void.m4
-new file mode 100644
-index 0000000..a73f858
---- /dev/null
-+++ b/config/kernel-block-device-operations-release-void.m4
-@@ -0,0 +1,29 @@
-+dnl #
-+dnl # 3.10.x API change
-+dnl #
-+AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
-+	AC_MSG_CHECKING([whether block_device_operations.release is void])
-+	tmp_flags="$EXTRA_KCFLAGS"
-+	EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-+	ZFS_LINUX_TRY_COMPILE([
-+		#include <linux/blkdev.h>
-+
-+		void blk_release(struct gendisk *g, fmode_t mode) { return; }
-+
-+		static const struct block_device_operations
-+		    bops __attribute__ ((unused)) = {
-+			.open		= NULL,
-+			.release	= blk_release,
-+			.ioctl		= NULL,
-+			.compat_ioctl	= NULL,
-+		};
-+	],[
-+	],[
-+		AC_MSG_RESULT(void)
-+		AC_DEFINE(HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID, 1,
-+		          [struct block_device_operations.release returns void])
-+	],[
-+		AC_MSG_RESULT(int)
-+	])
-+	EXTRA_KCFLAGS="$tmp_flags"
-+])
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index 7b8e3b0..46c0255 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -7,6 +7,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
- 	ZFS_AC_TEST_MODULE
- 	ZFS_AC_KERNEL_CONFIG
- 	ZFS_AC_KERNEL_BDEV_BLOCK_DEVICE_OPERATIONS
-+	ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
- 	ZFS_AC_KERNEL_TYPE_FMODE_T
- 	ZFS_AC_KERNEL_KOBJ_NAME_LEN
- 	ZFS_AC_KERNEL_3ARG_BLKDEV_GET
-diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
-index e35c91b..b516156 100644
---- a/module/zfs/zvol.c
-+++ b/module/zfs/zvol.c
-@@ -1024,7 +1024,11 @@ out_mutex:
- 	return (error);
- }
- 
-+#ifdef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
-+static void
-+#else
- static int
-+#endif
- zvol_release(struct gendisk *disk, fmode_t mode)
- {
- 	zvol_state_t *zv = disk->private_data;
-@@ -1044,7 +1048,9 @@ zvol_release(struct gendisk *disk, fmode_t mode)
- 	if (drop_mutex)
- 		mutex_exit(&zvol_state_lock);
- 
-+#ifndef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
- 	return (0);
-+#endif
- }
- 
- static int
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.5-discard-on-zvol-fix.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.5-discard-on-zvol-fix.patch
deleted file mode 100644
index 632d08d28e1f..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.5-discard-on-zvol-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 96165264ad0afe7a5d440ef49f9712a188486266 Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@gentoo.org>
-Date: Fri, 18 Sep 2015 08:32:52 -0400
-Subject: [PATCH] Discard on zvols should not exceed the length of a block
-
-37f9dac592bf5889c3efb305c48ac39b4c7dd140 replaced the end-start
-calculation with a cached value, but neglected to update it on discard
-operations. This can cause us to discard data not requested, causing
-data loss on zvols.
-
-Reported-by: Richard Connon <richard.connon@zynstra.com>
-Signed-off-by: Richard Yao <ryao@gentoo.org>
----
- module/zfs/zvol.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
-index 492f8ff..c5a8071 100644
---- a/module/zfs/zvol.c
-+++ b/module/zfs/zvol.c
-@@ -661,6 +661,7 @@ zvol_discard(struct bio *bio)
- 	if (!(bio->bi_rw & REQ_SECURE)) {
- 		start = P2ROUNDUP(start, zv->zv_volblocksize);
- 		end = P2ALIGN(end, zv->zv_volblocksize);
-+		size = end - start;
- 	}
- #endif
- 
--- 
-2.4.6
-
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild
deleted file mode 100644
index cf47024ea92d..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-	EGIT_REPO_URI="https://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 ~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="test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	virtual/awk
-	dev-lang/perl
-"
-
-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 8 || die "Linux 3.8 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Fix regression where snapshots are not visible
-		epatch "${FILESDIR}/${P}-fix-invisible-snapshots.patch"
-
-		# Fix deadlock involving concurrent `zfs destroy` and `zfs list` commands
-		epatch "${FILESDIR}/${P}-fix-recursive-reader.patch"
-
-		# Fix USE=debug build failure involving GCC 4.7
-		epatch "${FILESDIR}/${P}-gcc-4.7-compat.patch"
-
-		# Cast constant for 32-bit compatibility
-		epatch "${FILESDIR}/${PN}-0.6.0_rc14-cast-const-for-32bit-compatibility.patch"
-
-		# Handle missing name length check in Linux VFS
-		epatch "${FILESDIR}/${PN}-0.6.0_rc14-vfs-name-length-compatibility.patch"
-
-		# Fix barrier regression on Linux 2.6.37 and later
-		epatch "${FILESDIR}/${PN}-0.6.0_rc14-flush-properly.patch"
-	fi
-
-	# 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)
-	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	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
-
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild
deleted file mode 100644
index 83e7fafaae31..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r5.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://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 ~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="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
-		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() {
-	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"
-
-		# Do not second guess Linux's memory management
-		epatch "${FILESDIR}/${P}-zfs_arc_memory_throttle_disable.patch"
-	fi
-
-	# 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
-
-	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 "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-0.6.1-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.1-r2.ebuild
deleted file mode 100644
index 73671492db28..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://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 ~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="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
-		!UIDGID_STRICT_TYPE_CHECKS
-		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 10 || die "Linux 3.10 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Correctness fix for getdents
-		epatch "${FILESDIR}/${P}-fix-getdents.patch"
-
-		# Prevent possible deadlock regression
-		epatch "${FILESDIR}/${P}-fix-txg_quiesce-deadlock.patch"
-
-		# Correctness fixes for xattr
-		epatch "${FILESDIR}/${P}-fix-xattr-behavior-1.patch"
-		epatch "${FILESDIR}/${P}-fix-xattr-behavior-2.patch"
-
-		# Make certain that zvols always appear
-		epatch "${FILESDIR}/${P}-fix-zvol-initialization-r1.patch"
-
-		# Linux 3.10 Compatibility
-		epatch "${FILESDIR}/${PN}-0.6.1-linux-3.10-compat.patch"
-
-		# ARC Read Panic Fix
-		epatch "${FILESDIR}/${PN}-0.6.1-fix-arc-read-panic.patch"
-
-		# Fix zfsctl_expire_snapshot deadlock
-		epatch "${FILESDIR}/${PN}-0.6.1-fix-zfsctl_expire_snapshot-deadlock.patch"
-
-		# Fix NULL pointer dereference in zfsctl_expire_snapshot
-		epatch "${FILESDIR}/${PN}-0.6.1-fix-zfs_sb_teardown-NULL-pointer-deref.patch"
-	fi
-
-	# 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-0.6.2-r3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild
deleted file mode 100644
index 179739a94410..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://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
-		https://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p2.tar.xz"
-	S="${WORKDIR}/zfs-zfs-${MY_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="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
-		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 12 || die "Linux 3.12 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"
-
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
-	fi
-
-	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
-}
-
-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-0.6.3-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild
deleted file mode 100644
index 0b675bc3253c..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-		https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-${PR}.tar.xz"
-	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_RANDKSTACK
-		!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 26 || die "Linux 2.6.26 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 17 || die "Linux 3.17 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/zfs-${PV}-patches"
-	fi
-
-	# 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 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-0.6.4.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild
deleted file mode 100644
index b19cd598f867..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 1 || die "Linux 4.1 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."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5-r1.ebuild
deleted file mode 100644
index 89ab1f556502..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 2 || die "Linux 4.2 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Fix zvol data loss regression
-		# https://github.com/zfsonlinux/zfs/pull/3798
-		epatch "${FILESDIR}/${P}-discard-on-zvol-fix.patch"
-	fi
-
-	# 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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.10.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.10.ebuild
deleted file mode 100644
index ddbb09881e76..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.10.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 12 || die "Linux 4.12 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild
deleted file mode 100644
index b6b9fe5951cc..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-		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 3 || die "Linux 4.3 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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r4.ebuild
deleted file mode 100644
index 820a3730461d..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r4.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-p3.tar.xz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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-kernel/spl-0.6.5.3-r1
-	!sys-fs/zfs-fuse
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 4 || die "Linux 4.4 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/zfs-${PV}-patches"
-	fi
-
-	# 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild
deleted file mode 100644
index 95f4d0eea20c..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 3 || die "Linux 4.3 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild
index fdbff506ec4e..2b7c7f36b229 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild
deleted file mode 100644
index bda3a991ca09..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 3 || die "Linux 4.3 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.6.ebuild
deleted file mode 100644
index b22b3b796e2e..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.6.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 5 || die "Linux 4.5 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.7.ebuild
deleted file mode 100644
index 4d295e7b233b..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 6 || die "Linux 4.6 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.8.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.8.ebuild
deleted file mode 100644
index dc3011a0f159..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.8.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 8 || die "Linux 4.8 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.9.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.9.ebuild
deleted file mode 100644
index eba247a785f6..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.9.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 10 || die "Linux 4.10 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.0.ebuild
deleted file mode 100644
index ddbb09881e76..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 12 || die "Linux 4.12 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.1.ebuild
deleted file mode 100644
index ddbb09881e76..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 12 || die "Linux 4.12 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.2.ebuild
deleted file mode 100644
index 6de1cb67ef13..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-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
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		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 13 || die "Linux 4.13 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}"
-}
-
-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 previous versions. 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 wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 86570fa3f282..ba20945b70c5 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,27 +1,4 @@
-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
-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.5.10.tar.gz 2597676 SHA256 90a0ca76667076e9f58776216cb761f68761eb0192f8b0c45893f84cabc6f27e SHA512 822004d11a1a7c0e258cce049bfee0248dd1ac225a922c1e4a25c8593f23e9b1d7aa4a45a1122f6904025ea0a8c7f4884ec4ab353bfa9c734aedb0969b8d6eb4 WHIRLPOOL 87596a0e89afd3b7da1476c996c87491ee3962f0accd0c1a50d9cd9ab4dd49b3c1c71e14c6eeeddfc53db9bba665bc525ef9580da8082b1e4426bce54ee83401
 DIST zfs-0.6.5.11.tar.gz 2521959 SHA256 136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 WHIRLPOOL 867f6b22726ca13e43a5ff7a832610bbfd44e6c367bd314a20a7f0a03364b1c3bda1d7b3d7c3502e08249b8d8d9e8034e93d0200abb70f793352f7689e19deac
-DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634
-DIST zfs-0.6.5.3-patches-p0.tar.xz 63780 SHA256 cc6d2881304738619b9d00bc55fbd358119b35cbb345cae2ecf538051f1b7fe7 SHA512 4a531fd10d1d4d9c9cabaad9c13d8112eab3641249a7ce44599288bc4510b444d132833fae2fdf922eff43670ce77d32972c7b5b4a7d70f80c3365a0dcc89b70 WHIRLPOOL adc20e7917a518c790007499763210a4d27a164abe00a86f76d64f56f0fafc459f5d5c483019acacc136e41c57894e669fd58956b3f0ac0bcafeb1e02fec7988
-DIST zfs-0.6.5.3-patches-p2.tar.xz 85996 SHA256 0e38b1bd7e2eb96c74b3eaab49c14f1f65fa02dc42b62b6015200185bfc911c7 SHA512 0a8fb131cc9a5a239a7434593000259a581b20ee7c6fef87ec2ea78281b7887151e219ebe66603b9dafaa4fa22cbf8c55175e1f6b36af4502c147c478f0b3e38 WHIRLPOOL 726bf1c05605943a205e2e70099c6cf8c7ba8cc9bbf34d45a2d56cea87c1e23166700979e47c82dd91bd1778e297dd211a0e6f48e0eab2392471218bcb5853ce
-DIST zfs-0.6.5.3-patches-p3.tar.xz 88736 SHA256 031cd97765f890d9b78e1a5746cbd2a3ce06c7208693ec75c0b47324ac67b97a SHA512 8f17cc6e02a35828a57a7c2a437d9d18a41203b6e3f9e154b2ab863296b64596dc827afeeb0f993e37f47881d0f2ed4834f270d0ba843ab84b21c491cc352576 WHIRLPOOL 20f69c0a936bb612d5e3b551d4bf904aca3aff6d885d72f67f3b14cd720094ec13e383032ee4e322b0e81017d8ffcfafb47bf07f273badef34f7210d687ddacc
-DIST zfs-0.6.5.3-patches-p4.tar.xz 89140 SHA256 34114671614aec3b33b17e6fc66a31549b3dd3e1d21ccd68d6987a1e1641f86b SHA512 3f8a4490e654a2d13bf4d31ee688276243244d4e0ab7c7911d597730bbbf6c9d7dea8e075409de4c22e871928cd647ce3064a671a1259f3adaf2b27bcc5370b8 WHIRLPOOL a63c0a2eff6c29c9600e4aaafa7120a0c1bd9bdf9b2f1e52d5a85df2c02e5e924ed74a406919cff9353a77c697dcf4248749ad6a7137f17dc427c7f0d63ea99a
-DIST zfs-0.6.5.3.tar.gz 2524218 SHA256 49e6f9760ea172cb756f7357e4bcb90ee0293028540a68d62ed087724276131f SHA512 325cb91b7ddbcd6aa0bb9fc41eb0099dbb047a4e32d096fd414799729ef68cbc9c2e15714092eff8044a681af4ab552bd9ac1949cc673c6c5c3de1a23d9895ec WHIRLPOOL 957c3a75bb11befd4b74583883f2f11f717deb6bda368939b342049e809aa191a9ee8d1e709eaddc2a831418c7fdb5e763f918ff56d45f03baf4569ef8a4a070
-DIST zfs-0.6.5.4-patches-p1.tar.xz 64004 SHA256 83877d9b7c629730838325fd5b16bcb54259520e200f0539de9b8edfdcee9403 SHA512 9203356b43bdad2ed78c946af8c95c9fc4d2996b41a09a3b1f5a8657d2742ac69d10b4a87d443db497d591878cf7a70ebb19762b0df135ee25f4e8d2ed6ad71f WHIRLPOOL ff5788356d6a85608d22ea2c010a799464922614204c7eea06b57930a44ee876e596a053a773205de0543d36c04337d60c32594939e8e64d3022906c51c4d4e6
 DIST zfs-0.6.5.4-patches-p2.tar.xz 63912 SHA256 bbcfe43ee4a46deed86543d23abd31bbc662408f56ef8f7c9500dc25fecd49c4 SHA512 9f598c2a750b92dadddb677a6a9dda4573fa91421a82270d8104d718da4b945a4d5412bab92037a033cec1ec177f2a0eb52207babd023847918e3754054ec5e9 WHIRLPOOL bab1330c7489dd172c522300698f6a2d670a2f6ddcf8cd2566d1daffe8b41a3667755ad1ab377d07716af66449f7332974bcd7df4647bb028b5f5279c59c428c
 DIST zfs-0.6.5.4.tar.gz 2506470 SHA256 780862ec2301ccace412a324787e9df762cff6046e73e2ac0ebdce9e2bd59b0f SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01 WHIRLPOOL eacd2ec09afdbc3f6d946583116296fadcd7d0dea5158c89f82f6d0b02e0cbf075712015bfa5f321ae5815cf86af13b39ce93e5026e6a00da58d9ddb04d12320
-DIST zfs-0.6.5.6.tar.gz 2561093 SHA256 c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff SHA512 94c55a50f0f9a90ce07a45dc72bb2730b2a41373ab5a12845df00ef38bb22e4a80ab2fb6e31a9c3a45e51516cdea441bb9da1d0acf71f2f88b38c7c3e9e995b0 WHIRLPOOL 6fcbe473bfce90f800989bac506fa6d4cf5662ad9ca617a477f1251c1625de906495a45759d6190e5a24dcf05f2ed3dd7ea1c0b2f243165a60e5efd098082935
-DIST zfs-0.6.5.7.tar.gz 2537816 SHA256 4a9e271bb9a6af8d564e4d5800e4fff36224f1697b923a7253659bdda80dc590 SHA512 559b826ae1a176217b92d8407729e2c5feeffb117dc9affaa8c9c2134d996b6c3cbe095f7a0c4666c9b131742491f1304eeb292e13e0df0b6d001fa620568af2 WHIRLPOOL bf2e0865de35496cc995738ddde34df797b0c5047c0dd17e5b755803ef16e7c16f8ba89927106a1f6131c2f75a6749c31a72dff95fc0fee186b308c50ce0b4f4
-DIST zfs-0.6.5.8.tar.gz 2521921 SHA256 d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84 SHA512 e5b53a9531b865e7c650892c0deb1ee81db086a33538cd667a087a8a8d33a0ad93a30ae5e800096abfc4dc8ed00843da924230082e204fb7543dd401ef41fcde WHIRLPOOL 623bf8ee51d59dcd1842bf41ccf19c2eb6813fb1e88dea1ea1c6f1388c11484b798546bdcb94500735a0e9e5f9099a4df43308760b353b5b62ff56af035f88bd
-DIST zfs-0.6.5.9.tar.gz 2610650 SHA256 b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f SHA512 6e175f32421cf0f9e13429f12f0fac0564dc7059ab076831d0ebc4f6a17412160ca3526ebdf894bc7666e82580355b08701dd01c411d3177f82e7330b4529a37 WHIRLPOOL 149d730a26363b50691363b314669756d218c4a16e6d06e319c2b0866c5f8ed6e2da2396a516297c127d3343d51d78072d8b7371e3f4d327d30fa43c90be5cd3
-DIST zfs-0.7.0.tar.gz 6714094 SHA256 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2 SHA512 6e6cbf54399fc85b74b76a6ceb3f30e94903f755fe6386fccc56b5e6d307a907759e4b62acec5d32e8383ef1083423eaff8dee2b0ef01a99459171a42b47d217 WHIRLPOOL 74687be4220bab51f18fdd3c047400c4261acf16f38086c2485f5cb9d79af87f5adfafced92860b021814aece7446cb18e9ca310a363b90c6bac39343b72a4b6
-DIST zfs-0.7.1.tar.gz 6376234 SHA256 231b104979ddacfeb1889e1dec175337276e7b3b109d40656089744b5caf3ef6 SHA512 64b0a3b5eeaf09ce824e3e029880a8e5dcb3e4567d1fb2fa24c89d8e55fee1ebe2d2f3a9f77d5468cc5637074e27d5ba7696b566829c93fd69c610b288200a37 WHIRLPOOL 700c83aadca96578ae8d6a9795f91c0c25b69afcc6ec6c02141daafcbcd550ae413438e96c4821c5c90816e0e29366ecfc3e7289623f14c255722c37d9f9a7f6
-DIST zfs-0.7.2.tar.gz 6389699 SHA256 f75f4d8bbb8241e3d06321b53914e53fa22d1ccc8be89819b578b46e5d3e5cf4 SHA512 fd10350b3ba5906b8d4968cee4f9febcc475b49e7d5499209566f7cfa39f29c4c2c1a4bae0698ce98244fa66657e7956a8c170de1e5f13b1bc05d2861d2c7722 WHIRLPOOL b1e270bddf9d34a6d60a9f3d80f767d6a19a7c2ae5b51d3fe83fb28432e267d494cd5b4f003b6049a074e8bf65fa9179793dec0b40f366cea493f7993dd3d19d
 DIST zfs-0.7.3.tar.gz 6393145 SHA256 cb8fc606835d3f91471e49aca31a6a0a71733b1cbe74fa510e0fe0efa670fe51 SHA512 fe116fd787050f7bc099fe3ed5335c2d18711e5e665af5be13b3971939258e036e273432e80106e704f037d1f6e3114b12e26b01f97b575723f8bd46acdcbf61 WHIRLPOOL 4a7442898bd8855c24c8cdbd8d58b02dfb41ba5e55096ad20afb61c9a2903fd5aa7808fa525dfaaa20bd85ab05e1f44828f8c557ee15c7f2b5dd1174b1810e63
-DIST zfs-kmod-0.6.2-p4.tar.xz 63984 SHA256 9167edc4be86e3fcda6b3c198e51f92ab0c95ac5baca11666c28029a628cdac9 SHA512 13e4ec415c35d2f268d89565745f5898c0943423577a2ba6714b3a069c5a80f244cd06dff91464f38dd4ed60673d1145ead080bb03a56d4be33e328f948ffa64 WHIRLPOOL 8c399ec67119ed4fbebb5599d00f888918678bc4e4ea369b4bdc5c75bfc90fc76396087624c8011de370a54ff103bccaa8922d05ac7ccebb2b3481bbbcf44b19
diff --git a/sys-fs/zfs/files/bash-completion b/sys-fs/zfs/files/bash-completion
deleted file mode 100644
index 1b9428bf8602..000000000000
--- a/sys-fs/zfs/files/bash-completion
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright (c) 2010, Aneurin Price <aneurin.price@gmail.com>
-
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use,
-# copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following
-# conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-__zfs_get_commands()
-{
-    zfs 2>&1 | awk '/^\t[a-z]/ {print $1}' | uniq
-}
-
-__zfs_get_properties()
-{
-    zfs get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all
-}
-
-__zfs_get_editable_properties()
-{
-    zfs get 2>&1 | awk '$2 == "YES" {printf("%s=\n", $1)}'
-}
-
-__zfs_get_inheritable_properties()
-{
-    zfs get 2>&1 | awk '$3 == "YES" {print $1}'
-}
-
-__zfs_list_datasets()
-{
-    zfs list -H -o name
-}
-
-__zfs_list_filesystems()
-{
-    zfs list -H -o name -t filesystem
-}
-
-__zfs_list_snapshots()
-{
-    zfs list -H -o name -t snapshot
-}
-
-__zfs_list_volumes()
-{
-    zfs list -H -o name -t volume
-}
-
-__zfs_argument_chosen()
-{
-    for word in $(seq $((COMP_CWORD-1)) -1 2)
-    do
-        local prev="${COMP_WORDS[$word]}"
-        for property in $@
-        do
-            if [ "x$prev" = "x$property" ]
-            then
-                return 0
-            fi
-        done
-    done
-    return 1
-}
-
-__zfs_complete_ordered_arguments()
-{
-    local list1=$1
-    local list2=$2
-    local cur=$3
-    local extra=$4
-    if __zfs_argument_chosen $list1
-    then
-        COMPREPLY=($(compgen -W "$list2 $extra" -- "$cur"))
-    else
-        COMPREPLY=($(compgen -W "$list1 $extra" -- "$cur"))
-    fi
-}
-
-__zfs_complete()
-{
-    local cur prev cmd cmds
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    cmd="${COMP_WORDS[1]}"
-    cmds=$(__zfs_get_commands)
-
-    if [ "${prev##*/}" = "zfs" ]
-    then
-        COMPREPLY=($(compgen -W "$cmds -?" -- "$cur"))
-        return 0
-    fi
-
-    case "${cmd}" in
-        clone)
-            __zfs_complete_ordered_arguments "$(__zfs_list_snapshots)" "$(__zfs_list_filesystems) $(__zfs_list_volumes)" $cur
-            return 0
-            ;;
-        get)
-            __zfs_complete_ordered_arguments "$(__zfs_get_properties)" "$(__zfs_list_datasets)" "$cur" "-H -r -p"
-            return 0
-            ;;
-        inherit)
-            __zfs_complete_ordered_arguments "$(__zfs_get_inheritable_properties)" "$(__zfs_list_datasets)" $cur
-            return 0
-            ;;
-        list)
-            if [ "x$prev" = "x-o" ]
-            then
-                COMPREPLY=($(compgen -W "$(__zfs_get_properties)" -- "${cur##*,}"))
-                local existing_opts=$(expr "$cur" : '\(.*,\)')
-                if [ ! "x$existing_opts" = "x" ]
-                then
-                    COMPREPLY=( "${COMPREPLY[@]/#/${existing_opts}}" )
-                fi
-            else
-                COMPREPLY=($(compgen -W "$(__zfs_list_datasets) -H -r -o" -- "$cur"))
-            fi
-            return 0
-            ;;
-        promote)
-            COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur"))
-            return 0
-            ;;
-        rollback|send)
-            COMPREPLY=($(compgen -W "$(__zfs_list_snapshots)" -- "$cur"))
-            return 0
-            ;;
-        snapshot)
-            COMPREPLY=($(compgen -W "$(__zfs_list_filesystems) $(__zfs_list_volumes)" -- "$cur"))
-            return 0
-            ;;
-        set)
-            __zfs_complete_ordered_arguments "$(__zfs_get_editable_properties)" "$(__zfs_list_filesystems) $(__zfs_list_volumes)" $cur
-            return 0
-            ;;
-        *)
-            COMPREPLY=($(compgen -W "$(__zfs_list_datasets)" -- "$cur"))
-            return 0
-            ;;
-    esac
-
-}
-
-__zpool_get_commands()
-{
-    zpool 2>&1 | awk '/^\t[a-z]/ {print $1}' | uniq
-}
-
-__zpool_get_properties()
-{
-    zpool get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all
-}
-
-__zpool_get_editable_properties()
-{
-    zpool get 2>&1 | awk '$2 == "YES" {printf("%s=\n", $1)}'
-}
-
-__zpool_list_pools()
-{
-    zpool list -H -o name
-}
-
-__zpool_complete()
-{
-    local cur prev cmd cmds
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    cmd="${COMP_WORDS[1]}"
-    cmds=$(__zpool_get_commands)
-
-    if [ "${prev##*/}" = "zpool" ]
-    then
-        COMPREPLY=($(compgen -W "$cmds" -- "$cur"))
-        return 0
-    fi
-
-    case "${cmd}" in
-        get)
-            __zfs_complete_ordered_arguments "$(__zpool_get_properties)" "$(__zpool_list_pools)" $cur
-            return 0
-            ;;
-        import)
-            if [ "x$prev" = "x-d" ]
-            then
-                _filedir -d
-            else
-                COMPREPLY=($(compgen -W "$(__zpool_list_pools) -d" -- "$cur"))
-            fi
-            return 0
-            ;;
-        set)
-            __zfs_complete_ordered_arguments "$(__zpool_get_editable_properties)" "$(__zpool_list_pools)" $cur
-            return 0
-            ;;
-        add|attach|clear|create|detach|offline|online|remove|replace)
-            local pools="$(__zpool_list_pools)"
-            if __zfs_argument_chosen $pools
-            then
-                _filedir
-            else
-                COMPREPLY=($(compgen -W "$pools" -- "$cur"))
-            fi
-            return 0
-            ;;
-        *)
-            COMPREPLY=($(compgen -W "$(__zpool_list_pools)" -- "$cur"))
-            return 0
-            ;;
-    esac
-
-}
-
-complete -F __zfs_complete zfs
-complete -o filenames -F __zpool_complete zpool
diff --git a/sys-fs/zfs/files/zed b/sys-fs/zfs/files/zed
deleted file mode 100644
index d46acfacb4a3..000000000000
--- a/sys-fs/zfs/files/zed
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need zfs
-}
-
-start() {
-	ebegin "Starting ZFS Event daemon"
-
-	checkpath -q -d -m 0755 /var/run/zed
-
-	start-stop-daemon --start -q \
-		--exec /sbin/zed -- -M \
-			-p /var/run/zed/pid
-	eend $?
-
-}
-
-stop() {
-ebegin "Stopping ZFS Event daemon"
-	start-stop-daemon --stop -q --pidfile /var/run/zed/pid
-eend $?
-}
diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch b/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch
deleted file mode 100644
index b493424a1e77..000000000000
--- a/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 399f60c8b47f7513d078a7c181ff132e2cafdd15 Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@cs.stonybrook.edu>
-Date: Tue, 5 Feb 2013 18:14:30 -0500
-Subject: [PATCH] Fix function relocations in libzpool
-
-binutils 2.23.1 fails in situations that generate function relocations
-on PowerPC and possibly other architectures. This causes linking of
-libzpool to fail because it depends on libnvpair. We add a dependency on
-libnvpair to lib/libzpool/Makefile.am to correct that.
-
-Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #1267
----
- lib/libzpool/Makefile.am |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
-index 3e62de6..cbba388 100644
---- a/lib/libzpool/Makefile.am
-+++ b/lib/libzpool/Makefile.am
-@@ -94,7 +94,8 @@ libzpool_la_SOURCES = \
- 
- libzpool_la_LIBADD = \
- 	$(top_builddir)/lib/libunicode/libunicode.la \
--	$(top_builddir)/lib/libuutil/libuutil.la
-+	$(top_builddir)/lib/libuutil/libuutil.la \
-+	$(top_builddir)/lib/libnvpair/libnvpair.la
- 
- libzpool_la_LDFLAGS = -pthread -version-info 1:1:0
- 
--- 
-1.7.10
-
diff --git a/sys-fs/zfs/files/zfs-0.6.1-avoid-zdb-abort.patch b/sys-fs/zfs/files/zfs-0.6.1-avoid-zdb-abort.patch
deleted file mode 100644
index f73840feeed6..000000000000
--- a/sys-fs/zfs/files/zfs-0.6.1-avoid-zdb-abort.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5d3dc3fb72518a4c191e3a014622b74365eb3a74 Mon Sep 17 00:00:00 2001
-From: Mike Leddy <mike.leddy@gmail.com>
-Date: Thu, 4 Jul 2013 01:02:05 -0300
-Subject: [PATCH] Avoid abort() in vn_rdwr(): libzpool/kernel.c
-
-Make sure that buffer is aligned to 512 bytes on linux so that
-pread call combined with O_DIRECT does not return EINVAL.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #1570
----
- cmd/zdb/zdb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
-index 936974b..a2b6bfe 100644
---- a/cmd/zdb/zdb.c
-+++ b/cmd/zdb/zdb.c
-@@ -2844,7 +2844,7 @@
- 	psize = size;
- 	lsize = size;
- 
--	pbuf = umem_alloc(SPA_MAXBLOCKSIZE, UMEM_NOFAIL);
-+	pbuf = umem_alloc_aligned(SPA_MAXBLOCKSIZE, 512, UMEM_NOFAIL);
- 	lbuf = umem_alloc(SPA_MAXBLOCKSIZE, UMEM_NOFAIL);
- 
- 	BP_ZERO(bp);
--- 
-1.8.1.6
-
diff --git a/sys-fs/zfs/files/zfs-0.6.1-fix-gcc-4.8-warning.patch b/sys-fs/zfs/files/zfs-0.6.1-fix-gcc-4.8-warning.patch
deleted file mode 100644
index 00ec1057efa1..000000000000
--- a/sys-fs/zfs/files/zfs-0.6.1-fix-gcc-4.8-warning.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3db3ff4a787acf068b122562fb5be5aecec2611f Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@gentoo.org>
-Date: Tue, 2 Jul 2013 00:07:15 -0400
-Subject: [PATCH] Use MAXPATHLEN instead of sizeof in snprintf
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This silences a GCC 4.8.0 warning by fixing a programming error
-caught by static analysis:
-
-../../cmd/ztest/ztest.c: In function ‘ztest_vdev_aux_add_remove’:
-../../cmd/ztest/ztest.c:2584:33: error: argument to ‘sizeof’
-  in ‘snprintf’ call is the same expression as the destination;
-  did you mean to provide an explicit length?
-  [-Werror=sizeof-pointer-memaccess]
-  (void) snprintf(path, sizeof (path), ztest_aux_template,
-                                 ^
-
-Signed-off-by: Richard Yao <ryao@gentoo.org>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #1480
----
- cmd/ztest/ztest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
-index b38d7b1..93a5f1e 100644
---- a/cmd/ztest/ztest.c
-+++ b/cmd/ztest/ztest.c
-@@ -2581,7 +2581,7 @@ enum ztest_object {
- 		zs->zs_vdev_aux = 0;
- 		for (;;) {
- 			int c;
--			(void) snprintf(path, sizeof (path), ztest_aux_template,
-+			(void) snprintf(path, MAXPATHLEN, ztest_aux_template,
- 			    ztest_opts.zo_dir, ztest_opts.zo_pool, aux,
- 			    zs->zs_vdev_aux);
- 			for (c = 0; c < sav->sav_count; c++)
--- 
-1.8.1.6
-
diff --git a/sys-fs/zfs/files/zfs-0.6.1-fix-zvol-initialization-r1.patch b/sys-fs/zfs/files/zfs-0.6.1-fix-zvol-initialization-r1.patch
deleted file mode 100644
index b1e7d3736db0..000000000000
--- a/sys-fs/zfs/files/zfs-0.6.1-fix-zvol-initialization-r1.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff --git a/module/zfs/spa.c b/module/zfs/spa.c
-index e986e92..65f78b7 100644
---- a/module/zfs/spa.c
-+++ b/module/zfs/spa.c
-@@ -64,6 +64,7 @@
- #include <sys/zfs_ioctl.h>
- #include <sys/dsl_scan.h>
- #include <sys/zfeature.h>
-+#include <sys/zvol.h>
- 
- #ifdef	_KERNEL
- #include <sys/bootprops.h>
-@@ -2856,6 +2857,7 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy,
- 	spa_load_state_t state = SPA_LOAD_OPEN;
- 	int error;
- 	int locked = B_FALSE;
-+	int firstopen = B_FALSE;
- 
- 	*spapp = NULL;
- 
-@@ -2879,6 +2881,8 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy,
- 	if (spa->spa_state == POOL_STATE_UNINITIALIZED) {
- 		zpool_rewind_policy_t policy;
- 
-+		firstopen = B_TRUE;
-+
- 		zpool_get_rewind_policy(nvpolicy ? nvpolicy : spa->spa_config,
- 		    &policy);
- 		if (policy.zrp_request & ZPOOL_DO_REWIND)
-@@ -2953,6 +2957,11 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy,
- 		mutex_exit(&spa_namespace_lock);
- 	}
- 
-+#ifdef _KERNEL
-+	if (firstopen)
-+		zvol_create_minors(spa->spa_name);
-+#endif
-+
- 	*spapp = spa;
- 
- 	return (0);
-@@ -4010,6 +4019,10 @@ spa_import(const char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags)
- 	mutex_exit(&spa_namespace_lock);
- 	spa_history_log_version(spa, LOG_POOL_IMPORT);
- 
-+#ifdef _KERNEL
-+	zvol_create_minors(pool);
-+#endif
-+
- 	return (0);
- }
- 
-diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
-index 1226b2c..a9184a1 100644
---- a/module/zfs/zfs_ioctl.c
-+++ b/module/zfs/zfs_ioctl.c
-@@ -1268,9 +1268,6 @@ zfs_ioc_pool_import(zfs_cmd_t *zc)
- 			error = err;
- 	}
- 
--	if (error == 0)
--		zvol_create_minors(zc->zc_name);
--
- 	nvlist_free(config);
- 
- 	if (props)
-diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
-index 43a7bb6..e35c91b 100644
---- a/module/zfs/zvol.c
-+++ b/module/zfs/zvol.c
-@@ -1215,6 +1215,9 @@ zvol_alloc(dev_t dev, const char *name)
- 
- 	zv = kmem_zalloc(sizeof (zvol_state_t), KM_SLEEP);
- 
-+	spin_lock_init(&zv->zv_lock);
-+	list_link_init(&zv->zv_next);
-+
- 	zv->zv_queue = blk_init_queue(zvol_request, &zv->zv_lock);
- 	if (zv->zv_queue == NULL)
- 		goto out_kmem;
-@@ -1248,9 +1251,6 @@ zvol_alloc(dev_t dev, const char *name)
- 	    sizeof (rl_t), offsetof(rl_t, r_node));
- 	zv->zv_znode.z_is_zvol = TRUE;
- 
--	spin_lock_init(&zv->zv_lock);
--	list_link_init(&zv->zv_next);
--
- 	zv->zv_disk->major = zvol_major;
- 	zv->zv_disk->first_minor = (dev & MINORMASK);
- 	zv->zv_disk->fops = &zvol_ops;
-@@ -1561,30 +1561,36 @@ zvol_init(void)
- {
- 	int error;
- 
-+	list_create(&zvol_state_list, sizeof (zvol_state_t),
-+	            offsetof(zvol_state_t, zv_next));
-+	mutex_init(&zvol_state_lock, NULL, MUTEX_DEFAULT, NULL);
-+
- 	zvol_taskq = taskq_create(ZVOL_DRIVER, zvol_threads, maxclsyspri,
- 		                  zvol_threads, INT_MAX, TASKQ_PREPOPULATE);
- 	if (zvol_taskq == NULL) {
- 		printk(KERN_INFO "ZFS: taskq_create() failed\n");
--		return (-ENOMEM);
-+		error = -ENOMEM;
-+		goto out1;
- 	}
- 
- 	error = register_blkdev(zvol_major, ZVOL_DRIVER);
- 	if (error) {
- 		printk(KERN_INFO "ZFS: register_blkdev() failed %d\n", error);
--		taskq_destroy(zvol_taskq);
--		return (error);
-+		goto out2;
- 	}
- 
- 	blk_register_region(MKDEV(zvol_major, 0), 1UL << MINORBITS,
- 	                    THIS_MODULE, zvol_probe, NULL, NULL);
- 
--	mutex_init(&zvol_state_lock, NULL, MUTEX_DEFAULT, NULL);
--	list_create(&zvol_state_list, sizeof (zvol_state_t),
--	            offsetof(zvol_state_t, zv_next));
-+	return (0);
- 
--	(void) zvol_create_minors(NULL);
-+out2:
-+	taskq_destroy(zvol_taskq);
-+out1:
-+	mutex_destroy(&zvol_state_lock);
-+	list_destroy(&zvol_state_list);
- 
--	return (0);
-+	return (error);
- }
- 
- void
-diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh
-index 141348c..281166c 100755
---- a/scripts/zconfig.sh
-+++ b/scripts/zconfig.sh
-@@ -264,8 +264,9 @@ test_4() {
- 	zconfig_zvol_device_stat 0 ${POOL_NAME} ${FULL_ZVOL_NAME} \
- 	    ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 9
- 
--	# Load the modules, wait 1 second for udev
-+	# Load the modules, list the pools to ensure they are opened
- 	${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 10
-+	${ZPOOL} list &>/dev/null
- 
- 	# Verify the devices were created
- 	zconfig_zvol_device_stat 10 ${POOL_NAME} ${FULL_ZVOL_NAME} \
-diff --git a/udev/rules.d/90-zfs.rules.in b/udev/rules.d/90-zfs.rules.in
-index 52e1d63..a2715d2 100644
---- a/udev/rules.d/90-zfs.rules.in
-+++ b/udev/rules.d/90-zfs.rules.in
-@@ -1,4 +1,4 @@
--SUBSYSTEM!="block", GOTO="zfs_end"
-+SUBSYSTEM!="block|misc", GOTO="zfs_end"
- ACTION!="add|change", GOTO="zfs_end"
- 
- ENV{ID_FS_TYPE}=="zfs", RUN+="/sbin/modprobe zfs"
-@@ -7,4 +7,6 @@ ENV{ID_FS_TYPE}=="zfs_member", RUN+="/sbin/modprobe zfs"
- KERNEL=="null", SYMLINK+="root"
- SYMLINK=="null", SYMLINK+="root"
- 
-+SUBSYSTEM=="misc", KERNEL=="zfs", RUN+="@sbindir@/zpool list"
-+
- LABEL="zfs_end"
diff --git a/sys-fs/zfs/files/zfs-0.6.1-gentoo-openrc-dependencies.patch b/sys-fs/zfs/files/zfs-0.6.1-gentoo-openrc-dependencies.patch
deleted file mode 100644
index e794b183eb33..000000000000
--- a/sys-fs/zfs/files/zfs-0.6.1-gentoo-openrc-dependencies.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit 75c2fb953c99bba008f1ef72ee71136002749f51
-Author: Richard Yao <ryao@cs.stonybrook.edu>
-Date:   Tue May 28 20:08:15 2013 -0400
-
-    Improve OpenRC init script
-    
-    The current zfs OpenRC script's dependencies cause OpenRC to attempt to
-    unmount ZFS filesystems at shutdown while things were still using them,
-    which would fail. This is a cosmetic issue, but it should still be
-    addressed. It probably does not affect systems where the rootfs is a
-    legacy filesystem, but any system with the rootfs on ZFS needs to run
-    the ZFS init script after the system is ready to shutdown filesystems.
-    
-    OpenRC's shutdown process occurs in the reverse order of the startup
-    process. Therefore running the ZFS shutdown procedure after filesystems
-    are ready to be unmounted requires running the startup procedure before
-    fstab. This patch changes the dependencies of the script to expliclty
-    run before fstab at boot when the rootfs is ZFS and to run after fstab
-    at boot whenever the rootfs is not ZFS. This should cover most use
-    cases.
-    
-    The only cases not covered well by this are systems with legacy
-    root filesystems where people want to configure fstab to mount a non-ZFS
-    filesystem off a zvol and possibly also systems whose pools are stored
-    on network block devices. The former requires that the ZFS script run
-    before fstab, which could cause ZFS datasets to mount too early and
-    appear under the fstab mount points. The latter requires that the ZFS
-    script run after networking starts, which precludes the ability to store
-    any system information on ZFS. An additional OpenRC script could be
-    written to handle non-root pools on network block devices, but that will
-    depend on user demand and developer time.
-    
-    Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
-
-diff --git a/etc/init.d/zfs.gentoo.in b/etc/init.d/zfs.gentoo.in
-index 5b8671e..0034e02 100644
---- a/etc/init.d/zfs.gentoo.in
-+++ b/etc/init.d/zfs.gentoo.in
-@@ -10,9 +10,16 @@ fi
- 
- depend()
- {
-+	# Try to allow people to mix and match fstab with ZFS in a way that makes sense.
-+	if [ "$(mountinfo -s /)" = 'zfs' ]
-+	then
-+		before localmount
-+	else
-+		after localmount
-+	fi
-+
- 	# bootmisc will log to /var which may be a different zfs than root.
--	before net bootmisc
--	after udev localmount
-+	before bootmisc logger
- 	keyword -lxc -openvz -prefix -vserver
- }
- 
diff --git a/sys-fs/zfs/files/zfs-0.6.5-fix-openrc-scripts.patch b/sys-fs/zfs/files/zfs-0.6.5-fix-openrc-scripts.patch
deleted file mode 100644
index fec87d0123f3..000000000000
--- a/sys-fs/zfs/files/zfs-0.6.5-fix-openrc-scripts.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-commit 3cb750b249717b43cbfcde78b44b0e38a2a61dc2
-Author: James Lee <jlee@thestaticvoid.com>
-Date:   Sat Sep 19 22:00:36 2015 -0400
-
-    zfs-import: Perform verbatim import using cache file
-    
-    This change modifies the import service to use the default cache file
-    to perform a verbatim import of pools at boot.  This fixes code that
-    searches all devices and imported all visible pools.
-    
-    Using the cache file is in keeping with the way ZFS has always worked,
-    how Solaris, Illumos, FreeBSD, and systemd performs imports, and is how
-    it is written in the man page (zpool(1M,8)):
-    
-        All pools  in  this  cache  are  automatically imported when the
-        system boots.
-    
-    Importantly, the cache contains important information for importing
-    multipath devices, and helps control which pools get imported in more
-    dynamic environments like SANs, which may have thousands of visible
-    and constantly changing pools, which the ZFS_POOL_EXCEPTIONS variable
-    is not equipped to handle.  Verbatim imports prevent rogue pools from
-    being automatically imported and mounted where they shouldn't be.
-    
-    The change also stops the service from exporting pools at shutdown.
-    Exporting pools is only meant to be performed explicitly by the
-    administrator of the system.
-    
-    The old behavior of searching and importing all visible pools is
-    preserved and can be switched on by heeding the warning and toggling
-    the ZPOOL_IMPORT_ALL_VISIBLE variable in /etc/default/zfs.
-    
-    Closes #3777
-    Closes #3526
-
-diff --git a/etc/init.d/zfs-import.in b/etc/init.d/zfs-import.in
-index 5e21929..2258638 100755
---- a/etc/init.d/zfs-import.in
-+++ b/etc/init.d/zfs-import.in
-@@ -1,11 +1,10 @@
- #!@SHELL@
- #
--# zfs-import    This script will import/export zfs pools.
-+# zfs-import    This script will import ZFS pools
- #
- # chkconfig:    2345 01 99
--# description:  This script will import/export zfs pools during system
--#               boot/shutdown.
--#               It is also responsible for all userspace zfs services.
-+# description:  This script will perform a verbatim import of ZFS pools
-+#               during system boot.
- # probe: true
- #
- ### BEGIN INIT INFO
-@@ -17,7 +16,7 @@
- # X-Start-Before:    checkfs
- # X-Stop-After:      zfs-mount
- # Short-Description: Import ZFS pools
--# Description: Run the `zpool import` or `zpool export` commands.
-+# Description: Run the `zpool import` command.
- ### END INIT INFO
- #
- # NOTE: Not having '$local_fs' on Required-Start but only on Required-Stop
-@@ -43,6 +42,16 @@ do_depend()
- 	keyword -lxc -openvz -prefix -vserver
- }
- 
-+# Use the zpool cache file to import pools
-+do_verbatim_import()
-+{
-+	if [ -f "$ZPOOL_CACHE" ]
-+	then
-+		zfs_action "Importing ZFS pool(s)" \
-+			"$ZPOOL" import -c "$ZPOOL_CACHE" -N -a
-+	fi
-+}
-+
- # Support function to get a list of all pools, separated with ';'
- find_pools()
- {
-@@ -60,8 +69,8 @@ find_pools()
- 	echo "${pools%%;}" # Return without the last ';'.
- }
- 
--# Import all pools
--do_import()
-+# Find and import all visible pools, even exported ones
-+do_import_all_visible()
- {
- 	local already_imported available_pools pool npools
- 	local exception dir ZPOOL_IMPORT_PATH RET=0 r=1
-@@ -109,7 +118,7 @@ do_import()
- 		fi
- 	fi
- 
--        # Filter out any exceptions...
-+	# Filter out any exceptions...
- 	if [ -n "$ZFS_POOL_EXCEPTIONS" ]
- 	then
- 		local found=""
-@@ -249,41 +258,15 @@ do_import()
- 	return "$RET"
- }
- 
--# Export all pools
--do_export()
-+do_import()
- {
--	local already_imported pool root_pool RET r
--	RET=0
--
--	root_pool=$(get_root_pool)
--
--	[ -n "$init" ] && zfs_log_begin_msg "Exporting ZFS pool(s)"
--
--	# Find list of already imported pools.
--	already_imported=$(find_pools "$ZPOOL" list -H -oname)
--
--	OLD_IFS="$IFS" ; IFS=";"
--	for pool in $already_imported; do
--		[ "$pool" = "$root_pool" ] && continue
--
--		if [ -z "$init" ]
--		then
--			# Interactive - one 'Importing ...' line per pool
--			zfs_log_begin_msg "Exporting ZFS pool $pool"
--		else
--			# Not interactive - a dot for each pool.
--			zfs_log_progress_msg "."
--		fi
--
--		"$ZPOOL" export "$pool"
--		r="$?" ; RET=$((RET + r))
--		[ -z "$init" ] && zfs_log_end_msg "$r"
--	done
--	IFS="$OLD_IFS"
--
--	[ -n "$init" ] && zfs_log_end_msg "$RET"
--
--	return "$RET"
-+	if check_boolean "$ZPOOL_IMPORT_ALL_VISIBLE"
-+	then
-+		do_import_all_visible
-+	else
-+		# This is the default option
-+		do_verbatim_import
-+	fi
- }
- 
- # Output the status and list of pools
-@@ -323,14 +306,6 @@ do_start()
- 	fi
- }
- 
--do_stop()
--{
--	# Check to see if the module is even loaded.
--	check_module_loaded "zfs" || exit 0
--
--	do_export
--}
--
- # ----------------------------------------------------
- 
- if [ ! -e /etc/gentoo-release ]
-@@ -340,7 +315,7 @@ then
- 			do_start
- 			;;
- 		stop)
--			do_stop
-+			# no-op
- 			;;
- 		status)
- 			do_status
-@@ -350,7 +325,7 @@ then
- 			;;
- 		*)
- 			[ -n "$1" ] && echo "Error: Unknown command $1."
--			echo "Usage: $0 {start|stop|status}"
-+			echo "Usage: $0 {start|status}"
- 			exit 3
- 			;;
- 	esac
-@@ -360,6 +335,5 @@ else
- 	# Create wrapper functions since Gentoo don't use the case part.
- 	depend() { do_depend; }
- 	start() { do_start; }
--	stop() { do_stop; }
- 	status() { do_status; }
- fi
-diff --git a/etc/init.d/zfs.in b/etc/init.d/zfs.in
-index eabb7e4..d81ef22 100644
---- a/etc/init.d/zfs.in
-+++ b/etc/init.d/zfs.in
-@@ -16,6 +16,24 @@ ZFS_SHARE='yes'
- # Run `zfs unshare -a` during system stop?
- ZFS_UNSHARE='yes'
- 
-+# By default, a verbatim import of all pools is performed at boot based on the
-+# contents of the default zpool cache file.  The contents of the cache are
-+# managed automatically by the 'zpool import' and 'zpool export' commands.
-+#
-+# By setting this to 'yes', the system will instead search all devices for
-+# pools and attempt to import them all at boot, even those that have been
-+# exported.  Under this mode, the search path can be controlled by the
-+# ZPOOL_IMPORT_PATH variable and a list of pools that should not be imported
-+# can be listed in the ZFS_POOL_EXCEPTIONS variable.
-+#
-+# Note that importing all visible pools may include pools that you don't
-+# expect, such as those on removable devices and SANs, and those pools may
-+# proceed to mount themselves in places you do not want them to.  The results
-+# can be unpredictable and possibly dangerous.  Only enable this option if you
-+# understand this risk and have complete physical control over your system and
-+# SAN to prevent the insertion of malicious pools.
-+ZPOOL_IMPORT_ALL_VISIBLE='no'
-+
- # Specify specific path(s) to look for device nodes and/or links for the
- # pool import(s). See zpool(8) for more information about this variable.
- # It supersedes the old USE_DISK_BY_ID which indicated that it would only
-@@ -23,6 +41,18 @@ ZFS_UNSHARE='yes'
- # The old variable will still work in the code, but is deprecated.
- #ZPOOL_IMPORT_PATH="/dev/disk/by-vdev:/dev/disk/by-id"
- 
-+# List of pools that should NOT be imported at boot
-+# when ZPOOL_IMPORT_ALL_VISIBLE is 'yes'.
-+# This is a space separated list.
-+#ZFS_POOL_EXCEPTIONS="test2"
-+
-+# List of pools that SHOULD be imported at boot by the initramfs
-+# instead of trying to import all available pools.  If this is set
-+# then ZFS_POOL_EXCEPTIONS is ignored.
-+# Only applicable for Debian GNU/Linux {dkms,initramfs}.
-+# This is a semi-colon separated list.
-+#ZFS_POOL_IMPORT="pool1;pool2"
-+
- # Should the datasets be mounted verbosely?
- # A mount counter will be used when mounting if set to 'yes'.
- VERBOSE_MOUNT='no'
-@@ -97,17 +127,6 @@ ZFS_INITRD_POST_MODPROBE_SLEEP='0'
- # Example: If root FS is 'rpool/ROOT/rootfs', this would make sense.
- #ZFS_INITRD_ADDITIONAL_DATASETS="rpool/ROOT/usr rpool/ROOT/var"
- 
--# List of pools that should NOT be imported at boot?
--# This is a space separated list.
--#ZFS_POOL_EXCEPTIONS="test2"
--
--# List of pools to import?
--# If this variable is set, there will be NO auto-import of ANY other
--# pool. In essence, there will be no auto detection of availible pools.
--# This is a semi-colon separated list.
--# Makes the variable ZFS_POOL_EXCEPTIONS above redundant (won't be checked).
--#ZFS_POOL_IMPORT="pool1;pool2"
--
- # Optional arguments for the ZFS Event Daemon (ZED).
- # See zed(8) for more information on available options.
- #ZED_ARGS="-M"
diff --git a/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild b/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild
deleted file mode 100644
index e545cac769a8..000000000000
--- a/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://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 ~arm ~ppc ~ppc64"
-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
-		)
-"
-
-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)"
-	)
-	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-0.6.0_rc14-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild
deleted file mode 100644
index 3c1aed0df31b..000000000000
--- a/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://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 ~arm ~ppc ~ppc64"
-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
-
-	if [ ${PV} != "9999" ]
-	then
-		epatch "${FILESDIR}/${P}-fix-libzpool-function-relocations.patch"
-	fi
-
-	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)"
-	)
-	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-0.6.1-r4.ebuild b/sys-fs/zfs/zfs-0.6.1-r4.ebuild
deleted file mode 100644
index 2ac499a40822..000000000000
--- a/sys-fs/zfs/zfs-0.6.1-r4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://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 ~arm ~ppc ~ppc64"
-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() {
-	if [ ${PV} != "9999" ]
-	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
-	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)"
-		$(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
-}
diff --git a/sys-fs/zfs/zfs-0.6.2-r5.ebuild b/sys-fs/zfs/zfs-0.6.2-r5.ebuild
deleted file mode 100644
index fa129ce86dbb..000000000000
--- a/sys-fs/zfs/zfs-0.6.2-r5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,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="https://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
-		https://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p4.tar.xz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-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 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
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches"
-	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="$(get_udevdir)"
-		--with-blkid
-		$(use_enable debug)
-		$(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-r1" 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
-}
diff --git a/sys-fs/zfs/zfs-0.6.3-r2.ebuild b/sys-fs/zfs/zfs-0.6.3-r2.ebuild
deleted file mode 100644
index 08afee227fbe..000000000000
--- a/sys-fs/zfs/zfs-0.6.3-r2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,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="https://github.com/zfsonlinux/${PN}.git"
-else
-	inherit eutils versionator
-	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/${P}-patches-r1.tar.xz"
-	S="${WORKDIR}/${PN}-${P}"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-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() {
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${P}-patches"
-	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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	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"
-}
-
-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.4.2.ebuild b/sys-fs/zfs/zfs-0.6.4.2.ebuild
deleted file mode 100644
index ad8286b39e3d..000000000000
--- a/sys-fs/zfs/zfs-0.6.4.2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,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="https://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 ~arm ~ppc ~ppc64"
-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
-}
diff --git a/sys-fs/zfs/zfs-0.6.5.10.ebuild b/sys-fs/zfs/zfs-0.6.5.10.ebuild
deleted file mode 100644
index 535d86509fdf..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.10.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		)
-	sys-fs/udev-init-scripts
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.5.2-r1.ebuild b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
deleted file mode 100644
index b202c6dc5ffd..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit python-r1 linux-info
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-2 linux-mod
-	EGIT_REPO_URI="https://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 ~arm ~ppc ~ppc64"
-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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-src_prepare() {
-if [ ${PV} != "9999" ]
-	then
-		# Fix OpenRC scripts
-		epatch "${FILESDIR}/zfs-0.6.5-fix-openrc-scripts.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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	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"
-}
-
-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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.5.3-r1.ebuild b/sys-fs/zfs/zfs-0.6.5.3-r1.ebuild
deleted file mode 100644
index bff26ccbf7da..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.3-r1.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/${P}-patches-p0.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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-kmod-0.6.5.3-r1
-		)
-	!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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${P}-patches"
-	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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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
-
-	einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and "
-	einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable "
-	einfo "/dev/zfs API developed by ClusterHQ. This means that situations "
-	einfo "arising from the kernel modules and userland tools being "
-	einfo "mismatched on future updates will not cause problems."
-	einfo
-	einfo "In specific, this should solve the failure to mount filesystems when "
-	einfo "old modules are cached in an old initramfs provided that those "
-	einfo "modules support this API"
-	if use rootfs
-	then
-		einfo
-		ewarn "The older modules will *NOT* work with the new userland code."
-		ewarn "It is very important that you update your initramfs after this "
-		ewarn "update."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.5.3-r3.ebuild b/sys-fs/zfs/zfs-0.6.5.3-r3.ebuild
deleted file mode 100644
index 5738ad4a5d9e..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.3-r3.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/${P}-patches-p2.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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-kmod-0.6.5.3-r1
-		)
-	!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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${P}-patches"
-	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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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
-
-	einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and "
-	einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable "
-	einfo "/dev/zfs API developed by ClusterHQ. This means that situations "
-	einfo "arising from the kernel modules and userland tools being "
-	einfo "mismatched on future updates will not cause problems."
-	einfo
-	einfo "In specific, this should solve the failure to mount filesystems when "
-	einfo "old modules are cached in an old initramfs provided that those "
-	einfo "modules support this API"
-	if use rootfs
-	then
-		einfo
-		ewarn "The older modules will *NOT* work with the new userland code."
-		ewarn "It is very important that you update your initramfs after this "
-		ewarn "update."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.5.3-r4.ebuild b/sys-fs/zfs/zfs-0.6.5.3-r4.ebuild
deleted file mode 100644
index 7e7b6f6cd9d4..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.3-r4.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/${P}-patches-p3.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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-kmod-0.6.5.3-r1
-		)
-	!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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${P}-patches"
-	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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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
-
-	einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and "
-	einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable "
-	einfo "/dev/zfs API developed by ClusterHQ. This means that situations "
-	einfo "arising from the kernel modules and userland tools being "
-	einfo "mismatched on future updates will not cause problems."
-	einfo
-	einfo "In specific, this should solve the failure to mount filesystems when "
-	einfo "old modules are cached in an old initramfs provided that those "
-	einfo "modules support this API"
-	if use rootfs
-	then
-		einfo
-		ewarn "The older modules will *NOT* work with the new userland code."
-		ewarn "It is very important that you update your initramfs after this "
-		ewarn "update."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.5.3-r5.ebuild b/sys-fs/zfs/zfs-0.6.5.3-r5.ebuild
deleted file mode 100644
index a16b87cb3010..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.3-r5.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/${P}-patches-p$((${PR#r} - 1)).tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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-kmod-0.6.5.3-r1
-		)
-	!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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${P}-patches"
-	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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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
-
-	einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and "
-	einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable "
-	einfo "/dev/zfs API developed by ClusterHQ. This means that situations "
-	einfo "arising from the kernel modules and userland tools being "
-	einfo "mismatched on future updates will not cause problems."
-	einfo
-	einfo "In specific, this should solve the failure to mount filesystems when "
-	einfo "old modules are cached in an old initramfs provided that those "
-	einfo "modules support this API"
-	if use rootfs
-	then
-		einfo
-		ewarn "The older modules will *NOT* work with the new userland code."
-		ewarn "It is very important that you update your initramfs after this "
-		ewarn "update."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.5.3.ebuild b/sys-fs/zfs/zfs-0.6.5.3.ebuild
deleted file mode 100644
index 9e43172c6aa8..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.3.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.5.4-r1.ebuild b/sys-fs/zfs/zfs-0.6.5.4-r1.ebuild
deleted file mode 100644
index aea524fba7b0..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.4-r1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/${P}-patches-p${PR#r}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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-kmod-0.6.5.3-r1
-		)
-	!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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${P}-patches"
-	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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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
-
-	einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and "
-	einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable "
-	einfo "/dev/zfs API developed by ClusterHQ. This means that situations "
-	einfo "arising from the kernel modules and userland tools being "
-	einfo "mismatched on future updates will not cause problems."
-	einfo
-	einfo "In specific, this should solve the failure to mount filesystems when "
-	einfo "old modules are cached in an old initramfs provided that those "
-	einfo "modules support this API"
-	if use rootfs
-	then
-		einfo
-		ewarn "The older modules will *NOT* work with the new userland code."
-		ewarn "It is very important that you update your initramfs after this "
-		ewarn "update."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.6.5.4.ebuild b/sys-fs/zfs/zfs-0.6.5.4.ebuild
deleted file mode 100644
index 706e33be491b..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.4.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.5.6.ebuild b/sys-fs/zfs/zfs-0.6.5.6.ebuild
deleted file mode 100644
index 706e33be491b..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.6.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.5.7.ebuild b/sys-fs/zfs/zfs-0.6.5.7.ebuild
deleted file mode 100644
index 706e33be491b..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.7.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.5.8-r1.ebuild b/sys-fs/zfs/zfs-0.6.5.8-r1.ebuild
deleted file mode 100644
index 535d86509fdf..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.8-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		)
-	sys-fs/udev-init-scripts
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.5.8.ebuild b/sys-fs/zfs/zfs-0.6.5.8.ebuild
deleted file mode 100644
index 706e33be491b..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.8.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		)
-	!>=sys-fs/udev-init-scripts-28
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.5.9.ebuild b/sys-fs/zfs/zfs-0.6.5.9.ebuild
deleted file mode 100644
index 535d86509fdf..000000000000
--- a/sys-fs/zfs/zfs-0.6.5.9.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		)
-	sys-fs/udev-init-scripts
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.7.0-r2.ebuild b/sys-fs/zfs/zfs-0.7.0-r2.ebuild
deleted file mode 100644
index b20cb49f36ad..000000000000
--- a/sys-fs/zfs/zfs-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
-		)
-	sys-fs/udev-init-scripts
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.7.1-r1.ebuild b/sys-fs/zfs/zfs-0.7.1-r1.ebuild
deleted file mode 100644
index c5bf93725371..000000000000
--- a/sys-fs/zfs/zfs-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
-		)
-	sys-fs/udev-init-scripts
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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.7.2.ebuild b/sys-fs/zfs/zfs-0.7.2.ebuild
deleted file mode 100644
index c5bf93725371..000000000000
--- a/sys-fs/zfs/zfs-0.7.2.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="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
-		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
-		)
-	sys-fs/udev-init-scripts
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-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-dracutdir="/usr/$(get_libdir)/dracut"
-		--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
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	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
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	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
-}