gentoo resync : 22.05.2018

17 files changed, 467 insertions, 6 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index d864f3db36b5..1828ba6c5ffd 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 6c13d6581ab3..0b29faf4f8a1 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -20,6 +20,9 @@ DIST genpatches-4.14-45.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0da
 DIST genpatches-4.14-46.base.tar.xz 1190412 BLAKE2B cf4c875da660153fdc018e10a208d0277ca7e9645aa3ced2a6331f182a9eb50ad3f459d94680f0749cff6cf2e2900930a169873b0e3076d54b4155a4718aba5b SHA512 8704a4855b85b5ae151cbf66300ba7b0f546e7283fb58cfa8db32c038b32d00481770d9152e6a616f90010709215d7c07fcebd7ddfabd2978397b669894d794d
 DIST genpatches-4.14-46.experimental.tar.xz 5184 BLAKE2B 501c9b838f5e44380043ceaa9f8a5d9097bcd97c9113874cd8c9959224d1556e64867605c803e02ba92f70e250cb8f96728dee728e52b97feaf43eeb75a95fdd SHA512 907a896f768ac555d04c7d5278c632bf9a89c556a1ba863d01ba73cfa98f20c5b12742cd057bcb6037b41d12420069ac7a2453774d1a79a4e68e1216c188192b
 DIST genpatches-4.14-46.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.14-47.base.tar.xz 1200752 BLAKE2B 4e52afb8c85a9d2f162dec0d0e6ef557a66a6b899d47fd7578a350d65ad30bab32daa514d1305cf3a7faf66ce43f74c6a4525c8b987846bc92c2ec14405ec9cf SHA512 c2a46c73d999a199b406a712e79b74d1c33c1a3d0963d43a69f8fd32b9e52beb715867cd064639c842f2395993e789de42b18973932a042061be03957ee81b1a
+DIST genpatches-4.14-47.experimental.tar.xz 5184 BLAKE2B 12a3437d97cd8f7779e158f6e376ba41cada33db4fdbad8c803baaba01e5e459738b155fec1352e3354020f5b43846bb479fe2682dee5fa296d498e41b67af58 SHA512 885fc8f8b127f792426b575dc87d4c8d5655ef514eee7d8a77e065415db674fd995f6eb91c0f23ad0f03a26b01dfa67f2d474bd5a8e7753922cb9387be2d184c
+DIST genpatches-4.14-47.extras.tar.xz 17504 BLAKE2B 5f364e68c663c7ef6d5bf5cded7fc304d806adde306d25294996063efc6c9d3134e4d8da1839cc4fccb2da4d0781b2a9ab926351ce6bf4b4c0bae9cd955233b4 SHA512 6d17fdfa3228377120147e43f7a53700c8d3f25c6f2a09c82818558bce493e09db4a7405c42f1b4697a4424ababc607128d98d88301f825a266c802fd18cd78c
 DIST genpatches-4.15-20.base.tar.xz 464468 BLAKE2B b3c30e02819663b31b4ed83794d57c4521fe13015a4419088664f017f4753117bbc88a5600e310092d8eaf8b132b0757d59fb7b503abef046db0249ed7ae96e6 SHA512 cf79c85b65f3a68d3d721d2425fb6e498df808097bd8b1c610023d0c36c0378ec0f92d33ee0dc39592730d87f4a1df52931ea9608be2d56d5543a201f9d1d658
 DIST genpatches-4.15-20.experimental.tar.xz 5184 BLAKE2B 96ab38624869b7ca2caddceea1be6701c6a9df489dda0be4736765a6546909d522f5b32a44506875270485606797357bf44e044ed61ee40f6171670a5956bdbb SHA512 673083672ca1758f0b3dcc4507bd18c3ea1c024c86f1f8e0bcafe6117f33e226ad981fa123f1b3317858b93f5a17b5f56924e5e5eefb6c0980fc8572626010da
 DIST genpatches-4.15-20.extras.tar.xz 17492 BLAKE2B a610729f55d64e3ef6dee6129879f5ae27f31bb2738b0d8d3270f3502eaa19024323a741f0ac3325ba72342ae9e3c7fc9b4dbd56f8763a4be29e825d98a17b18 SHA512 304fa9e1f83f5b8e2fe10905799badc8bd8e9ac981fd59b3568f9d9d208dc671ec4dc1b88163351322d047596db4d2c8f9a261dbefa3351cf25f321b84beca9e
@@ -29,6 +32,9 @@ DIST genpatches-4.15-21.extras.tar.xz 17496 BLAKE2B 2240a8879139d6ad765a9e38d0ef
 DIST genpatches-4.16-10.base.tar.xz 215644 BLAKE2B b2706d34e5778c3453aac5e63c006a94a1f35ebf164cff8af692b754721205303a3d22a1cf7715a1809359d166191dbe29503ae0632af421c34ac59210876ee0 SHA512 0d290d1853481052b74d7777ea62c16f1c9d25d3b27b9fffa5f444d48e23a4dcf79cd12008940c2ab8cd6af3733003a287620148a4535431081a7d37e7b9d5c1
 DIST genpatches-4.16-10.experimental.tar.xz 5164 BLAKE2B f99e68621a2e5b17e4f6bef55a24ec2c52c442abfa35230e869ae008e4fca3721375e4a93a4f6cd7c49f09e5412ba4cd753bedab2fb4ae85fad57dfb8761f04f SHA512 4288ddbd0123242c5e22b69645f9da7d706c08c7dd313c7c59481ffd42c395076e7aac8bc26736729d04cebe5b1da579cadeca1ecd4644bcf1d786e402e87642
 DIST genpatches-4.16-10.extras.tar.xz 17488 BLAKE2B 75169c7816271f85df521749f6da4a706217797b10a4b3bd8ff7cdb37e380c3427f442428707449afa361956bb0197cc4c30f794491bb9ba1f5056abc586d2ad SHA512 dc8253041478cfb0ce1f6d5d1ec5a4e006320822e14b79f40fea752575e47444948987c17b8ad90d1bf5febece034393f49ab8a049e5e33078831e8e640c27e2
+DIST genpatches-4.16-11.base.tar.xz 229832 BLAKE2B ad7e4b657825802cd3049893140621a26a20f78f5327c43d36cdbbc3ba87938a80276757f1952fb532933d691428ce0bb8dc23d8c8c1c6533d939adaf7a65b5b SHA512 589eb66c4908d6c4964b50e62b22ccbcf6e9b5959cc0ce0bac6d07dbf483c0a0ded6c640649819efcee07f71ed0f930a0f6059be77d8df65e11a3f5031f8555d
+DIST genpatches-4.16-11.experimental.tar.xz 5168 BLAKE2B 9d8fb3e66bce93a3e8e2925d3b0b3627d37af82fc3b31faa4a676e2b8c355f36ffc998e1cb0b7a7ae75153712ffb3cbe289a351a1a5511b65251734b9b977e57 SHA512 eff2802e2d950357dcd368a9b358bbb2a5892b886be8991da0b808ecf61f199fd079a1d4e3a60bfe0c70bb4c97b582142a1f3341731d50aafc6fad06e462c634
+DIST genpatches-4.16-11.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
 DIST genpatches-4.16-9.base.tar.xz 196768 BLAKE2B 25c4b6a22a9a07af643ddc73fea2cf6e997f5cca89f86cf8386286d1b63e0c0dd393f138f66f87773d9eba382bcaec3a2562d2a4c22140a61358cd2612e11d4f SHA512 aab3c760270e8d72c892d58a88fac3db792150a8f7157a2fb656d52ecfb29c9f6a049783ec9583b98b9cfd09ae6f77f672ef375d6a260cb2cb4df8157e5398a7
 DIST genpatches-4.16-9.experimental.tar.xz 5164 BLAKE2B 0e8c1ce1a65404faafe4c0c7163cf87ce4ba4195edec6caab0dcbffff5351c6b211b233b6b659a7521e48e11e0fcf726e23341728591e9dbf305a4cac4500175 SHA512 9b4003d7902152183e4a76c54e0d4d09da33c9956aadafef4b11cdde81f7539a0d7931f4ae7d4d7e02928bbd7c128eba5fda00319723c1f7c2a7abb34ecddc9c
 DIST genpatches-4.16-9.extras.tar.xz 17492 BLAKE2B 2e9bb4e33e33f0b5ba923bc0036a3697abefcf7c439dfba68beb0c4d0a558dffde1c9224f56da6bbea560bec3664cb1025c0ce1c961037598523d1af0d0513fb SHA512 e1ed8a1532488aa849969a90bf299eaf39233695eb9bda7b070a87906b8891e2332a06234d4b2c98338b04380020387b8fb212dc95072ae79cc58274e8118656
