Linux 3.9 Support; Fix barrier regression on Linux 2.6.37 and later; Improve autotools checks; Install symlinks to make building lustre easier for the Gentoo Cluster team; dodoc miscellaneous documentation; Update github urls on older ebuilds to make repoman happy

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

12 files changed, 340 insertions, 32 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index c896aed0c1e0..3afcaf69a5aa 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for sys-fs/zfs-kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.20 2013/02/16 22:12:55 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.21 2013/03/15 13:20:45 ryao Exp $
+
+*zfs-kmod-0.6.0_rc14-r4 (15 Mar 2013)
+*zfs-kmod-0.6.0_rc12-r3 (15 Mar 2013)
+*zfs-kmod-0.6.0_rc10-r2 (15 Mar 2013)
+*zfs-kmod-0.6.0_rc13-r4 (15 Mar 2013)
+*zfs-kmod-0.6.0_rc11-r3 (15 Mar 2013)
+
+  15 Mar 2013; Richard Yao <ryao@gentoo.org>
+  +files/zfs-kmod-0.6.0_rc14-flush-properly.patch,
+  +files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch,
+  +files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch,
+  +files/zfs-kmod-0.6.0_rc14-symlink-headers.patch,
+  +zfs-kmod-0.6.0_rc10-r2.ebuild, +zfs-kmod-0.6.0_rc11-r3.ebuild,
+  +zfs-kmod-0.6.0_rc12-r3.ebuild, +zfs-kmod-0.6.0_rc13-r4.ebuild,
+  +zfs-kmod-0.6.0_rc14-r4.ebuild, -zfs-kmod-0.6.0_rc10-r1.ebuild,
+  -zfs-kmod-0.6.0_rc11-r2.ebuild, -zfs-kmod-0.6.0_rc12-r2.ebuild,
+  -zfs-kmod-0.6.0_rc13-r3.ebuild, -zfs-kmod-0.6.0_rc14-r3.ebuild,
+  zfs-kmod-9999.ebuild:
+  Linux 3.9 Support; Fix barrier regression on Linux 2.6.37 and later; Improve
+  autotools checks; Install symlinks to make building lustre easier for the
+  Gentoo Cluster team; dodoc miscellaneous documentation; Update github urls on
+  older ebuilds to make repoman happy
 
 *zfs-kmod-0.6.0_rc14-r3 (16 Feb 2013)
 
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index eda517cc79ed..909b07f38c3a 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX zfs-kmod-0.6.0_rc11-fix-32-bit-integer-size-mismatch.patch 2640 SHA256 980e35884570b152a92679f6c43304f246b91af1bf02d384c7dda51eda5c7aae SHA512 9e962e506085325af05553f03eaa4a83ac89f115214c1ccce720420049dddb241252106afb3442d2594d69c55bad4dba021d144fa148d72e7cf1fb2205ef8dba WHIRLPOOL 57059786530d1131cd73c081fb7d73c9f4c85c4b2d0d9f71f95c792b1431fa964e31f296d4f30384aa548fea1c029c9319857d62e487ef037c66ab82b7ac716f
 AUX zfs-kmod-0.6.0_rc11-fix-i386-infinite-loop.patch 2619 SHA256 2512714f8fbad3f6489d3fdab58fba5471d34ddb9cb6e3788f599b7bf9eea4f0 SHA512 ba1769ac2fdd1e9e71bb3b0edddaf777c26a5fec1e6eeafda0c045544337b4dd2ca416d941e824c11a7df77184e1f51032c3f0ec5fcad3d0126b8f99d7853fdc WHIRLPOOL c01acff767dd20a55c86a0c8d6be1fdd579cf30301f6eb91a8f2f877aacf7194fabd556102cefbc5b2885dfbbb11bfef59bd580b0df43298c95bf297fced4f30
 AUX zfs-kmod-0.6.0_rc11-fix-rename-failure.patch 6409 SHA256 50bd8bee2f91d8139589464fa16c7dda3f21408f59f2bce91284496dab87332f SHA512 b42cbab209a2a4229782fd5a4e6c6537713bb6e4e51744734d079eac4b9c0dc00557cabe9edd4034224e80994cf74cfd49a256629d0fecd01d6d076d8424865d WHIRLPOOL bdbeccb3d08e192c48f26f5bffc0dfe58310180915d94f6343be599d0d12b7be8bc0fa792ed1dce9e6c03e5cdc4c7cf8e63bfe96c274284781be5b7605d38da0
