gentoo resync : 18.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-18 18:38:22 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-18 18:38:22 +0000
commit: a5956e0a0daddcad648e0d8d8e5cb3e49e09bda7 (patch)
tree: 3d2e0a61f348a5299e73ca7c2b236156a8cc79b5 /sys-kernel
parent: 38f60b3ec9ff175535d9a056a76ae42931e61e21 (diff)
52 files changed, 754 insertions, 3447 deletions
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index feb446d2a70b..69b797fc8293 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -29,9 +29,18 @@ DIST genpatches-4.13-13.extras.tar.xz 17396 SHA256 dc3c9d2b5c8c5f95af5e3da9463e0
 DIST genpatches-4.13-14.base.tar.xz 243120 SHA256 7ab50617a0dd9661b8e23db22d3be8d20c39715b9dee8b2ab7b9a19ecca2b1fb SHA512 c885d59f4d301b1ef71d40e3b35758914b669e25a15a64826454b3f46f5b45a49850971ddf11cd1d5db41d1c0fc5d814158dd02f14d9eb0c97af208865c44dd2 WHIRLPOOL 36f0972a3ff9f58100603faf6a7086e03a32cfdef42d903df5e202734c0d56eace42d7c1242712e764aa5b87f1eb9fe1c78070a05cff6eafc2150d05f35ffde2
 DIST genpatches-4.13-14.experimental.tar.xz 5184 SHA256 6734f0f0fdf33b648f7af28252e17b72e9345a483ef0714fa45e192cb33e2b7c SHA512 c220d229f4dffaf7bf09b9d4cb1a73d61b7646191d715098e5eb51808c66d38827729edcc9999f1252d7b1bfaaed7d2d2566add7b6cbadad1db246379334dee1 WHIRLPOOL 307fe32b1492096547eca0af6de818d81724ee58f2594d4c537b1a6bf797ef45b96a51a25b5e92d279e78398f5104bb28bb20a2c2980bab779e5f292017de246
 DIST genpatches-4.13-14.extras.tar.xz 17396 SHA256 dc3c9d2b5c8c5f95af5e3da9463e0fc3d9c83b8c40d992f6381ac3d4523d0287 SHA512 67a4cf48502378663c5277e5d6c2d98d195d7f7b3a7fe0e79a5118c7e910e19c9882807cd7d80f73c08f28d702b83e4af9248597af751dc3cf923eee40a5c0ab WHIRLPOOL 8aa276bb0617a876fea012e15ee8e1877ae6921b386e846c60881410ff565960e9c5b82e88e62e39c85439a79bf1561e2834912358f754a274870e224381ce8d
+DIST genpatches-4.13-15.base.tar.xz 254132 SHA256 42f1e2ba1ea6218492b7aa39553aec4497955eea9cca383ee757d30aaa5f58c0 SHA512 7d38c30f213a1bc0a38d2bb8e97f1f6b86ecff60779aa36cd1c9bd9cd2726c16b8bd3067364cae716d38e22d8f34dd34cac3072d5fe2c8256de229b99cb9a4b3 WHIRLPOOL 0457c37dae998872a21a84ae5e07259afa759f27cc61a27bd2b29fe4a530330ccce9acdf2f48c9b95af4f38a3e67c551d4f1f09afbedfdafc27f00e454db930b
+DIST genpatches-4.13-15.experimental.tar.xz 5184 SHA256 86e11d4000233f7832090f20771cb0b9b5fb68f630ded53e0492da79a54ae4ac SHA512 4c5416bdfa602ae083a9058d04d2dede66bef95e5c589dd211aa82264c044a1102b63459dc384e7bdd6c10678b440542db2b274ebeb4456aeef93f09aea4693f WHIRLPOOL d13f518bb332ff5c5daa9a4ec1e949ed93936d69c248f62b596e8426ace5a00b27cd907d40e2610d46fcc3ef6dace2a56d15969762645d8406b8c0d8e9d3ba47
+DIST genpatches-4.13-15.extras.tar.xz 17400 SHA256 28a3431e5d8aca353b9d763c67261ccf3f07209d3f622d118b6025c7b1b31f38 SHA512 4e41c0780bc7c37fa5e13847ee203cefc6e1676921d1560fef9a198ffcb948c7df38acb642098a1266661bf5ddeb022510aa0ab6863e654e29400eeccf093cc9 WHIRLPOOL d0ef7f5de7f12f94030676c9b9c94834b95dcf23d4607c1e33ee2c1a87830d136ae184ec61e27410b6cdab716b21959d681ddcb90f34b3599b51a8272d46146d
+DIST genpatches-4.4-100.base.tar.xz 1513104 SHA256 46ccb979e540dcb77f7af38d07c5f66a396a128f74c4af38aa7dc43e86ce2c48 SHA512 75324834165e3493387e635918cb81d73d27b3274cc6826557df548f7f84a0aab456faf1b60e1e4bf35d8ae5fef00d1bdb4298f43208440c0422e006a3b248ef WHIRLPOOL 1db08d1b79e29854e830ac9e4b167cf076620a9da8db8c3b0ae18679cab90fd3333b43b1479f68372b04daf4acefb6dbd2c97fc65f660ae9c685d617ab5b8576
+DIST genpatches-4.4-100.experimental.tar.xz 87748 SHA256 c0d5113ebed9c284738d8999e48734f2834f42d8583ff86899f82014bf4c69f2 SHA512 822c943f114c35a8caeea20ee5f6c56d67f0d1122ca9db8f3bd9f34561735b0eaa72f9be7161b55c390ab5adf967ee64540a81a042746e39c6d294158cfd52b9 WHIRLPOOL 27fd96867ba9dad975cc401737d979867582742bd68cd14c24edae86ceb155d2d9db72c5fcc61964b48fb1c6c44f9652709ca6963cf705435b3e8ff88c6feb95
+DIST genpatches-4.4-100.extras.tar.xz 16464 SHA256 68ddbd5cbab566284824a0458e40982c467aee31bc84bc7107ad95de97971bf1 SHA512 b9ae815130b993cd2723ba54c41aa62b04e8e373b4b26f63ad0c511c445eaa1af71e7d63f0eaecd23b6ded8589b65b4e9da0dd62349a0b8b836b15b01a4e523b WHIRLPOOL 6e9b183367a2327a957130b83cea4cd8b4f1faf01e12eed927c2ea7463d72533c275e6ec7f20c73813c4b2649e0a4b050187416fc019e8842d9c42677a94826b
 DIST genpatches-4.4-101.base.tar.xz 1522480 SHA256 bd06966f0752c704152cc10710b6090815694454e155ff817aa81b7bdc351b05 SHA512 4b0c6aaabca1984996c393c118a61e289553c7b2e65847d19f8148a75a363ac50f88b63666e3cd3c90ae8aa6724da402ec6867b30e3cab6bdc6fdbe4de6373bf WHIRLPOOL 6dc02a0f2c41dee713046e8d423033066d623e7bd7db02bf79c7f7eaf6f2bace3ad62d9fc7ed4a5b9abdbb034cb6be873d1067e417cb0cb17cee7b0e2cbae020
 DIST genpatches-4.4-101.experimental.tar.xz 87768 SHA256 afb292bff4fc3ca0893807e66e2e514425ba3f71db6e7a12a370b1241ce32609 SHA512 631feeed11f995d6071f38a7cd8d6b50a824cc33b3736a6ba8bb89943cb00c0c17039e4f4d27e8bd69740739b27d877d03616b2a88d19cf30ad0a51708077670 WHIRLPOOL 5c45651642a4e7583370cdf2dda0ea25b620154077df14f6ab2a1fe7c9426ba635377e29dc94d539ea311ffb3dc312a5a97f417f08d27bc5590b7b42c4da0d77
 DIST genpatches-4.4-101.extras.tar.xz 16468 SHA256 17d08fbb9f38fb01ae0877fc2c17b51235d48fcd0547e377e2e3cb973408b377 SHA512 aaed443e351ff3c24063e7edfb2c24e73ed6e2d8796bafb03202b7eb35ff6d50985d22f45c1f0eb811f8074c1fc43cbc84116d37cbe81110776a867b79eb8a23 WHIRLPOOL 9f6b82f4b769a5b7b0dcf705a0a97313c7a0462ad6ae52928ecebcbcd1fb68f2fd1a1c089454c11d6d0e1a81ca4a765e70e59b9ba9ac427fa5894bf3ebbc1cb9
+DIST genpatches-4.4-102.base.tar.xz 1534876 SHA256 87f89f0d5912a9ed843d2c4ed8d45377e878a4df98101d99c10ef915b30c9479 SHA512 bc314f6a6bd7477ae3e217ce27c8b859f4574de76a7e5f3c1e70247eb3236d7bfd8e37a12d27a46cded56e49056e6e7d646c2814935634f387d2ab680b23e5af WHIRLPOOL b2dc5d694dda0c899877532918c636c3c265296e46f3aed31883e1d8da896607786f13a748e6ac5f6e2514a2ca3850b9a01369955cd4f5694ec5adae7cc255fc
+DIST genpatches-4.4-102.experimental.tar.xz 87724 SHA256 d76def758c05682a2bba83a4f86b933ca027d54212dfe33b4d87de26cdf1f42e SHA512 f38af999df68a51778d44aa83dc442824f09cdc4a743ebf1f96cb091338bd77ac0f8a0d49d04ddeca80c5930fc10fb00e3589ad5074e0ec08cdc9c7f09b7316e WHIRLPOOL 15f0aa454442407e6893d28f6526d6b3fd0edda15d5c40ad710f9ddfdd0f72511c25c16b9f8c11663b3dc2caf6c76dd76b8fdee3c654a65ac8f7f54977e516e9
+DIST genpatches-4.4-102.extras.tar.xz 16460 SHA256 6f58d9d2058c087bd1e09eca3b445b3012fa2805e3f5992a6121f99b13b3c2c9 SHA512 c93def08004c8a7f15aae95d8be454c2ff9142dc0721eb6623cb18fa621093539fa9458a3735cbc803aa76b8353b8e6ae421b32bb38bfafdcaaf131179b8c5e3 WHIRLPOOL e54226b1c873e07bda99939c700e3ba983d4f67b978b59857b1f0b9e4e402224fef5ec6f370861992b130c3d032430a13f8831c637f2b3f978c908853f93157c
 DIST genpatches-4.4-91.base.tar.xz 1428436 SHA256 d6c806bd868856a9021b35d0bc3ced37029c8803846d6b251fe7fefadfe46c69 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554 WHIRLPOOL 8de12e7bdba76256e8fc41738605bbe961fa3fa0ccbe1fccaf0c8cb3708c692bb65a27db7675e42ce5558a22c81b9017742b14d6776ee2b93f4d1d92535942a9
 DIST genpatches-4.4-91.experimental.tar.xz 87760 SHA256 e04a99c94b4dd9f5856dd08ed4b286b19c765d8d0fe40237dce256f7c874dbf8 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f WHIRLPOOL fb6306af0191198d466b3349c348139342a70de118bcce0563e3209a7ead8a9d56291f3a4155ba4a4d211db8fc1e20ddec3a3b463d62fff5375df823646f7b02
 DIST genpatches-4.4-91.extras.tar.xz 16468 SHA256 6cc85cbae6d2ccf087104b5f719abf10d186d3b630572caeb1906c344c66de76 SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d WHIRLPOOL 81f8fa1676856f0941bc6d09e7e602d2213740bed6edc914d9341bad590650d5a5249fd8bbd2d640380a638ce2a12fd4ec66e0c3753c8d9d22c1fa2c3f07aacb
@@ -50,6 +59,9 @@ DIST genpatches-4.9-62.extras.tar.xz 17356 SHA256 6a9eb1e797afee5006c2d11435f9b0
 DIST genpatches-4.9-63.base.tar.xz 1183404 SHA256 8e5ad88a7a26df4c64b92a9fc6650ea753db6f7876034bfc4bf054d917db7eb0 SHA512 cb8e7ee1e8cf88e08bad0ec7078667f8cb044a5369a7bda6db68846ac56696d888125527b3dc0d4b5fc90bc072cbd31a75c327c6317036ba697ffa235c1c074e WHIRLPOOL b079cd9151f22140a9b1774159d28f430f7cc2a26816c1d7e58b9781c1b6f58635412eb308ad01a0fba90633cd582bb936fce8f44a970d70c5a7e8ab44d1dae3
 DIST genpatches-4.9-63.experimental.tar.xz 106440 SHA256 f4b1d833cd7f827cd36a0354c52065a08a495436adfafe0c6f3c4643ff7e4d79 SHA512 3c03fadd3a532cf0db5e3b7a319f8ffa6a96e3d304f31cf017baba5766da4af619daacb08749ec12bf8d62ce7439d2087de05b07f42ae0a41d81540f130a615a WHIRLPOOL 255dbef473aca9748358a34d535335fab5a11db1614db80d10edde5b8e4970f2ae48680fe1d3812d0f9e280dced7c58f8cee7840eeea2bfdd3b892037cbef970
 DIST genpatches-4.9-63.extras.tar.xz 17348 SHA256 28408ae0b16962f032f994635723a65d1dc2a4ad1fa41f36e2f3d18091e9e5eb SHA512 26e91da7d56177e7d0ec5c0c58e1acdddb99432978551a60cd48b58800c6f286054fbfabb87cf15b56ac4b7102c12f2c3edc2865f8fecce89e7eb0e7191ef1fa WHIRLPOOL 56313feff208263f6239237c3b177b8bf755d3b1a3ecfca7a42e71c5799836b7fbb9faf68d8a02ad9f93b2bef29fa33a834adcb2a7f7198d81e357c96b727769
+DIST genpatches-4.9-64.base.tar.xz 1203336 SHA256 218a08e0f85e6cadfddaf34cfb187b3eaf3f7aeed6f78f932a6ecb197196e07a SHA512 34bfbd0f72570d6f50b6d22b10dc2aa742b9554e467cbe82fad8c9fb463baaaaf7cad9acb46a4f65f44c3d720af539fa5923647afb144363110ec0cc3928bf65 WHIRLPOOL 331e3c21cc59e62f9f7d287fc2e441ca602affb828ba4cc59487ce2ba2af84de53e4820bf6a332c3fc1f5858e89f526ea07a321cfeb6041780b6c13e77de170f
+DIST genpatches-4.9-64.experimental.tar.xz 106388 SHA256 88279fabd32a49fce437d4dcc1c16539db18211e3ddba3dbfe29e02409cefaf9 SHA512 9ba6da1ae2a618b5c766a1b9cabb459d5e3296643ede83fc9a2eb3991030abcd37652e1cdcfa9f1756f42b386b2fccdfd498ccd6e7b54f87e7c953cd05faa8a7 WHIRLPOOL 16f76f83c2d91b7648b435308b27335734247402d36b1113b8fe1b7f4a47917a19c8d636b49e36a73879ba39a8b0175ba50f3b890ccad8d496ea8b225c451619
+DIST genpatches-4.9-64.extras.tar.xz 17356 SHA256 91388a8444f98a0535cade4b901a9480e6802f0895696c62b19377ec667d2d67 SHA512 2788478d0f659ab53b9fb5569cb6286b7db457520b2257db19ba8b9e2ef08be7e20e1901fe6d09069da09c8504507b2c1ea8ef3483ea5fda5272902ad49c18fe WHIRLPOOL 7c86180c55b4ebe26b93b4d8f1b280ec54c56d55b106109a614cfec211222f1c4e17803b1537c3179760a12dc12483951698c81bd2f7bf8deefcd5f454453180
 DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 WHIRLPOOL 3b97da251c2ba4ace4a27b708f2b1dcf94cb1b59aaeded6acb74bd98f0d3e33f1df83670665e4186d99a55daa84c88d539d93e20f0ff18a6d46ef326c48dd375
 DIST linux-4.13.tar.xz 100579888 SHA256 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 WHIRLPOOL d3d332e02cd3c5056c76c28cf1f81504c6f7b8f2caed7238e7dd7866747fb03154b88d8d7aec4d0eddf5760624bc7d6c5485fb52a3e32d098a2742eba96c0d05
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
@@ -60,13 +72,17 @@ EBUILD aufs-sources-4.12.14.ebuild 2236 SHA256 36161bc119555e132c44a01e31e091431
 EBUILD aufs-sources-4.13.10.ebuild 2236 SHA256 b252b842e544e12e9ed7397749bbfd9ffb9ebb400a088aefacbaea32ac599cc6 SHA512 4e32787fcea7ee20aaddd042d26c80bfd692968d025592455e823c3589df25b6800718870aab13e4e8a699377854f300db7d0a393ec94e69b82a56d7def93f72 WHIRLPOOL 5b186ecf2e427009282cf4fd933b17ac282c81026158f5c6aacc1bd39dc58ada858ab1aea298b6b7d5e9bb256263ee351e23b842ee82fda96fe24bbfe1ee5523
 EBUILD aufs-sources-4.13.11.ebuild 2236 SHA256 c6dfd95924466897d3ff5c925e8faafb9c21d95d327105e9b6647e7168623188 SHA512 82aa95fe4fe950f644af037a12a9e05a5a21804356996839ea83e570454e704ab35a781ad3309494fc65a4beb51780210df8e309583edefb81c4b154b56f1de5 WHIRLPOOL e295b42e7d95468b9ac883567a56fc6e171ddf95fd6d03df8bef8b2c0ddc7554e2a2e18c5f6fc66638fc86d091ff70d3ac496c4f4dac601deae661e0669a91a4
 EBUILD aufs-sources-4.13.12.ebuild 2236 SHA256 22fdc8ca0c430c4231eea8f0c285ff250abca14e0ef50926ff82228fc7bac384 SHA512 d2703d57ba7a620ac7ed9deaafe36a9d0ce305e61c4368a1d2db6b9aa2b8640011517866421e7db0782d65d0aaae0d0d4953128b63c66f8234e2b1f454819f36 WHIRLPOOL 18df78957ba8dcaf217f40390b84db6287344a867cd8d08246787bf069b3edf476de2d5a78deded13829bab1e69fd8117c46d42820f8c8ed2c9e44dc7132166f
+EBUILD aufs-sources-4.13.13.ebuild 2236 SHA256 5242dc2e59b77824bf3672f1024b31a7d48d3855f821fb2d12b30d1ed804beaa SHA512 3472debcd9c2f41024762402086d9b6c498739d2c1a007e1f0313fd167713a5b159c5168630e29484d95f6c906d207ecf097c1892f371820fc8d8027f9b4d3fd WHIRLPOOL 8f19fcbb9076920519e0c2e27f98ec37235dafd52bc04d0d6e7e878b83cf03c4325b3a54790a9812264e1740ab59be51cd04923d8a98240c5996617268312533
 EBUILD aufs-sources-4.4.87-r1.ebuild 2235 SHA256 0efd7fd48cdcb780bf21ad729e556dce14aaa91e3103cc5eda28a6b010a575fa SHA512 686bff5fbc4deb8870f9afc21edee4ff023b8c20adaad098ab8fefb1eeab0cec2560e79466981158aeb6085faef45b872289920ffd3e920e25e303cfe2d28d9a WHIRLPOOL 1ec67cdaa38219174c20ef5239be3d7ae25f47f87c9bfc3514fe5cae8fb26d55982788ea53deebe85012f50266137a13162ee214ae9ddf92a11750a2a16b8af0
 EBUILD aufs-sources-4.4.95.ebuild 2235 SHA256 b06d745a6302656fb352ae984d55ebe6acda1f20f0a852670b885b177bcf033a SHA512 0472fbd4acbd67243d4a59bfbf2706d174c3446a8f741c92a98af3ad1808ad7b4252a5924743876ca0e7e9a004bb81e92307d6e4f4b33e15602c629247ff6e8d WHIRLPOOL 6b9babebb14eae0bb1ba5a5834b2d0fcf20a3bd728959732be151ec93e07d719b9e402d5c9dae441381be5895f2047b5cbc14f430d0cfb42af5f0a98a0c89278
+EBUILD aufs-sources-4.4.96.ebuild 2236 SHA256 63559c20be69885eaebc4b8a80e8f329abaa3565110618896e87611941c0d6d5 SHA512 759a10c084967ead75020d49b0dc4e9ae1f0f28958af8bb1ff38acd49ded9b4b5151185e74deff1733c77100fdcfb2546e2ae55150eea187b01837a1c4531a5b WHIRLPOOL 893b6a77f32705f0ad5e6063989f03ac8e18d3b2211679c6ac524e18c2762e39ddf22a5186666493d624a579bba8ea20328a3800e527a511ea427ad1fbd9466e
 EBUILD aufs-sources-4.4.97.ebuild 2236 SHA256 6aee7790aaf149c386d231f6cae65df91ee53bbbf21b9c5ee35687e29c712aeb SHA512 14a96a91eee0d35c3ed39b6dfc366f82e8f2bdb535d7d6e85020ef5f50a731aa322d9dbf666e1c0af7038a032d8dafd532027558f7389bacfa4658c276a9d460 WHIRLPOOL a4019e5a3b1610dcf63a9005d1a4ad7ea8edf2e73bf073949f8e9e8901e8323afdddfffab1b3e844daae1e41db0bc474f8af970f545bd8c4f1c3af1e38339528