@@ -38,6 +44,9 @@ DIST genpatches-4.9-102.extras.tar.xz 17356 BLAKE2B d9a05e5b95c7a4c2477f01c7cef7
 DIST genpatches-4.9-103.base.tar.xz 1979040 BLAKE2B 767d35109446a55c229bd3cd7a66beece88557f810b1ed1548d556e21205e2ed50eb5ee3d3aeb21255f5a1f7878ecaa722b3cc2dd0a45f116cb9288f04ae2d2c SHA512 8ccfe558b0ff3fea8765664a5304b67c7e244fbe88990cdb50f82b6e9b88c2abfd865663329458c5455cafc29f62bcfa5e3a6d6557a989af99ea0899a4ebbb92
 DIST genpatches-4.9-103.experimental.tar.xz 106388 BLAKE2B c8a171fda6fd70e17662b779805cc7353303159443fc4031f153bb8acda5c3632aaf331d1720c389b030fbc837d25522c4abbf6cb1858e7023ba292c5373b633 SHA512 db1c60f4c5356cc67e26244af373678fa7b51155c620cb8d62ae966e63e5b2c8320167bae699137135fd2e522337e197d6e2d8c1bf9f736ba5fc0657243218a3
 DIST genpatches-4.9-103.extras.tar.xz 17356 BLAKE2B e84df76263c11d9ae1fe5bbbad0d24dfd2e866f625deab07f7b72404c351237ac28f8907cb4ef30e5bb88947ef303e1c8c4123acf4c6f899aa66f2ccfab5de41 SHA512 49025fe6fd388ddf72cdb3cbb68f24ae8225d4356459bbb2f8677b90488eb49f27e62591f98f87038f2d17d0355c55bf0c38b8fb94e3929a0619ebf2bccd06e6
+DIST genpatches-4.9-104.base.tar.xz 1988596 BLAKE2B 00e31664c8da68ded4e831c872296319b341690c2640c47e0940b1dad6ac1cf9c78a1a773ea5120605af3f09ccf4a62f544b6e6a5d42562d3a803ccae6617dfd SHA512 13fab296b38eae012ec9e58bb3e29fb5bf3b4afced6156d87e275836d04c9afc1a5c748b45e495d770c665e3e61020893f3ae912d7c014b2891fc56b87f640ab
+DIST genpatches-4.9-104.experimental.tar.xz 106388 BLAKE2B c8a171fda6fd70e17662b779805cc7353303159443fc4031f153bb8acda5c3632aaf331d1720c389b030fbc837d25522c4abbf6cb1858e7023ba292c5373b633 SHA512 db1c60f4c5356cc67e26244af373678fa7b51155c620cb8d62ae966e63e5b2c8320167bae699137135fd2e522337e197d6e2d8c1bf9f736ba5fc0657243218a3
+DIST genpatches-4.9-104.extras.tar.xz 17356 BLAKE2B e84df76263c11d9ae1fe5bbbad0d24dfd2e866f625deab07f7b72404c351237ac28f8907cb4ef30e5bb88947ef303e1c8c4123acf4c6f899aa66f2ccfab5de41 SHA512 49025fe6fd388ddf72cdb3cbb68f24ae8225d4356459bbb2f8677b90488eb49f27e62591f98f87038f2d17d0355c55bf0c38b8fb94e3929a0619ebf2bccd06e6
 DIST genpatches-4.9-96.base.tar.xz 1813704 BLAKE2B 43236fbdf22137a2f98c617919e3a21208cf7269a5d5e51d705734610e348f443b57677e3c00aa1d75a73c68314de537252eb24bd23cf83e8d7de05c2f111526 SHA512 c8275aad26fce06c6f8286d4341964031aaa5308ee4e0396fde48f3abbc97fc47db6bcc67764ba424dbed6d93fcc935f07831c20c5dada21acdd9e2d9575a5d8
 DIST genpatches-4.9-96.experimental.tar.xz 106408 BLAKE2B a959d2df5d348d1dac693e9e99169f7f87a0234cd45e4a7b8f77e5d446cb844ed210ae64e7d5f50239e5d4e1d55da67ab740cf803d428a683d23ac481731ce80 SHA512 aa23d0364460a82382f6554416019ae1bec6fb61e3dc18ed2c9366b25f47fac447c30ba5316b5b627e041710cfd33d8411c998bba1e5e9ace722aca304ce9816
 DIST genpatches-4.9-96.extras.tar.xz 17352 BLAKE2B ab1643d3b767b33a4f0cf1d5de5fd373d7de89f2eec1d0c626cab8155b057d18667f614bc1cf29926e5c55538ed4570ef9c25aef171f13d8c86fb3aa130174d7 SHA512 7a56e5b5108ed398696e220c25859ac1a5a9e02afac6659977f1c38b8d0731ee9b8455654d3e5d03e50f188ea0eaf2e8714435eb241a4bb7fdc6f2b273859661
@@ -56,11 +65,14 @@ EBUILD ck-sources-4.14.34.ebuild 1890 BLAKE2B e396f6558628023e7e5330e522391c059e
 EBUILD ck-sources-4.14.35.ebuild 1890 BLAKE2B 31e796623109a95e9479c14c1fe4215d48703d0daf74e31ac9bed2241316610a57eceff0d1877549cbbe27eacb2445965cf58cdf5ff12ac5353245b0173043a1 SHA512 1ebbd911db82c82361b31f38126b6e8edbad30d2ee33857635237d0dcf7a83ca31eb7235bd67b07522b9a4aa9bcdb735bf2382c9a4547d834d09df9915076ab9
 EBUILD ck-sources-4.14.40.ebuild 1890 BLAKE2B 1189c57b729c29b7fe37d421e69a5bef9f1ee9d6ba9398a116bb40b839927a85925678a65666c24ec26cc445e332d7d56af77a91d19b31b574e3b3068279fe8e SHA512 6eb6b7001d973e354163c8ced89ae13999a0b8d9aeb4f469c0d46648960c05433b42186376ee815944460e0358761c3ece9fb97a89a15b104354fff690004e62
 EBUILD ck-sources-4.14.41.ebuild 1890 BLAKE2B a951cff7570362e32c29c2702612b9b877342a16504165b4dda2c93725506e69b6cc2f3d2aa1c0785a9387982b9126cf9fd82164469fdf503c5a76c2f678b9fb SHA512 643c67eadb27afbdde7aaad402e6326bed9b842b44984eaf8accd4c0a5e6ddd86270d0fb570def87fecd449ec647ed71bf639f9ed8b8089bff5e4d988342f1ac