@@ -13,7 +16,11 @@ AUX zfs-kmod-0.6.0_rc13-fix-invisible-snapshots.patch 1371 SHA256 f48710ba112304
 AUX zfs-kmod-0.6.0_rc13-fix-recursive-reader.patch 1161 SHA256 f74db8f9704f35d460a1a2250993057d301710c065e553c688381e778fb8e320 SHA512 9a16107d448c90914e9e1fc767c68eba7fb3793c1a7b1e26182759d0b398d09641f51911981a1092e76223cd8a56724c634bc939e9f1fdc412cf4e469e1e9384 WHIRLPOOL ccd43c7610420c165ac19684217fc8d2aa6b5e95d3fa40dec651ea1bf145f9ec0463ff806f918678636d2658dc6c80946077d5773f7486e4d68c13ad3cb1960c
 AUX zfs-kmod-0.6.0_rc13-gcc-4.7-compat.patch 1882 SHA256 bd691dfdb8379c276309715b597b2091595c0f177a2241249ec76f6e31f3f101 SHA512 7f24915fdacaca01620a961febcc524b4c40989e85754cc927df5d8d87b77ba6bcce919db54fd7e42646abf16b6b29349de5e8dc30b5c12a9744e7321a9280e4 WHIRLPOOL 432182663ba978f1ae530a27d7f813e7aba04380763354a5446933c53848abaca738145c316b4c6c5fee06e65812b4e210def8a6432f7f5a8c845f4334b09d5b
 AUX zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch 1068 SHA256 4fba06f71807086da90c9d8f4c2a04cd83af4b606ab2ab9a4bc22f08e9439861 SHA512 8f1d20ab9be3ae388424ad543d400244df9ad093a0e2c61243c6b481347cd2fc0ab194ace5062d4ef6d162622324a5ed14c43c8c6c4e63d56725624f86a3961e WHIRLPOOL 4edda0e2353e851fdfc8381d9ab91c3c68d7c7f60dd69778817a9aeea46ba8b15e51954ccc5c49c4e094063d3bf350f14e2ab49fed9837980772a2eb495cf2af
+AUX zfs-kmod-0.6.0_rc14-flush-properly.patch 1058 SHA256 becf3bd60019415281f38633ad10d9a4b57587aa8b9d0679dfd7aa83ae76092b SHA512 5ffe861de9d7ff54a1108a08a1c077e9f2eb1266fe72a60d4b790be463714a6736fc8b96168d656192bdcd7a0d836e5d09dd04aba3dbdb7370a682542be68a35 WHIRLPOOL 2cc7619a3e76abedd0b77427f408562c5f7206f904dc40a58f2aa519305820c121ceea53311f747ea1f103bcedd5cf88cb27cf8bdfda6b43f879f35855a8724d
+AUX zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch 3841 SHA256 0c456d53f0f5c861fc3b92122290f9ae8dc90af9469bd66f35f5ad802a037f4a SHA512 985d1d3359cec0c5752adebd398e241e2b7cfe174ac500e2c66e84c960bddfc8908f6de19468f628f2752434f4987ea926842cc40c4268a9a18376d1c1c04460 WHIRLPOOL d3ee7ac7cd3711db31229a45b33cf0eeceae6a9710a4b5befb9ac4734bc0a8dcedc37a38d497827430e99282feaea8200b4b54295228238e9b39750c179d39a3
 AUX zfs-kmod-0.6.0_rc14-improved-hardened-support.patch 17568 SHA256 1155f2587e249fe2b80e887c10549da11dc0ccb2f1a86d7bf4ad37bc73eeede1 SHA512 0d7a3354a336a749be0aeb1781f9c78ac3037ad515e31039184fc13075ec10b237581d25d6eddf5c0bf9b9b49b137d73c0ad9685d544fa8f8a7200463300acfb WHIRLPOOL 365e07900bc89fde7624f987ecdbc5ce55cebe1318f60062ae0c36ad044cb2911af81a57886d958237b01de12b865cef3377b7cce8e760a55abc2ec4fbde0379