+EBUILD aufs-sources-4.4.98.ebuild 2236 SHA256 cdcc3e9cfb81fedaa610b6e8892be4f5b70007576fff839fec19baa1f0d1fd49 SHA512 4fb32bca8c8c39ba4c544440910214e5d12f54e3b563a662d11231202e7492a3e1ad8801a3b6927d684cd1ece4ca7d0841c97554ee62b60156f5b5c7f876b5a6 WHIRLPOOL 71f698dedacd65fb9a9b4932939e8b75e20656c337ef3ea8becf4cd2707d4c1b405de166ff645fe1248286827c01f07c417c3a55ff8cabff9ba312fe4f9c4411
 EBUILD aufs-sources-4.9.49-r1.ebuild 2235 SHA256 1fdabe87b20c5104ecd0a70a3717863daaaec5314c0e3f679123ab1feea29625 SHA512 f2968a9900eae2f9ae3309b726810ec9441348e0b40abcaf0b817145707f737cad8a34127c4628d06424863fec1d13b1ebe0285fad492c683a26d1f5502ca8c0 WHIRLPOOL 028d7b564b0a06ad1a900a350eff8ba25929ea79e537ddfd675fa821d73c4f125d078c3ae80fa5ef8ddaf403c4bed022a2e94159624ea04849d3c078c32baefe
 EBUILD aufs-sources-4.9.59.ebuild 2235 SHA256 0e971c79ac22274e680785112676c14e15b152e6bf6e20a3a2633991b929ad65 SHA512 55f370f3ae501265348167b0c812363da3780d2df7083405b3c3deb987774b75ae1d05fd3c07ef39648d29194e95ec896700643bfebc2abb67d9a56a7c5521a8 WHIRLPOOL 5acc9c402879ca029180f981851f7327fedb86085f0924dc13cfca363f68e158baa39372590f9a2ed7455e569ac915353e220b294a708e5ead68da0c35c72021
 EBUILD aufs-sources-4.9.60.ebuild 2235 SHA256 e62888f49cd4e8b5e66dcc53a2662c936b419eaa771dec3fb8e512f5dc893943 SHA512 8a8870e478879fcd624b9d7a234878cbef6f36ef3ae0a171fa43d3d2bb6a91169649e23337001db7474f79e43289be4a7409b3a8c0785da7ac5ceacb9f252977 WHIRLPOOL 76841581fac652b1adb918ff186ee8aa32249be990621473ed7a05f81c9cb3c0aea1760b3e9d40f6adc6e1d2b59f21a9b0bbef6b6d4d54fcf523208bf867899a
 EBUILD aufs-sources-4.9.61.ebuild 2235 SHA256 83c265b875737f25fe37c0259b6c1dbdb5f02eae52e5881fc07c357b8a453570 SHA512 ec076d0260c37a1b03943b5db97b5df1aaa6009af811f7c6986743fa5cd777e7588afb81c99fc2d3bd9b2417a648db91d2e20d32375d333e24bb025e491ffce8 WHIRLPOOL bb389ceb0981e6de26dfa333be2e10b40f5ef872e1c10e2a7af74e6954778eff578d432d03bab2fccdc8d207856d7b41c91850f23aece0e8f07f922978e093f5
+EBUILD aufs-sources-4.9.62.ebuild 2235 SHA256 912f4cb9cf7143e2d3d3e94245502d25732b642145f99299fc3217f03c73cd3d SHA512 5cc1c094eaffb89776dd3abfddcfc4bb2b0d1acab53511ed983ce5e1d223767b8a43bbc0db737412224cfd52a1e6c8115f4eb71b80ea2e3d3553656509c2da18 WHIRLPOOL 6e71d29bd08a837704433e4087bcd9bada6951c806fe744b497db9afdf6058198d8ea25a6db1eb7f3f8b9cdc29054bef4d4c788ff65a89a7307f574f4f360b11
 MISC ChangeLog 22242 SHA256 f82cfee9cea2fe42cda38b43410eefd727dc68a1b03bfa83bcca6ee7f53f6fc1 SHA512 08e13df93a331b205a1fe6541484dbc0e1fe7fcb9317945d65b1e78e54efd6d8d1469733af4b29759b54b786fb18daf976b1cfa45c7171f3c24705d538a1ec6b WHIRLPOOL 0dac0da02a1501e2c200d52726bb7c3c70f6b02c43679ab70079be8063f0a8e1c49ea38ef171e54342e76963814381fb3d5c705c181f3c718a4228a69d797333
 MISC ChangeLog-2015 50675 SHA256 526e7bca65edf8f620189e8285d6f6cfcc7ec2633651e348669e77f102035a7b SHA512 cba4676e581d900f479f7e473c6da83a95595411c02553dfea23101ebae1fc88ad61046236acb29ee69428e567f99ef829b06629a17f3d5d1af23071ca48294a WHIRLPOOL ec59c7c4a025bc56b19aa074ebe52213afadfc4d0d4e71e89d5ba3aaf30a62f8fc5042571c65f4fda9c74729a217507f4dd922fa85d416cb6c5133df44d7522f
 MISC metadata.xml 786 SHA256 c63192429d4a97f7efc51ea1f1a3b073a741b97d35a7f463bb9843474736925b SHA512 95853521c2369a4bfa752be73e2e7e8e5665e790a5763c7d347da1762ac142fd6caec3e20f7d31f58c16f3a38df6dfcca63b296569b7131dcbd72eeb23e9d3ff WHIRLPOOL 3e4363a3821bf06b5102ab0e7113a26a22f968cce1079c6907cd0e4f535b03fccacee656c8a282af080ee766fd77c3d038e042f180a580df359cd49c6aa5629a
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.13.ebuild
new file mode 100644
index 000000000000..f2d45008bddd
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.13.13.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=15
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.13_p20171106
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild
new file mode 100644
index 000000000000..d74e2010db13
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=100
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171002
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.98.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.98.ebuild
new file mode 100644
index 000000000000..23423f27b301
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.98.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=102
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171106
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.62.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.62.ebuild
new file mode 100644
index 000000000000..186e388fef96
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.62.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=64
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20171106
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/bliss-initramfs/Manifest b/sys-kernel/bliss-initramfs/Manifest
index d9341e49ac55..f8e704323341 100644
--- a/sys-kernel/bliss-initramfs/Manifest
+++ b/sys-kernel/bliss-initramfs/Manifest
@@ -1,6 +1,8 @@
 DIST bliss-initramfs-6.8.3.tar.gz 50581 SHA256 7dc970ae20e2fe7552db6108ded180468f255fbfdc1439acf1c58346b0aa2302 SHA512 951063a87d5f7ce52803916746fffda96321a25f2ba4943095f2bd87b4a65e6bce93846babe2d0f3382d364f29afa389b18471553bd32a5609143d5ad333b1b5 WHIRLPOOL 5d9884984ac9522eb3417d7111811fa1befc16b519ac49c39f30605bacafaa74b100515fa24fc00e26c94ef793d143043573919650dcd9f3cbd752d9aee73a53
 DIST bliss-initramfs-7.1.0.tar.gz 30805 SHA256 b061142600fb5db2eb352521201d30440d98e96951057c2386dfcc534ee479bb SHA512 7a7f297756dfb6abb86d2f9159c9ab92ca6e5c24022c0563584a6f82396b88f16bac09bf746f9acd94ef05304e285c6978c7ff3026434c16ef9d50e6064fe85b WHIRLPOOL bed646fd65ebae0221a1514ba071284b6a5b98cc3283dc1d719a7f36b36d6ccd77dbc2b0762bab287ade5fc3acb78ea9e2d7fe14195083ad5ee8f5a277f630fe
-EBUILD bliss-initramfs-6.8.3-r2.ebuild 1128 SHA256 59e4870927580ab07ad9b87c9a5f380b61823b1eff108bb91084a1e897b87f3d SHA512 76264938deef360093603fa42305e045d91a777420cb6ec75d80779eac3f25269eda7f78f52ba0b4bd91ed4f7f41d06c85991502bc3c87ab3550a6d4df9b2f3a WHIRLPOOL ee6851eeac4ab4664770958a86ed23e1b00e075b89b3f95e2e2e53559f2d93c0a640423c91dcfb1ecf6f9af090754a7c7eedb110aa5f57a1c2eb0858d313eb14
-EBUILD bliss-initramfs-7.1.0.ebuild 1120 SHA256 9c0b7b7f096f0c94699c7004f4938dfab63532794ba313b7c8a396dd8608046d SHA512 1ff9b83f7569f8b49989d6575a40980772f5144ee8270ddc3e7f7c140dce26409cc82dff5661419d77ae163c1ee41ce2a0e0763562040d27e75ec2bc06e16270 WHIRLPOOL b00d901af23af4115979a1b0fdcffd9670f9e5db172da3bdd833fc9fe0cdbbae366600d0ec7841d7b19b341e6747943faa26673160a38f34c29a2b83d1218f5c
+DIST bliss-initramfs-7.1.1.tar.gz 30781 SHA256 dbd9c341b60600a3e737d4c0297c704ee0a55fe2ed9d1cf67ace5b0e6e3c3a10 SHA512 2e98cbf3026ddbf5bf7234c695fd38da4ab1c443fe067c222f0dcb83d1258ad41fbdac85934a672bd32a74613165ff4a0c00c5bc50058da5b6aacdea43f9e75f WHIRLPOOL 4a8dcab9c9b26a4c91a88a30317af7dbbc1bc20d1b0c1e0ca9e10d2ef2868a90516ca784e776b1fbaa775755684394c817b686b471db1d29be4b195310e050df
+EBUILD bliss-initramfs-6.8.3-r2.ebuild 1138 SHA256 622b9fa4499a5fde4457e4d412c3b5ad181016fd51ba4499117f99b8fa7e88ad SHA512 8d58fdfe2424c74d664948aa3b511b0a77ace1954061529eea5aff25babf5884456193a4e409f9b35a79b01f5adf03053cff04f4c49cf247735041318967d55e WHIRLPOOL c09ced81f036cb42c7405361fc83324edc7d3869020dbbb2ebcc00a9b66d24e6efe7bd7f6b79028db4dfc3d097344aa9f1bad50554a4469589f85af923bc284d
+EBUILD bliss-initramfs-7.1.0.ebuild 1130 SHA256 c41db13bbf0a96715953e161be9cc9bcc755554758b1bbf18b76c40a10ad97ca SHA512 113f3b2a2c5eecf426fccca057a99aff1f60d2735c835ecf570aa22884eae8093b3d1b873a08325a1a439a23c9211f07ffb854eb966158efffb7a1659cf8ec9f WHIRLPOOL d8b99ce3e9644e2c1251bb6feaabcec2a76b2ae08681143dbaa0b1dbee4144e2aa8d90b4b06b3341273f6bd28b948185552f1f05189caa2d6ff12541e65ec092
+EBUILD bliss-initramfs-7.1.1.ebuild 1131 SHA256 95f893ed876e04476c8144faf894d55cbb02cb965b4a3516f60888ed4444fdf0 SHA512 31c034269612235bdc65d7e4d9f7d49fe2213e90da2426e079ea99450c623a43c3d41dd8d35f8fc02bd732fc7c6909f8a3810e7233acfaefc157997d20a6953e WHIRLPOOL 8dcd174a26268d7d1f3a0858885fb8735827a76afa38a9e28bdace4fcd8648d504537fa8cf18ef621d459a09994caa8c07d9385efde7ced8927638b959b1a51a
 MISC ChangeLog 1035 SHA256 fd923f4cd535d8ff2e30ac96dd8d0988a2d197b4ee54191b58d4077f0c880f1a SHA512 593fc4b87c8d9738ab22ba209c132c489ee10f952f430285675029b6baac9fce7a828f3782d71057bfbcbdd0dd0db0af791b4d6cea0bb3fc0bc8a177c2c7a2b5 WHIRLPOOL 3b9242dc7820845807dd908818ecf110c7c6939f897ea012e2d17e0a078f6da2dc762b16f828558f5a8fafd34a62e7cc9327e2724155aff847951890864b4333
 MISC metadata.xml 376 SHA256 d51e0e3518bf8ec933360519b3953809376b715511318cd61506ee0215d122f5 SHA512 f940dbaec346e821e3d95c58bbb3977103277cc4a969a6ddd8e68b5068b9fe5745bd2c89a7c00236e18833e95c2dbbac0fd2b4ce05ad63f7486195e39c386d55 WHIRLPOOL 1c5a07fe7e642c73e229db85aec445a53aa30c0aca6f8db7b0592b0b0a2cfdd0974dfffcb0e926a043f11c586035b5e092bb79f853e415c67951a9093a63cb4b
diff --git a/sys-kernel/bliss-initramfs/bliss-initramfs-6.8.3-r2.ebuild b/sys-kernel/bliss-initramfs/bliss-initramfs-6.8.3-r2.ebuild
index bab2dbc53147..f602e16dc194 100644
--- a/sys-kernel/bliss-initramfs/bliss-initramfs-6.8.3-r2.ebuild
+++ b/sys-kernel/bliss-initramfs/bliss-initramfs-6.8.3-r2.ebuild
@@ -40,5 +40,5 @@ src_install() {
 	dodoc CHANGES README USAGE
 
 	# Make a symbolic link: /sbin/bliss-initramfs
-	dosym "/opt/${PN}/${executable}" "/sbin/${PN}"
+	dosym "${EPREFIX}/opt/${PN}/${executable}" "/sbin/${PN}"
 }
diff --git a/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.0.ebuild b/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.0.ebuild
index b1a9302c6c6b..a0dd452913e5 100644
--- a/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.0.ebuild
+++ b/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.0.ebuild
@@ -41,5 +41,5 @@ src_install() {
 	dodoc README USAGE
 
 	# Make a symbolic link: /sbin/bliss-initramfs
-	dosym "/opt/${PN}/${executable}" "/sbin/${PN}"
+	dosym "${EPREFIX}/opt/${PN}/${executable}" "/sbin/${PN}"
 }
diff --git a/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.1.ebuild b/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.1.ebuild
new file mode 100644
index 000000000000..e6dc27dbe60d
--- /dev/null
+++ b/sys-kernel/bliss-initramfs/bliss-initramfs-7.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit python-single-r1
+
+GITHUB_USER="fearedbliss"
+GITHUB_REPO="bliss-initramfs"
+GITHUB_TAG="${PV}"
+
+DESCRIPTION="Boot your system's rootfs from ZFS, LVM, RAID, or a variety of other configs."
+HOMEPAGE="https://github.com/${GITHUB_USER}/${GITHUB_REPO}"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}/archive/${GITHUB_TAG}.tar.gz -> ${P}.tar.gz"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="strip"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-arch/cpio
+	virtual/udev"
+
+S="${WORKDIR}/${GITHUB_REPO}-${GITHUB_TAG}"
+
+src_install() {
+	# Copy the main executable
+	local executable="mkinitrd.py"
+	exeinto "/opt/${PN}"
+	doexe "${executable}"
+
+	# Copy the libraries required by this executable
+	cp -r "${S}/files" "${D}/opt/${PN}" || die
+	cp -r "${S}/pkg" "${D}/opt/${PN}" || die
+
+	# Copy documentation files
+	dodoc README USAGE
+
+	# Make a symbolic link: /sbin/bliss-initramfs
+	dosym "${EPREFIX}/opt/${PN}/${executable}" "/sbin/${PN}"
+}
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 0e21b5d0ad07..4259d21f420c 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -6,9 +6,11 @@ AUX dracut-044-bash-4.4.patch 5036 SHA256 c443525f1e3f2e7459e4db00b4b88d54caa843
 AUX dracut-044-preserve-xattrs-when-copying.patch 2354 SHA256 e6e09c6b6946d512c08470f39045abc87e5fae6628be79a3c20bf38ee0c365fa SHA512 b15babf62a4ece46c8b55a2ac21c3284665da8c38c10fc1209c08605b778689cf80108b8baa0ce66eee2218d6975cc5b9401d8a70326ddb6f731c55373e52a02 WHIRLPOOL d13f561f51a931f706a8bf86ff4304c96951fe6807052421223042131bd35cb4afa8662b0cbfe0dfb9f41bf192bb7c44257a1bbec72d4368c352af9ea7ef3d8f
 DIST dracut-044.tar.xz 280004 SHA256 84b97c9b0120e9fde06c3b9cf2ede1c4632cccd8e085e980b9ec9c788655af05 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d WHIRLPOOL 684591df596fa902447e671adfaeeb8cdc469c257f756616e42747835b71be7caaac9c72bd4b1a5ba5728ec4332baaba1d265cddb1c30cbfa65cf4dce0690bc0
 DIST dracut-045.tar.xz 292652 SHA256 ca9c7ea54d3efc8b57ac1427cc5fa4d66688f6cf9d3088f4c5e7ae7c7e84ebf8 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a WHIRLPOOL d9cdf32e4fb745b2598aa2f0504c943f5a069dddc17d5261d594b2fc33921306196386bc35156d5bf71983cc15be3b0cddd504d1b6a2042b45b5c5ae622b23b9
+DIST dracut-046.tar.xz 299520 SHA256 3cb206abc198811972d452d53e88c32f29dd1b0bb24e35e23b4056aa74824f99 SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122 WHIRLPOOL 2a430978934e00a5c87908a6e312e94785d8c2d4d9281c23de9a04d0e91658d234e97dbf826c3e90c6d3c7186f96eb251cfd5e7508ac0c2d2e9dd46486dc284d
 EBUILD dracut-044-r1.ebuild 7688 SHA256 e51652455405c841b00e8fcc0e3f064a3d9a189e37bc1bc98a28fd18d7251de6 SHA512 e82388ff89b4a9309f2e38c8d4cae5db63765b423d1066b978d7eb2b7374f355af49b3962ec22e4ca1a37fe699ed3311c610565f1218d249189e4f28a5677067 WHIRLPOOL 22f0d0d887d7d2ede9c32bfc77c434ad278cc2a1c3b077e9e7a599fef3c85ab735170f0c2de898953d8ff97cb486d3bb559f23e696005a2f75fc9fa8102006e3
 EBUILD dracut-044-r3.ebuild 6939 SHA256 31bdc406d9a18851f2c244bfba04d29c1c2e8d2fb54efe449ac00c7875944658 SHA512 b49f4a6dea1b6c03b6422b7c4edd7e655a123ca7074ebe38d98bc5ae324060cb0dda3cecbb8dd8caae5209d16d767680aaf4ec740cf65af496545b50c41d7a28 WHIRLPOOL 93c981d0b134c33c28cc3afb64268bf0ba4e0e04cfb1b39103fd2ec0cfe4df55f8deb964e5a110a5decf959fe2824a3ccd0fe4dd73231d3a0b9416cd020ac8eb
 EBUILD dracut-045-r2.ebuild 4792 SHA256 119f380f3285f6ea53caec7335c960e5cdb34672ded41e932e79963b1a52766e SHA512 7d08f8cda9bd4fd34c8521331daa996e361d142c16e077ad2ed9614e8dba7c50242dc60193128a15ada9e500d998b223d9d80bf91e8ecc063d5fc64bd62d8cd3 WHIRLPOOL 811e4bef3ddfaf9d9a0ab4033b6a8098c952973a35d7a137a9e5441248a7c7a25863273ce2cffb70850229e318b397daa291bff6a98ae98d9698972f3a8489df
+EBUILD dracut-046.ebuild 4767 SHA256 41e6cbf060cd21a9adcc271aa4d399cdf1103eb6e6e2ad88902de92e53e6f3af SHA512 8716a1adb52a65ef2a77bb0c5aaa08e834e4fa5e5889e0b5ced2b34a72465196fc7b4a44ecd3e8a08366734d520e8af41dd1116a8a44d0bde1275a1bd3b97e14 WHIRLPOOL 828be58d66c3559051c50cb212786ca52e8daa74d5c8cf4ede59b9715db34473146cd64ba354f3a658a5eec8b995814b03d1ba128b6f72461396bc250b6629c3
 MISC ChangeLog 8004 SHA256 11ded091b910b3c6807e344e4986675c50af2e5e0a2fdcdb352e086f5097e090 SHA512 dd8b1e996946fa47093440be61de1cb645a15fcf289a380226590ba541af8e4a47df33747491a25258a21599ab90c0402da548371de131d4f4cabf06965d0807 WHIRLPOOL da2a37d08cc7eb53eafd6282b635672df58db6ba88aa7dbc8e79f08db25a329245c84d4977937857b42ae9b3d84ad989ac40cf3dbbd96f3b30e2a34c36d9b40e
 MISC ChangeLog-2015 84625 SHA256 839b114233a8e918dfd787ff5a1f3a0743da7ee5320ff571aff4474ecb9ee45e SHA512 67588a45f9745381b08712b0bb8219d7101cd0c5a78b89be177658b18188a0a2c2185688e1e6239d44ad93345c7da34b71d4ce9a923122b2d62b1121abf0bdf6 WHIRLPOOL 51d19990f3bc47e4d43ee98fd48bc84cad89115e7f812469d25322e9c30efe3902e0007f3d9026464d471c201454e761c04770fbd1d32b545791cf28c67d22cb
 MISC metadata.xml 840 SHA256 8ef5aab36d95735b3b0b1cdba609ef3cd8e883ac38fb619c957fe5ae1e35bd6d SHA512 d347acc0a7c8b821804280f198aa28cbd4198a8f2d570c2725584b18b04125a684bed6adb48f5cb71fe1ef0e1c19320ad3dbff612dbf972f741b50b91fc388ba WHIRLPOOL 9edf380512d517d1eb6303a81379e8df8c342c3ab4501b150f2c23078185d09251903b4ea182a65c49caeda51ce21845ba34783875b7c8111883ff3855f0dbac