+EBUILD ck-sources-4.14.42.ebuild 1890 BLAKE2B c5c2ee07b80189e0c0a144660ed141c5d92a2ac5af5e0130c4e970c93a1f3f2d52fd3a5d3736784ccda6168d815ac5c2ed920a20d5f41cd79a9a520cfd90b076 SHA512 6928cf9380784473ca96ef15c821332aee5b6b0b3068e430c5277ce084273286d63a1e4f495234740e1a78d7985326f269a527ce2bc76b8ac459ccc749029854
 EBUILD ck-sources-4.15.17.ebuild 1613 BLAKE2B c686bdc39cf2bcdfb39fc6bb1d022abe7c89c6bf56d6768dca114ef37a75028958760b0248cd998fca8e38b0eee1a91fe60f377855bbced0962ebdb2e6fc1d3b SHA512 c89b106684d799d5cc02f57b2c963ceacd67ec9319aa2ed4d56a377699972d817463fd5dc1449bbde5b000f67944430bc6de04275ed8aa8fc261ca63636caec3
 EBUILD ck-sources-4.15.18.ebuild 1613 BLAKE2B d44234f86f13cdddd3e9e4aef9ba9416fa99f43dfd9de249fc38e7c51f733bd1ca21ae07fc2f862e304139ec5bff459022054978931996d8c6c033f89331760f SHA512 ed30d4061718fd052ec346697a2d5f6d737d4bfbcb16ea9164d0d45f6cb9312845d1301ebb1f51e759a1748bf44f2a6080132cce3ed8e34bcc1e2c9caa8c9109
+EBUILD ck-sources-4.16.10.ebuild 1613 BLAKE2B 68dfdcfe26016215211970aea4ea14e95042e9db0dab3ebc090017ac964bce69f3b721edf7ebfe1dff80876b496689601e982dd2524ed82c3722a51be8b6d96b SHA512 c0b101634574032eb2cdfb489dbd1615a8cda82602db99dfb04f3b4f8bb696c2faacdb0a1dd19c53d2481056cb544a2ec651e42a229e3bb0ae35f92c460c862c
 EBUILD ck-sources-4.16.8.ebuild 1612 BLAKE2B b4065b5b7b954efe9f1dd0c947ba8254c5720e29be9b310bf5a4309016a4413233da74737d65e9c6f1a36fa923323eeb2920093e34f6df538c8e07fc3a4147a8 SHA512 c2739523c055f939b14ac149fd76788100d0fcd5d750056cbecd1935b80effabc11de5caf9ab96df946d45f4c354b780e456990a0a4037d49e49c4b5045a59dc
 EBUILD ck-sources-4.16.9.ebuild 1613 BLAKE2B d48cd4eef9a3de8313a0d400ddd0ed46d5bb5f71ad5d07373673234308394af43d0f5058766b5b09b3b7355674f4acab59755057e7e6ef677d1fecebeb6b7c0f SHA512 3426bb5264b67d482fbfd20cc4ffb664c2f60ed31fd169c078ccf06370c5beddff376ecefa6fb37d587be1c2673312cfde2e3f79f4c139f393e248c900c833ba
 EBUILD ck-sources-4.9.100.ebuild 1892 BLAKE2B fc000087dca221160f4e403aa79158fa72552ae807233543a619b7afca0931f3d7b22386b9b170e0a384514dcbb5bb46133814c5d7b35a1c6b9747f99880e2df SHA512 5fbbb633cd61982643079f1562070fa6426c7541ed3b31d4134b120ba5151042a12175b8ae2e63232335217bea6fdb0120113bea920715cb932abba50f506e9e
+EBUILD ck-sources-4.9.101.ebuild 1892 BLAKE2B ff6f002af8e3ff6dec87ca42cd5128d4429697addf8d3748712ef5ba8818e40c14fd8ec5c8d2c0fd817560abc58926f3f1160fa16ff5c66e6767ac5a58b63d56 SHA512 c2a276c330872f031f3c729887489a874f8ec6df8603187a9c6eda59127a3af969d590eda09606f0330f40d7389cf4ef72a375c15fb2eb60c9dfad5e6dffcad5
 EBUILD ck-sources-4.9.93.ebuild 1891 BLAKE2B 6b6fbd4a9ada3a7f348012e1d5dd541a8d8c930c9bb51737f2e12faadb57fe9c2fdd54cf88361557b3cd69c8891815b3f0ee38875d631745bb4f4ac3915ab6bd SHA512 bc67bb18bf2d98ee26f575feae16696e695c93f3591d2cfefef7c6439fdc8b7d5f69ec06953d20c56dad0c251acb1148ab8dedabd28d84c79c0a02c4b40f69b1
 EBUILD ck-sources-4.9.95.ebuild 1891 BLAKE2B 69e55844a6b354cc046acc196ce3c966c05e8c1fb27e06f7bf7cca68b8ef0fd98ad1057195a11de52810d0b6d64e97c76421d67f76107a87389daa9218be9d8d SHA512 e60b5414bd80181ba16a00841a2ab51923996bae6401121ddead1ed199bda77525651e3e754f980186ab64e20fee18dc45c46547ae3d35d4ced73caebf8a7237
 EBUILD ck-sources-4.9.99.ebuild 1892 BLAKE2B 0112b97794c6f18328ba0e2063bbd238cb515091c8c530fcf6170d62ead611ffb26fc9ca1b9ee314a8db009e2475f609ae81d7bc055c9be97f40f53c4616b03a SHA512 7c4feace1bfe13cf8d4e576fd72e3e066c0eac1d0a2fae5e238c334fd719f3fcf631f907f7a47dac495f97cec6eafd44d64f80c7b76b04ba49ce580313f8b55b
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.42.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.42.ebuild
new file mode 100644
index 000000000000..e6c63746647d
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.14.42.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="47"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# Fix for: https://github.com/gentoo/gentoo/pull/6942
+BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
+BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
+BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	elog "ck-sources previously enabled CPU optimizations by default."
+	elog "USE=\"experimental\" is now required to enable this patch."
+	elog "this can be set in /etc/portage/package.use (or make.conf)"
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.16.10.ebuild b/sys-kernel/ck-sources/ck-sources-4.16.10.ebuild
new file mode 100644
index 000000000000..12ff9f3f4929
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.16.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="11"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	elog "ck-sources previously enabled CPU optimizations by default."
+	elog "USE=\"experimental\" is now required to enable this patch."
+	elog "this can be set in /etc/portage/package.use (or make.conf)"
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.101.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.101.ebuild
new file mode 100644
index 000000000000..c29dc6503402
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.101.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="104"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 2fcaae3fb156..3829855f584a 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -28,6 +28,9 @@ DIST genpatches-4.14-45.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0da
 DIST genpatches-4.14-46.base.tar.xz 1190412 BLAKE2B cf4c875da660153fdc018e10a208d0277ca7e9645aa3ced2a6331f182a9eb50ad3f459d94680f0749cff6cf2e2900930a169873b0e3076d54b4155a4718aba5b SHA512 8704a4855b85b5ae151cbf66300ba7b0f546e7283fb58cfa8db32c038b32d00481770d9152e6a616f90010709215d7c07fcebd7ddfabd2978397b669894d794d
 DIST genpatches-4.14-46.experimental.tar.xz 5184 BLAKE2B 501c9b838f5e44380043ceaa9f8a5d9097bcd97c9113874cd8c9959224d1556e64867605c803e02ba92f70e250cb8f96728dee728e52b97feaf43eeb75a95fdd SHA512 907a896f768ac555d04c7d5278c632bf9a89c556a1ba863d01ba73cfa98f20c5b12742cd057bcb6037b41d12420069ac7a2453774d1a79a4e68e1216c188192b
 DIST genpatches-4.14-46.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.14-47.base.tar.xz 1200752 BLAKE2B 4e52afb8c85a9d2f162dec0d0e6ef557a66a6b899d47fd7578a350d65ad30bab32daa514d1305cf3a7faf66ce43f74c6a4525c8b987846bc92c2ec14405ec9cf SHA512 c2a46c73d999a199b406a712e79b74d1c33c1a3d0963d43a69f8fd32b9e52beb715867cd064639c842f2395993e789de42b18973932a042061be03957ee81b1a