+AUX zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch 1098 SHA256 3572e68fabdaea723a2f31e109fe17646c966e12e2c99364798fdcae1ec63b3f SHA512 c59a09d741549192bfb9433e4ab9ed2c42e8346c5c0eb7accd76a40edc8b50f3c49f9dab69c66e2c4fce4d9b62961121512c475ab7b9fd9f8d821ce1075dd309 WHIRLPOOL b4f29f80ba433196d12b2c4b0945841f6282d5def9eeaf4b59f032fd57042073d437b33a1ae849bc2323af3a0cc16f23808825f2fcccbc7bd1a2b8a98cfbb5d2
+AUX zfs-kmod-0.6.0_rc14-symlink-headers.patch 402 SHA256 96f1eda7cdcb8bba99315ba2f1354c0ac4fb7e66d8ad727c725fcf80e8485d41 SHA512 758216de1664c4ccec164181dbea17770d3a1e09d3dea1b16422f521286ff8d9c429607d473b120343d5fd00ed39ca399e45c172ef9647ecdaa8cb766536655e WHIRLPOOL e7200d66a89910c6549f00017362b149592b4c708eb2a83e64407268b18fa53d65649070b5484cc71c2027de4466ce826a895ca1346730908eb8c396f3909697
 AUX zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch 1074 SHA256 ca1efba212bdec982d519a05c81035271440a43f2aa6333c3e7f244690fbbdcc SHA512 0df3ca10c9919d554c197a45a0fc9217db19f6de39db6d00ff1f6501857430df79e9403c924c34928dc236adf73a5ce9bdc80b877a62709d4591a1fbab2c87fa WHIRLPOOL 3fe58a362d1c0fb0c8aa30bbec4a43d88d95b6c956445246ed8f28ae890c2fcc2b13de184eba91937e1ff8ac93b38a3f0b6824733da45cf46999e23b51f31d9a
 AUX zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch 1438 SHA256 d1f1b3f47e0ada27e43ac04576eb61a96b5abe3bc6a7bd7869fe72e1e08bb4df SHA512 f133fed7acea871bec4e08b9e24b358111877f8c8a481746639913ab162a3a85216ceb848f9461aa57ebaa1d90a61b7e5105938511f6a98dfd6c281592c5ab09 WHIRLPOOL c49ea43a12a8c9e4dca30df0dbbeba6f4fd07cf7c0271aa9c45d9bf3c5e8eef93efe9da600ec1b1c9bc782d55382674db68f07afd3f7c1083e0e1b85816d9416
 AUX zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch 1979 SHA256 6f61761703c4c71d8c91fb6e49b927069301698d78fea35c2bcdc603bfdce59d SHA512 dd4bfdd218791c6eef6120d95049860ba304ac474872357f3a5ff5b3783421a39035c732cd508f990145ff371bb8fcca2757152d41d963bcd559fa8f69fdedbe WHIRLPOOL 9bbd6479c22c905615ba6b4188aa332a9ec2685536cd6f784da28c081fdde430df15cb902b2ec1f7f9cdbfdcb20aabbc49460f5de09656686193001338c05a7a