diff --git a/sys-kernel/dracut/dracut-046.ebuild b/sys-kernel/dracut/dracut-046.ebuild
new file mode 100644
index 000000000000..8c505a56267c
--- /dev/null
+++ b/sys-kernel/dracut/dracut-046.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 linux-info toolchain-funcs systemd
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux"
+
+RESTRICT="test"
+
+CDEPEND="virtual/udev
+	virtual/pkgconfig
+	>=sys-apps/kmod-15[tools]
+	"
+RDEPEND="${CDEPEND}
+	app-arch/cpio
+	>=app-shells/bash-4.0:0
+	|| (
+		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/systemd[sysv-utils]
+	)
+	sys-apps/coreutils[xattr(-)]
+	>=sys-apps/util-linux-2.21
+
+	debug? ( dev-util/strace )
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsepol
+		sec-policy/selinux-dracut
+	)
+	!net-analyzer/arping
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	>=dev-libs/libxslt-1.1.26
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	"
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+	README.testsuite TODO )
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+	"${FILESDIR}/045-systemdutildir.patch"
+)
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--bashcompletiondir="$(get_bashcompdir)"
+		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	tc-export CC PKG_CONFIG
+
+	echo ./configure "${myconf[@]}"
+	./configure "${myconf[@]}" || die
+}
+
+src_install() {
+	default
+
+	local dracutlibdir="usr/lib/dracut"
+
+	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
+	if [[ ${SYMLINK_LIB} = yes ]]; then
+		# Preserve lib -> lib64 symlinks in initramfs
+		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
+	fi
+
+	einfo "Setting libdirs to \"${libdirs}\" ..."
+	echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf"
+	insinto "${dracutlibdir}/dracut.conf.d"
+	doins "${T}/gentoo.conf"
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+
+	dodir /var/lib/dracut/overlay
+
+	dodoc dracut.html
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_exists; then
+		ewarn ""
+		ewarn "If the following test report contains a missing kernel"
+		ewarn "configuration option, you should reconfigure and rebuild your"
+		ewarn "kernel before booting image generated with this Dracut version."
+		ewarn ""
+
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+		# Kernel configuration options descriptions:
+		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
+		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
+"(initramfs/initrd) support"
+
+		local opt desc
+
+		# Generate ERROR_* variables for check_extra_config.
+		for opt in ${CONFIG_CHECK}; do
+			opt=${opt#\~}
+			desc=desc_${opt}
+			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
+				"is missing and REQUIRED'"
+		done
+
+		check_extra_config
+		echo
+	else
+		ewarn ""
+		ewarn "Your kernel configuration couldn't be checked.  Do you have"
+		ewarn "/usr/src/linux/.config file there?  Please check manually if"
+		ewarn "following options are enabled:"
+		ewarn ""
+		ewarn "  CONFIG_BLK_DEV_INITRD"
+		ewarn "  CONFIG_DEVTMPFS"
+		ewarn ""
+	fi
+
+	elog "To get additional features, a number of optional runtime"
+	elog "dependencies may be installed:"
+	elog ""
+	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2 "net-misc/iputils[arping]"
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		"sys-fs/cryptsetup[-static-libs]"
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "Framebuffer splash (media-gfx/splashutils)" \
+		media-gfx/splashutils
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		net-misc/openssh
+	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+		app-admin/rsyslog
+}
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 60a5a75c2578..ca7c39f0af5e 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -19,6 +19,7 @@ DIST genkernel-3.5.2.0.tar.xz 291956 SHA256 a2bd11be022f61d8ce734a1755228d5a2170
 DIST genkernel-3.5.2.1.tar.xz 293680 SHA256 8682e937ee44f1fe82a3e546acc3de542069a368e59eca9691c0ee6250992eee SHA512 94dd1e4b09578b1563db5152af1f651022196b05492ef69cd7330fb05eb3c950d71b6b5c5e228c8316ced5130cb7cd9d4a24ce31c5ada093e173c9f67f309789 WHIRLPOOL 91f276e8e6ec641ddf544e3e993ddfff3fead9f685a1ca5393d879910fc8cce77fc8d79c8a6bd4080a3586bc7571969da40604b18e3030dcb48ac75cd6a8d369
 DIST genkernel-3.5.2.2.tar.xz 316632 SHA256 9a39aa65a01a543a2685610397a477823523251621caa183743205294b680851 SHA512 c98f836d92b2a940fc76e9c9b8799c19a55f6ac818fe74280321a954361e5d0886095d0b95ef429791161fb67afd3d7fdff518cc99c58bdc120456f7321c8edf WHIRLPOOL b63aa97a9ea479e5d3a6a5df0ca6fc01b67f83091f34462b75c982c5f335cc287285adfa4152cdb6a6ba82c61dde358c67f7aef311cdcaca62ffd83bd007bc78
 DIST genkernel-3.5.2.3.tar.xz 317280 SHA256 067cf7e0b0b6ba1707ecc08b2012a81d8a36154d0f28d76eda2fa8871636e4f8 SHA512 78e4464b19d825221527a2c60eecd4a1a625dc66c2d0cc33d69883ad0687e37f974c755301710f582bd4264dc328871d1327314eb098e09c7e6e393b1978f100 WHIRLPOOL 120e086d9d2668607419ef6725a1f38affa5df971396fab38eaeb7cc372170a1b23ae376c6c6e83865fbda69f7c3a98819091461c3ddee2a3179ad43b475048e
+DIST genkernel-3.5.2.4.tar.xz 318152 SHA256 a0b641d3460bb863fc8a87a2367e2a3f8599233b2b43ad05a86ed34abd2ec107 SHA512 2490ad2c6bacda87c848f8e216318e41f76cc25459c1960d0a10c5ad5768736a527cb954ed2c41ad1f52f53a37ca8c049a56793e97a3cb598b3cc4e436156a74 WHIRLPOOL dbaabe7351ae4be7c6fc7b617af2b881dd038d7858accf90d4546121bb2168521cf2d41b152f3aecf25e0151b325c1d8da1755ff1f0e78f3c94f3d3411cfb825
 DIST gnupg-1.4.11.tar.bz2 3407075 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6 SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae WHIRLPOOL 6f914627e2f527f6616e1f99d2ae06942b734f839d03a45ffa45bf67516a81d58f89e6a85612cf8e5fd83be04ab0b6bc2da8f81114143dad7523e5fcea62366b
 DIST gnupg-1.4.22.tar.bz2 3746546 SHA256 9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708 WHIRLPOOL 3d5f09fc43bf3cf316934c0d0a45a60252dbabe41d12251a93f01f1691fe2436a6dd295b1b4505177281e33611f1911b4a03eaed545810053cc110c6ed539304
 DIST mdadm-3.1.5.tar.bz2 292709 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3 SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d WHIRLPOOL 003595a1338b3a95ccc176b07a31f26dd5fda9460f2c4d3513b9ca09cdab1c91dab05f8914f2354047fccff42c4dcfc6131a383c84467c2838ac7b1af2f9bef8
@@ -36,6 +37,7 @@ EBUILD genkernel-3.5.2.0-r1.ebuild 4967 SHA256 8a96eaaaf8629a631c19054445c109272
 EBUILD genkernel-3.5.2.1.ebuild 4967 SHA256 8a96eaaaf8629a631c19054445c109272ac944ca5decbf6e0d06eff6489ed2a3 SHA512 8db5f79f89922feebbde110d2e68e2d41171615c9c624e5f03ce165abbb4c42a1898e138caeca8e0b3904e62d72521335eb4a44b5263b6f0c0d3b809b8f46142 WHIRLPOOL 593549f3b298705ec8c6b33afb797f8676010c650d3138d7d3bb9be19f5e990cb3236c7208ef2d8796b5054b3d7faaecb627394bead652f26ae36b7d4bb61388
 EBUILD genkernel-3.5.2.2.ebuild 4967 SHA256 8a96eaaaf8629a631c19054445c109272ac944ca5decbf6e0d06eff6489ed2a3 SHA512 8db5f79f89922feebbde110d2e68e2d41171615c9c624e5f03ce165abbb4c42a1898e138caeca8e0b3904e62d72521335eb4a44b5263b6f0c0d3b809b8f46142 WHIRLPOOL 593549f3b298705ec8c6b33afb797f8676010c650d3138d7d3bb9be19f5e990cb3236c7208ef2d8796b5054b3d7faaecb627394bead652f26ae36b7d4bb61388
 EBUILD genkernel-3.5.2.3.ebuild 4967 SHA256 8a96eaaaf8629a631c19054445c109272ac944ca5decbf6e0d06eff6489ed2a3 SHA512 8db5f79f89922feebbde110d2e68e2d41171615c9c624e5f03ce165abbb4c42a1898e138caeca8e0b3904e62d72521335eb4a44b5263b6f0c0d3b809b8f46142 WHIRLPOOL 593549f3b298705ec8c6b33afb797f8676010c650d3138d7d3bb9be19f5e990cb3236c7208ef2d8796b5054b3d7faaecb627394bead652f26ae36b7d4bb61388
+EBUILD genkernel-3.5.2.4.ebuild 4967 SHA256 8a96eaaaf8629a631c19054445c109272ac944ca5decbf6e0d06eff6489ed2a3 SHA512 8db5f79f89922feebbde110d2e68e2d41171615c9c624e5f03ce165abbb4c42a1898e138caeca8e0b3904e62d72521335eb4a44b5263b6f0c0d3b809b8f46142 WHIRLPOOL 593549f3b298705ec8c6b33afb797f8676010c650d3138d7d3bb9be19f5e990cb3236c7208ef2d8796b5054b3d7faaecb627394bead652f26ae36b7d4bb61388
 EBUILD genkernel-9999.ebuild 4967 SHA256 8a96eaaaf8629a631c19054445c109272ac944ca5decbf6e0d06eff6489ed2a3 SHA512 8db5f79f89922feebbde110d2e68e2d41171615c9c624e5f03ce165abbb4c42a1898e138caeca8e0b3904e62d72521335eb4a44b5263b6f0c0d3b809b8f46142 WHIRLPOOL 593549f3b298705ec8c6b33afb797f8676010c650d3138d7d3bb9be19f5e990cb3236c7208ef2d8796b5054b3d7faaecb627394bead652f26ae36b7d4bb61388
 MISC ChangeLog 12730 SHA256 14add548082018ef2c82f46439d5fd00c2982a617bf793c3fc5fc03b75c18210 SHA512 e510d869a00592373d55567b27f46507589c477214a3080c3e993fc6e50c287ac8c7447e16fb629f5901bf87630d025e7714a6b10afb2e121289cbba2577cee0 WHIRLPOOL 8563bb36461bc8dad5394809c5a149e91282f2a6149353e7b64576a29f1ad5543d4d710043392cb747cf151a3dc07202c1c3fd97df8269bb3bb9d435b8e57c5f
 MISC ChangeLog-2015 74270 SHA256 30a980d5d4db610ce073917fff1fa44acb392636480ca413a32ee7f34659fbae SHA512 0fba080bd2985495aa8f7870290f9ae020cc0479c9dd36a46df97871b3243b6e6c8172f84f1c85ddc09560b615073cd8cea58d3420bd08719fd817175c1aded4 WHIRLPOOL 75b22782cfcc4aff766f33d79854855083ba262f5524549dda10c543a38bf046b6ebbfce9e3f83b2ec83753a7d01d28f4f0e86ebcf6796b95589fd45bcea6b6b
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
new file mode 100644
index 000000000000..d5c932bcdb6c
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
+
+VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
+VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
+VERSION_MDADM='4.0' # warning, be sure to bump patches
+VERSION_FUSE='2.8.6' # warning, be sure to bump patches
+VERSION_ISCSI='2.0-872' # warning, be sure to bump patches
+VERSION_LVM='2.02.173' # warning, be sure to bump patches
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.22'
+
+RH_HOME="ftp://sourceware.org/pub"
+DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="https://busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
+		https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-2 bash-completion-r1 eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+else
+	inherit bash-completion-r1 eutils
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="cryptsetup ibm +firmware selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+	cryptsetup? ( sys-fs/cryptsetup )
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	sys-apps/util-linux[static-libs(+)]
+	firmware? ( sys-kernel/linux-firmware )
+	!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+pkg_pretend() {
+	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.xz
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+	if use selinux ; then
+		sed -i 's/###//g' "${S}"/gen_compile.sh || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+
+	epatch_user
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	cd "${DISTDIR}"
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	echo
+	ewarn "This package is known to not work with reiser4.  If you are running"
+	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
+	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
+	echo
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+}
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index e33d6e800880..772f52080743 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -1,59 +1,11 @@
-AUX spl-0.6.0_rc13-fix-on_each_cpu-autotools-check.patch 1508 SHA256 1ef61882e689ed1182b0e77a3b27ba108f18fccff7311462d9c8aef29dfa9056 SHA512 b9bf99b52f3135cb5ae017409ad773e7741536ed6c7181cccb8d97aa627a000417b24971818894dbfa0158a81f4a1be7a9627896b69d4f13988a99f1a39c0bfe WHIRLPOOL 9356a518a1d4a661c4a706347d00b2ec2873198fab379d5a644dde0fc4749f43a9ee542bcf65884de25b97a0e75668a2bd741ce4878ac80c398346eef4b55884
-AUX spl-0.6.0_rc13-fix-soft-lockup.patch 6154 SHA256 85173dcdd261f6aebee9e04098201c58164a74ba01d4a8775d6fb3c7c197c69c SHA512 bbc4d30be0f4425cc1f6076f1ed8d572a8255052f194ad47bde7a9b837689786dcf131326d50f8d4e23d8f0bbf79ce438c273fa33f7c98cdf0bb94c4673c4a0d WHIRLPOOL c4a7efb0858a92da466a69db14f4559188a7f731da7eeaf4f17470a17acb60d81da41c22b6801116d23eb71e4c449097f2ce2af386fd6c3aa915ef7718f49dae
-AUX spl-0.6.0_rc14-fix-atomic64-checks.patch 2327 SHA256 f3254d8c739ddd013ab99619e11263b5591058012cc9da0c066f60da7d3d52ad SHA512 90e2874904600ad191eb594b9ace2ab85c01943b1c5e190fc89b0b91e322aa30a4a32ecd8a407c14b9f1a103676c9956ce03ae5b7ebbd4ee7b962e86b7565245 WHIRLPOOL 59fb9f8544b1e7698e130985f3b95ad0ff419f8abffc705216f6236ac042b16a1bb7dafda586fed51d6fe2761b10e584f675a03b06a89ca503f6e92e9af87f58
-AUX spl-0.6.0_rc14-fix-mutex-owner-check.patch 997 SHA256 7060f161cca637085f0f102a497e26246474bb7239506f7e66cd38b524c711ab SHA512 82b40b9cb92ec3be6b3d22865f807b1925cc273af4bbe798391ce59db044ff0a4b1db48a16c407eee9be48a7c5a92014cb3c2417c1c8783dc2339c3763b5ee44 WHIRLPOOL 3b6deb69e815695ed3fd4100dad27235646563269138cd1abe94084bdd7f5465789c1ee70ed2bc4a8ece5612342c86f57a148571d3b3de5d4a7472d67e8dd4a2
-AUX spl-0.6.0_rc14-linux-3.9-compat.patch 6437 SHA256 830181596f6f1248f304185d6a9016439a09123a08c2d275c7a204ad7240648e SHA512 ea728aa00dfff1e0cf7a433547700a8a435a7eb5a0f3761ab9e133441ccc24aa867df952f00002aba4b587397722b04c015eae82a7e9b523253b09a0ff4cccce WHIRLPOOL 5cb867433c18ca6fb1d1a5a63ef5e875277af53135293b1032dca161488ca66063d5f3783a08e12efe7d4c10dc25970190ab0f29d18f4774db7dca273101576f
-AUX spl-0.6.0_rc14-no-cond_resched.patch 1212 SHA256 d561310b6941104190c65dd8864250c3405338cb752e41d8220797c81d4a7ab2 SHA512 a68afca7da8948a73e00a774c226797451dfaf071be0fe0d18382681390640d680c49c2ee306a1c71b2b412b0766f7724cb9c14d9cbbd954ec77e4f37151e68a WHIRLPOOL 6928505289ef7a4324eede4d2de9464ad687cc3bb0767e164951a100927744817c243b058059f00934974ad4be10d38b8995ecb02a27785ca8e85627130765b8
-AUX spl-0.6.0_rc14-simplify-hostid-logic.patch 5604 SHA256 1d8c48e5f9a0df8dc2691f2e861f304fd003ae03e5b47fd0221632a584317188 SHA512 279c9616ac6311cc51a0f052eabd873418e6d599c3ce22d02e777ad0df0f416bf27b04d1f37a094878ad20070a2cc8a1c9b52ac23f74416c05a7c5a565cf0c20 WHIRLPOOL 3763272378ca15e523546637d697c2ea151b17a1714a1e966324dd1b418ac8fe412221d36f680a4de2015efdee75774824db3e5c7371cd3a00155624c517b054
-AUX spl-0.6.1-builtin-fix.patch 742 SHA256 32e7f741a73f6c644fd691a72db927d90ee9f5a4a1398b7da8a08c535ca9a042 SHA512 c40ff6a8cdef34aa3ae595042ba421b7a56a2d620595b1994de8b7c19153d0fa0af54cdb8bb183300111e2be799389b8d4eb4cc31849f3010ca218ea26c67865 WHIRLPOOL 67b14ae3278cce4a55ff2d58b129448902d9d41179cd0ac7b625bfacd957a27ed102bcf2979390bf360022696b6f64113353e3508aefada441eb02d1f5b6cae7
-AUX spl-0.6.1-constify-ctl_table.patch 1545 SHA256 46e53c4d52a94c982419933210f8d8248b0a7c2c8f5ba0fa2085a21942cd0fe4 SHA512 4406463a71081bd0e47c4867f63b58eed5913c46fcdcf4d55b391c6aac2dfc4f27a90c0a2bc9a1a3c46d2397cf2cba115d6d8e792f17914c70e6f4ba96e3a1ae WHIRLPOOL 7c9c77b5c53b118ae8320c0d7e9791ce2b40dbee4e951a244d0f359b3527049f8fd5b761f4e75b9b61d76451627b0a730df7a89cc5b0ae165cdb0580fadd1ce0
-AUX spl-0.6.1-fix-delay.patch 1159 SHA256 0cda36204ca959eab3f5ffbf898830c15c5378be6347121834bee1672f137354 SHA512 2a2481f620c0db033530c6ad69f54b42bb3a0c8e25f47683a4f04f8fb3b26764538a4940e50fd78299e628c69b342f8c46d19eb5a0403ef9ca53caf6016819fe WHIRLPOOL c3584a0da3d80c1954fe5b84690f06a7aeb882cbe047acab6fac30bd637cc23865ef227f8af09dc5a83a93a7101550a83ab375ebde45637a85172a05b147261a
-AUX spl-0.6.1-linux-3.10-compat.patch 11835 SHA256 8e6cc3ecf7e8cb662148d3af2771949ee80726fcf3de2c543a9031b109222dce SHA512 5632532c8361d8bbe2776c8d28c5825925a61f844af6016970058644f3707990f48508b4f041039eee7b0b5ac0af0edb51c6dcca883671865568da9d0bfb7206 WHIRLPOOL 06d20aa7320a554fb48a602a9ea560efe1998b03f9509a4d86c6975df69f15b64081ea57226b5fba4ce059915151eb88c67f50051524e9e3108f47787afffce8
-DIST spl-0.6.0-rc13.tar.gz 210192 SHA256 500d9c9297f2b7abdc4fce43efe05dddda2edbe403f9ca76d01ae632f798ee1f SHA512 630b63c15e98ada397bc8b8a1a5b6a48255ffa5d7fad8dd0ed9ad7fbede32f3557651effcc99234ffef1a1b9bb13e289c0ca5a2cf60307e0a57ac3a93b709f6b WHIRLPOOL 9330dd1567421e610a714b69d096bbae66c102baaf90fa3daed45cc1a2928eb3dd0e8537f3cf83a7fb2b157bf52ff37b031bcf6c9f52760acd6e480ad335b69a
-DIST spl-0.6.0-rc14.tar.gz 210495 SHA256 92785e2c2c6caf93ec31175e192a18b27458613a99e6578041f6029875b061e3 SHA512 85d066a97d62ce60f60c552d121c20d5a719e95e0eb6d7ec1b10e29acca1e3429a751bcbb811e9cee2a14282c8908684cb9ee0df9cbc8e53ddfe47da18df4cf9 WHIRLPOOL 6473236476dd9a2d392e2f71fee6810ed83e68f309d1eaaa5fbad1f73ae567ad629db97a2bc81a4ad9e28991f4be3d4100c1b9ab0f65941206afe6e5b03f64ab
-DIST spl-0.6.1.tar.gz 213191 SHA256 24d73eeeb0b08bcc162342c5236f116b90ed0a2e69344ae34de744f61c2e3663 SHA512 116117235b4730b5e7041107188747fa2872fb204a08d67a03e1ec95d6302ca57aa17edd12e6f9284492a844e60d446a25d1172d7a2ce53075c36bd889879b31 WHIRLPOOL 4554eb9ba4a2b60fbfc7d73ada4b5c7ce20b26d6655f0a8d9fe5479d11124acc27cf2ba6eab5af4e4a08c886b06687dcbb656322c8e26c43f07b4066770f9a4d
-DIST spl-0.6.2-p4.tar.xz 9076 SHA256 8b434bb53da79c5adb5339b36bddf4d19c4e8d5df7a8a5d2a4ca1bcf7336094e SHA512 77ca1ce0235edb85cf36243ad45710ee8759dcc49bacddc661a986d558eb9cd92671ce256c88287e056732882a038b12bb0d9ae131229819702a06de18c50bc1 WHIRLPOOL afc335ba0a7d24a610f272e6a65460326b91ab91652bf66525e14110a811b2490de65847560989f793aab8d473794c56836e438cb7f1e19d4e253373178f0a72
-DIST spl-0.6.2.tar.gz 215032 SHA256 a8147eaba030ca71bf8c47b46a2c7ae92f9b4ef60aa8ccfa7368f395faeb85ac SHA512 ef5b77046259ec754e0a41f90b51c27207bf91e832d54a8502232b19cfaff711de301f24945ca739faeac2544b3ef22a57f58cf6298d756a1ebaff06f765b8a9 WHIRLPOOL ab7229691a6f56ab3f98513fd0e32048c11dd7cf3ea61e438bac2d97ebd8cd92eeeb422ef1c4e639572feb3e8f69c0840b861f654ca31de481601ef54295be37
-DIST spl-0.6.3-patches-r1.tar.xz 15996 SHA256 7f1cf74c9be5c14eeff529ce0a45d7dcca33cc08e5b9e7d17fc79dd5a58719d7 SHA512 6eeee3a18466bbe8ca903910d807a3242bff0c12848d4fc6e226fe40592cd6cd9109bc5ee301867f0512b5cf2ad28eab2988e261c69fd200c5dd6eb6d8027b2c WHIRLPOOL 93578cfa435dc343edc8087a0d49aa90ddc457bf75292b0c10ce30836e00f27ea0c4768a62270a6ec559238b778ccfcde71c15740a8242f9f93c7d84934c5f72
-DIST spl-0.6.3.tar.gz 221430 SHA256 5d60dfbe86a50e65dbce17f538d8d0874a0cc293374f59eed46cd2dd1809a944 SHA512 c4b82f1e279c7581d0082c044157e8a933edf53233c8c7c8202117454cfda0473ab85fbb56ac0b6da09a4d6798e33020a9c55bf23e25d630efa3265545c3defc WHIRLPOOL eaf001a96a80264e16ce416da38b988eabbfd2fce17690151a496a3141c32e92e5d00791e2d9c009ae0cf6910f80434c10f02a700752fc664f6bf6723bb03dba
-DIST spl-0.6.4.2.tar.gz 190421 SHA256 05c428f48acc55287c0662a90cfc087985b8ef3694dc057cfb16e1fa2ebbda43 SHA512 6a295651622dd1819bc9ef8f693c6a3cf73dbb084a4789ad508dda644bfcaa1984c5487ea0e16c8d6d468da59a3fae2e9309b2b13cd869a4af4ea675c394bbe3 WHIRLPOOL e270b66ac9e22c806876e727ef040c3cfb2c304889de982f1c54a1625f7bf0214d3b6f8baac42cb3710aa23897f1b1bc67ef633fe35cb1b2c4b57196390a0fad
-DIST spl-0.6.5.10.tar.gz 576268 SHA256 cace7e53dd092f44e0909452dbef74adaebbe8ff0bb59b24341b0c5dafff1b45 SHA512 775cf359b5734a52eb0c54c6de8f314a9522194569f2af083117341799344839b174c1594d5e17b5ffa9aa39fa5011dec04e1a9f0c42908bf989849db3a1c876 WHIRLPOOL 6282d6dced15a359bac04863aa492ae79012a9f86d28f323eb5c67214287c52f8670f30c3b5d98692732b36dc3325680f873953d81951bcb67259da46b9f96ac
 DIST spl-0.6.5.11.tar.gz 531710 SHA256 ebab87a064985f93122ad82721ca54569a5ef20dc3579f84d18075210cf316ac SHA512 eae1641a0d528cb9182deccd309625e13abf3db88ba1cbb54947055b23d1f94b62c045f939d5e952784f19719eea5fdf85d65c5abd22b9db167ea7780bc55722 WHIRLPOOL bc528e07624f01bdd41080548ad2098e05167b9d2492a1d27ed5cdd065f843c648dfffb46634d85b9c52325ba9c3e6f921d8d9318e1c040c2d7c6e545426200f
-DIST spl-0.6.5.2.tar.gz 193153 SHA256 2642b69870b32e0feeaa57fbfcef546a330064bd4e5805c4862a97287a9287ca SHA512 9db23daf6cc1d6aaa926c987e284d7dbbc538876d6a8b9636d3126efc2be9d54b5ae2cb9cb3a89b604b3d4106374d85d9ad2c1acaf940a1299c1620ee1526d3f WHIRLPOOL cc99f131f9dfcc9ef84237f16491c8c5417af70c57dcbc3dba448c83f93636d5161b301f4fefa4fa8c54c56a1864cd9ce5d5fc758697803bac880839ea57e359
-DIST spl-0.6.5.3-patches-p0.tar.xz 4968 SHA256 8e652d41eba421720bcecee99077d3f3c375153809426011f04a2c64aa181ca7 SHA512 cdc053d7ad537cec3b0e7d777d6a341d1b48d6f49613f77db3831b86f54cef098748b944a353c3bf920974a812d650b65116fe26906ff7921ea69cfa5fef9691 WHIRLPOOL ff9e6a193a8585738f57fec59a3513fe69856019569e90c95da306ab853b0c5a8266bb457ef1f4df0c4bcd20dfbde1062c616d3ee55621b288ab796c733d9589
-DIST spl-0.6.5.3.tar.gz 556179 SHA256 637c1eccd721f5d3bb1570621d2cd6646ec0488608482c0dbeb2838cf4bb310c SHA512 24a0c97f1a425e44d12f43519c23ba78672c06d65a03833a8d3827e4c762a873283c90ce66f64b9b186ab815f0b005e69da537e120b8b53877d0f13e649bac57 WHIRLPOOL e67f50c8adc4ac2b770dfaeb479fa8a8c87270c8314b5366dd95665a30adb2f1fb29db9719a0431cc18adc6865ea6f222c1b443f2b95b764cede8db50f49333d
 DIST spl-0.6.5.4-patches-p1.tar.xz 2020 SHA256 0a554d86ff1874b09263fbec2ee8e03dbae24f4c45cf54c9e8a8d2fcf3a21207 SHA512 2650f06bf23045bd2805ef58baa2561534373862e1fbbaf189cf93283aa8e18cbee989b4e81751b37da3058aeba357cf8e46db97331379e1b5eafde7faa33851 WHIRLPOOL 8054310c8d62d17f45566e67f886e025b5798c1ebb32bf66f3b91b440a42869d09a45030e5d8695687ace829fe21f43289647dafd206d1021626fffb35a2979e
 DIST spl-0.6.5.4.tar.gz 556298 SHA256 a49ff1dd255215da18ea60bf76dc5b764ddc1aa40d86f4e842b63185357b1504 SHA512 a50d804008237820d6a8e7d938f6699df2966836ebedf0b6a4421f55bd6c24ae69e8f80eaf3aa2b7f6ed308983ab4ca11abfb32f98c8d070e4957b4802e00cac WHIRLPOOL 4c9150fec7e5539e391ffd078e7aa4412d47416749187d62e36136d945514694b09920e595c391ed3fedcf5d13f7486539f49ca33e166909d8a8b2fc99b39a37
-DIST spl-0.6.5.6.tar.gz 559142 SHA256 167595fe76eb5497c3a1ffe396b6300155d0cbe46d06824a710099ca1ae1b8bd SHA512 23c6d2f041a09ffa9e3f12ddbf59fbe76b74ed6cd0de984b2a04adb14247979aabd13de08b5a5a08b37918ac247aefc599cb0e234527bc118f855ffccf6397e1 WHIRLPOOL af8d2a3d523cece5b42b57836d58048c180bddc00b8846cc4887d2a88b022f2b49e09aa27f32407b34e99a0a3842c82f75e34219f53d5b4b9a6749d047dbf718
-DIST spl-0.6.5.7.tar.gz 558570 SHA256 dc8690e407183eeb7a6af0e7692d6e0a1cd323d51dd1aa492522c421b1924ea0 SHA512 d84d7b088af44c231e7d3f9dfc613acbd55c4c98e8cd8fc04f56194481c46dfd61d49f2f18f4152ce86202e4c4f96de823535754b5412ddd67eef9a403790764 WHIRLPOOL 0591ac89b14096fd5cdcbff2be5fbfd5bdd63fc8313dff182a7dd5d8c4d7ac6be066b68a791812eb2098a48510bc9f322d94c6dbc2a2e5f764cfa264ec206676
-DIST spl-0.6.5.8.tar.gz 553270 SHA256 2d22117106782222d2b7da88cc657b7b9c44d281b1cc74d60761e52d33ab1155 SHA512 4078bcc96c112f12129918583400d927d7dd56686c470dd9cb8fc6ba641dcb5afb044c95de02ac397909bb90f4c50d0aada91177ffed810883b5889610d8b0b4 WHIRLPOOL 57b42a93d74348352e367f7d0e08189cd1d443e74c711d8147c35e1bc4264df1a742e231b381ffcc32aaa755cb732c7e062653145fb929872b6835caa2afda27
-DIST spl-0.6.5.9.tar.gz 594271 SHA256 d9ccd24786bb5a8616748a93a3c0b1270aa891175e2f5d726195b416f5c03b9c SHA512 356db95fcc93eb4ee298efc1ac25d38743572c539fc10b2d1533af861b4fd60804e61c3fb9f9bbad3d7a51cf123113b5b0bcbd49eba1bad7b1d8823d206022e8 WHIRLPOOL 6565a4939efaeba0cff75496ce9e8ea84b55da97fe47457ca33bcaf07aaa93a27dd410a9264b29539e65475029c0f0c612bc93b9fee4f97c7d6db9c92aab6a34
-DIST spl-0.7.0.tar.gz 608150 SHA256 567f461435f99f862efb1b740ed0876b52a2a539aafad6e5372a84a06a5da4d3 SHA512 a01798fad4f46788cf91d97699837526d5a33e35dcd46247a9e00747d3d439b949113eb42c8d9fe9cbc4a7b1ee645a5ac09eb764db82a2a07eaddbbb9605d11c WHIRLPOOL 7087089423c3515945af9de27879b8f009cf39ee3840400bde2aebd967bfe2be41d513ca6368774ad06d1871c81c3abd50f442d5ea9602da456cbe6a3e8cecd4
-DIST spl-0.7.1.tar.gz 547932 SHA256 e6a83dc50bc83a5ce6f20238da16fb941ab6090c419be8af8fc9223210f637fd SHA512 1edd0d21f6bc24c3c1295a3e1002ccc03954b1a8657f34050ca9992aac33eb2caa4356c92c74b1c1767ce69f67f3463bcab749b411b2676b5ed16c6ca838e0fe WHIRLPOOL 8facc1c8bc10481a09b92d16f7c4e3c6612749d55014c28444d0b62382940c84857f2f4c165b45f55aa917172a562dcc2897bc8bc5b8045793e9ebe96345fe5e
-DIST spl-0.7.2.tar.gz 547903 SHA256 c22e410c661a29acfa16caee21b82f8bb166f5b6611ec56431cd9c172ab4729e SHA512 89aef037306b29d6fde8543f2cd0ef300e3a71620a10695f57646154a6122c02a8f8907221a93ee32344c2a07a54cde4635710318dd8d67b1904b64729c3ee40 WHIRLPOOL 4240467e6188bd499511a5a16e063b912b221dc74cb9c325ba0119e9bff91c18625c6039978023920e97163af01f42210ca17e156bc6afc7f314ac8833efec20
 DIST spl-0.7.3.tar.gz 548434 SHA256 cd8b8624163577bdec1d1d214c942c5771f183432a04d35c00fc6e7f12fa836b SHA512 22d081449e699147f3bcd9791c89709196bb08cf3cd17cdd6fe2472fd9fb5011d6ea52e2c9c95be89d5cc46704b38a4ac57821584e1691b7bb8b0a705a6d78a1 WHIRLPOOL fc02411fd3eb393ea990ff12852cff430aeaf93d8e99dff4037c3437b795e82d7489b6454307448c44dde0e4b66e34c2d0b086354e35544b0f69b085bbb4b47d
-EBUILD spl-0.6.0_rc13-r2.ebuild 2640 SHA256 5618eb9e561d7e9de3d1cd859ad88783de706184d88c3f57c4f2969d53e72327 SHA512 40bf49e792a9f3d7bf2e35c4dd5c6ed6840f03fc2b72b9514fd7058d7cd794211a5bb4ab41c6639be7ac7159ad8749d91ac7c1b146359d7fef16d371648d3998 WHIRLPOOL 17c7d32ca672058c05bcce093647f892018be641b1047b95fb3c07873f5483ca1f28510e09f71737bee43e822de2d95192aa3d958350b6c75e05be7fa4f5e1a5
-EBUILD spl-0.6.0_rc14-r3.ebuild 2926 SHA256 de564fb1f3ddfed9f02c603239697f255e500c314efc9309ae1028ac33f92b3b SHA512 a72dbf022c93656063efcfbe78ba8c1fffc55cbd13d1535bd97de1fd22591c93b52edd6ac5b71ab549c502596a7024f21359f4b3227480f87719546b7fa1c787 WHIRLPOOL fa03c2276f77e18d4bcaffcfdb2cf455c3fb2e27018d2497f7e8489e6b0a284a7db39db7c34158d95610e13facdb1762a6ab7dadf01432ab03de4eb7d794c730
-EBUILD spl-0.6.1-r3.ebuild 3093 SHA256 695f1f44b15d038dcb7a76ac57314381f622af8d72bffea9520034c8da0498da SHA512 322eb4cc68c360636f4b2db76697180a9d0ec8afe31f9a6fd00a5ff21817ae49ffa42c1eb73e7e175f8745a489ee5a843a71def1a8d234104331865552f53ad5 WHIRLPOOL 8fefec7b6553136a5cf4a8f8df22ab837085c76400d2b4a1aaaf8888d05c52605b8b440b22d52359c151f7397e593a4cc343e11bf770f656848f82f0e922fbdd
-EBUILD spl-0.6.2-r5.ebuild 2729 SHA256 5e17c20fec94efb4134d09c5eefefdba47f86b84b5d965bf7c2cf41b0da4da9d SHA512 16d98df88cefbe3146a49c452e32a94093344d0585c195d771b1b63da4adf6ff7c7df5f76999638fbbbc5cb7b851a2ce1e605e288e034ffbde05cb37063d3c26 WHIRLPOOL 5d4451eccf90c0817947411facf99c775d9d1e3e72647f37903748aec9b7b42a6f215530a922d9573fe1884299537b49441407e3501376c7513057e5a963192f
-EBUILD spl-0.6.3-r1.ebuild 3040 SHA256 f8ddc586c8107f3b522f219b2f9269831217a1eefdeb0acaf8647dc32e77cc46 SHA512 dd2ebd265f436534fde8873af724d196993ffb080c6ddacd0455010fcf1bad2d2fae9c3b976cae33dfc8acef9af2f07cb14562551964ff6ec8329fc54bdd52ea WHIRLPOOL 3bea884cafd2663a73895eeb7707734add3a27d9017ec69894e86958f20d15e7d2810bfba05e128ca7ead2add78434b464a86263a9a37e5cbf2b86b86fc89795
-EBUILD spl-0.6.4.2.ebuild 2811 SHA256 6b04b3d5049e2d4502cef30ac0bdeb1adcdb849fe9a868091ff98b18f614a1fe SHA512 9c5cf319206f6114ec18adec969558e36ee2aa4deb478775c6c091ac3c645414a0b58cde4a805e56b92c775aae942920a6d901806470f48279a5827ea45e6930 WHIRLPOOL 9ece85b09cd95b44c1c7eb6c4ee9b7af5f7f832746445f2f652844fe3e412cc7d286e9e5c0a66fc2a42d36e256daec2e007d9bae170748340e7b22c9c7fd21dc
-EBUILD spl-0.6.5.10.ebuild 2717 SHA256 e7587d6d038cc443e1a9b551b94e23018dff427c903bafe635e64505169fef06 SHA512 13cea0c1dfe684bebb4783dc0c655278a7a9903402a738c05238de66c131edf328834070adfc8d303949560f8d62eff07a5d9f321bdda45c002bcc64dd5d3431 WHIRLPOOL a4d74dadc6ebc4c768a350f27365b6c7fce5172df7743c81c64f8716074d3159efc2e71040e828feceb0554a8d226c47638ab56b406be7f867864b7a3d6c83fd
-EBUILD spl-0.6.5.11.ebuild 2717 SHA256 e7587d6d038cc443e1a9b551b94e23018dff427c903bafe635e64505169fef06 SHA512 13cea0c1dfe684bebb4783dc0c655278a7a9903402a738c05238de66c131edf328834070adfc8d303949560f8d62eff07a5d9f321bdda45c002bcc64dd5d3431 WHIRLPOOL a4d74dadc6ebc4c768a350f27365b6c7fce5172df7743c81c64f8716074d3159efc2e71040e828feceb0554a8d226c47638ab56b406be7f867864b7a3d6c83fd
-EBUILD spl-0.6.5.2.ebuild 2801 SHA256 be2e708b0bc6f78706254fafb5e6b28b108273a447f389085c58eae2a8a94828 SHA512 5c61d3c433e0f979d01611d465058395a0b33578bdb35553353946d91ec0634ee2abdea9166d85e687e00dd07477912881e3329f8b63b75521b24a22b51cb7c5 WHIRLPOOL a1a2f285e1bf780c932141d5666b513850679a34055f518cfceb7c9309d1f734e0c83e5f65b748df111983e2148dcd80390bbe8bf9c0cb4f09a5891938d29ae0
-EBUILD spl-0.6.5.3-r1.ebuild 2932 SHA256 742fcc066a6649e05a8320f18c21f07b0962103bbe1611011c82332fe607a61c SHA512 d7651e16a8c33b56fac28c40cc7ea9d53f975dba4da1af820c678c4531940a9a0eb1159dd017deb3c52676e0b0f3669e670a067fd87a76e9b98a345c9a10045d WHIRLPOOL ddaab11b311934d15222c1400757e17fb17370e69980725d7757d84453b0af6dda8a9e072424f7db4df761275e66458e59300da8a3b457af192020b337289ff6
-EBUILD spl-0.6.5.3.ebuild 2731 SHA256 3d5b803bea8409f09a99c21e97193e85e473a8e0da3b943550c3d99c6ac6badc SHA512 e4e8547992095143da2f3c7027fc8798293b6b9119188af7b6ac724941446e58ea6094506a67eb36f434a014a0a2b313e6e81205da5d445ab49b0103d796b233 WHIRLPOOL 225d7a30a939d8237ad82600e2295f5abc1c5aec82327285761a2038a1327cf15208daa18958cb2ad46a81688d30ff867e20097b59df41b4555be1cc2825dfbe
-EBUILD spl-0.6.5.4-r1.ebuild 2938 SHA256 1bec23d12beedf7ff3a09dbc3c653d64adccfab12e4b0ad6a1ab2242ec772aa8 SHA512 6ad88c61234a963318e6b0a9db5009788ac9a829dbcfda5e18c807a19e12b5a8ead15a0b1d501fd4db1f3dfd2227390302f8a7d84fddaa5e214cfe62a3c29b0c WHIRLPOOL 9fc47d6066d498d400cd547d91ad3eef8f895cbadea7c6f096176bb91f7c2da960313ba2a742080d3b5743c1f9b9e9759930e7cdb6345a0885c994e8cbc26fe0
-EBUILD spl-0.6.5.4.ebuild 2715 SHA256 b83d7c9fc2da663f4c51badf4f6a266187b4d089c13825c6c60ac22f357cda16 SHA512 2e01e409044ac381365609abe8f218b8ab92cf24e39d9e0de9cf9deb0368c18e34384b31b9b766e2dbe711c14054968e40d7d568c340b66e6f6e8b0233076428 WHIRLPOOL 6469c5aed67f9d5e9e781b8e3a3569725b1d8d5fe605843a1b73d31d32180f5f83197b08589851bffbcaefe9c8cb227563fd79a9c0bca09373722c41edc586b3
-EBUILD spl-0.6.5.6.ebuild 2715 SHA256 3173a1c0168df300395681819e527280637051735000b2b617abd0c92f9c65af SHA512 1c99c953467b3a0928755688f9fb79765d3aa6a5e554c97be4a96f9cc5315930696a333e7a5e4e77db4e090fe13538b83d7fbb69265ab7fff04991b2899b1aa4 WHIRLPOOL b617d0a738bcef907b762a569a6b3f97c0a4a7659c8578d86fe9c6cb9215e41fdc18e47993b4294d85c5575ebf75ea245e07f1eae8d2d92d1f5971975ef773a8
-EBUILD spl-0.6.5.7.ebuild 2715 SHA256 0532097b0c93dc8db95e4afa2f31d1e4c24e2ff09fa396f61f889ac6c5c6e486 SHA512 cb1aabd8912bf6de3256ef0ac233df8004a6d60a39514b72def60255038a410fe8650368ae052fd8cb9f341d69fa6393e9a85b4c4350bf1bf16fe5ebce0cd38a WHIRLPOOL 39f4f29f235dce68edc47ac9201f6dd4499f729ca1fbf36d66332ca0cc72502d79c2faeef5a13eef37312988f0f046eca820ec09208576edac7826120571edf2
-EBUILD spl-0.6.5.8.ebuild 2715 SHA256 afa48d61c8b4883842eff08472462e3cdcda4f1cdaba2265cb2fa352bb5b3208 SHA512 af7c083979f27633fd33dd60cae7c7b4a7b3efe7bf0bf19edf4a7ba699772e82b1c7d00bb25d2c8c4f7681fe652657a831718f0f8a66ac984a55634fb467817e WHIRLPOOL a5775589727d4bad3778ec69215d4523438d7c71627b711020e08fc6ffd60d685a535ce102ac1c787999d4c7cd17795a1011a492d7124095f956268436cee66c
-EBUILD spl-0.6.5.9.ebuild 2717 SHA256 56ff526b677d27d476a7b3ab32f98a708fa695b46ce2ef04ce1eaee558b4f6e7 SHA512 eba48ac715d2ef1928236e7774688de46538afc640fe30b4650dde7c33b3e54f627429c0578b54cb87926b14b2c27cf1e489d74c83cf80e696c39ad5762bea70 WHIRLPOOL d330e15185f39380d0fa6fdf02acb5d7cfcf049402fc55b7bbab5ba0ec1aeea56818875516f76bd359aef602bd6852aff70010899763cb2ee68f78373ed57378
-EBUILD spl-0.7.0.ebuild 2717 SHA256 e7587d6d038cc443e1a9b551b94e23018dff427c903bafe635e64505169fef06 SHA512 13cea0c1dfe684bebb4783dc0c655278a7a9903402a738c05238de66c131edf328834070adfc8d303949560f8d62eff07a5d9f321bdda45c002bcc64dd5d3431 WHIRLPOOL a4d74dadc6ebc4c768a350f27365b6c7fce5172df7743c81c64f8716074d3159efc2e71040e828feceb0554a8d226c47638ab56b406be7f867864b7a3d6c83fd
-EBUILD spl-0.7.1.ebuild 2717 SHA256 e7587d6d038cc443e1a9b551b94e23018dff427c903bafe635e64505169fef06 SHA512 13cea0c1dfe684bebb4783dc0c655278a7a9903402a738c05238de66c131edf328834070adfc8d303949560f8d62eff07a5d9f321bdda45c002bcc64dd5d3431 WHIRLPOOL a4d74dadc6ebc4c768a350f27365b6c7fce5172df7743c81c64f8716074d3159efc2e71040e828feceb0554a8d226c47638ab56b406be7f867864b7a3d6c83fd
-EBUILD spl-0.7.2.ebuild 2717 SHA256 dfc04b9e783b5c216e28e873dece38bf00fa7933545841d49cb06f684022eaeb SHA512 ac51c4aefdc48c7d8c3a382f4333ad31780a01ca571897c1175ffe1a42ed7210c771ca88276096153ac65072a50cf73ea26ebfbbc527f19ed2b3de460422c468 WHIRLPOOL 2978dd970551ef105a716c8d4ed571d0510f1b832ebac917feca3e71d4548650f0671435fcd2394f198e879709dc224b874ab760b5bb48ef009e0af3c0d8f1b3
-EBUILD spl-0.7.3.ebuild 2717 SHA256 dfc04b9e783b5c216e28e873dece38bf00fa7933545841d49cb06f684022eaeb SHA512 ac51c4aefdc48c7d8c3a382f4333ad31780a01ca571897c1175ffe1a42ed7210c771ca88276096153ac65072a50cf73ea26ebfbbc527f19ed2b3de460422c468 WHIRLPOOL 2978dd970551ef105a716c8d4ed571d0510f1b832ebac917feca3e71d4548650f0671435fcd2394f198e879709dc224b874ab760b5bb48ef009e0af3c0d8f1b3
-EBUILD spl-9999.ebuild 2752 SHA256 43a4ca3d4f65c05343ae4f5eecefc0811d4eec6dc27d42851f8c99e62c4a119f SHA512 9c1ee1ec008d4f6f9a58a5e2c2942b62979ec0c7e6cb80a136c5b874adb52111beb7302ac347a9d60412ee5165cced4656e276d7ca0125edb7e8e594706bc408 WHIRLPOOL ec8473441c80125b0ee9387b14280e2d502a7596485c438eee70aa2202d76da440c259fd0fcf5c04dc23e723508b25ae2fd4df9b34d3b5134202cb74aaed48e0
+EBUILD spl-0.6.5.11.ebuild 2686 SHA256 07ed1a2018e71ef92de6e016a00f9e794d78e158e8e2cc3538cd9e19f8f6b773 SHA512 029199b48d01d6c752377eb1fae7a2202f13681e9b86ad6e7e87790473367c77d2292d09463b46c9278206e28889d97f7a7322c4dc82c1e8d190f00687f502c7 WHIRLPOOL 5df73e00bdede754701673f718f293555811d36c7c4f6290af4e26de012bdc1e4b9f1b83bad600d7b99c5a570333ba9517ee449a739befe644cac46c6802be05
+EBUILD spl-0.6.5.4-r1.ebuild 2907 SHA256 eee3f2a35034888d039b5d12363793d7b9fe7c9ff330d5b2d56822bcf8a81bf8 SHA512 0004ea021f6e4cdfc9c891cf55b5b7e4c60615bf4ca7187908f91e1530aa00a7c47d393e4c3c1b9f6ae15a07fa7054c8b2568af48eb73fad4db8b2d9c3fc6d4d WHIRLPOOL 16355421a70dd7ade932b5b22db5baffe96e3b435bafa0cf7a9c12d6764939d783ab8700e9b60f3342666f43ebff8c42916c1154c65f51cd8f96d2f9f964e2da
+EBUILD spl-0.7.3.ebuild 2686 SHA256 fd58c7504a17d097115c041fb6d2479d4d67a91318648f5c47c4fc5d1b42d205 SHA512 40efef0df61bafa6616601a089154322cf632e544682b6ec99c71c10469e0955cf59d5fead2086d034b2e876146cb10c43fed5cf5456be46ae71a992e4e51785 WHIRLPOOL d637bdc7df802668120fd45bea7390484aecc341fff8f9e6eb31ae4a335aae202136b6fab4f98d258b984e4dcefe37abe89217287d05571d493df63b45daa7ca
+EBUILD spl-9999.ebuild 2721 SHA256 53609236ccfbee09fdaefb0bd017fcf5903815b23f540ac96bced7e5dce53fb8 SHA512 98367c39fcef4f69b912876d4d79388df280f5f46ce7cb98ec815e4e1ab9f8a53422064e23a9ee3a1ecd4123216fd3d8819df0cbe35cda9e4c03c80310148bd9 WHIRLPOOL b3378344a691bfaeecdddfd90a0d391343dcb0ac2b4dafe3371f561719095ce024c6f1859079d23d5312a99efd78769f7534740c06db6911ab93225740d151f8
 MISC ChangeLog 10748 SHA256 7f43e2292109f0e78d4fba1100efdc8f542599774a29e6ce896801dc7677df67 SHA512 b36e5641e1be62a579edc449c882675f4570c0443d0eee4daedad3a494fd814f8dfcbc736cfbd315555e1a9603d5cb95a3fba8e844753c72c2613038fd0428ad WHIRLPOOL d088e4b5ffc56327d4e289dd6331acb90912d3ebd0c02c6a63c50345be650346faa973646bd912a953f4f388368ccd3e5241a14230da7c9f3c1e92ae5bb90abf
 MISC ChangeLog-2015 16325 SHA256 c81ebdd34dcab30fe1b238f412debae6dfe1997ba55b486029321d6bcad7d9fd SHA512 3b265e5b9fdd79eac7946d7f7be229478960491e4467763e56ac4f5b9cd82855f164173bf32c73fb4b1ac4bd8446d68f86a73a40a6210876dfe88ab53d333e31 WHIRLPOOL 98c9f57885cad957a671985fbb469a329599f1ac4b8ae407765917574e412143b1ee8df3fb73e21b73d1394fe5a5da3f0cc252c6b5b8fb8302056207c12d1ae7
-MISC metadata.xml 513 SHA256 ad1644b1d5d04829193792cdc514b02a13bcd76e05a5c43d755ba463f857fe4f SHA512 6a8f7273eda76e5b2f5a96b772ff6a56b7248279b4efea9375d958c2a849d64e6213a7ebb452947c5e4076a4f8e3c612258c6a6ba01007b3d04a51b815fd5c73 WHIRLPOOL 847ae2aa8adbba49dd8a71a19491686c3dff298e990a7d2608e5be0370dbe7cf6381427527ff1ab0f2dd4710e940ded79df522935ba10035d313a9a843e5ed53
+MISC metadata.xml 436 SHA256 61915e85c41074fabf77026fd10be5049ac78d00b955b6fb6e2d274488010f3a SHA512 1b867378bde3ac034a7fbdc84e47b77b570ecf7a7688b0dc47950de7ea6601284c8101600928ddb7725f7a09ecc73eb01bdf646b0ecca250029e3063a4427ca8 WHIRLPOOL f36649a4f252848dd710f3c3fce24746894fd24f66cefae18930f065260fd79abf49ce2cd8bbc7db1e18088fd9ca56eaaa5ceb1b3f8d16b0917375f18f396a73
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc13-fix-on_each_cpu-autotools-check.patch b/sys-kernel/spl/files/spl-0.6.0_rc13-fix-on_each_cpu-autotools-check.patch
deleted file mode 100644
index e8eaa385c642..000000000000
--- a/sys-kernel/spl/files/spl-0.6.0_rc13-fix-on_each_cpu-autotools-check.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 050cd84e628e5d827a0b345cda12b97253fccd37 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Mon, 7 Jan 2013 14:09:09 -0800
-Subject: [PATCH] Linux compat 3.7.1, on_each_cpu()
-
-Some kernels require that we include the 'linux/irqflags.h'
-header for the SPL_AC_3ARGS_ON_EACH_CPU check.  Otherwise,
-the functions local_irq_enable()/local_irq_disable() will not
-be defined and the prototype will be misdetected as the four
-argument version.
-
-This change actually include 'linux/interrupt.h' which in turn
-includes 'linux/irqflags.h' to be as generic as possible.
-
-Additionally, passing NULL as the function can result in a
-gcc error because the on_each_cpu() macro executes it
-unconditionally.  To make the test more robust we pass the
-dummy function on_each_cpu_func().
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #204
----
- config/spl-build.m4 |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/config/spl-build.m4 b/config/spl-build.m4
-index f710d8e..6e4afed 100644
---- a/config/spl-build.m4
-+++ b/config/spl-build.m4
-@@ -1312,9 +1312,12 @@ dnl #
- AC_DEFUN([SPL_AC_3ARGS_ON_EACH_CPU], [
- 	AC_MSG_CHECKING([whether on_each_cpu() wants 3 args])
- 	SPL_LINUX_TRY_COMPILE([
-+		#include <linux/interrupt.h>
- 		#include <linux/smp.h>
-+
-+		void on_each_cpu_func(void *data) { return; }
- 	],[
--		on_each_cpu(NULL, NULL, 0);
-+		on_each_cpu(on_each_cpu_func, NULL, 0);
- 	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_3ARGS_ON_EACH_CPU, 1,
--- 
-1.7.10
-
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc13-fix-soft-lockup.patch b/sys-kernel/spl/files/spl-0.6.0_rc13-fix-soft-lockup.patch
deleted file mode 100644
index 99227feb04a2..000000000000
--- a/sys-kernel/spl/files/spl-0.6.0_rc13-fix-soft-lockup.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From d4899f4747fd03be748fd1a589b9db5786fa1375 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Fri, 11 Jan 2013 14:29:32 -0800
-Subject: [PATCH] kmem-cache: Fix slab ageing soft lockup
-
-Commit a10287e00d13c4c4dbbff14f42b00b03da363fcb slightly reworked
-the slab ageing code such that it is no longer dependent on the
-Linux delayed work queue interfaces.
-
-This was good for portability and performance, but it requires us
-to use the on_each_cpu() function to execute the spl_magazine_age()
-function.  That means that the function is now executing in interrupt
-context whereas before it was scheduled in normal process context.
-And that means we need to be slightly more careful about the locking
-in the interrupt handler.
-
-With the reworked code it's possible that we'll be holding the
-skc->skc_lock and be interrupted to handle the spl_magazine_age()
-IRQ.  This will result in a deadlock and soft lockup errors unless
-we're careful to detect the contention and avoid taking the lock in
-the interupt handler.  So that's what this patch does.
-
-Alternately, (and slightly more conventionally) we could have used
-spin_lock_irqsave() to prevent this race entirely but I'd perfer to
-avoid disabling interrupts as much as possible due to performance
-concerns.  There is absolutely no penalty for us not aging objects
-out of the magazine due to contention.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Prakash Surya <surya1@llnl.gov>
-Closes zfsonlinux/zfs#1193
----
- module/spl/spl-kmem.c |   94 +++++++++++++++++++++++++++----------------------
- 1 file changed, 51 insertions(+), 43 deletions(-)
-
-diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c
-index bc08a55..cc5961e 100644
---- a/module/spl/spl-kmem.c
-+++ b/module/spl/spl-kmem.c
-@@ -827,8 +827,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
- struct rw_semaphore spl_kmem_cache_sem; /* Cache list lock */
- taskq_t *spl_kmem_cache_taskq;          /* Task queue for ageing / reclaim */
- 
--static int spl_cache_flush(spl_kmem_cache_t *skc,
--                           spl_kmem_magazine_t *skm, int flush);
-+static void spl_cache_shrink(spl_kmem_cache_t *skc, void *obj);
- 
- SPL_SHRINKER_CALLBACK_FWD_DECLARE(spl_kmem_cache_generic_shrinker);
- SPL_SHRINKER_DECLARE(spl_kmem_cache_shrinker,
-@@ -1244,6 +1243,38 @@ static int spl_cache_flush(spl_kmem_cache_t *skc,
- 	SRETURN(0);
- }
- 
-+/*
-+ * Release objects from the per-cpu magazine back to their slab.  The flush
-+ * argument contains the max number of entries to remove from the magazine.
-+ */
-+static void
-+__spl_cache_flush(spl_kmem_cache_t *skc, spl_kmem_magazine_t *skm, int flush)
-+{
-+	int i, count = MIN(flush, skm->skm_avail);
-+	SENTRY;
-+
-+	ASSERT(skc->skc_magic == SKC_MAGIC);
-+	ASSERT(skm->skm_magic == SKM_MAGIC);
-+	ASSERT(spin_is_locked(&skc->skc_lock));
-+
-+	for (i = 0; i < count; i++)
-+		spl_cache_shrink(skc, skm->skm_objs[i]);
-+
-+	skm->skm_avail -= count;
-+	memmove(skm->skm_objs, &(skm->skm_objs[count]),
-+	        sizeof(void *) * skm->skm_avail);
-+
-+	SEXIT;
-+}
-+
-+static void
-+spl_cache_flush(spl_kmem_cache_t *skc, spl_kmem_magazine_t *skm, int flush)
-+{
-+	spin_lock(&skc->skc_lock);
-+	__spl_cache_flush(skc, skm, flush);
-+	spin_unlock(&skc->skc_lock);
-+}
-+
- static void
- spl_magazine_age(void *data)
- {
-@@ -1252,10 +1283,23 @@ static int spl_cache_flush(spl_kmem_cache_t *skc,
- 
- 	ASSERT(skm->skm_magic == SKM_MAGIC);
- 	ASSERT(skm->skm_cpu == smp_processor_id());
-+	ASSERT(irqs_disabled());
-+
-+	/* There are no available objects or they are too young to age out */
-+	if ((skm->skm_avail == 0) ||
-+	    time_before(jiffies, skm->skm_age + skc->skc_delay * HZ))
-+		return;
- 
--	if (skm->skm_avail > 0)
--		if (time_after(jiffies, skm->skm_age + skc->skc_delay * HZ))
--			(void) spl_cache_flush(skc, skm, skm->skm_refill);
-+	/*
-+	 * Because we're executing in interrupt context we may have
-+	 * interrupted the holder of this lock.  To avoid a potential
-+	 * deadlock return if the lock is contended.
-+	 */
-+	if (!spin_trylock(&skc->skc_lock))
-+		return;
-+
-+	__spl_cache_flush(skc, skm, skm->skm_refill);
-+	spin_unlock(&skc->skc_lock);
- }
- 
- /*
-@@ -1451,7 +1495,7 @@ static int spl_cache_flush(spl_kmem_cache_t *skc,
- 
-         for_each_online_cpu(i) {
- 		skm = skc->skc_mag[i];
--		(void)spl_cache_flush(skc, skm, skm->skm_avail);
-+		spl_cache_flush(skc, skm, skm->skm_avail);
- 		spl_magazine_free(skm);
-         }
- 
-@@ -1932,42 +1976,6 @@ static int spl_cache_flush(spl_kmem_cache_t *skc,
- }
- 
- /*
-- * Release a batch of objects from a per-cpu magazine back to their
-- * respective slabs.  This occurs when we exceed the magazine size,
-- * are under memory pressure, when the cache is idle, or during
-- * cache cleanup.  The flush argument contains the number of entries
-- * to remove from the magazine.
-- */
--static int
--spl_cache_flush(spl_kmem_cache_t *skc, spl_kmem_magazine_t *skm, int flush)
--{
--	int i, count = MIN(flush, skm->skm_avail);
--	SENTRY;
--
--	ASSERT(skc->skc_magic == SKC_MAGIC);
--	ASSERT(skm->skm_magic == SKM_MAGIC);
--
--	/*
--	 * XXX: Currently we simply return objects from the magazine to
--	 * the slabs in fifo order.  The ideal thing to do from a memory
--	 * fragmentation standpoint is to cheaply determine the set of
--	 * objects in the magazine which will result in the largest
--	 * number of free slabs if released from the magazine.
--	 */
--	spin_lock(&skc->skc_lock);
--	for (i = 0; i < count; i++)
--		spl_cache_shrink(skc, skm->skm_objs[i]);
--
--	skm->skm_avail -= count;
--	memmove(skm->skm_objs, &(skm->skm_objs[count]),
--	        sizeof(void *) * skm->skm_avail);
--
--	spin_unlock(&skc->skc_lock);
--
--	SRETURN(count);
--}
--
--/*
-  * Allocate an object from the per-cpu magazine, or if the magazine
-  * is empty directly allocate from a slab and repopulate the magazine.
-  */
-@@ -2053,7 +2061,7 @@ static int spl_cache_flush(spl_kmem_cache_t *skc,
- 
- 	/* Per-CPU cache full, flush it to make space */
- 	if (unlikely(skm->skm_avail >= skm->skm_size))
--		(void)spl_cache_flush(skc, skm, skm->skm_refill);
-+		spl_cache_flush(skc, skm, skm->skm_refill);
- 
- 	/* Available space in cache, use it */
- 	skm->skm_objs[skm->skm_avail++] = obj;
--- 
-1.7.10
-
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-fix-atomic64-checks.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-fix-atomic64-checks.patch
deleted file mode 100644
index 9ac8a4308dd6..000000000000
--- a/sys-kernel/spl/files/spl-0.6.0_rc14-fix-atomic64-checks.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From dd3678fc29d75286b57e705454bbd7e60e1b44e0 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Tue, 5 Feb 2013 09:35:43 -0800
-Subject: [PATCH] Fix atomic64_* autoconf checks
-
-The SPL_AC_ATOMIC_SPINLOCK, SPL_AC_TYPE_ATOMIC64_CMPXCHG, and
-SPL_AC_TYPE_ATOMIC64_XCHG were all directly including the
-'asm/atomic.h' header.  As of Linux 3.4 this header was removed
-which results in a build failure.
-
-The right thing to do is include 'linux/atomic.h' however we
-can't safely do this because it doesn't exist in 2.6.26 kernels.
-Therefore, we include 'linux/fs.h' which in turn includes the
-correct atomic header regardless of the kernel version.
-
-When these incorrect APIs are used in ZFS the following build
-failure results.
-
-  arc.c:791:80: warning: '__ret' may be used uninitialized
-  in this function [-Wuninitialized]
-  arc.c:791:1875: error: call to '__cmpxchg_wrong_size'
-  declared with attribute error: Bad argument size for cmpxchg
-
-Since this is all Linux 2.6.24 compatibility code there's
-an argument to be made that it should be removed because
-kernels this old are not supported.  However, because we're
-so close to a release I'm going to leave it in place for now.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes zfsonlinux/zfs#814
-Closes zfsonlinux/zfs#1254
----
- config/spl-build.m4 |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/config/spl-build.m4 b/config/spl-build.m4
-index e9695de..8518404 100644
---- a/config/spl-build.m4
-+++ b/config/spl-build.m4
-@@ -777,7 +777,7 @@ AC_DEFUN([SPL_AC_ATOMIC_SPINLOCK], [
- 		[enable_atomic_spinlocks=check])
- 
- 	SPL_LINUX_TRY_COMPILE([
--		#include <asm/atomic.h>
-+		#include <linux/fs.h>
- 	],[
- 		atomic64_t *ptr __attribute__ ((unused));
- 	],[
-@@ -820,8 +820,7 @@ dnl #
- AC_DEFUN([SPL_AC_TYPE_ATOMIC64_CMPXCHG],
- 	[AC_MSG_CHECKING([whether kernel defines atomic64_cmpxchg])
- 	SPL_LINUX_TRY_COMPILE([
--		#include <asm/atomic.h>
--		#include <asm/system.h>
-+		#include <linux/fs.h>
- 	],[
- 		atomic64_cmpxchg((atomic64_t *)NULL, 0, 0);
- 	],[
-@@ -840,7 +839,7 @@ dnl #
- AC_DEFUN([SPL_AC_TYPE_ATOMIC64_XCHG],
- 	[AC_MSG_CHECKING([whether kernel defines atomic64_xchg])
- 	SPL_LINUX_TRY_COMPILE([
--		#include <asm/atomic.h>
-+		#include <linux/fs.h>
- 	],[
- 		atomic64_xchg((atomic64_t *)NULL, 0);
- 	],[
--- 
-1.7.10
-
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-fix-mutex-owner-check.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-fix-mutex-owner-check.patch
deleted file mode 100644
index ee7314d3cf32..000000000000
--- a/sys-kernel/spl/files/spl-0.6.0_rc14-fix-mutex-owner-check.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a0625691b39468d04eb716919e237f96a3987b48 Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@cs.stonybrook.edu>
-Date: Tue, 5 Feb 2013 16:42:29 -0500
-Subject: [PATCH] Fix HAVE_MUTEX_OWNER_TASK_STRUCT autotools check on PPC64
-
-The HAVE_MUTEX_OWNER_TASK_STRUCT fails on PPC64 with the following
-error:
-
-error: 'current' undeclared (first use in this function)
-
-We include linux/sched.h to ensure that current is available.
-
-Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
----
- config/spl-build.m4 |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/spl-build.m4 b/config/spl-build.m4
-index 8518404..4cb7e1d 100644
---- a/config/spl-build.m4
-+++ b/config/spl-build.m4
-@@ -1269,6 +1269,7 @@ AC_DEFUN([SPL_AC_MUTEX_OWNER_TASK_STRUCT], [
- 	EXTRA_KCFLAGS="-Werror"
- 	SPL_LINUX_TRY_COMPILE([
- 		#include <linux/mutex.h>
-+		#include <linux/sched.h>
- 	],[
- 		struct mutex mtx __attribute__ ((unused));
- 		mtx.owner = current;
--- 
-1.7.10
-
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-linux-3.9-compat.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-linux-3.9-compat.patch
deleted file mode 100644
index 5f9a4c698803..000000000000
--- a/sys-kernel/spl/files/spl-0.6.0_rc14-linux-3.9-compat.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-diff --git a/config/spl-build.m4 b/config/spl-build.m4
-index 3dcc05e..6a8e658 100644
---- a/config/spl-build.m4
-+++ b/config/spl-build.m4
-@@ -64,6 +64,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
- 	SPL_AC_USER_PATH_DIR
- 	SPL_AC_SET_FS_PWD
- 	SPL_AC_2ARGS_SET_FS_PWD
-+	SPL_AC_SET_FS_PWD_WITH_CONST
- 	SPL_AC_2ARGS_VFS_UNLINK
- 	SPL_AC_4ARGS_VFS_RENAME
- 	SPL_AC_VFS_FSYNC
-@@ -88,6 +89,8 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
- 	SPL_AC_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE
- 	SPL_AC_SHRINK_CONTROL_STRUCT
- 	SPL_AC_RWSEM_SPINLOCK_IS_RAW
-+	SPL_AC_SCHED_RT_HEADER
-+	SPL_AC_2ARGS_VFS_GETATTR
- ])
- 
- AC_DEFUN([SPL_AC_MODULE_SYMVERS], [
-@@ -1684,12 +1687,55 @@ AC_DEFUN([SPL_AC_2ARGS_SET_FS_PWD],
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_2ARGS_SET_FS_PWD, 1,
- 		          [set_fs_pwd() wants 2 args])
-+		HAVE_2ARGS_SET_FS_PWD=yes
- 	],[
- 		AC_MSG_RESULT(no)
- 	])
- ])
- 
- dnl #
-+dnl # 3.9 API change
-+dnl # set_fs_pwd takes const struct path *
-+dnl #
-+AC_DEFUN([SPL_AC_SET_FS_PWD_WITH_CONST],
-+if test "x$HAVE_2ARGS_SET_FS_PWD" = xyes; then
-+	tmp_flags="$EXTRA_KCFLAGS"
-+	EXTRA_KCFLAGS="-Werror"
-+	[AC_MSG_CHECKING([whether set_fs_pwd() requires const struct path *])
-+	SPL_LINUX_TRY_COMPILE([
-+		#include <linux/spinlock.h>
-+		#include <linux/fs_struct.h>
-+		#include <linux/path.h>
-+		void (*const set_fs_pwd_func)
-+			(struct fs_struct *, const struct path *)
-+			= set_fs_pwd;
-+	],[
-+		return 0;
-+	],[
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_SET_FS_PWD_WITH_CONST, 1,
-+			[set_fs_pwd() needs const path *])
-+	],[
-+		SPL_LINUX_TRY_COMPILE([
-+			#include <linux/spinlock.h>
-+			#include <linux/fs_struct.h>
-+			#include <linux/path.h>
-+			void (*const set_fs_pwd_func)
-+				(struct fs_struct *, struct path *)
-+				= set_fs_pwd;
-+		],[
-+			return 0;
-+		],[
-+			AC_MSG_RESULT(no)
-+		],[
-+			AC_MSG_ERROR(unknown)
-+		])
-+	])
-+	EXTRA_KCFLAGS="$tmp_flags"
-+fi
-+])
-+
-+dnl #
- dnl # SLES API change, never adopted in mainline,
- dnl # Third 'struct vfsmount *' argument removed.
- dnl #
-@@ -2217,3 +2263,53 @@ AC_DEFUN([SPL_AC_RWSEM_SPINLOCK_IS_RAW], [
- 	])
- 	EXTRA_KCFLAGS="$tmp_flags"
- ])
-+
-+dnl #
-+dnl # 3.9 API change,
-+dnl # Moved things from linux/sched.h to linux/sched/rt.h
-+dnl #
-+AC_DEFUN([SPL_AC_SCHED_RT_HEADER],
-+	[AC_MSG_CHECKING([whether header linux/sched/rt.h exists])
-+	SPL_LINUX_TRY_COMPILE([
-+		#include <linux/sched.h>
-+		#include <linux/sched/rt.h>
-+	],[
-+		return 0;
-+	],[
-+		AC_DEFINE(HAVE_SCHED_RT_HEADER, 1, [linux/sched/rt.h exists])
-+		AC_MSG_RESULT(yes)
-+	],[
-+		AC_MSG_RESULT(no)
-+	])
-+])
-+
-+dnl #
-+dnl # 3.9 API change,
-+dnl # vfs_getattr() uses 2 args
-+dnl # It takes struct path * instead of struct vfsmount * and struct dentry *
-+dnl #
-+AC_DEFUN([SPL_AC_2ARGS_VFS_GETATTR], [
-+	AC_MSG_CHECKING([whether vfs_getattr() wants])
-+	SPL_LINUX_TRY_COMPILE([
-+		#include <linux/fs.h>
-+	],[
-+		vfs_getattr((struct path *) NULL,
-+			(struct kstat *)NULL);
-+	],[
-+		AC_MSG_RESULT(2 args)
-+		AC_DEFINE(HAVE_2ARGS_VFS_GETATTR, 1,
-+		          [vfs_getattr wants 2 args])
-+	],[
-+		SPL_LINUX_TRY_COMPILE([
-+			#include <linux/fs.h>
-+		],[
-+			vfs_getattr((struct vfsmount *)NULL,
-+				(struct dentry *)NULL,
-+				(struct kstat *)NULL);
-+		],[
-+			AC_MSG_RESULT(3 args)
-+		],[
-+			AC_MSG_ERROR(unknown)
-+		])
-+	])
-+])
-diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
-index 7c4da67..b4778b7 100644
---- a/include/sys/sysmacros.h
-+++ b/include/sys/sysmacros.h
-@@ -26,12 +26,17 @@
- #define _SPL_SYSMACROS_H
- 
- #include <linux/module.h>
-+#include <linux/sched.h>
- #include <linux/cpumask.h>
- #include <sys/debug.h>
- #include <sys/varargs.h>
- #include <sys/zone.h>
- #include <sys/signal.h>
- 
-+#ifdef HAVE_SCHED_RT_HEADER
-+#include <linux/sched/rt.h>
-+#endif
-+
- #ifndef _KERNEL
- #define _KERNEL				__KERNEL__
- #endif
-diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c
-index e3538b5..f9c1114 100644
---- a/module/spl/spl-kmem.c
-+++ b/module/spl/spl-kmem.c
-@@ -404,7 +404,8 @@ kmem_del_init(spinlock_t *lock, struct hlist_head *table, int bits, const void *
- 	spin_lock_irqsave(lock, flags);
- 
- 	head = &table[hash_ptr(addr, bits)];
--	hlist_for_each_entry_rcu(p, node, head, kd_hlist) {
-+	hlist_for_each_rcu(node, head) {
-+		p = list_entry_rcu(node, struct kmem_debug, kd_hlist);
- 		if (p->kd_addr == addr) {
- 			hlist_del_init(&p->kd_hlist);
- 			list_del_init(&p->kd_list);
-diff --git a/module/spl/spl-tsd.c b/module/spl/spl-tsd.c
-index d7749cf..6e5605b 100644
---- a/module/spl/spl-tsd.c
-+++ b/module/spl/spl-tsd.c
-@@ -113,7 +113,8 @@ tsd_hash_search(tsd_hash_table_t *table, uint_t key, pid_t pid)
- 	hash = hash_long((ulong_t)key * (ulong_t)pid, table->ht_bits);
- 	bin = &table->ht_bins[hash];
- 	spin_lock(&bin->hb_lock);
--	hlist_for_each_entry(entry, node, &bin->hb_head, he_list) {
-+	hlist_for_each(node, &bin->hb_head) {
-+		entry = list_entry(node, tsd_hash_entry_t, he_list);
- 		if ((entry->he_key == key) && (entry->he_pid == pid)) {
- 			spin_unlock(&bin->hb_lock);
- 			SRETURN(entry);
-diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
-index 4d571c6..dac452c 100644
---- a/module/spl/spl-vnode.c
-+++ b/module/spl/spl-vnode.c
-@@ -175,7 +175,11 @@ vn_open(const char *path, uio_seg_t seg, int flags, int mode,
- 	if (IS_ERR(fp))
- 		SRETURN(-PTR_ERR(fp));
- 
--	rc = vfs_getattr(fp->f_vfsmnt, fp->f_dentry, &stat);
-+#ifdef HAVE_2ARGS_VFS_GETATTR
-+	rc = vfs_getattr(&fp->f_path, &stat);
-+#else
-+	rc = vfs_getattr(fp->f_path.mnt, fp->f_dentry, &stat);
-+#endif
- 	if (rc) {
- 		filp_close(fp, 0);
- 		SRETURN(-rc);
-@@ -602,7 +606,11 @@ vn_getattr(vnode_t *vp, vattr_t *vap, int flags, void *x3, void *x4)
- 
- 	fp = vp->v_file;
- 
--        rc = vfs_getattr(fp->f_vfsmnt, fp->f_dentry, &stat);
-+#ifdef HAVE_2ARGS_VFS_GETATTR
-+	rc = vfs_getattr(&fp->f_path, &stat);
-+#else
-+	rc = vfs_getattr(fp->f_path.mnt, fp->f_dentry, &stat);
-+#endif
- 	if (rc)
- 		SRETURN(-rc);
- 
-@@ -754,7 +762,12 @@ vn_getf(int fd)
- 	if (vp == NULL)
- 		SGOTO(out_fget, rc);
- 
--        if (vfs_getattr(lfp->f_vfsmnt, lfp->f_dentry, &stat))
-+#ifdef HAVE_2ARGS_VFS_GETATTR
-+	rc = vfs_getattr(&lfp->f_path, &stat);
-+#else
-+	rc = vfs_getattr(lfp->f_path.mnt, lfp->f_dentry, &stat);
-+#endif
-+        if (rc)
- 		SGOTO(out_vnode, rc);
- 
- 	mutex_enter(&vp->v_lock);
-@@ -827,7 +840,11 @@ EXPORT_SYMBOL(releasef);
- # ifdef HAVE_2ARGS_SET_FS_PWD
- /* Used from 2.6.25 - 2.6.31+ */
- void
-+#  ifdef HAVE_SET_FS_PWD_WITH_CONST
-+set_fs_pwd(struct fs_struct *fs, const struct path *path)
-+#  else
- set_fs_pwd(struct fs_struct *fs, struct path *path)
-+#  endif
- {
- 	struct path old_pwd;
- 
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-no-cond_resched.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-no-cond_resched.patch
deleted file mode 100644
index 9f1d692d0371..000000000000
--- a/sys-kernel/spl/files/spl-0.6.0_rc14-no-cond_resched.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 58a382c73ad3393d7591421950624e75d3c4aea1 Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@cs.stonybrook.edu>
-Date: Thu, 21 Mar 2013 13:21:11 -0400
-Subject: [PATCH] Do not call cond_resched() in spl_slab_reclaim()
-
-Calling cond_resched() after each object is freed and then after each
-slab is freed can cause slabs of objects to live for excessive periods
-of time following reclaimation. This interferes with the kernel's own
-memory management when called from kswapd and can cause direct reclaim
-to occur in response to memory pressure that should have been resolved.
-
-Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
----
- module/spl/spl-kmem.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c
-index f9c1114..a0ca2d2 100644
---- a/module/spl/spl-kmem.c
-+++ b/module/spl/spl-kmem.c
-@@ -1112,14 +1112,11 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
- 
- 		if (skc->skc_flags & KMC_OFFSLAB)
- 			kv_free(skc, sko->sko_addr, size);
--
--		cond_resched();
- 	}
- 
- 	list_for_each_entry_safe(sks, m, &sks_list, sks_list) {
- 		ASSERT(sks->sks_magic == SKS_MAGIC);
- 		kv_free(skc, sks, skc->skc_slab_size);
--		cond_resched();
- 	}
- 
- 	SEXIT;
--- 
-1.8.1.5
-
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-simplify-hostid-logic.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-simplify-hostid-logic.patch
deleted file mode 100644
index 3d5199fb4eb6..000000000000
--- a/sys-kernel/spl/files/spl-0.6.0_rc14-simplify-hostid-logic.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From f47f028ae6f039c13d3138e2ee1c0056a3a3f789 Mon Sep 17 00:00:00 2001
-From: Richard Yao <ryao@cs.stonybrook.edu>
-Date: Mon, 11 Mar 2013 21:16:36 -0400
-Subject: [PATCH] Simplify hostid logic
-
-There is plenty of compatibility code for a hw_hostid
-that isn't used by anything. At the same time, there are apparently
-issues with the current hostid logic. coredumb in #zfsonlinux on
-freenode reported that Fedora 17 changes its hostid on every boot, which
-required force importing his pool. A suggestion by wca was to adopt
-FreeBSD's behavior, where it treats hostid as zero if /etc/hostid does
-not exist
-
-Adopting FreeBSD's behavior permits us to eliminate plenty of code,
-including a userland helper that invokes the system's hostid as a
-fallback.
-
-Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
----
- include/sys/sysmacros.h  |  1 -
- include/sys/systeminfo.h |  3 +--
- module/spl/spl-generic.c | 55 ++++++------------------------------------------
- module/spl/spl-proc.c    | 11 ----------
- 4 files changed, 7 insertions(+), 63 deletions(-)
-
-diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
-index 7c4da67..4dd2685 100644
---- a/include/sys/sysmacros.h
-+++ b/include/sys/sysmacros.h
-@@ -138,7 +138,6 @@
- /* Missing globals */
- extern char spl_version[32];
- extern unsigned long spl_hostid;
--extern char hw_serial[11];
- 
- /* Missing misc functions */
- extern int highbit(unsigned long i);
-diff --git a/include/sys/systeminfo.h b/include/sys/systeminfo.h
-index e22a085..a4c1984 100644
---- a/include/sys/systeminfo.h
-+++ b/include/sys/systeminfo.h
-@@ -25,6 +25,5 @@
- #ifndef _SPL_SYSTEMINFO_H
- #define _SPL_SYSTEMINFO_H
- 
--#define HW_INVALID_HOSTID	0xFFFFFFFF	/* an invalid hostid */
- #define HW_HOSTID_LEN		11		/* minimum buffer size needed */
- 						/* to hold a decimal or hex */
-diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
-index 3cef489..b8e2ed1 100644
---- a/module/spl/spl-generic.c
-+++ b/module/spl/spl-generic.c
-@@ -52,14 +52,11 @@
- char spl_version[32] = "SPL v" SPL_META_VERSION "-" SPL_META_RELEASE;
- EXPORT_SYMBOL(spl_version);
- 
--unsigned long spl_hostid = HW_INVALID_HOSTID;
-+unsigned long spl_hostid = 0;
- EXPORT_SYMBOL(spl_hostid);
- module_param(spl_hostid, ulong, 0644);
- MODULE_PARM_DESC(spl_hostid, "The system hostid.");
- 
--char hw_serial[HW_HOSTID_LEN] = "<none>";
--EXPORT_SYMBOL(hw_serial);
--
- proc_t p0 = { 0 };
- EXPORT_SYMBOL(p0);
- 
-@@ -467,7 +464,7 @@ struct new_utsname *__utsname(void)
- 	int result;
- 	uint64_t size;
- 	struct _buf *file;
--	unsigned long hostid = 0;
-+	uint32_t hostid = 0;
- 
- 	file = kobj_open_file(spl_hostid_path);
- 
-@@ -511,45 +508,10 @@ struct new_utsname *__utsname(void)
- 	return 0;
- }
- 
--#define GET_HOSTID_CMD \
--	"exec 0</dev/null " \
--	"     1>/proc/sys/kernel/spl/hostid " \
--	"     2>/dev/null; " \
--	"hostid"
--
--static int
--hostid_exec(void)
--{
--	char *argv[] = { "/bin/sh",
--	                 "-c",
--	                 GET_HOSTID_CMD,
--	                 NULL };
--	char *envp[] = { "HOME=/",
--	                 "TERM=linux",
--	                 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
--	                 NULL };
--	int rc;
--
--	/* Doing address resolution in the kernel is tricky and just
--	 * not a good idea in general.  So to set the proper 'hw_serial'
--	 * use the usermodehelper support to ask '/bin/sh' to run
--	 * '/usr/bin/hostid' and redirect the result to /proc/sys/spl/hostid
--	 * for us to use.  It's a horrific solution but it will do for now.
--	 */
--	rc = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);
--	if (rc)
--		printk("SPL: Failed user helper '%s %s %s', rc = %d\n",
--		       argv[0], argv[1], argv[2], rc);
--
--	return rc;
--}
--
- uint32_t
- zone_get_hostid(void *zone)
- {
- 	static int first = 1;
--	unsigned long hostid;
--	int rc;
- 
- 	/* Only the global zone is supported */
- 	ASSERT(zone == NULL);
-@@ -559,21 +521,16 @@ struct new_utsname *__utsname(void)
- 
- 		/*
- 		 * Get the hostid if it was not passed as a module parameter.
--		 * Try reading the /etc/hostid file directly, and then fall
--		 * back to calling the /usr/bin/hostid utility.
-+		 * Try reading the /etc/hostid file directly.
- 		 */
--		if ((spl_hostid == HW_INVALID_HOSTID) &&
--		    (rc = hostid_read()) && (rc = hostid_exec()))
--			return HW_INVALID_HOSTID;
-+		if (hostid_read())
-+			spl_hostid = 0;
- 
- 		printk(KERN_NOTICE "SPL: using hostid 0x%08x\n",
- 			(unsigned int) spl_hostid);
- 	}
- 
--	if (ddi_strtoul(hw_serial, NULL, HW_HOSTID_LEN-1, &hostid) != 0)
--		return HW_INVALID_HOSTID;
--
--	return (uint32_t)hostid;
-+	return spl_hostid;
- }
- EXPORT_SYMBOL(zone_get_hostid);
- 
-diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
-index cd4fa1b..1113cf2 100644
---- a/module/spl/spl-proc.c
-+++ b/module/spl/spl-proc.c
-@@ -506,9 +506,6 @@ enum {
-                 if (str == end)
-                         SRETURN(-EINVAL);
- 
--                (void) snprintf(hw_serial, HW_HOSTID_LEN, "%lu", spl_hostid);
--                hw_serial[HW_HOSTID_LEN - 1] = '\0';
--                *ppos += *lenp;
-         } else {
-                 len = snprintf(str, sizeof(str), "%lx", spl_hostid);
-                 if (*ppos >= len)
-@@ -1051,14 +1048,6 @@ enum {
-                 .mode     = 0644,
-                 .proc_handler = &proc_dohostid,
-         },
--        {
--                CTL_NAME    (CTL_HW_SERIAL)
--                .procname = "hw_serial",
--                .data     = hw_serial,
--                .maxlen   = sizeof(hw_serial),
--                .mode     = 0444,
--                .proc_handler = &proc_dostring,
--        },
- #ifndef HAVE_KALLSYMS_LOOKUP_NAME
-         {
-                 CTL_NAME    (CTL_KALLSYMS)
--- 
-1.8.1.5
-
diff --git a/sys-kernel/spl/files/spl-0.6.1-builtin-fix.patch b/sys-kernel/spl/files/spl-0.6.1-builtin-fix.patch
deleted file mode 100644
index 6be0c6d06ffe..000000000000
--- a/sys-kernel/spl/files/spl-0.6.1-builtin-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 991857cac5929fa149820722b8e8cd90f874670c Mon Sep 17 00:00:00 2001
-From: Matthew Thode <mthode@mthode.org>
-Date: Fri, 21 Jun 2013 14:55:07 -0400
-Subject: [PATCH] Copy spl.release.in to kernel dir
-
-Required when compiling ZFS in the kernel.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #253
----
- copy-builtin | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/copy-builtin b/copy-builtin
-index 3277270..cd98b7a 100755
---- a/copy-builtin
-+++ b/copy-builtin
-@@ -33,6 +33,7 @@ rm -rf "$KERNEL_DIR/include/spl" "$KERNEL_DIR/spl"
- cp --recursive include "$KERNEL_DIR/include/spl"
- cp --recursive module "$KERNEL_DIR/spl"
- cp spl_config.h "$KERNEL_DIR/"
-+cp spl.release.in "$KERNEL_DIR/"
- 
- adjust_obj_paths()
- {
--- 
-1.8.1.6
-
diff --git a/sys-kernel/spl/files/spl-0.6.1-constify-ctl_table.patch b/sys-kernel/spl/files/spl-0.6.1-constify-ctl_table.patch
deleted file mode 100644
index e17cbad4ce81..000000000000
--- a/sys-kernel/spl/files/spl-0.6.1-constify-ctl_table.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
-index cd4fa1b..3cac8a1 100644
---- a/module/spl/spl-proc.c
-+++ b/module/spl/spl-proc.c
-@@ -37,6 +37,12 @@
- 
- #define SS_DEBUG_SUBSYS SS_PROC
- 
-+#ifdef CONSTIFY_PLUGIN
-+typedef struct ctl_table __no_const spl_ctl_table;
-+#else
-+typedef struct ctl_table spl_ctl_table;
-+#endif
-+
- #ifdef DEBUG_KMEM
- static unsigned long table_min = 0;
- static unsigned long table_max = ~0;
-@@ -323,7 +329,7 @@ enum {
- SPL_PROC_HANDLER(proc_console_max_delay_cs)
- {
-         int rc, max_delay_cs;
--        struct ctl_table dummy = *table;
-+        spl_ctl_table dummy = *table;
-         long d;
- 	SENTRY;
- 
-@@ -355,7 +361,7 @@ enum {
- SPL_PROC_HANDLER(proc_console_min_delay_cs)
- {
-         int rc, min_delay_cs;
--        struct ctl_table dummy = *table;
-+        spl_ctl_table dummy = *table;
-         long d;
- 	SENTRY;
- 
-@@ -387,7 +393,7 @@ enum {
- SPL_PROC_HANDLER(proc_console_backoff)
- {
-         int rc, backoff;
--        struct ctl_table dummy = *table;
-+        spl_ctl_table dummy = *table;
- 	SENTRY;
- 
-         dummy.data = &backoff;
-@@ -417,7 +423,7 @@ enum {
- {
-         int rc = 0;
-         unsigned long min = 0, max = ~0, val;
--        struct ctl_table dummy = *table;
-+        spl_ctl_table dummy = *table;
- 	SENTRY;
- 
-         dummy.data = &val;
-@@ -444,7 +450,7 @@ enum {
- {
-         int rc = 0;
-         unsigned long min = 0, max = ~0, val = 0, mask;
--        struct ctl_table dummy = *table;
-+        spl_ctl_table dummy = *table;
-         spl_kmem_cache_t *skc;
-         SENTRY;
- 
--- 
diff --git a/sys-kernel/spl/files/spl-0.6.1-fix-delay.patch b/sys-kernel/spl/files/spl-0.6.1-fix-delay.patch
deleted file mode 100644
index 42f1f59c7299..000000000000
--- a/sys-kernel/spl/files/spl-0.6.1-fix-delay.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ab59be7bc752481db64df07c821e2ae6bf2ae71b Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 1 May 2013 16:20:28 -0700
-Subject: [PATCH] Fix delay()
-
-Somewhat amazingly it went unnoticed that the delay() function
-doesn't actually cause the task to block.  Since the task state
-is never changed from TASK_RUNNING before schedule_timeout() the
-scheduler allows to task to continue running without any delay.
-Using schedule_timeout_interruptible() resolves the issue by
-correctly setting TASK_UNINTERRUPTIBLE.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
----
- include/sys/timer.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/sys/timer.h b/include/sys/timer.h
-index 13ef404..2542510 100644
---- a/include/sys/timer.h
-+++ b/include/sys/timer.h
-@@ -35,7 +35,7 @@
- #define ddi_get_lbolt()			((clock_t)jiffies)
- #define ddi_get_lbolt64()		((int64_t)get_jiffies_64())
- 
--#define delay(ticks)			schedule_timeout((long)(ticks))
-+#define delay(ticks)			schedule_timeout_uninterruptible(ticks)
- 
- #define SEC_TO_TICK(sec)		((sec) * HZ)
- #define MSEC_TO_TICK(ms)		msecs_to_jiffies(ms)
--- 
-1.8.1.6
-
diff --git a/sys-kernel/spl/files/spl-0.6.1-linux-3.10-compat.patch b/sys-kernel/spl/files/spl-0.6.1-linux-3.10-compat.patch
deleted file mode 100644
index aac1c926bbb4..000000000000
--- a/sys-kernel/spl/files/spl-0.6.1-linux-3.10-compat.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-diff --git a/config/spl-build.m4 b/config/spl-build.m4
-index 8a8e3ba..da179e3 100644
---- a/config/spl-build.m4
-+++ b/config/spl-build.m4
-@@ -33,6 +33,8 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
- 	SPL_AC_TASK_CURR
- 	SPL_AC_CTL_UNNUMBERED
- 	SPL_AC_CTL_NAME
-+	SPL_AC_VMALLOC_INFO
-+	SPL_AC_PDE_DATA
- 	SPL_AC_FLS64
- 	SPL_AC_DEVICE_CREATE
- 	SPL_AC_5ARGS_DEVICE_CREATE
-@@ -1358,6 +1360,43 @@ AC_DEFUN([SPL_AC_GET_VMALLOC_INFO],
- ])
- 
- dnl #
-+dnl # 3.10 API change,
-+dnl # struct vmalloc_info is now declared in linux/vmalloc.h
-+dnl #
-+AC_DEFUN([SPL_AC_VMALLOC_INFO], [
-+	AC_MSG_CHECKING([whether struct vmalloc_info is declared])
-+	SPL_LINUX_TRY_COMPILE([
-+		#include <linux/vmalloc.h>
-+		struct vmalloc_info { void *a; };
-+	],[
-+		return 0;
-+	],[
-+		AC_MSG_RESULT(no)
-+	],[
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_VMALLOC_INFO, 1, [yes])
-+	])
-+])
-+
-+dnl #
-+dnl # 3.10 API change,
-+dnl # PDE is replaced by PDE_DATA
-+dnl #
-+AC_DEFUN([SPL_AC_PDE_DATA], [
-+	AC_MSG_CHECKING([whether PDE_DATA() is available])
-+	SPL_LINUX_TRY_COMPILE_SYMBOL([
-+		#include <linux/proc_fs.h>
-+	], [
-+		PDE_DATA(NULL);
-+	], [PDE_DATA], [], [
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_PDE_DATA, 1, [yes])
-+	],[
-+		AC_MSG_RESULT(no)
-+	])
-+])
-+
-+dnl #
- dnl # 2.6.17 API change
- dnl # The helper functions first_online_pgdat(), next_online_pgdat(), and
- dnl # next_zone() are introduced to simplify for_each_zone().  These symbols
-diff --git a/include/linux/proc_compat.h b/include/linux/proc_compat.h
-index 434ffa3..7b044e7 100644
---- a/include/linux/proc_compat.h
-+++ b/include/linux/proc_compat.h
-@@ -43,9 +43,6 @@
- #endif
- 
- extern struct proc_dir_entry *proc_spl_kstat;
--struct proc_dir_entry *proc_dir_entry_find(struct proc_dir_entry *root,
--					   const char *str);
--int proc_dir_entries(struct proc_dir_entry *root);
- 
- int spl_proc_init(void);
- void spl_proc_fini(void);
-diff --git a/include/sys/kstat.h b/include/sys/kstat.h
-index 9275c1e..da3c589 100644
---- a/include/sys/kstat.h
-+++ b/include/sys/kstat.h
-@@ -83,6 +83,13 @@ struct kstat_s;
- typedef int kid_t;                                  /* unique kstat id */
- typedef int kstat_update_t(struct kstat_s *, int);  /* dynamic update cb */
- 
-+typedef struct kstat_module {
-+	char             ksm_name[KSTAT_STRLEN+1];  /* module name */
-+	struct list_head ksm_module_list;           /* module linkage */
-+	struct list_head ksm_kstat_list;            /* list of kstat entries */
-+	struct proc_dir_entry *ksm_proc;            /* proc entry */
-+} kstat_module_t;
-+
- typedef struct kstat_s {
- 	int              ks_magic;                  /* magic value */
-         kid_t            ks_kid;                    /* unique kstat ID */
-@@ -102,6 +109,7 @@ typedef struct kstat_s {
-         void             *ks_private;               /* private data */
-         kmutex_t         ks_lock;                   /* kstat data lock */
-         struct list_head ks_list;                   /* kstat linkage */
-+	kstat_module_t   *ks_owner;                 /* kstat module linkage */
- } kstat_t;
- 
- typedef struct kstat_named_s {
-diff --git a/include/sys/vmsystm.h b/include/sys/vmsystm.h
-index 9c52d28..34aea2b 100644
---- a/include/sys/vmsystm.h
-+++ b/include/sys/vmsystm.h
-@@ -74,10 +74,12 @@ extern size_t vmem_size(vmem_t *vmp, int typemask);
- #ifndef HAVE_GET_VMALLOC_INFO
- #ifdef CONFIG_MMU
- 
-+#ifndef HAVE_VMALLOC_INFO
- struct vmalloc_info {
- 	unsigned long used;
- 	unsigned long largest_chunk;
- };
-+#endif
- 
- typedef void (*get_vmalloc_info_t)(struct vmalloc_info *);
- extern get_vmalloc_info_t get_vmalloc_info_fn;
-diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c
-index b7e4b94..4e900c0 100644
---- a/module/spl/spl-kstat.c
-+++ b/module/spl/spl-kstat.c
-@@ -33,9 +33,12 @@
- #endif
- 
- #define SS_DEBUG_SUBSYS SS_KSTAT
-+#ifndef HAVE_PDE_DATA
-+#define PDE_DATA(x) (PDE(x)->data)
-+#endif
- 
--static spinlock_t kstat_lock;
--static struct list_head kstat_list;
-+static kmutex_t kstat_module_lock;
-+static struct list_head kstat_module_list;
- static kid_t kstat_id;
- 
- static void
-@@ -348,6 +351,47 @@ static struct seq_operations kstat_seq_ops = {
-         .stop  = kstat_seq_stop,
- };
- 
-+static kstat_module_t *
-+kstat_find_module(char *name)
-+{
-+	kstat_module_t *module;
-+
-+	list_for_each_entry(module, &kstat_module_list, ksm_module_list)
-+		if (strncmp(name, module->ksm_name, KSTAT_STRLEN) == 0)
-+			return (module);
-+
-+	return (NULL);
-+}
-+
-+static kstat_module_t *
-+kstat_create_module(char *name)
-+{
-+	kstat_module_t *module;
-+	struct proc_dir_entry *pde;
-+
-+	pde = proc_mkdir(name, proc_spl_kstat);
-+	if (pde == NULL)
-+		return (NULL);
-+
-+	module = kmem_alloc(sizeof (kstat_module_t), KM_SLEEP);
-+	module->ksm_proc = pde;
-+	strlcpy(module->ksm_name, name, KSTAT_STRLEN+1);
-+	INIT_LIST_HEAD(&module->ksm_kstat_list);
-+	list_add_tail(&module->ksm_module_list, &kstat_module_list);
-+
-+	return (module);
-+
-+}
-+
-+static void
-+kstat_delete_module(kstat_module_t *module)
-+{
-+	ASSERT(list_empty(&module->ksm_kstat_list));
-+	remove_proc_entry(module->ksm_name, proc_spl_kstat);
-+	list_del(&module->ksm_module_list);
-+	kmem_free(module, sizeof(kstat_module_t));
-+}
-+
- static int
- proc_kstat_open(struct inode *inode, struct file *filp)
- {
-@@ -359,7 +403,7 @@ proc_kstat_open(struct inode *inode, struct file *filp)
-                 return rc;
- 
-         f = filp->private_data;
--        f->private = PDE(inode)->data;
-+        f->private = PDE_DATA(inode);
- 
-         return rc;
- }
-@@ -390,10 +434,10 @@ __kstat_create(const char *ks_module, int ks_instance, const char *ks_name,
- 	if (ksp == NULL)
- 		return ksp;
- 
--	spin_lock(&kstat_lock);
-+	mutex_enter(&kstat_module_lock);
- 	ksp->ks_kid = kstat_id;
-         kstat_id++;
--	spin_unlock(&kstat_lock);
-+	mutex_exit(&kstat_module_lock);
- 
-         ksp->ks_magic = KS_MAGIC;
- 	mutex_init(&ksp->ks_lock, NULL, MUTEX_DEFAULT, NULL);
-@@ -456,71 +500,64 @@ EXPORT_SYMBOL(__kstat_create);
- void
- __kstat_install(kstat_t *ksp)
- {
--	struct proc_dir_entry *de_module, *de_name;
-+	kstat_module_t *module;
- 	kstat_t *tmp;
--	int rc = 0;
--	SENTRY;
--
--	spin_lock(&kstat_lock);
- 
--	/* Item may only be added to the list once */
--        list_for_each_entry(tmp, &kstat_list, ks_list) {
--                if (tmp == ksp) {
--		        spin_unlock(&kstat_lock);
--			SGOTO(out, rc = -EEXIST);
--		}
--	}
-+	ASSERT(ksp);
- 
--        list_add_tail(&ksp->ks_list, &kstat_list);
--	spin_unlock(&kstat_lock);
-+	mutex_enter(&kstat_module_lock);
- 
--	de_module = proc_dir_entry_find(proc_spl_kstat, ksp->ks_module);
--	if (de_module == NULL) {
--                de_module = proc_mkdir(ksp->ks_module, proc_spl_kstat);
--		if (de_module == NULL)
--			SGOTO(out, rc = -EUNATCH);
-+	module = kstat_find_module(ksp->ks_module);
-+	if (module == NULL) {
-+		module = kstat_create_module(ksp->ks_module);
-+		if (module == NULL)
-+			goto out;
- 	}
- 
--	de_name = create_proc_entry(ksp->ks_name, 0444, de_module);
--	if (de_name == NULL)
--		SGOTO(out, rc = -EUNATCH);
-+	/*
-+	 * Only one entry by this name per-module, on failure the module
-+	 * shouldn't be deleted because we know it has at least one entry.
-+	 */
-+	list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list)
-+		if (strncmp(tmp->ks_name, ksp->ks_name, KSTAT_STRLEN) == 0)
-+			goto out;
-+
-+	list_add_tail(&ksp->ks_list, &module->ksm_kstat_list);
- 
- 	mutex_enter(&ksp->ks_lock);
--	ksp->ks_proc = de_name;
--	de_name->proc_fops = &proc_kstat_operations;
--        de_name->data = (void *)ksp;
-+	ksp->ks_owner = module;
-+	ksp->ks_proc = proc_create_data(ksp->ks_name, 0444,
-+	    module->ksm_proc, &proc_kstat_operations, (void *)ksp);
-+	if (ksp->ks_proc == NULL) {
-+		list_del_init(&ksp->ks_list);
-+		if (list_empty(&module->ksm_kstat_list))
-+			kstat_delete_module(module);
-+	}
- 	mutex_exit(&ksp->ks_lock);
- out:
--	if (rc) {
--		spin_lock(&kstat_lock);
--	        list_del_init(&ksp->ks_list);
--		spin_unlock(&kstat_lock);
--	}
--
--	SEXIT;
-+	mutex_exit(&kstat_module_lock);
- }
- EXPORT_SYMBOL(__kstat_install);
- 
- void
- __kstat_delete(kstat_t *ksp)
- {
--	struct proc_dir_entry *de_module;
-+	kstat_module_t *module = ksp->ks_owner;
- 
--	spin_lock(&kstat_lock);
--        list_del_init(&ksp->ks_list);
--	spin_unlock(&kstat_lock);
-+	mutex_enter(&kstat_module_lock);
-+	list_del_init(&ksp->ks_list);
-+	mutex_exit(&kstat_module_lock);
- 
--        if (ksp->ks_proc) {
--	        de_module = ksp->ks_proc->parent;
--	        remove_proc_entry(ksp->ks_name, de_module);
-+	if (ksp->ks_proc) {
-+		remove_proc_entry(ksp->ks_name, module->ksm_proc);
- 
--	        /* Remove top level module directory if it's empty */
--	        if (proc_dir_entries(de_module) == 0)
--		        remove_proc_entry(de_module->name, de_module->parent);
-+		/* Remove top level module directory if it's empty */
-+		if (list_empty(&module->ksm_kstat_list))
-+			kstat_delete_module(module);
- 	}
- 
- 	if (!(ksp->ks_flags & KSTAT_FLAG_VIRTUAL))
--                kmem_free(ksp->ks_data, ksp->ks_data_size);
-+		kmem_free(ksp->ks_data, ksp->ks_data_size);
- 
- 	mutex_destroy(&ksp->ks_lock);
- 	kmem_free(ksp, sizeof(*ksp));
-@@ -533,8 +570,8 @@ int
- spl_kstat_init(void)
- {
- 	SENTRY;
--	spin_lock_init(&kstat_lock);
--	INIT_LIST_HEAD(&kstat_list);
-+	mutex_init(&kstat_module_lock, NULL, MUTEX_DEFAULT, NULL);
-+	INIT_LIST_HEAD(&kstat_module_list);
-         kstat_id = 0;
- 	SRETURN(0);
- }
-@@ -543,7 +580,8 @@ void
- spl_kstat_fini(void)
- {
- 	SENTRY;
--	ASSERT(list_empty(&kstat_list));
-+	ASSERT(list_empty(&kstat_module_list));
-+	mutex_destroy(&kstat_module_lock);
- 	SEXIT;
- }
- 
-diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
-index cd4fa1b..b8379d0 100644
---- a/module/spl/spl-proc.c
-+++ b/module/spl/spl-proc.c
-@@ -1120,39 +1120,6 @@ static struct ctl_table spl_root[] = {
- 	{ 0 }
- };
- 
--static int
--proc_dir_entry_match(int len, const char *name, struct proc_dir_entry *de)
--{
--        if (de->namelen != len)
--                return 0;
--
--        return !memcmp(name, de->name, len);
--}
--
--struct proc_dir_entry *
--proc_dir_entry_find(struct proc_dir_entry *root, const char *str)
--{
--	struct proc_dir_entry *de;
--
--	for (de = root->subdir; de; de = de->next)
--		if (proc_dir_entry_match(strlen(str), str, de))
--			return de;
--
--	return NULL;
--}
--
--int
--proc_dir_entries(struct proc_dir_entry *root)
--{
--	struct proc_dir_entry *de;
--	int i = 0;
--
--	for (de = root->subdir; de; de = de->next)
--		i++;
--
--	return i;
--}
--
- int
- spl_proc_init(void)
- {
-@@ -1174,11 +1141,11 @@ spl_proc_init(void)
-         if (proc_spl_kmem == NULL)
-                 SGOTO(out, rc = -EUNATCH);
- 
--	proc_spl_kmem_slab = create_proc_entry("slab", 0444, proc_spl_kmem);
-+	proc_spl_kmem_slab = proc_create_data("slab", 0444,
-+		proc_spl_kmem, &proc_slab_operations, NULL);
-         if (proc_spl_kmem_slab == NULL)
- 		SGOTO(out, rc = -EUNATCH);
- 
--        proc_spl_kmem_slab->proc_fops = &proc_slab_operations;
- #endif /* DEBUG_KMEM */
- 
-         proc_spl_kstat = proc_mkdir("kstat", proc_spl);
-diff --git a/module/splat/splat-atomic.c b/module/splat/splat-atomic.c
-index df3b38f..f702196 100644
---- a/module/splat/splat-atomic.c
-+++ b/module/splat/splat-atomic.c
-@@ -26,6 +26,7 @@
- 
- #include <sys/atomic.h>
- #include <sys/thread.h>
-+#include <linux/slab.h>
- #include "splat-internal.h"
- 
- #define SPLAT_ATOMIC_NAME		"atomic"
-diff --git a/module/splat/splat-thread.c b/module/splat/splat-thread.c
-index a1e70db..e55acd0 100644
---- a/module/splat/splat-thread.c
-+++ b/module/splat/splat-thread.c
-@@ -26,6 +26,7 @@
- 
- #include <sys/thread.h>
- #include <sys/random.h>
-+#include <linux/slab.h>
- #include "splat-internal.h"
- 
- #define SPLAT_THREAD_NAME		"thread"
-diff --git a/module/splat/splat-time.c b/module/splat/splat-time.c
-index ca60c45..cd513c9 100644
---- a/module/splat/splat-time.c
-+++ b/module/splat/splat-time.c
-@@ -25,6 +25,7 @@
- \*****************************************************************************/
- 
- #include <sys/time.h>
-+#include <linux/slab.h>
- #include "splat-internal.h"
- 
- #define SPLAT_TIME_NAME			"time"
diff --git a/sys-kernel/spl/metadata.xml b/sys-kernel/spl/metadata.xml
index 758e445e8e26..38d0d1b63f4d 100644
--- a/sys-kernel/spl/metadata.xml
+++ b/sys-kernel/spl/metadata.xml
@@ -9,9 +9,6 @@
 		<email>fearedbliss@gentoo.org</email>
 		<name>Jonathan Vasquez</name>
 	</maintainer>
-	<use>
-		<flag name="debug-log">Enable additional diagnostics</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">zfsonlinux/spl</remote-id>
 	</upstream>
diff --git a/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
deleted file mode 100644
index 0f727fa171fa..000000000000
--- a/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	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
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
-	if [ ${PV} != "9999" ]
-	then
-		# Fix on_each_cpu autotools to work correctly
-		epatch "${FILESDIR}/${P}-fix-on_each_cpu-autotools-check.patch"
-
-		# Fix soft lockup regression
-		epatch "${FILESDIR}/${P}-fix-soft-lockup.patch"
-
-		# Fix x86 build failures on Linux 3.4 and later, bug #450646
-		epatch "${FILESDIR}/${PN}-0.6.0_rc14-fix-atomic64-checks.patch"
-
-		# Fix autotools check that fails on ~ppc64
-		epatch "${FILESDIR}/${PN}-0.6.0_rc14-fix-mutex-owner-check.patch"
-	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=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-		$(use_enable debug-log)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	if [[ ! -e /proc/modules ]]
-	then
-		die  "Missing /proc/modules"
-	elif [[ $UID -ne 0 ]]
-	then
-		ewarn "Cannot run make check tests with FEATURES=userpriv."
-		ewarn "Skipping make check tests."
-	elif grep -q '^spl ' /proc/modules
-	then
-		ewarn "Cannot run make check tests with module spl loaded."
-		ewarn "Skipping make check tests."
-	else
-		autotools-utils_src_test
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.0_rc14-r3.ebuild b/sys-kernel/spl/spl-0.6.0_rc14-r3.ebuild
deleted file mode 100644
index c18cad215004..000000000000
--- a/sys-kernel/spl/spl-0.6.0_rc14-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	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
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
-	if [ ${PV} != "9999" ]
-	then
-		# Fix x86 build failures on Linux 3.4 and later, bug #450646
-		epatch "${FILESDIR}/${P}-fix-atomic64-checks.patch"
-
-		# Fix autotools check that fails on ~ppc64
-		epatch "${FILESDIR}/${P}-fix-mutex-owner-check.patch"
-
-		# Linux 3.9 Support
-		epatch "${FILESDIR}/${P}-linux-3.9-compat.patch"
-
-		# Free memory under load quickly
-		epatch "${FILESDIR}/${P}-no-cond_resched.patch"
-	fi
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	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=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-		$(use_enable debug-log)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc AUTHORS DISCLAIMER README.markdown
-
-	# Provide /usr/src/spl symlink for lustre
-	dosym "$(basename $(echo "${ED}/usr/src/spl-"*))/${KV_FULL}" /usr/src/spl
-}
-
-src_test() {
-	if [[ ! -e /proc/modules ]]
-	then
-		die  "Missing /proc/modules"
-	elif [[ $UID -ne 0 ]]
-	then
-		ewarn "Cannot run make check tests with FEATURES=userpriv."
-		ewarn "Skipping make check tests."
-	elif grep -q '^spl ' /proc/modules
-	then
-		ewarn "Cannot run make check tests with module spl loaded."
-		ewarn "Skipping make check tests."
-	else
-		autotools-utils_src_test
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.1-r3.ebuild b/sys-kernel/spl/spl-0.6.1-r3.ebuild
deleted file mode 100644
index cae6622f754d..000000000000
--- a/sys-kernel/spl/spl-0.6.1-r3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	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
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!UIDGID_STRICT_TYPE_CHECKS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
-	if [ ${PV} != "9999" ]
-	then
-		# Be more like FreeBSD and Illumos when handling hostids
-		epatch "${FILESDIR}/${PN}-0.6.0_rc14-simplify-hostid-logic.patch"
-
-		# Block tasks properly
-		epatch "${FILESDIR}/${PN}-0.6.1-fix-delay.patch"
-
-		# Linux 3.10 Compatibility
-		epatch "${FILESDIR}/${PN}-0.6.1-linux-3.10-compat.patch"
-
-		# Fix kernel builtin support
-		epatch "${FILESDIR}/${PN}-0.6.1-builtin-fix.patch"
-
-		# Support recent hardened kernels
-		if kernel_is ge 3 8
-		then
-			epatch "${FILESDIR}/${PN}-0.6.1-constify-ctl_table.patch"
-		fi
-	fi
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	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=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-		$(use_enable debug-log)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.2-r5.ebuild b/sys-kernel/spl/spl-0.6.2-r5.ebuild
deleted file mode 100644
index 5a152da27c55..000000000000
--- a/sys-kernel/spl/spl-0.6.2-r5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	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}-${MY_PV}-p4.tar.xz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 14 || die "Linux 3.14 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
-	fi
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	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=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-		$(use_enable debug-log)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.3-r1.ebuild b/sys-kernel/spl/spl-0.6.3-r1.ebuild
deleted file mode 100644
index 645d48179d8f..000000000000
--- a/sys-kernel/spl/spl-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	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-${PR}.tar.xz"
-	S="${WORKDIR}/${PN}-${P}"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${P}-patches"
-	fi
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-		$(use_enable debug-log)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-	dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.4.2.ebuild b/sys-kernel/spl/spl-0.6.4.2.ebuild
deleted file mode 100644
index 246a8c052365..000000000000
--- a/sys-kernel/spl/spl-0.6.4.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	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
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-	dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.5.10.ebuild b/sys-kernel/spl/spl-0.6.5.10.ebuild
deleted file mode 100644
index 1a3984b06ec7..000000000000
--- a/sys-kernel/spl/spl-0.6.5.10.ebuild
+++ /dev/null
@@ -1,110 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.5.11.ebuild b/sys-kernel/spl/spl-0.6.5.11.ebuild
index 1a3984b06ec7..fc6a7c74ebf5 100644
--- a/sys-kernel/spl/spl-0.6.5.11.ebuild
+++ b/sys-kernel/spl/spl-0.6.5.11.ebuild
@@ -14,7 +14,7 @@ fi
 
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
+DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
 HOMEPAGE="http://zfsonlinux.org/"
 
 LICENSE="GPL-2"
diff --git a/sys-kernel/spl/spl-0.6.5.2.ebuild b/sys-kernel/spl/spl-0.6.5.2.ebuild
deleted file mode 100644
index a365223f4c3f..000000000000
--- a/sys-kernel/spl/spl-0.6.5.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	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
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-	dodoc AUTHORS DISCLAIMER README.markdown
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.5.3-r1.ebuild b/sys-kernel/spl/spl-0.6.5.3-r1.ebuild
deleted file mode 100644
index cefedbe27d4f..000000000000
--- a/sys-kernel/spl/spl-0.6.5.3-r1.ebuild
+++ /dev/null
@@ -1,119 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/${P}-patches-p0.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_RANDSTRUCT
-		KALLSYMS
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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}/${P}-patches"
-	fi
-
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.5.3.ebuild b/sys-kernel/spl/spl-0.6.5.3.ebuild
deleted file mode 100644
index 3863709af2b8..000000000000
--- a/sys-kernel/spl/spl-0.6.5.3.ebuild
+++ /dev/null
@@ -1,110 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.5.4-r1.ebuild b/sys-kernel/spl/spl-0.6.5.4-r1.ebuild
index 5563bd29c255..036383da98cc 100644
--- a/sys-kernel/spl/spl-0.6.5.4-r1.ebuild
+++ b/sys-kernel/spl/spl-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"
@@ -15,7 +15,7 @@ fi
 
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
+DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
 HOMEPAGE="http://zfsonlinux.org/"
 
 LICENSE="GPL-2"
diff --git a/sys-kernel/spl/spl-0.6.5.4.ebuild b/sys-kernel/spl/spl-0.6.5.4.ebuild
deleted file mode 100644
index 03153ad984c8..000000000000
--- a/sys-kernel/spl/spl-0.6.5.4.ebuild
+++ /dev/null
@@ -1,110 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.5.6.ebuild b/sys-kernel/spl/spl-0.6.5.6.ebuild
deleted file mode 100644
index e9b4054db990..000000000000
--- a/sys-kernel/spl/spl-0.6.5.6.ebuild
+++ /dev/null
@@ -1,110 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.5.7.ebuild b/sys-kernel/spl/spl-0.6.5.7.ebuild
deleted file mode 100644
index d596d575af31..000000000000
--- a/sys-kernel/spl/spl-0.6.5.7.ebuild
+++ /dev/null
@@ -1,110 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.5.8.ebuild b/sys-kernel/spl/spl-0.6.5.8.ebuild
deleted file mode 100644
index a8e210883ead..000000000000
--- a/sys-kernel/spl/spl-0.6.5.8.ebuild
+++ /dev/null
@@ -1,110 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.5.9.ebuild b/sys-kernel/spl/spl-0.6.5.9.ebuild
deleted file mode 100644
index 30a56d6506ce..000000000000
--- a/sys-kernel/spl/spl-0.6.5.9.ebuild
+++ /dev/null
@@ -1,110 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.7.0.ebuild b/sys-kernel/spl/spl-0.7.0.ebuild
deleted file mode 100644
index 1a3984b06ec7..000000000000
--- a/sys-kernel/spl/spl-0.7.0.ebuild
+++ /dev/null
@@ -1,110 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.7.1.ebuild b/sys-kernel/spl/spl-0.7.1.ebuild
deleted file mode 100644
index 1a3984b06ec7..000000000000
--- a/sys-kernel/spl/spl-0.7.1.ebuild
+++ /dev/null
@@ -1,110 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.7.2.ebuild b/sys-kernel/spl/spl-0.7.2.ebuild
deleted file mode 100644
index 4663b4d58f83..000000000000
--- a/sys-kernel/spl/spl-0.7.2.ebuild
+++ /dev/null
@@ -1,110 +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/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
-	KEYWORDS=" ~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug"
-RESTRICT="debug? ( strip ) test"
-
-COMMON_DEPEND="dev-lang/perl
-	virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS DISCLAIMER )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!PAX_SIZE_OVERFLOW
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	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() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
-		die "Cannot patch check.sh"
-
-	# splat is unnecessary unless we are debugging
-	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
-
-	# 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() {
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(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/spl" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.7.3.ebuild b/sys-kernel/spl/spl-0.7.3.ebuild
index 4663b4d58f83..2b74e28c2490 100644
--- a/sys-kernel/spl/spl-0.7.3.ebuild
+++ b/sys-kernel/spl/spl-0.7.3.ebuild
@@ -14,7 +14,7 @@ fi
 
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
+DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
 HOMEPAGE="http://zfsonlinux.org/"
 
 LICENSE="GPL-2"
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index eb6159b9a65b..4d2feca40780 100644
--- a/sys-kernel/spl/spl-9999.ebuild
+++ b/sys-kernel/spl/spl-9999.ebuild
@@ -14,7 +14,7 @@ fi
 
 inherit flag-o-matic linux-info linux-mod autotools-utils
 
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
+DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
 HOMEPAGE="http://zfsonlinux.org/"
 
 LICENSE="GPL-2"
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index dbb501748177..bc3e6f2be707 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -8,16 +8,16 @@ DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0
 DIST patch-3.16.50.xz 1768284 SHA256 e57f3e038b219da4bd906d34cb7c5cd8b4a9e1156b153e4fd5c85b9248e62313 SHA512 7632a44e541f780210b2ebf797846be015b353735aa8161b4c3949577df074a9478b5c87ca4fd5b82f83a9d17c4b2b568114dbc9dbc731b4f5331c158c4dd9d9 WHIRLPOOL 00f8a254696b2d34321bd1b307413c6a665dfb3830ec4cca69543de17cc3f43da270cdbd308476d35e223bac37e18ac6bb91a142f2254a74b28964cf5a19c236
 DIST patch-3.2.95.xz 1814816 SHA256 71cc9d329538f676bf0c5e243215d32ac727a11c4128596cf6e5d6bc55d8446c SHA512 68b065aa8c64431cb3478f8e061e4b7a5c0a273ad7a82de4c20422b7e7c8ab4e103e571945421929c03e5790da572d9a567277e42355bbf1878c78a8e83134be WHIRLPOOL 8186e777c3d4e257abfd5114559e6eb8e0ddabf527511a411cfcddf081b9ef32a0d9eccc474ce8128dbff8acee4b7448a1ab34d8328a31326d2448e048e5e922
 DIST patch-4.1.46.xz 1236640 SHA256 b066ec1a0aabec07afe8e71766b5bf5b397a681070698e7a6e00b52ae00de982 SHA512 c6b50ddd848c949119dfe1ebe45542a53c8116718e09345e8b47b300f057d4396f0991de51a6ce0ae1ea88502e53339573c8873126bfe202c742a09455b00519 WHIRLPOOL 4ccb03d9474c52c8c84a89f0b8103b36284371991b24555d9c74956edc13487b767c96b050776ded5b4c7985de545c042baa968f8c0c1acdaa5ab4cab70dc889
-DIST patch-4.13.13.xz 245028 SHA256 7414baa3aa0037ee370aaad4998f88f583cf5badb3be9b17016a529eee8e2a24 SHA512 27966bedc01ef5e2d023ee0b91224ca5ab3c5019f431305a9daa62b3acddf80e4e4c201ec47ca06243aba7778810d5ecb95e9d115e15935153a4a5d061af3fac WHIRLPOOL 46cb3ccadda7d12a689a7667ff7ebeaad51314ec9197c111e1a21d02d1287b6853caa8a844f545223ae651a59a968a096afbdea151ae4b91692f388604ca9ea3
-DIST patch-4.4.98.xz 1422116 SHA256 cda543f0e6981324ad402bd0341a8aff4f5c11b25338d4e0b175342e512f8c8b SHA512 6695837c2f5e7025af4bf19e4ab9f19c2f311985166a8770460a958ea23c25f62b4dc29c8f8e77bf0ce0fa99912ecd07928d254d02959f1501b9dbaadcabab90 WHIRLPOOL ff10bdb639b5edfac8bbd5df6bc4be5a1939e437e5a2335d5c33c187d6eb897589920f1f97889542fdfd4d9f8a9c8662378109c130248df2e2f3fa661877a982
-DIST patch-4.9.62.xz 1132528 SHA256 c6c8dee0cf759f5a6f04617179dc20940019dc5bad7c6f7aa5b0463d1711fe5b SHA512 95f5f4b5d32c134980d5861216dc57b14c4e3a3242b843a69a17af3be16dec14ce3e6444d6761504479e91c6ce2105139779cd68b0ed50687b557dbe05f42455 WHIRLPOOL cd685de96b41260f4fdbc31fb2681361b03af0bcbca453b81cfd4bf02f5fa0c4a0e68e5bbb857fad30ef3a4adc08f34920bd8a94b2b090aff3d9593bd4e7e267
+DIST patch-4.13.14.xz 256976 SHA256 f6d10bf6569f433b8ad6eef54acb395bf15990b709ee34c7a82a95829acaa917 SHA512 6cbcd43f1691be45f74a2d06ed55d59e4dc49c9a02d7573f3ca11130ad27a6f35f36d9da054e762ffbf9a5517735fba44bae601b60d477fcf5603a8867221c08 WHIRLPOOL 52259008714d76d912a5a926f10b0cc532b9f7adf21d64503207b00e8cc98bdadb49ac959e069a4be78d6f83df8c0c667bf1d46be304084f30e8ba6b47c2e1b2
+DIST patch-4.4.99.xz 1428600 SHA256 b87f6562043171cd1bf09564f34f782803af3ce461fc6ef2d4c7590cb51c20ab SHA512 7f7e3f0e2fffcb5e1980f09484177a26a6bacebea7e430f1dde041e97b31e6f73fe67b9e815f98158e7de6f3a6072f406e173f9b06250c26a8557bcd68719f1b WHIRLPOOL f8e72bc368c7a7942242504d6777d5fd4d089ac355911cf0f77c36f3148512ed21cb8514e506fe9019beb688699dd8374122d72021b1cb9431a85d962dda5d72
+DIST patch-4.9.63.xz 1142136 SHA256 bcd440b398c8ab8158d91fa7245d583ed00203caba4f0751293687305e570eb1 SHA512 51fa0a5c19989be5326130421afe29aeb22bc7be65adbe882fc32b0b22c414e8631e3e7cefb6fecfc23545851a19211f5feddd7196934f5c84ec507b4f2984c0 WHIRLPOOL 585a9c032e672eca1cf16cf13600ca935367307ce1791d9cc8719c2a418a2e8a4f57722eba79eb08c727b8a413b4667323d470abc02a559bedf9b830856d54e4
 EBUILD vanilla-sources-3.16.50.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-3.2.95.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-4.1.46.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.13.13.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.13.14.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-4.14.0.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.4.98.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.9.62.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.4.99.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.9.63.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 MISC ChangeLog 48866 SHA256 5e96c40666532838415dc80201535a16e22c7513cce19c979effe9592694c294 SHA512 06ee49f4aa7730f7c92a4ca500f6fcc105591d6b4ab7431e77a77b29821b81d7b882852370ac800461d2ca2efa68519e64504367534ef2e94dcd0da21b2fd9a0 WHIRLPOOL 31715105c3f96167303a5884816f10983a03213fb66fd96e032eb4b0cfbfeb98ab1ac662c585143e60f7a0f85dd465554498b4b03ff35887e5061fd1f2b8be60
 MISC ChangeLog-2013 104895 SHA256 3ad2bcc0b59ccc0f293134875f35690751b160483a3f010b6c3b95174df96471 SHA512 35c725d7c676a1ae6ebac12647004988b0b1e2b87fb7cbce95c101b8ad7b1e9527cc23a6bbc4a27fe11c47813d3743ba35223dfb8b546dd1f204943939172c47 WHIRLPOOL b250875b50ea9f08f26f3f92c45960fc317e7495b70fbf053f9586e75924b6478eafbd2ba54a2cf1c983d49b0341e63a15b2d46ff135f8945c3b61e3e87eabc5
 MISC ChangeLog-2015 43787 SHA256 aae0d19a00913935885696dbc734946b05091c72d5c32e1f57925b76da4fc9fd SHA512 0a63afa2ce400c72c57c796c3dd4b8fe257d0d827b62b77cbeb1561a3cc99d7c04d9039ee9523edfe8bca8f4f197e91a58282b91909cb5b272685a9a4c5db8b0 WHIRLPOOL 6b940c705250ec86a7d0c0792f797279a88aa9fe0e63ae32d01bab9ad22ffc4a8f955aea6f0afad15ccfba945e70a3e8ed10ce46016c44da5691605ed098e97d
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.13.13.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.13.14.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.13.13.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.13.14.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.98.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.99.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.98.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.99.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.62.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.63.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.62.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.63.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-18 18:38:22 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-18 18:38:22 +0000
commit	a5956e0a0daddcad648e0d8d8e5cb3e49e09bda7 (patch)
tree	3d2e0a61f348a5299e73ca7c2b236156a8cc79b5 /sys-kernel
parent	38f60b3ec9ff175535d9a056a76ae42931e61e21 (diff)