+DIST genpatches-4.14-47.experimental.tar.xz 5184 BLAKE2B 12a3437d97cd8f7779e158f6e376ba41cada33db4fdbad8c803baaba01e5e459738b155fec1352e3354020f5b43846bb479fe2682dee5fa296d498e41b67af58 SHA512 885fc8f8b127f792426b575dc87d4c8d5655ef514eee7d8a77e065415db674fd995f6eb91c0f23ad0f03a26b01dfa67f2d474bd5a8e7753922cb9387be2d184c
+DIST genpatches-4.14-47.extras.tar.xz 17504 BLAKE2B 5f364e68c663c7ef6d5bf5cded7fc304d806adde306d25294996063efc6c9d3134e4d8da1839cc4fccb2da4d0781b2a9ab926351ce6bf4b4c0bae9cd955233b4 SHA512 6d17fdfa3228377120147e43f7a53700c8d3f25c6f2a09c82818558bce493e09db4a7405c42f1b4697a4424ababc607128d98d88301f825a266c802fd18cd78c
 DIST genpatches-4.15-19.base.tar.xz 418976 BLAKE2B a3308a311f69861513ea5d0f92c65f180e640353e015e0e0869cb5aa1fa5f1d00bc9b3339f1115b1c0b193f6917237e029177d011a56660d43ae30299566d547 SHA512 16955bee641b1467f7ffed95100ff2e840093638ca5ded0937e2eac8854c6c213f0f466c51df2262d8f0feb41d265410bbc04f6ef0dd62ea0ab48777aeaef5c5
 DIST genpatches-4.15-19.experimental.tar.xz 5188 BLAKE2B 7057889db0d41a03e8a2ad1c3bb81f529088938ab8dfae6c6a0850de99af8cf73d9f4ebf9e7d10adcf4a34abdc516853570ad1f8d1d019bc256d2823efe47743 SHA512 74d6c91eaf4e6eea292aa1a268fec104f4d0b1baf6cf412fed32a6eebfb8c778d1f27d5d140f5addf4fc25fccb5b21b374760e3c648bb38517e316adcae2602b
 DIST genpatches-4.15-19.extras.tar.xz 17484 BLAKE2B 4f0dd93555cbdf9d64b94714e34430a0f55f1a36e509aaf0f6a367fb9a2875680f5a97205f08b8307f7e66d7e6479bb3e40823c763512387d0c6af3618a75158 SHA512 9779f34f4077b1dd662dccfec156682f1015163b75b084c2888b58372fc42e50f2de8f8f9011e5deea8850fe5e819ef3a6756255ef6171b6f42ee23d3eff4209
@@ -40,6 +43,9 @@ DIST genpatches-4.15-21.extras.tar.xz 17496 BLAKE2B 2240a8879139d6ad765a9e38d0ef
 DIST genpatches-4.16-10.base.tar.xz 215644 BLAKE2B b2706d34e5778c3453aac5e63c006a94a1f35ebf164cff8af692b754721205303a3d22a1cf7715a1809359d166191dbe29503ae0632af421c34ac59210876ee0 SHA512 0d290d1853481052b74d7777ea62c16f1c9d25d3b27b9fffa5f444d48e23a4dcf79cd12008940c2ab8cd6af3733003a287620148a4535431081a7d37e7b9d5c1
 DIST genpatches-4.16-10.experimental.tar.xz 5164 BLAKE2B f99e68621a2e5b17e4f6bef55a24ec2c52c442abfa35230e869ae008e4fca3721375e4a93a4f6cd7c49f09e5412ba4cd753bedab2fb4ae85fad57dfb8761f04f SHA512 4288ddbd0123242c5e22b69645f9da7d706c08c7dd313c7c59481ffd42c395076e7aac8bc26736729d04cebe5b1da579cadeca1ecd4644bcf1d786e402e87642
 DIST genpatches-4.16-10.extras.tar.xz 17488 BLAKE2B 75169c7816271f85df521749f6da4a706217797b10a4b3bd8ff7cdb37e380c3427f442428707449afa361956bb0197cc4c30f794491bb9ba1f5056abc586d2ad SHA512 dc8253041478cfb0ce1f6d5d1ec5a4e006320822e14b79f40fea752575e47444948987c17b8ad90d1bf5febece034393f49ab8a049e5e33078831e8e640c27e2
+DIST genpatches-4.16-11.base.tar.xz 229832 BLAKE2B ad7e4b657825802cd3049893140621a26a20f78f5327c43d36cdbbc3ba87938a80276757f1952fb532933d691428ce0bb8dc23d8c8c1c6533d939adaf7a65b5b SHA512 589eb66c4908d6c4964b50e62b22ccbcf6e9b5959cc0ce0bac6d07dbf483c0a0ded6c640649819efcee07f71ed0f930a0f6059be77d8df65e11a3f5031f8555d
+DIST genpatches-4.16-11.experimental.tar.xz 5168 BLAKE2B 9d8fb3e66bce93a3e8e2925d3b0b3627d37af82fc3b31faa4a676e2b8c355f36ffc998e1cb0b7a7ae75153712ffb3cbe289a351a1a5511b65251734b9b977e57 SHA512 eff2802e2d950357dcd368a9b358bbb2a5892b886be8991da0b808ecf61f199fd079a1d4e3a60bfe0c70bb4c97b582142a1f3341731d50aafc6fad06e462c634
+DIST genpatches-4.16-11.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
 DIST genpatches-4.16-4.base.tar.xz 46368 BLAKE2B 30a98545ab83f25ca726d3b2fddd4abf2a5b325be187ff16836aecfa699526efde2d8c56dbfc7af068b2e281527525edc0d18a14244513636e42f31fd726dca7 SHA512 dd723b619926eaf4fe13db53197e2142d8ff6b2e18eacf829635ce84d442a795e3ec392ac70ddcf0ce55af48470a3ba594beaf27783b473cb169e3aa4f608223
 DIST genpatches-4.16-4.experimental.tar.xz 5164 BLAKE2B d64e5d3c47c7b98fe56b7d1fcfa331c8fb114e56829b602321ef52181934a5548f6a6a5bca578faf64637b277430e8378ed85285d2e422e0589d3292d96c2479 SHA512 b08c4fc95160ec60dce4e4dc15d885e3d7559a2b133dce76e134982139e1b9a6ae2034a60812e2b2c263e10be0e6422ee2e0ceea2b9bc00c2152bc19239856b4
 DIST genpatches-4.16-4.extras.tar.xz 17496 BLAKE2B 04b98295a1a852516aefd1f99e806b1d471b98164948368e64179eb6c0131079b7743639eacb2b5852417e9dba0b34d7b2c92031c3f36bfc8845f230c6dc9f5d SHA512 5941bf6ffbe7e79233b4d722404c76790ab0c7c2a5090e1fa52a41a9dd8b5597013676f9e877f7440f6ffbef3d3ef91da6da9241f5bc94e7337bc0f8a2001508