@@ -24,11 +31,28 @@ DIST zfs-0.6.0-rc12.tar.gz 2150456 SHA256 3eb85e4028480e9dd56e29eca0a4e71565c150
 DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535afefafde4aef0f112f8c833a09 SHA512 c9bbf1fb7f293a0f5b1247e17c411073994bf419d5f6c1b781efeeb4022f62851e8ea3cf7ee0330b0609bfe13b8084c48f00e942ce52323d706733cccf49699e WHIRLPOOL 97083a6f5d66addc9bc7b3cc3f7dd3bc1696980affbd4033d71cd09ecad413ffb666a8a185dfa2e4f20dd4003746ad61d12142f7a6556db5b34008716c933798
 DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d
 DIST zfs-kmod-0.6.0-rc12-p0.tar.xz 13400 SHA256 700f88edb1a31d3df63f7a5be84429c6b835ec4a01820ec25b96881c9796db7a SHA512 846eb064daf40c4f53e3924ef6f0d05761fd85480e3471360c8be2089c4ebb9999b2b128e03c0b852a14d5dfa24e3a108b3d3bca1d96a39fef7beab2dde92f91 WHIRLPOOL 636b77725b0355097c92080b97a9871aacf5683b8e4af2d22ea03d5eac23f032f52319b68f43bc78286e2519f63f3d5ea9f5cf7fab84b688703ffa5479140680