@@ -91,6 +97,9 @@ DIST genpatches-4.9-102.extras.tar.xz 17356 BLAKE2B d9a05e5b95c7a4c2477f01c7cef7
 DIST genpatches-4.9-103.base.tar.xz 1979040 BLAKE2B 767d35109446a55c229bd3cd7a66beece88557f810b1ed1548d556e21205e2ed50eb5ee3d3aeb21255f5a1f7878ecaa722b3cc2dd0a45f116cb9288f04ae2d2c SHA512 8ccfe558b0ff3fea8765664a5304b67c7e244fbe88990cdb50f82b6e9b88c2abfd865663329458c5455cafc29f62bcfa5e3a6d6557a989af99ea0899a4ebbb92
 DIST genpatches-4.9-103.experimental.tar.xz 106388 BLAKE2B c8a171fda6fd70e17662b779805cc7353303159443fc4031f153bb8acda5c3632aaf331d1720c389b030fbc837d25522c4abbf6cb1858e7023ba292c5373b633 SHA512 db1c60f4c5356cc67e26244af373678fa7b51155c620cb8d62ae966e63e5b2c8320167bae699137135fd2e522337e197d6e2d8c1bf9f736ba5fc0657243218a3
 DIST genpatches-4.9-103.extras.tar.xz 17356 BLAKE2B e84df76263c11d9ae1fe5bbbad0d24dfd2e866f625deab07f7b72404c351237ac28f8907cb4ef30e5bb88947ef303e1c8c4123acf4c6f899aa66f2ccfab5de41 SHA512 49025fe6fd388ddf72cdb3cbb68f24ae8225d4356459bbb2f8677b90488eb49f27e62591f98f87038f2d17d0355c55bf0c38b8fb94e3929a0619ebf2bccd06e6
+DIST genpatches-4.9-104.base.tar.xz 1988596 BLAKE2B 00e31664c8da68ded4e831c872296319b341690c2640c47e0940b1dad6ac1cf9c78a1a773ea5120605af3f09ccf4a62f544b6e6a5d42562d3a803ccae6617dfd SHA512 13fab296b38eae012ec9e58bb3e29fb5bf3b4afced6156d87e275836d04c9afc1a5c748b45e495d770c665e3e61020893f3ae912d7c014b2891fc56b87f640ab
+DIST genpatches-4.9-104.experimental.tar.xz 106388 BLAKE2B c8a171fda6fd70e17662b779805cc7353303159443fc4031f153bb8acda5c3632aaf331d1720c389b030fbc837d25522c4abbf6cb1858e7023ba292c5373b633 SHA512 db1c60f4c5356cc67e26244af373678fa7b51155c620cb8d62ae966e63e5b2c8320167bae699137135fd2e522337e197d6e2d8c1bf9f736ba5fc0657243218a3
+DIST genpatches-4.9-104.extras.tar.xz 17356 BLAKE2B e84df76263c11d9ae1fe5bbbad0d24dfd2e866f625deab07f7b72404c351237ac28f8907cb4ef30e5bb88947ef303e1c8c4123acf4c6f899aa66f2ccfab5de41 SHA512 49025fe6fd388ddf72cdb3cbb68f24ae8225d4356459bbb2f8677b90488eb49f27e62591f98f87038f2d17d0355c55bf0c38b8fb94e3929a0619ebf2bccd06e6
 DIST genpatches-4.9-51.base.tar.xz 1001928 BLAKE2B be8a1a304f634b40dba1daa56922473c25fc57cedca73401bc1a142674832bb797f805f883aecc56a4b17fd63dae6aebe42f7c642739e8c5704f130b6675dfde SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5
 DIST genpatches-4.9-51.experimental.tar.xz 106416 BLAKE2B 483d57d8e19a135130e7084238c304e07ddf04e51dba8aa705566d4be3cf3a3b21a1f8a4ed49a7b2b06bc5b70f820788bc22e42ece8e6eb5d3ea3597eaf31289 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3
 DIST genpatches-4.9-51.extras.tar.xz 17356 BLAKE2B 03160cc66db43d543f4bbd3171741cc36ecdd1d3088a143144e8725d1a8452fbb3743dbbd196ba387875cd0eb4fd966821fc9d3b3269a6848d2fda650da5ccbe SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e
@@ -125,9 +134,11 @@ EBUILD gentoo-sources-4.14.38.ebuild 742 BLAKE2B 448fdb83ecb3208a8c47f809774ec33
 EBUILD gentoo-sources-4.14.39.ebuild 742 BLAKE2B 269255718016d4c18fe36618ec32da0ba83befa46a0061e2703b70839cd783bc9926f3867541028ab383a12198170a9131f008959de8ee0f3e29c6be9b6ae435 SHA512 53ca3e5fc5ba4e0e65b00e63e82427ec99ddee9664f504f30699f61f90d998a1f952da922f75e12de969bce8faac53c005fe24e7c226d04d2c728ea839347dff
 EBUILD gentoo-sources-4.14.40.ebuild 742 BLAKE2B b33b45fdfce80d37224a1e9921bef528a2d53e32734d36065b415d31d524e4a90dc58beeb0ff56b494bdf22386589a913ed2dc8291f3a2cf27080a129373b541 SHA512 5cb52d93d3de1fc28d7e0db8738aecd28569f4332a743cd03670413cdd3ccc395412466cd62855fbdfa2b9ada2ecd049644d292711faa61846fe057b3e1665d5
 EBUILD gentoo-sources-4.14.41.ebuild 742 BLAKE2B 93a3bad7a055db53273778c1afead34634ff7dd3b4105695d600e5167c89bd0bbc8354d841a6997d98d554970cf3f936c8bb3696dcc802b420a1ed6cf8d71c9f SHA512 4ab9503c525fdf8224816464ff4bd80d9cfb0491e7c15ef0412a6b70aee390d258cc9fd7aba87007cd3d0669874d4fa269bb1197ca3dd1c855d24f16cd22114d
+EBUILD gentoo-sources-4.14.42.ebuild 742 BLAKE2B 0784e34075ae9b9eaa71b78ced91108776191ab424b2e9026d8ec72079a7e8a1c889443171b7ba745d018ab8e8099586a53e3d118350447183df33c4e6a87f59 SHA512 9d333379549b157028563f02f9a21b75fb3260a99fe98fe8c9448204a2812c74379a618de7ee6426d0efdbdf2d6f80f039c3e27a95cbf7b0dcc838e8c78770f0
 EBUILD gentoo-sources-4.15.16.ebuild 742 BLAKE2B 8cf138fd93fa76e2280baf29a973fd8d26a495d41cda3cbf0b9ac1b81718209a14ba87ac2623ce768bb9bf2f23813dc3a9e35ec942c3b031c1e9cb264cb93d7b SHA512 042e8df152e227429809a4e994d86668641b5632ae50f21780636aa22138b2e7fb48b25db6533875617c9e578c3c3f0f852188dad4137bf6c25c55ae75b86eed
 EBUILD gentoo-sources-4.15.17.ebuild 742 BLAKE2B d3121b065e2470df22b82884c4786e16b886b2d665555596f08f2193d8b37cfa624e84a241382651e38811e9bb24f41a608795620ae3df5166d2b5830bdf8014 SHA512 adc5a779711a415a5e614c26e60fac4b301e0b7f101fbb8c0e06308005f355b7e0f61ca613d5135c70b6b266b33b408a6962ab20b816b68826ac1e81451af5e9
 EBUILD gentoo-sources-4.15.18.ebuild 742 BLAKE2B 863f9406c40f4646d01f4b023b393cce2df9d8570840c9d3b59b8269deaf646f4f94cff234c7284df02599dba189edbb741edbd6d68c9514299aba6093964d46 SHA512 c8114271cbf01aaae62118c40c15e178ff87854d1a3d27df49fae729bbf472626e4e30458e687db36174a6735a9ac3fdc3b5d04421cb71493e5ab3b412a910d1