-EBUILD zfs-kmod-0.6.0_rc10-r1.ebuild 2875 SHA256 52426c4df3243f6fb2d51a5e0a1c0ba43c2523789cdbc9f1d894473906aea9be SHA512 e5aba9b678239fe227b5af7cb8667c8d1f1f05b288b61870f56d2c79c8bbb2910ae0d2abbefb4fa5f41e8589f77729c42bcca64c3ed6fccb0f8499ea8e6846c7 WHIRLPOOL 41abcc91012bd1fa974473d3ac0d01606dc36c0d98aaef8ec516d2012044227330f3d29232aa2b333dc4e434d234d9f6baa0e29e846548aebefb56e827a52a24
-EBUILD zfs-kmod-0.6.0_rc11-r2.ebuild 2956 SHA256 e565576942bbbb0dfefa156df54746d58517ee989d7af55de2c3775a481ed426 SHA512 8586e299caea6b6ac4bec5579b3afcc5cdfaa48c3a75e8f9fa5fee7f3915ac80a5071dc8d8ea2d69c39da7e43f59a90ba0ca4aec38b3d0cce07421eaf140c5c9 WHIRLPOOL c8c14920896d4e51a8c24100fce41230f3cf964ee253f8326713e4798973ca3b5b9fb2f777fc6d278fa3de55a9ac32f8911a80cf19f0cec0cacfcb99f666886b
-EBUILD zfs-kmod-0.6.0_rc12-r2.ebuild 2460 SHA256 e1b5d0387c092e3244a4035dbcdc1881c1e1c4105d3964f167036a02e00c664c SHA512 5228978dcd5c4d0c1cdc0424a97edf760a11dd62ee9560121dac7a2d7b2c9f601bfbd0b76df26af86db78d477f355f7cd73c2ecdde2b8b2267e33f94d5440bf3 WHIRLPOOL 814a7890e0a994711eb72bcb148b5c5d24af59d3f462310d63f96631eeeb427d5cdd3d9ebca1e69c29fc9ecc0090a2391a22e0c0ef5d338cb98df3b099fbcf6c
-EBUILD zfs-kmod-0.6.0_rc13-r3.ebuild 2651 SHA256 28d1b73f618919cf262736b6363171bc11c333dc75c837ca25f1e7da2660a601 SHA512 952b704c87c2f3df98b13fdf1f6348bdd2ff6a0c84831327900fbccc1260e54834e2966ffd86c7e64609c7b1e300bf6c0980d3ef7cec030ec5ebd3f66e59800a WHIRLPOOL e6c0a40189d51ac80de8e21a98da7cae007aeb2ce9af10deb027611118b05a63462c396ff7fe9d9156192b5fc67e5a201c93c257cb10faaa5bee6011df2ad278
-EBUILD zfs-kmod-0.6.0_rc14-r3.ebuild 2867 SHA256 e045922e4af26cdf7c453db340c029cb97c7c5a130f84b66a5a75ac2fbe6c356 SHA512 90c6b93e8698c87fe7943da10f286a1b6accf7a901fa61b6a40ba61ab3e6dc3ec993dcc66f8d24f0ef4caa089231dda7c2270605909cf5f99f752e514621caf8 WHIRLPOOL 98eee97d9f513649dbf3c7c5f5f2447c83ff7f352c94d1ad7ecc5479f8abc3d6fb3c06f459121a9353f67c03603130396f3671c9ca68988c81e1b76ee56e6b1d
-EBUILD zfs-kmod-9999.ebuild 2390 SHA256 ba414eb496f41d1b0c115e16bcdc8cc66a0ec868cd328ee40d3926883740fda4 SHA512 d05f345af3d7602ba484fc76767ea27ac3c564964ca96c376cb5440f6bce40978329d8ddb4546e187300250ec974263399b407adb91d374c69fa87cf73b4fe92 WHIRLPOOL 008493e2d536ce8db1fd97747cc57e7a6696b8b5b8b44a9cedcfabefafc8e433a461e39eb09c94694cffd4673263feecb3337df3385ea6ed359c29c970330597
-MISC ChangeLog 5791 SHA256 adea258a5bc80bff0d602b058eec32e8955f5890abfe667eb60b1b1e36c53919 SHA512 1025891d3c72f1dfd7092e20d42406a800b6e83637cd1eb3ea3f99ecf88e04e713316ee41012e4713ddbc50ad54d357e702cc812d6abe0ce3312574e328be97e WHIRLPOOL 4cd18a0c2b8e5661826dfa7de2502a580cc320e635506adf094f03f44213917dbd479ce28131df7b30be98792f27da08087ddaef5e091b07afeae81e130ca54a
+EBUILD zfs-kmod-0.6.0_rc10-r2.ebuild 3179 SHA256 1b3f679a62fe1d011bda194f26de34d2723e8832731e36e2a3bce570145f801a SHA512 25d2cde29c187214a343ea77bdeb19f334cc892b217a59805f66286def5a88cfc3093ea0702b15b8279b2b369e5bc95525a0472c6f0d2326079c8d55fac73f3e WHIRLPOOL 34ed15b85f3bb02593539bfecb9b865178d913bbb363b6ce908b7b026813c76af5963aa0e2029cd6b244af8da1a009d8fd9dac3986543b1fb6a8da668c20eede
+EBUILD zfs-kmod-0.6.0_rc11-r3.ebuild 3261 SHA256 ea87571c23003a2d1852eb0c5d78e7bd02695a9ebfea15d3d0a63a751178af44 SHA512 b96807b81fde31228d3f1db5a842083c939a810abe868738e8accadcf6e246bd8f78ec5a96a9c2706d4ebb21ed32941a0f5c2c01898e8b61c324fa2487d0141f WHIRLPOOL 860e7aef22c708972320c063d249e6b1ab5e236a4b2cf567ec515bdbce7ee2f18a1b8ad513e9e4405adcced1a3415d774aa97dc462e840400af67d98db7079b4
+EBUILD zfs-kmod-0.6.0_rc12-r3.ebuild 2764 SHA256 ec5c78e135a79727e64d17884699d6a4ff0f55597a06e4f923abb822558cd869 SHA512 fc623fb156634ff607e98ee6d15f94db5af9982fe29c2bdbf33460a6b6fd70df53660b65bc4260c104e655b4e8018b5edea75616216f6b9f4969b69e810b39c4 WHIRLPOOL 396d5aecf36a32d4236031bdd55fc6ea9eeb9ec33ead5ddc95fd994e8a332607a20e8bb1380b1acfda3f9606bdd2b759b82f259ab285bbfb68ad334d45cc9e48
+EBUILD zfs-kmod-0.6.0_rc13-r4.ebuild 2969 SHA256 23a3267fee72e1ab5c43b0cb60e2b9678b864d5f25bde3b2367863830c38d798 SHA512 17f4e60ac93c9bd5e5eb06c4a8aed0819f477b232968fd2cb73536eae66386be72ec29107f53a44e4220cc5fdf601d57b47638026706cfb3592ba909e2c1fe7d WHIRLPOOL a7240ad61a4d4480f222feafaa2073c44ab341e9ca0d594d9cb4f83c377635853e0ea2bea4f683424c96a223a2e4e2cfdbfcfe8e30e0e9cebbaf218429395967
+EBUILD zfs-kmod-0.6.0_rc14-r4.ebuild 3441 SHA256 82e81e7b4d02787b1cf686c9dfb63560c25298c8b6faded0b7aa387a8800ad72 SHA512 842c385049760a89be0d4ea54360ee585d9925ccd8c5ae4c8c0ea2a1efb6b4ece0a5a0bb9db3c76a08cf315f131a9ada2c337bfb8f1f3bc728c3469aed82b0c2 WHIRLPOOL 082e08dcd86a725ba4019c2b3d8c0391ee4ff614acc49dec470b6d9f17c270f34c3fd838527431eb66a8ba40816980a7c6f83815d4f3623b297f8b64eb8e5bb9
+EBUILD zfs-kmod-9999.ebuild 3433 SHA256 186005af28499ecb1e0d1c26b8688fc62512b83f389f1c1df834db715ac4d792 SHA512 01cb4d79592023d559ca98334a4305ccdde321e951aef1a68b75d02f6977d49bc416f4e339cd0368c315ea1abe4a4aeb0ac4cbb3aa04397b1e51de2a9f8ab210 WHIRLPOOL 9f782f4116243beb38098062e1e2407a7fc4385274d30c38b69d6604071bbafd05d89435c784f12c519ae88a7992e69fc3361fca8ab05087cc75fd0f088aa04f
+MISC ChangeLog 6873 SHA256 610dcd5b9709dcf70b5fa5792679d5793330eb39c258a9b5e6e14386ffdfe057 SHA512 a7ad5d7947cf3109afbc9cd25984954c38e51a0a10eb06545aa1d5806a16b2779814befe5801b8da22096d7bfaf608a8b7c96d4783cfed71e32d92cf5efb666f WHIRLPOOL 46a5055a902b19e32f04fa1a9ee2a3aeb387e68d15a13719217856a02be0cf65e0be6ec51d92bba761cd7a84221f7779ce0a8741f778c7e7dc5664e06ff5286c
 MISC metadata.xml 346 SHA256 e4506ca3f73e0a7799675ddb48b546ce6e3754e912f77d7d32aefac860b3fb82 SHA512 13885781ec432fcaa913c6365b6101b899ba5cf72573b29eb56a0d567466f15edf43de61fd1cab357149c5ed2b73c8277d69a88589f5f3d8f9ae3ef671f9ad8a WHIRLPOOL 319e314874a770ba6ef2687056bb97d6aaf081b0014cf1f0d08c39d70f24adabd19f0b4b3ce61c00fb72dade7589c9821c4730508967e32ea32a2101f74a35d8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRQyAeAAoJECDuEZm+6ExkKXoQAJ45Ld8v6sR/tNhn7B5XqUH5
+HPj74dZwHRzV6SfQDFcFtnxhzHy7Ifk7/V4WvlCBxVvBN7lVy/Pm1U2VUht5Lw1E
+mquUssS2K5VolopA8rGmzVzyfTWtjpTGFl995x1/E/aGlnMjYyHC6cYtKZqQGzWV
+IB5l40IZDEx2KwiJ73g5kRuiqUDqN699HjX26CcTKYxo9kNs/yYfInna1jmjgFct
+hvpiDyfBfmfXctzIPgXY12r1dxbj2pc1K20nsDzzIyOrFozdkX+Y5Uk18vl9hlKz
+ikusx60gGPwsomHtme2R8ev4T7EEsl+Kd818SDc+4t9bb5Kv7OjAp+S8MZijdMXh
+dNAKTVmv1K0mO3P4BXtbwVFH8KIvgQO9fZRyHlk9whoSrsV/0qEeDqCMkBkRH94I
+gXHELaMZrpTmDk3ioeKYTH4ZIdMyvx3kQWTljPunn+b9ZG8bcGlpIJIU2YIYkuKw
+XPAQ4lgQ0T+HGeoAGfdlwYFGXC94HzqGZvEp/Wpncy232EuRFkb+HMNDqgJmCfyS
+cLVBkbVxlJOklxWVqNDDXvCU1fKy0fT4dLUqhe9M4gmsP3yuZ3YU3O1OIKn6o5qD
+MwO989BSEnRKmijT6Dgd0iuUISN8af8+30Y5lc8yQ92TB41bKx5q6KDkXSLQwZfr
+fpbv+9+tnx6MnRJJHaVC
+=1gWZ
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..fb4c7c35696c
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000000..15d5af34d5c5
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-improved-autotools-checks.patch
@@ -0,0 +1,105 @@
+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-linux-3.9-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch
new file mode 100644
index 000000000000..1dfef6117f1a
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-linux-3.9-compat.patch
@@ -0,0 +1,32 @@
+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-symlink-headers.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-symlink-headers.patch
new file mode 100644
index 000000000000..04b47e67f255
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-symlink-headers.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 833bee6..c7780f8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -38,6 +38,8 @@ install-data-local:
+ 	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
+ 		$(INSTALL) -D $$instfile $$instdest/$$instfile; \
+ 	done
++	release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
++	ln -s zfs-$$release/$(LINUX_VERSION) $(DESTDIR)/usr/src/zfs;
+ endif
+ 
+ ctags:
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r2.ebuild
index 5c78fbe241c9..3c4a3016bf8d 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r1.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r2.ebuild,v 1.1 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
+	SRC_URI="mirror://github/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
 	S="${WORKDIR}/zfs-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