+EBUILD gentoo-sources-4.16.10.ebuild 742 BLAKE2B 236aa15d94c986e007093b39cb21e36851191a907a7003f4cbffcbfa8075a69119926cdde47e8da9e88b31dac43a5e92ecaac1d20bd8534588f662b9b08feecf SHA512 fab04b4e34ccd0cf93560d2a27eefdb8029f6cd6f8c93590b1bd091b085a96faab788b25b764bba9917cc33385b4900fada87594aac17e79ad1d76e6f7ef0ce8
 EBUILD gentoo-sources-4.16.3.ebuild 741 BLAKE2B 64ad4fafa2243d25c4798c2020c8a16ce32c4212812023073b55a977021e150b52bb2fcd13133831233be438760178c71c03423643b3729e11814ad55aa71c95 SHA512 2a26da6cc8938e404fde1ae53aba5531521d87cdfb1ccda14cb64584df2595e9293d303ebcb09c384c2134b4a5e0e6176c0d5d77de6a55f463113e4b94a06d70
 EBUILD gentoo-sources-4.16.4.ebuild 741 BLAKE2B f1e5fa6acf69df9a5e78740ee57f94033bc417bc64b6af21df7016d4f20b10b5498c49eedfe042bb2a5c020d30baeab532d3296c5284cd8de1e95bd342b80c60 SHA512 2491e573773f078689ec07fd1c836b55032fca2773f5ec8195a4c3fd2e23c8356bfbf0a51976621c074491881352c3fc4ce35723f2ae2c1c55773b5dd799b463
 EBUILD gentoo-sources-4.16.5.ebuild 741 BLAKE2B e0a48fdf626979d01025952d1004c9c8b59cb5891d7bc966ad1f4dc38f636da59b4237f9d1ca078bb4e787d06e61a83886425a558495f0aa1b43285a7cbccb95 SHA512 19bb33b52273b61e22a9cbe31cf5cfc09a671fae876131fd37bd0c28d2bf75403aa80f81b6b52cfdbe37de383dc4d10d76029a17f37c10255006001305d7b767
@@ -143,6 +154,7 @@ EBUILD gentoo-sources-4.4.131.ebuild 743 BLAKE2B cdd429f650da7e9bfdfba79f33f6024
 EBUILD gentoo-sources-4.4.132.ebuild 743 BLAKE2B 96d6a21bc5179eaa4c8cd07615d4db6c1c85e71e2e6be6d102fa30a59cd6935df67325d6518d1f892c3425274df267ded9969b9211d505dab9873f719e7dc711 SHA512 27a3cbe5b476f3040d92e702d0814b8ec660c0c19ef680fbfb37cc0c051d7d5df239bad2d263efd3229822a20e50ef5dfaa454d3cee951e64489a0bea94c275d
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.100.ebuild 743 BLAKE2B 1e901227a2e45994ad3658fff49d125e23183ad9ebb1e1729cf9832329a1ac8e2d9e01b5a638097aa9775a3706bc2ef29f1bfd8a7c22a59de370a199818f7bdb SHA512 d95fa4ba848c9e3748b911bbd07619ff0a53de10732dab6678bea00e5847756f254a1b9e88822d4356f304de3924ed23169fc5a5601301b042263937886ac9ec
+EBUILD gentoo-sources-4.9.101.ebuild 743 BLAKE2B ffc4c00e086076225db245e5778bbf4be967fe5fd706959bb5c76d8b83b910fed6972b7807279cbeb94246533d0112cf51b1263193f332e80d041e5c8e6166c9 SHA512 e8006ef4f7db559cb2d571744762cfa2c05367e434ed89556a96ba8c6bc32395ac4c1551caa9a5294742d23e8303f35308a52a88b590d1ff8f2baf1a9cff4d59
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.72.ebuild 738 BLAKE2B 1c88296bca01b95ece33afc5dbc5fe7ebc29ec545fdbff53dae3113b028392c41fc5557e949c4c07503fdc88b5c5f925b79316e48bc8ba8978a316554a2aa191 SHA512 d1c3b5fbcb59ac3ab703b8dd62a8f4f213dbc14526be00a34c3bb480dc4eb068297d02ab0fff33bd0d6fcf8973e862df74ca31e774cbdb0a437edcf892c233e9
 EBUILD gentoo-sources-4.9.76-r1.ebuild 737 BLAKE2B fac5a16968488d560fa550e85e6f73c7f356d23f287abfcf1a2fe1aad048832f46bb152db6afcf2cab4daea535f7c51dff3672062d8379620cf2451d5d3e65a1 SHA512 6e3af1a01abcadaef0846cb4fb861d583561fb54937d60d22803eac7a7d62f1d4d1e3e05202fad77c9699a8d4a34d09ff915cf2af948a4e64224c4d1a1818d2b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.42.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.42.ebuild
new file mode 100644
index 000000000000..445b32fee602
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.42.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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="47"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.16.10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.16.10.ebuild
new file mode 100644
index 000000000000..8e9c3c7895d2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.16.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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="11"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.101.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.101.ebuild
new file mode 100644
index 000000000000..638725432fd1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.101.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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="104"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index b54b55fad1d5..20c460ca1454 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,9 +4,11 @@ DIST patch-4.17-rc2.patch 76681837 BLAKE2B ffd1b51b4dc8f8532d332a58cd0115ba4b313
 DIST patch-4.17-rc3.patch 77049043 BLAKE2B 3c9b46367213c8ce7d510805a24743b2e92c32242f7f283cb79c723b58037c4d70980bf1f377a440c52e8c2e9f119227dd0116a04f5399bd7c6a1f2b091946a8 SHA512 9ae8ebc92b11bcc61555f2a6377979e1cca97e6b44d80c99165da0c8e9b3bbb0913ed9de58b74b80b99ddf7585a77ec4e9b659dc1e51772966d8d2d8f5d808c7
 DIST patch-4.17-rc4.patch 77311375 BLAKE2B 459f8b6b19473d4e5b837c6c4f8c0d08445b294f925cbcca450366a7ff51f5009cef32054521acd06255f98d2e693ba2cba5bac38e72b471d31388dd467172a6 SHA512 75ceeda7f8c1e717ffc3d52b7c30a97564b9e4bd1963be086cda3627c40a64a36950511315287dd1f7bbcc02a5ce5e53a26a7dc934125988f20300a24243d886
 DIST patch-4.17-rc5.patch 77521265 BLAKE2B 6b484480cf896f109b2b2f93fe208f0a93fe3c759fc06df3d9ce2f6d1232910ba6f6e1c095f1bd293aa336510a42ecb4029006156db8be8c3a63b8d0bd17f324 SHA512 9dc5909ebc1d31dab402bbef68f679a41ee92845f4f2454680b5f8e53f659b0392f0475f62cd660eb3f081a75986e8fdc34fa17b61fa35f81c7a6770536afc58
+DIST patch-4.17-rc6.patch 77746464 BLAKE2B 1f09f65007e3e68bc8c771f2eb44e3322e2da8682d5dfa74238bccb2648088e6b083685342ee5e17dd9926b68604bf98c757d974aebef2f49dcdce4fcda420db SHA512 ccf62eec146ad854990227821f4c08fbf58422342ddadfc1328cd6260045a353981c9f860a40aee44dbfe4840e998c065e1a5c1345c0849df719e1a3ee6114a0
 EBUILD git-sources-4.17_rc1.ebuild 1179 BLAKE2B 1f2e3ac29b760cfc312d25650bb9498b3c905f98c3e20e9c0536905efa07752d281373c20b3055b78f0912a01e380f0d81ff0c4f42cf0f7e39ebd846289d0e72 SHA512 50666ebd52276f2c46914f89b95d419656df48e4678613ede96f1f85b84c074f97b3cbb10dfa09edfbb798db0209a01c8c40aca278a26397943f125ca6cddb5e
 EBUILD git-sources-4.17_rc2.ebuild 1179 BLAKE2B 1f2e3ac29b760cfc312d25650bb9498b3c905f98c3e20e9c0536905efa07752d281373c20b3055b78f0912a01e380f0d81ff0c4f42cf0f7e39ebd846289d0e72 SHA512 50666ebd52276f2c46914f89b95d419656df48e4678613ede96f1f85b84c074f97b3cbb10dfa09edfbb798db0209a01c8c40aca278a26397943f125ca6cddb5e
 EBUILD git-sources-4.17_rc3.ebuild 1179 BLAKE2B 1f2e3ac29b760cfc312d25650bb9498b3c905f98c3e20e9c0536905efa07752d281373c20b3055b78f0912a01e380f0d81ff0c4f42cf0f7e39ebd846289d0e72 SHA512 50666ebd52276f2c46914f89b95d419656df48e4678613ede96f1f85b84c074f97b3cbb10dfa09edfbb798db0209a01c8c40aca278a26397943f125ca6cddb5e
 EBUILD git-sources-4.17_rc4.ebuild 1179 BLAKE2B 1f2e3ac29b760cfc312d25650bb9498b3c905f98c3e20e9c0536905efa07752d281373c20b3055b78f0912a01e380f0d81ff0c4f42cf0f7e39ebd846289d0e72 SHA512 50666ebd52276f2c46914f89b95d419656df48e4678613ede96f1f85b84c074f97b3cbb10dfa09edfbb798db0209a01c8c40aca278a26397943f125ca6cddb5e
 EBUILD git-sources-4.17_rc5.ebuild 1179 BLAKE2B fcda14f936066c42140ea0bff6985895ca4f5fcdcc187398364c143bc60b144eab66fdb82c8cd40f6d106d53375441172a6f5638dc086b8cfdffea363f72272e SHA512 f1fcc605fb48709644d267f0c31f06830a501ff0c2fd60cc1eea84a4742ecfc42880e1b78f8272edaac968f85988235e36413d07f9bc47ca7e01b37865c4ea89
+EBUILD git-sources-4.17_rc6.ebuild 1179 BLAKE2B fcda14f936066c42140ea0bff6985895ca4f5fcdcc187398364c143bc60b144eab66fdb82c8cd40f6d106d53375441172a6f5638dc086b8cfdffea363f72272e SHA512 f1fcc605fb48709644d267f0c31f06830a501ff0c2fd60cc1eea84a4742ecfc42880e1b78f8272edaac968f85988235e36413d07f9bc47ca7e01b37865c4ea89
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-4.17_rc6.ebuild b/sys-kernel/git-sources/git-sources-4.17_rc6.ebuild
new file mode 100644
index 000000000000..c0dc94565fda
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.17_rc6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.16"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index c731eeace7f1..41c3302d977d 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,9 +1,11 @@
 DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403f43dbfe837912ccf3afd4bcc362e483bcf15e02df76a37b112b2545c67bfbb2df031890dead100552e402ffc4727041409d891 SHA512 ed95205c075b47a2f30d9c96181ca0047de017abb1b5904f7c504a0afb8ea673c179980eb92d5690dd1a5cfb29815f224f384b4dcc472f80ddc90af3b2cbd4ce
 DIST linux-firmware-20180416.tar.gz 149436328 BLAKE2B 1da8140b8805b4c4d1c12940fe2cb71a8d4fc41ceccdd306f1dbc0c20e986b8a4cef09a1e82bd0c270fad22722738ddb4d7eb2ba81553dfddbb76a3039552d97 SHA512 cf416c7ae8d70a8c36955e7fccff16194515f3b4964e80cba268b5ab2816ea0661bc4ea47ff3bf0c5f47dbdc7abceb39c5586117a6796b5b94bd6ef740424b27
 DIST linux-firmware-20180507.tar.gz 150551499 BLAKE2B 66cd52d64fdeb02e12e1b8fd6b578e2722bac9e9381fc949f7418425390521004e6d145e943ebc5b804989278f6c204806079db98074f842066350f6fcc7de40 SHA512 6ffdfdd5a730d62d476255bbd26252ddd24dfbf926b4a0e684f31f93a65d86f645a19cb0e8773b64cbd93a6840a991bc8767f6b483553a3b822a734014c1f94c
+DIST linux-firmware-20180518.tar.gz 150672075 BLAKE2B ef0c5a5d6ea2e978a5638fd509bde5fe4b50ebc682b685e6e8728667617b2d1460c562331e89b748c86d815341e5bede8fc4a2d5a3088c14b3bcc01bd783f01a SHA512 c2b1cce708f6bb21cc5d48408f335cadcf4318ef98c31c182cfe0630500b1074c90c0b0da1391c64bfcc921ebb500f0f46e8d8cdd6888c60458cce8faab6d12c
 DIST microcode_amd_fam17h.tar.gz 2204 BLAKE2B 20f3b006587f49fced335fd38711da2384a1f5cd0b93a483d7022d8aa211dc855427a637583dd2eae9f108120f2fda4b80db081d48d3332da906de8e10b94464 SHA512 d3b52797a5968f8da76d39322780e61d04bab5d810b0b07d64e469fcd67998e4191b0e0a9ab7e4c27189941369ef1b2850bbbb1458fd9bbeb958c98f6e378510
 EBUILD linux-firmware-20180103-r1.ebuild 3514 BLAKE2B 84d2faeb85a91d1c6e7b1b5b1ee5ccb0a314f191ec6bde04fbe2ba77330a94e58410f4def76459d18e5cc5d2ab566dc4583dafd34b1a3b8a92b0e1ad4cac334c SHA512 d58978d6008035a2d6b59d5a1dd4d04a9684ec9117e1d6d4e1366a7b27a91df4e897a0ccf53f8172d5c540dcae1c45ddf10e764d1e60246e76cc23cd128244ef
 EBUILD linux-firmware-20180416.ebuild 3513 BLAKE2B 85586cd99b12df5af71c105b5c0e715c75f74e6816a00df38da7322eca7e151e6e738ad3ca7611a20ee6048af72f2d25b9f2780f7898b6c20221791979c9f1cc SHA512 8dbd551e889ee4b53308bd37d97a494b949e7ad54e58bbb9a2d5fffd7effc2a882e7b36e7d26f070652b094559b35a40f705a3c2ec1296bd38f851135b0cadaf
 EBUILD linux-firmware-20180507.ebuild 3513 BLAKE2B 1091e1db75858d9a73f814042003c832a62a1882a3654695b98798ea67df6d4e188b05537f930bb4c9287a9762f9e35b26fd8acf8004d4861598ecb142f0ed9e SHA512 f7ae5e5b4bbf76a3db58dbd3fad334974bce9eb1702742be210ef2121652e8adc505331266fc4d504afbc9c44b8259815c82edb7b4f06f4735ea92f8c7c42328