@@ -24,7 +24,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -83,8 +83,14 @@ src_prepare() {
 
 		# Cast constant for 32-bit compatibility
 		epatch "${FILESDIR}/${PN}-0.6.0_rc14-cast-const-for-32bit-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
 }
 
@@ -94,6 +100,7 @@ src_configure() {
 	local myeconfargs=(
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 		--with-config=kernel
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r3.ebuild
index ec90268b29d4..475bc49d5050 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r2.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r3.ebuild,v 1.1 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
+	SRC_URI="mirror://github/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
 	S="${WORKDIR}/zfs-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
@@ -24,7 +24,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -73,6 +73,7 @@ src_prepare() {
 
 		# Linux 3.6 Support
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-0-elevator-change.patch"
+
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-1.patch"
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-2.patch"
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-3.patch"
@@ -84,8 +85,14 @@ src_prepare() {
 
 		# 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
 }
 
@@ -94,6 +101,7 @@ src_configure() {
 	set_arch_to_kernel
 	local myeconfargs=(
 		--bindir="${EPREFIX}/bin"
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 		--sbindir="${EPREFIX}/sbin"
 		--with-config=kernel
 		--with-linux="${KV_DIR}"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r3.ebuild
index 18e2919087df..a880af049331 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r2.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r3.ebuild,v 1.1 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
 	S="${WORKDIR}/zfs-${MY_PV}"
-	SRC_URI="https://github.com/downloads/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz
+	SRC_URI="mirror://github/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz
 		http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p0.tar.xz"
 	KEYWORDS="~amd64"
 fi
@@ -25,7 +25,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -75,8 +75,14 @@ src_prepare() {
 
 		# 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
 }
 
@@ -95,6 +101,7 @@ src_configure() {
 }
 
 src_install() {
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 	autotools-utils_src_install
 }
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild
index 5d5d25d81b7b..756407937665 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r3.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r3.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r4.ebuild,v 1.1 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -24,7 +24,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -78,7 +78,14 @@ src_prepare() {
 
 		# 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
 }
 
@@ -94,6 +101,7 @@ src_configure() {
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
 		$(use_enable debug)
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 	)
 	autotools-utils_src_configure
 }
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r4.ebuild
index 84d80baacce6..39797e8b7a36 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r3.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r3.ebuild,v 1.1 2013/02/16 22:12:55 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r4.ebuild,v 1.1 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -24,7 +24,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -56,12 +56,15 @@ pkg_setup() {
 	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."; }
+		{ kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; }
 
 	check_extra_config
 }
 
 src_prepare() {
+	# Provide /usr/src/zfs symlink for lustre
+	epatch "${FILESDIR}/${P}-symlink-headers.patch"
+
 	if [ ${PV} != "9999" ]
 	then
 		# Cast constant for 32-bit compatibility
@@ -71,8 +74,21 @@ src_prepare() {
 		epatch "${FILESDIR}/${P}-vfs-name-length-compatibility.patch"
 
 		# Fix NULL pointer exception on hardened kernels, bug #457176
-		epatch 	"${FILESDIR}/${P}-improved-hardened-support.patch"
+		epatch "${FILESDIR}/${P}-improved-hardened-support.patch"
+
+		# Fix barrier regression on Linux 2.6.37 and later
+		epatch "${FILESDIR}/${P}-flush-properly.patch"
+
+		# Improve accuracy of autotools checks
+		epatch "${FILESDIR}/${P}-improved-autotools-checks.patch"
+
+		# Linux 3.9 Support
+		epatch "${FILESDIR}/${P}-linux-3.9-compat.patch"
 	fi
+
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
 	autotools-utils_src_prepare
 }
 
@@ -94,6 +110,7 @@ src_configure() {
 
 src_install() {
 	autotools-utils_src_install
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 }
 
 pkg_postinst() {
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index c152342dddbc..b86cd6766f45 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.9 2013/02/06 01:46:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.10 2013/03/15 13:20:45 ryao Exp $
 
 EAPI="4"
 
@@ -24,7 +24,7 @@ fi
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL"
+LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="test"
@@ -56,23 +56,39 @@ pkg_setup() {
 	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."; }
+		{ kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; }
 
 	check_extra_config
 }
 
 src_prepare() {
+	# Provide /usr/src/zfs symlink for lustre
+	epatch "${FILESDIR}/${P}-symlink-headers.patch"
+
 	if [ ${PV} != "9999" ]
 	then
-		# Fix regression where snapshots are not visible
-		epatch "${FILESDIR}/${P}-fix-invisible-snapshots.patch"
+		# 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 deadlock involving concurrent `zfs destroy` and `zfs list` commands
-		epatch "${FILESDIR}/${P}-fix-recursive-reader.patch"
+		# Fix barrier regression on Linux 2.6.37 and later
+		epatch "${FILESDIR}/${P}-flush-properly.patch"
 
-		# Fix USE=debug build failure involving GCC 4.7
-		epatch "${FILESDIR}/${P}-gcc-4.7-compat.patch"
+		# Improve accuracy of autotools checks
+		epatch "${FILESDIR}/${P}-improved-autotools-checks.patch"
+
+		# Linux 3.9 Support
+		epatch "${FILESDIR}/${P}-linux-3.9-compat.patch"
 	fi
+
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
 	autotools-utils_src_prepare
 }
 
@@ -94,6 +110,7 @@ src_configure() {
 
 src_install() {
 	autotools-utils_src_install
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 }
 
 pkg_postinst() {
@@ -105,4 +122,10 @@ pkg_postinst() {
 		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 ..."
 }