+EBUILD linux-firmware-20180518.ebuild 3328 BLAKE2B da57e8f60e4133aad29390cb1d6f561432f95437931058bdf9f6b2593f93f59bae3a738ffb93517b4432c26db14c2e913bacbbf5ba5cdc02368f187c625c3d8b SHA512 2507de0063c35243920dcd2ec231fc04b7d4e7ec37a950ec98c21ca49d5ed9f94f09e1cc492a6b6404e0f5bc1cfe4518355c32059cf129cb0bedc55d4550c5c0
 EBUILD linux-firmware-99999999.ebuild 3252 BLAKE2B e676dc8c270f045b62137a1874b3c1560b07961b0b77a17693f28faa154db8b681706ee4d813311001b66b5bc46b166b245166bb5361d6b1e7c7f652350de84e SHA512 fa883958bd1ea0c24641b6ed48895306e5352a4e9baa5932b82d74f54aed7577ceeb7441488123c85a048a37b60ef7e6744f078be2f329cd6e94a2c404269154
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180518.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180518.ebuild
new file mode 100644
index 000000000000..df01f03be23e
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20180518.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit savedconfig
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+else
+	GIT_COMMIT="2a9b2cf50fb32e36e4fc1586c2f6f1421913b553"
+	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist"
+SLOT="0"
+IUSE="savedconfig"
+
+DEPEND=""
+RDEPEND="!savedconfig? (
+		!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+		!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+		!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+		!sys-firmware/alsa-firmware[alsa_cards_sb16]
+		!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		!media-tv/cx18-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
+		!net-dialup/ueagle-atm
+		!net-dialup/ueagle4-atm
+		!net-wireless/ar9271-firmware
+		!net-wireless/i2400m-fw
+		!net-wireless/libertas-firmware
+		!sys-firmware/rt61-firmware
+		!net-wireless/rt73-firmware
+		!net-wireless/rt2860-firmware
+		!net-wireless/rt2870-firmware
+		!sys-block/qla-fc-firmware
+		!sys-firmware/amd-ucode
+		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2000-ucode
+		!sys-firmware/iwl2030-ucode
+		!sys-firmware/iwl3945-ucode
+		!sys-firmware/iwl4965-ucode
+		!sys-firmware/iwl5000-ucode
+		!sys-firmware/iwl5150-ucode
+		!sys-firmware/iwl6000-ucode
+		!sys-firmware/iwl6005-ucode
+		!sys-firmware/iwl6030-ucode
+		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl3160-ucode
+		!sys-firmware/iwl7260-ucode
+		!sys-firmware/iwl7265-ucode
+		!sys-firmware/iwl3160-7260-bt-ucode
+		!sys-firmware/radeon-ucode
+	)"
+#add anything else that collides to this
+
+QA_PREBUILT="lib/firmware/*"
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		mv ${PN}-*/ ${P} || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
+	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
+
+	if use savedconfig; then
+		restore_config ${PN}.conf
+		ebegin "Removing all files not listed in config"
+		find * \( \! -type d -and \! -name ${PN}.conf \) \
+			| sort ${PN}.conf ${PN}.conf - \
+			| uniq -u | xargs -r rm
+		eend $? || die
+		# remove empty directories, bug #396073
+		find -type d -empty -delete || die
+	fi
+}
+
+src_install() {
+	if use !savedconfig; then
+		save_config ${PN}.conf
+	fi
+	rm ${PN}.conf || die
+	insinto /lib/firmware/
+	doins -r *
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index ec377354f2f7..f6ae97a93744 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,17 +9,17 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST patch-3.16.56.xz 1956224 BLAKE2B 27db858a51be5d57ff1f3d5409d511df5002f542584d80b64d2303f1569c0502d0d15783a3e36facc2ee9481ada4b8f08359a79972b4a3ca07ac180c2e607c01 SHA512 e1c1c004c2ac52fb6944718c82b6c70a9ee4175943fc8477b298dbbde42d16f1e1c9387f9d5ca05958b3efa0e851eb0105daf4a0d59ad836b31ec3919ee857b6
 DIST patch-3.2.101.xz 1942280 BLAKE2B 9000a0e0d23a6e9e8651c6f2f936e0aa14e6660ad27fa8d29c35fc71e4cb0590337460a80aecd5725804546a20a610f367ee9da5864d53ffd1fea45c0e43b2a1 SHA512 00a8d179a60bf628ea12595d866c25ce5848e9c68ae44d7a10388e5ab2e99fb7f3ae77d57689a9ae161c9084d5de84c595f0f96e4d8eaf60230bd28f3435acf2
 DIST patch-4.1.51.xz 1456804 BLAKE2B 8c95a6a85258c1ac13cd475b73ecf70bdd82018b74be68f34345ccdea88a2acc464117dbdeb764d11251a8a023eac2558753431025c9849ad62c60cecafff562 SHA512 37a5d84e15d1ca9096aff7e762007e6abec370d865a91e6f254412a322b3f371d95cb3dc5143118583a2a553ebad93f425439fdd0985a6ec2a4ecf65dcb3e1ac
-DIST patch-4.14.41.xz 1116864 BLAKE2B b2d844bd3dfb6e5e36841fff59ebd7d043f62f6b677034479eb124d0d56908cca216d29ab3fc2f18492dd0c30ae0a4ca12904c3baa3bb864cace1d314c20c016 SHA512 eb946d80e1782fe53b042d6b96be07ab1bc5e7d5e29bc6fa7e0590238acaa68c93fdcb93a85666e682941f5b35b407dc988853452a89d6253f31c2d7c91b71ec
+DIST patch-4.14.42.xz 1126044 BLAKE2B 7b180d715bbe338b8ef34572c3d2b3ef02aaa51ec552cec7ca4cd979c688cf20c068332c92d0f0535e988311a52fae5f08343fbb15fee8fe59dde79addb96bc1 SHA512 5480a05cca0c0d30dad2a8f5d1165d9e07d3d4252f4131c3f0be89261afed36859c42ba1e7eee8cc7ae0964a226d7435ccdba652a8390bef9153e1882ec190c8
 DIST patch-4.15.18.xz 456456 BLAKE2B 94b41c7ada6547c6e2823602e11504f8ba57c9b1ac9bfcfb156a35ec42415df55fb1faeb6f548f6d52cf435bd5109ec03d35c599ca742160672ae814281f91db SHA512 c40dfeedce4876fa4df51ae93978b2a8d9844ca04cf890a6d708fd85786dcda99a6611066977d5a4d841a03af8838d6aa6e1bc69084720fbf7147058b8394fb8
-DIST patch-4.16.9.xz 207880 BLAKE2B 20a86050829a471254761a17abbfe59a7e9bd6da014512446dda451083e1301c89a7cd873643fd4e1fc906d8746356c54a3dbb3a91122361fc56b75e07842559 SHA512 d3a26957b13ba6e7e9488991cbdfe4ac20112efccbd3ed6a5c786e344731561323ec3d36e0b163debcbdcc33a8c7c545ee755b33e14c8d10e0ce3e27d90ac109
+DIST patch-4.16.10.xz 221656 BLAKE2B 7232657cc83f1000e745e4e2b2b1b2c8dde3d0f53115534bd2559ec9a4e1eb49fb29613a9a97a421f56aeb8fc720e08540c2ad0a55a1216f2075f893af1fe32f SHA512 53d700ca245341cd6493ecd01af069b2015564c9d7514751348e57047838bb1a6379f065dcf21312cf8f861f5569d28e7445846b40d14c225c644a69c09da5d1
 DIST patch-4.4.132.xz 1883948 BLAKE2B 77e06affb5b3ec82cbb1dd95e87e896813c1891fbf0d6267508e5966182161ea1017e0d70667e6280fc531724e69f366e79987ba65ec953f789e7dc7696e5443 SHA512 eb4c2c9e4e91ec5a89039de1bcaef7e5003a5e353b000483a6e942bafa3499f718f91f396a8d76eb35e097f3d03bc0226dbf498be0f9a75e7d19da0341e41eda
-DIST patch-4.9.100.xz 1826600 BLAKE2B 769cbd1f93ff1bda57416c3ee653950ec92440065be8ed5cd80860edcc6f355fca367b8866295e2a87a2149b7c4ccec408005e49cd7cd272914a7c906288ee58 SHA512 365cf92409403a9a284c6a27e370797aeaedcb4d7a2aa39760026d7120c337efcca16403232b6bdbd4a2d688100a67352be5211856823c0fbfcccf680f491ea1
+DIST patch-4.9.101.xz 1835168 BLAKE2B 8adb0f070808cb42cc39f2ca1c0e64e211c8a902b821a6eb8efd04817979341ae73f4050354da54e182510ace372b869e036e798ad33038b44f93ae6417ede77 SHA512 4f63b7768f6dd36e2b24f62f36fd72d1407c32c66902788f671db246589751ec930275db52dea4fb8068e3204bc3a12f5cbaa5b79c9c69daccb5adf76f2f77fb
 EBUILD vanilla-sources-3.16.56.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-3.2.101.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-4.1.51.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.14.41.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.14.42.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.15.18.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.16.9.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.16.10.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.4.132.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.9.100.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.9.101.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.41.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.42.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.41.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.42.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.16.9.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.16.10.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.16.9.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.16.10.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.100.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.101.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.100.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.101.ebuild