gentoo resync : 29.08.2018

28 files changed, 538 insertions, 330 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index d29012ca9eee..6560d53f4916 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 2fea4c7ac1ba..55dcfe4765b5 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -11,9 +11,9 @@ DIST dracut-044.tar.xz 280004 BLAKE2B 5b9603eb769b542e2d56fae4d0f0fe250e7e60eb9c
 DIST dracut-045.tar.xz 292652 BLAKE2B 0e7c57ddca6757d59823afdc4ff23dcb06cc9cec317ece8cca14c5b6dfd2a7984fb8e857f5f48ad61922ba11b4b68944b366bddb02552efb52375f6e12802de7 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a
 DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122
 DIST dracut-047.tar.xz 305836 BLAKE2B 18333ae1e24cfbbb6a152bf9ba2c48884821f6a506344259ba56c581a9f3efac7b4c88e8ca149ef1f83347a5e4d59acba61e42b8e0ab3a9e9beb8684d5db28b0 SHA512 03369726b6c2b682d0c9dead7b7dbd1c3989aaf2b4a561015634d33a94e5230d03cb634c3890191b19dd8c1c83389533ae1a46d45d2024ba885e0d2d46c5d035
-EBUILD dracut-044-r1.ebuild 7688 BLAKE2B 0746d8c7b1bc07fffceb5fd8e12ecffd663885396fe1d8c849977d4792e0f82ae4db517cc28aa1f676726f843a74cbdaead75305543bac19d99c2afe4cd74f73 SHA512 e82388ff89b4a9309f2e38c8d4cae5db63765b423d1066b978d7eb2b7374f355af49b3962ec22e4ca1a37fe699ed3311c610565f1218d249189e4f28a5677067
-EBUILD dracut-044-r3.ebuild 6946 BLAKE2B 0d8d4af31cee443564192cb02ef4b620f33a5388ada4c5359dd21c6e21abd2beebf194b7d5890c6f96016e15928118b88603e56bf4a81fe82ce09f5d33534bf5 SHA512 65f4f7193a6eb32c81cf57ac8d37c7a82ad2fe0bb580f5dc65c168b02a41f4cea29b81f6432f760bf59decdde501800d7a573dd6a5c021834896e911035f5ebd
-EBUILD dracut-045-r2.ebuild 4798 BLAKE2B 9ea482401d66d49eadca291a2fea9a7238d052f304cc6af83f509a92369383109d99d43a8a8caee258bd9d9fbadb23a2e6822314c95db26194567ab2f78cfd8c SHA512 3cd182bff67a90bc94e7b289ce1f09532dbe3784f93e798e7d5362418cc43d42c26277d4c4e13abcb389058b76629ad0babfe3b7a7176390358bf148167c2c26
+EBUILD dracut-044-r1.ebuild 7658 BLAKE2B a91ac6e72fc1c2a38647cddf723af6af2f512cd448a2452ed331c64d8a21f81fea03a9dc1e7bb51ce644e887dad2eb3e5b16ecc833e605f382a2b40b4c6648a4 SHA512 736269ae2121b198127eeec0bc34618c6c5e51ea9c4d44306252cf1ef91e8c6fb38438863cda7c2d451fd7e98f8abd37ebd701cfa2a9a0a92e7fa6c6d67f890f
+EBUILD dracut-044-r3.ebuild 6916 BLAKE2B 1716e8f1fdf2e9422284b364642ce8adbf0ebbb29c3d4d46461bcc6119b2a7ade7c114e4f2bcb01ffa60dc83d7710473316333d737d3666e4df92c29dc5dd073 SHA512 8eb5753edeb092f3a26b72826d87d30c6557242e4c977572bd8e96055fbd1086062febbb6320fd3a695aa24c7f73acdd62c9618d67b1e9c6672ce5e07e4b7c37
+EBUILD dracut-045-r2.ebuild 4768 BLAKE2B 34616da5042feb908053be73605f2fad2f3afd106722c65724696ddff4415265fcc7aa989204af431a22a975519a60769f1c14eb366645e803dd336765a754c7 SHA512 acd10bbf8133d0516b630e9df3a5145edb59497c960b98f8f4f30d6d983bb53770c10a616e96099ec0b61a0b95befa34d7c94799ee31df6f4f2a0288b17f45bb
 EBUILD dracut-046-r1.ebuild 4807 BLAKE2B f31663293ad74ca0ac058a43edac505a8f7bea5af6677535a6425588de39bbd2a0750085e0c290af234de075d05cb9c71f43587490f7090724140856361e424b SHA512 b6c93ec687c3d005ba7e2b0f5ad1317f343edc20c527b68927b00c6c64c29c74fdcb6db0b4a738e22de94141bae43e5aef37aaf1625667f8824dd8dbc5691748
 EBUILD dracut-047-r1.ebuild 4736 BLAKE2B 6940ade45fdac58fabaf6f814037ca704e77f01872163da3e4dc96572051961ca92a1e467dfe0541e40c920988400fbaa37e2a62a1e7edda31d99564d4c3b5b9 SHA512 4f39489389f78dc8aab806156821e6bd95a276f117c5d1711a8fe4498a94d83590cdab10d533bfc0bf5e6e0b66de46c349aa827f244ca86101aa67aad9ba2756
 EBUILD dracut-9999.ebuild 4701 BLAKE2B c0da9267ec48b6c5640e4bc425eba6997023fa5a80cf1e22f613aa852270fc4cecac9261736730646d70a838f8aa74f3f509b2411afc12ae6c512396f14e523c SHA512 e508b5128a039a920ea792ddc1cf9393f2bdf0a6188c6eb4209e7625b17da982283d401fe7fcb5f048ad965ca56878b73a4548295fece70d24de81940dc0aed3
diff --git a/sys-kernel/dracut/dracut-044-r1.ebuild b/sys-kernel/dracut/dracut-044-r1.ebuild
index d31e51ccba92..9257c5e40e29 100644
--- a/sys-kernel/dracut/dracut-044-r1.ebuild
+++ b/sys-kernel/dracut/dracut-044-r1.ebuild
@@ -25,7 +25,6 @@ RDEPEND="${CDEPEND}
 	|| (
 		>=sys-apps/sysvinit-2.87-r3
 		sys-apps/systemd[sysv-utils]
-		sys-apps/systemd-sysv-utils
 	)
 	>=sys-apps/util-linux-2.21
 
diff --git a/sys-kernel/dracut/dracut-044-r3.ebuild b/sys-kernel/dracut/dracut-044-r3.ebuild
index 912b504799ac..fe6b6da7f562 100644
--- a/sys-kernel/dracut/dracut-044-r3.ebuild
+++ b/sys-kernel/dracut/dracut-044-r3.ebuild
@@ -28,7 +28,6 @@ RDEPEND="${CDEPEND}
 	|| (
 		>=sys-apps/sysvinit-2.87-r3
 		sys-apps/systemd[sysv-utils]
-		sys-apps/systemd-sysv-utils
 	)
 	>=sys-apps/util-linux-2.21
 
diff --git a/sys-kernel/dracut/dracut-045-r2.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild
index 13e9d481ce18..c5346244e0b9 100644
--- a/sys-kernel/dracut/dracut-045-r2.ebuild
+++ b/sys-kernel/dracut/dracut-045-r2.ebuild
@@ -25,7 +25,6 @@ RDEPEND="${CDEPEND}
 	|| (
 		>=sys-apps/sysvinit-2.87-r3
 		sys-apps/systemd[sysv-utils]
-		sys-apps/systemd-sysv-utils
 	)
 	sys-apps/coreutils[xattr(-)]
 	>=sys-apps/util-linux-2.21
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 80529996e536..109daaa978e7 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -88,6 +88,9 @@ DIST genpatches-4.4-152.extras.tar.xz 16464 BLAKE2B 1a3833eeddcdcc44fa12cca38d32
 DIST genpatches-4.4-153.base.tar.xz 2316272 BLAKE2B a9cffac3e4c1e0b239144cb7992b38342f56e0f990428e61ed50f531929ffe0a29461290ffc0e200231eba2f034690b2bbc69f6ae46e75db179ee6f069cc0bf5 SHA512 945d15d4096519795fd5ead874d3e84f73de4b6f594deb15fd35c3748a91f716f4f35cb4a1cbbbc5beded50e673352962d7a9f39e05036ae75309aaa19985dab
 DIST genpatches-4.4-153.experimental.tar.xz 87804 BLAKE2B 554213910881d20749634cf2bae37dddd2f49c26fbe25b21bddf0b452637b1e54bdb7bcc245f76dd181c8c3c3a5a624df882ca407e43091af3991f47d66e19ea SHA512 43acbd61d782f0a9afb1b5f3d38cc2f74c8f9e8aaf2a61897418df56188af3b0270e6ea239b545b5d7c46da5da1b15d752dc1fcd387c13c460f2695531ad222f
 DIST genpatches-4.4-153.extras.tar.xz 16460 BLAKE2B 8dfce6f8f44f738b91e5fdf2614cc63ee3ef252074ec459aafd04dc9d536e243c7f730b1deadca709c2c867b2514c573bd6ba521ca38f37089cb40f52e33c53a SHA512 c06e9b30cfa2bf5f04776e473501f9ab0e203060bc0ca3ee43057cbc1ac5939b3fa50406f19e6e78705f955323a01a1e43b1c7e43e4fbdcf5a2ca1d005b1e612
+DIST genpatches-4.4-154.base.tar.xz 2317332 BLAKE2B 54befa0c925d1af72c82f49b6b450fc524b55e33f75aaf7d6bf887029279a71b5e3539cddf29449af253ca0a82449d6034dd79a8ac8c57a1875455ffb89a6ec8 SHA512 9fc2d3f61cd7d9f5470a04f3ad8d8f66653a96fa54e60650386dbf5a1cae0a9a265f2e38c8aae95e51f7ba14be8c1bd478aeec83ba386307076e1f79c1608243
+DIST genpatches-4.4-154.experimental.tar.xz 87804 BLAKE2B 554213910881d20749634cf2bae37dddd2f49c26fbe25b21bddf0b452637b1e54bdb7bcc245f76dd181c8c3c3a5a624df882ca407e43091af3991f47d66e19ea SHA512 43acbd61d782f0a9afb1b5f3d38cc2f74c8f9e8aaf2a61897418df56188af3b0270e6ea239b545b5d7c46da5da1b15d752dc1fcd387c13c460f2695531ad222f
+DIST genpatches-4.4-154.extras.tar.xz 16460 BLAKE2B 8dfce6f8f44f738b91e5fdf2614cc63ee3ef252074ec459aafd04dc9d536e243c7f730b1deadca709c2c867b2514c573bd6ba521ca38f37089cb40f52e33c53a SHA512 c06e9b30cfa2bf5f04776e473501f9ab0e203060bc0ca3ee43057cbc1ac5939b3fa50406f19e6e78705f955323a01a1e43b1c7e43e4fbdcf5a2ca1d005b1e612
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -135,7 +138,7 @@ EBUILD gentoo-sources-4.14.62.ebuild 742 BLAKE2B 88465d86de0c92f34ffcb122c692c0e
 EBUILD gentoo-sources-4.14.63-r1.ebuild 740 BLAKE2B f286ce83318b38e1df0e6d241768cb234c0970214c547d10d8588eb6abdbc1244090870d9bf090482356cd961d9507d95c9da485b3814873a15cd7447fd48d6d SHA512 1e9d5686b4c0dbdc62bf35737a8981104a57f2f35909ce646b92f99b14f69c44c692752b62010afd45b0ef66c59e68cec0e77d9fc3d7f6579054e16bf73fdce6
 EBUILD gentoo-sources-4.14.63.ebuild 740 BLAKE2B 4fc84e9068fa6e0e70049695d3e85ceae1d4205ce7fedb58c6d2d2622664fdc70f8c16fdd6c347ecec6c869171412febe4551a667341929d4c8e144b54b629a7 SHA512 aa8d2ffe50811a0d4e07ffe71c7dd5357b58a00465917e4a2973b935589f43c363d74ed5d568b0f6783b98b0f371b38e52bee54c6f227468bb1719cccabf0a2d
 EBUILD gentoo-sources-4.14.64.ebuild 742 BLAKE2B 9f4760cc486c739f8ce5e950cc2a164cf038b4dee31e620e4f7d761e9ab756ffcf4c6f3b8e17b3593b4b1962123177a812148e30647d829da93344f1d3c2142a SHA512 6ab3a88edda74ccf850df643801e55c5c0711648ae0982078353d35536f7d1695dad1b7960248df5f941cd168f3bf422348c898cb8b2f1caae1d9dc96cb30629
-EBUILD gentoo-sources-4.14.65.ebuild 740 BLAKE2B 3b4ea7eac9aa902251630a6a431762dcafccc6e969ad9d729bf0041a6bb15520bb758205c4191e4415e4db3ef7c6a24f05fb8ada3064c53402f65aa3a118f223 SHA512 42f7592eac579b017b3d4041cc5a3b95c314035e227952f0a436fb61c904b5793f5e34f14922dc98f85fe6183c3488dab4406d2ce46d4bddff89cbaa85960f08
+EBUILD gentoo-sources-4.14.65.ebuild 739 BLAKE2B 6ec2bf90594d10041aab3a3c1317059e25a473b79dd5e9630deb802d67f1da6b617390476fd2c76a99eb4f98d6d60e020d681851173b4b8bfffac8659f80dd0d SHA512 2973332bf80202862e9ade2ffd2d299da3eb5970b94c532d007ebe6d6dad34a49681e67a675a12c8806c33112dcd15ced6fa1a1df390d3d2b8b539ea143bdc0c
 EBUILD gentoo-sources-4.14.66.ebuild 742 BLAKE2B 41a8f4ce2d4bd8b8167e2d63b306a80889319941401b8c40054a4884206664ec7a024dc42657e3ff7c7e7246dea03bfef4fb35565c26f271ac5505a83c20f204 SHA512 9ac4fdd1641ada5edea5d78f878642c9b7bf1c1a53598d5ffbaa91e977546eb7e088f59af548b8e5f3afad9f8c994d406c66c7c557048626a80be6101a91c46b
 EBUILD gentoo-sources-4.14.67.ebuild 742 BLAKE2B ea949a78652594f5f511a0e53e24e7dc09617eb743050862d03d086f4f6d929a2ae3c4d4bd3b7e444e21a2e5feffade4e23cd55835456b9825895173b127118a SHA512 b789fbedf29ef78672f07c6cfe05225319859f8f56ebbe8db7cd83f73e9f92513d8f227ab410deac3f8c3dc3830f291085f699949a8b9d74d795c9cb5c931c0f
 EBUILD gentoo-sources-4.17.15-r1.ebuild 742 BLAKE2B 58861d838c385bdce69f2b373a932d28823020b2208b034ec57d49c88ba74c6a61df046b948d428849daef152e4b39d150ea17eca788000a86f9cb40eea06f2e SHA512 67f2967d872499bfbd7f07685f7230e2c304eee168c5f3ce3684aca478498f7a6d698aae235f11f85944cb8137fc847b367e00c1eb0e781919335ccc4c5f17af
@@ -156,16 +159,17 @@ EBUILD gentoo-sources-4.4.146.ebuild 741 BLAKE2B b48cf3eacf7264149837999b66fd099
 EBUILD gentoo-sources-4.4.147.ebuild 743 BLAKE2B ca191c7631f1bae6576a088aba60a8bab643e75bff85d64abf7ff9d85583f1cd6135c29ead9325beeaaa87389c5383b29abf7c9b46623275a28ef2c7671751fc SHA512 c9014b2078d76567bdd9643d781a0b0f8e43725e830087091880b9d1fa350f01b55f90674d4c360dba0c67bb07574a192eea58d1fddd5272d08f1d8cd41281bd
 EBUILD gentoo-sources-4.4.148.ebuild 741 BLAKE2B 07a9e08055833ef28cfd070cb599c03320a973d7671909f07a292c23181a27386eeee951305a4df68441be38317bf16afc43afe3a4b89ca0bb4df0c783fc3c7f SHA512 0629298ac56688f10699912bac5567d64a2d926dd8ef42bf3f3f9e9a1ff160649cd91683ce3bf08d79ce6637f7b19d6ad97a63a75c011245eea5665ffdccf624
 EBUILD gentoo-sources-4.4.149.ebuild 743 BLAKE2B 3293a2f305da2b2be3bca9af03546584b7e1384eed91ae2f4f6fef9eb247f984e026aad6d2beac316433c169920b3e0d95d0e2c22e6802bd382257bd64d6a7bb SHA512 78ce20de357f19848c3f28fad55bad5bcd5679a979b07fdfd28cf81c5124e7bba4bd8661dd48e1321a1cee16b79b7b54f75844ca994a7f36895b591480239222
-EBUILD gentoo-sources-4.4.150.ebuild 741 BLAKE2B 88172712c200df48abb77a72f76979b90407c5316dbd26364585176a46f335e4c622ae1e1e6d8d24ab6324ca58585df1cfb39e589676e41390c32bbaffdf6c48 SHA512 5cfdd061fe5990ae147bda8034fe8b752f164b5bd8183741b78f7e90bd2e58b3ac2db7bfd8d0c853acd5830d69d0c9581f79960d74159811e9245b72a473dd7c
+EBUILD gentoo-sources-4.4.150.ebuild 740 BLAKE2B 9b5ddec23ef7659f24eeda41f8eb73612dbbe51c0bdd089b55097ce7b046b058a7f425ccfb9e08a28b600ba71621bcae286c4d3469bb043bed61d635db2efa39 SHA512 28bb247576bd3bf4e4812704a00a731220447036d1dd57bdc152355502efcc7cdb0159235c44ac059a6a717efcf7b7362f53fed6b511b8b4c3ed96939c632d02
 EBUILD gentoo-sources-4.4.151.ebuild 743 BLAKE2B 2c438cced769baf5dafc99b7992f5220c0faf1179c3e18f319774bae16be48fb75fb92bbbf230504bcb8cee49dcb4cdde2c2b82859ca3623c997181dd7a187ab SHA512 36d1ab3792f5d1a6eb19ff549e0b122b314aed9890a9ad52567beb6a8289ebe687a284d9d48c1c4c497cdd70e63a5c2b49f859ebe49b94840603d5cd479a8ef8
 EBUILD gentoo-sources-4.4.152.ebuild 743 BLAKE2B aa88275a043b0b4c577d8646f94248847408e0e1e00a37f52b825fe8cbbe4955eadbf24d6e17ad78ba860a8d1a385df03e0de84e702e2d5eedddf9818dc1692d SHA512 e695d65a0deff6e67a93dece4d4f49cbe636dd8d831491bc868c9c1920157f9507b4fa0490a4ddda902846a9c41ce6abea8f0f847dbb4ac9d4f34b606bc3c2fa
+EBUILD gentoo-sources-4.4.153.ebuild 743 BLAKE2B 3f7eeaa3d65ad9d8160228d7fcebc4e256bd9534d884474dd0e49453d8e3df2b03113a5b2ae57fe332dab0f8be1a425c45ca1f8769a805f4e4f7704bb1a2beb7 SHA512 bee0143995d222cb9b979e8c5360733fe96162478d25a75459d2e1fafb425ce61bb02de175390120f154a76a30d16f5f5205209ab7946ce493926480a0eada78
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.118.ebuild 741 BLAKE2B 58dbe5f53edf250b8e69f26c6702488426aaea4831afda19920718649b6c42a8aa92fa2e4488c35787fa666f2e3f7c7957b3d8c739f7522098a3053a5fd10dc0 SHA512 897c910425493a7c89d79ef24231903dcc40a774fd28472d1f3c35033a6d68cea5cceb14ce113ad852002c737ace73d1f45c4178f34e7e2d0286416b7fcf4da2
 EBUILD gentoo-sources-4.9.119.ebuild 743 BLAKE2B df51ed12fcc8c79456b03972a34a1bdd9c2278d582deb95355d12c7015a7efda33ee44bf7c65c99cdf3da924ef3c84656d6850935ee0861abb6add7d6f65e333 SHA512 11ae9347b175bb9d260f0350a0ace71223d9f24fd00931a96d175587905e3fdd30dd8b3a16a897ff68c5f6558c83b6b150f88e402d03433921f3d7a87c5c2dfd
 EBUILD gentoo-sources-4.9.120-r1.ebuild 741 BLAKE2B d17652c3d64c55fa20fe874af99afe9ae7ce7dbcffd12eba33b2fd31d9c41693e7415dbff62919e120fb05901c29db4186bea0fdd8275320d2075fb6dcd45665 SHA512 dd71e87b29a11c77027e336151ba05da0a6806ee6d8d083160ff31a6456c8ae4e94525419328b3663ce8807f8a5eb06d49957bbc6dc230237f6294e9f68fd79c
 EBUILD gentoo-sources-4.9.120.ebuild 741 BLAKE2B 0f93efecdbdf163e42ce53abde6281191f966a00d7bdccaa5e8fb8239b8d060515b7b5d994edd7b1d5a171e7f94c4ce116cdb4a8c2069496074863dff7a0e4a8 SHA512 5e2f62111d836c48ee5e56cba694f9b8803e291b6cc51e6804b4b70c631454c2e139e98e495918e9055ab555535d32d6f5e4739b33200b9a2d2278b7a3f2ee9e
 EBUILD gentoo-sources-4.9.121.ebuild 743 BLAKE2B f735fd2f7980e5ae343c215682df455b33d565b59d82946e5c8a9c3ef864b7638905f5506640f102b18ccda86e7ff0d78fbf09012d4ab0d476716513a2233612 SHA512 7730d21a53b6d8cf1ec0b889e76a0635cfc70ee640e17b9ff9f8f56988dad2130d13f42eeb53d34b73577869815f9bc55a9f9690f0483c032cf3fa817c2ca7a0
-EBUILD gentoo-sources-4.9.122.ebuild 741 BLAKE2B d954895cc261bc96591b1b7b95dd9adc2ed3b82489cf2b86aa076d1d0a0621bd88eae273684f100b4d5c4238d484649e79dee38147e06e77211427767603ca2c SHA512 439dc3a672e20254a8cc80e10ab629912e6a7806bdf3f0da3951fb95d21de5a57772d0177c58bdca0c344bb26dbd9612cd6713924e71eac795012abeb0b78471
+EBUILD gentoo-sources-4.9.122.ebuild 740 BLAKE2B b4dea4533565a2c2e63b91221b59c8bf50e1e5b48cfcdf7ae82092921d4154886477709b6b2a5b0f7e64d5963459060c6727584979e38e316447530f4dcfbed6 SHA512 897f882774925b6e0f991fb97b627151f6a0f05b228a410125d4a0978162971c5e441d419cedd6885529a166baa5415702de1a64eb126e0b7acab66320bda865
 EBUILD gentoo-sources-4.9.123.ebuild 743 BLAKE2B 48bc0794014acce93d1479bfb1b551b6347090c8f813bfd4df49a4df9d6cd90090841ee9259112b352912331e8ff47ff64d4850acab4672482618c5702ef5a58 SHA512 784536a62dece4628d2f85880b955b4e480900dd3494ca5e31476e6ef9824f1bb0026dbd5fa37e208d76535adbde538e4b619d263c984878b878ef35699a4f35
 EBUILD gentoo-sources-4.9.124.ebuild 743 BLAKE2B 750c4de3f5f6492f94cc4a255d5a4f969e668f48d9ecee46c005b0960417961c780531250fbc04f1756a398cc7ec303fbaee3907c05ae4276130d9e7ab24d06e SHA512 126394fec9cb289e66503f184b7e5ed9227bc01a07d2089a3be02e79fcaea2b5f9b59e91dee0a7572c700e914ed96db7a00147c6584674a4476f139f09dd611a
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.65.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.65.ebuild
index 24b7ad22540c..9c185803e1ff 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.65.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.65.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.150.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.150.ebuild
index f049283bb080..b5fe1b9cc394 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.150.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.150.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.153.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.153.ebuild
new file mode 100644
index 000000000000..f0c798963862
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.153.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="154"
+
+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.122.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.122.ebuild
index 1373a3ff8ecf..513651a01b82 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.122.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.122.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 8e54de5e1330..71751d2f2af2 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,18 +1,4 @@
-DIST linux-4.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b634a402c07e0fa5518a2b271293d97c5a7a8e3c30c9c4d78df16bf20a4f0befe998c9a9393bb3290d2df1dda3 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
-DIST patch-4.18-rc1.patch 52274025 BLAKE2B 8f3f9b01d981fbbdf4eb2b5857f8de305ccf434b3769d52bd029e98690f28ed82991001138bfbac38036b0c25bc491256647245b961ac90c1fedb693310ebbcb SHA512 3bf7227d5fc39d01f4be7706febde0973c3d8761457728bd0a01adb844954a9ef223d5d3f7c9a09132f6966cee0fe58ea72951363a96e7e8b579cf86da1ec8c6
-DIST patch-4.18-rc2.patch 52841801 BLAKE2B b9d65a0f2afb2f75b34ca3886cb2599cf85aa60eff943d9afacb5d708b131dfdb8956b357e6e94dc5e82f21f60135d887d6a1845edac0f0b3da1b5216c5f2a16 SHA512 1fdd5360543080f53d0889ce644818672c29a27850e1cf54cddaa3d4037ff91c01ac582dbfc7bb9a7b1e265c35f1c202145c44830a03feccfd807b13654c0e66
-DIST patch-4.18-rc3.patch 53031653 BLAKE2B 681fb4262705d4aaea58f43f050bbb781924c36adedbbf3c28768b1695e8bb22cf659d562dd6cd787dbe1007029646d575f10f228971d680526cc35bc1f48ce5 SHA512 ee568a9345d28a055a96a66681276ccb4240a159c57eb4d62c19ec640cf733a9be7e0b6536344be7c642cbc662ee5383399128bbc6210d627565a9f58c080a0e
-DIST patch-4.18-rc4.patch 53258687 BLAKE2B 3abd80176b7de14be61a8fd6826f9eaab970c20fe1199bd64615b44dbb573e20453f6dd4c9f23e029f8b83f95356fa1936f9b9c2527e4e0c0cd9d96bfcadb723 SHA512 c57e72111add18fe27c15487fa3c54e7982511a9d1f2bd46c530396a560422ed03c5988a0b2d3cf6225eeef08637c535c6c316932d5beb214582a801f8cd0bc2
-DIST patch-4.18-rc5.patch 53496453 BLAKE2B d8211e175f4d6d0f62b3458bd19731c408999c9d00510bee99323232cc59822da9d7eddbfeaacb441066a2e8f3b543106608d67b11896952f8c87c9a6c4b1a2e SHA512 9c7dc21dad12ad7cd005ce12128d25ab36d7cb6e5dd074bcc3d26b89437ae778727e52b8535240c084512c270dc5d9a66ac87babdaa9f5f030a94c2329fc9437
-DIST patch-4.18-rc6.patch 53787283 BLAKE2B 01fa18fe3cf1afdf1da52145e41c23422ba408f220c889835e01e524e03f30e2b8c61c7395c267f6893bc8f5e8888b254e28ae7f6bc099c25cab1d435c76048f SHA512 6abb369738ab4176fa0b6f25d68b8351a196c400a00045cd5afc7035e74fec5cb9e48b1506707c568a3aad441278cb10a6b345e9ca212f440e48bd5cf319816c
-DIST patch-4.18-rc7.patch 53978258 BLAKE2B f13b1b91f08d528657c4e7b7685f84bddc4aec24085c1667b943dbabc3fd59b3c438a96b29ec90cf450fa3d4bae21917f980e3770fc376bcde5ad0112b330f7e SHA512 c982f79d57f3b331de92754f423852913ecb3f8a29284b030780a8e291056b6257ab73b95edb502aa143de1982106d747c69095250c1746429dd477949f7fdd2
-DIST patch-4.18-rc8.patch 54117635 BLAKE2B 10439a54667a3b81a4635ae7ad1fffbd5862030f095ee382296c46ade02794c31f3b434721296e6d65901b3165d59e41cc286896b49b660680953721dad93f78 SHA512 afe4fa142d2d780a99a9bf7c9c8191262ce66df6947adb63c6fd9ee1e9c84f4211ae3da2872ce6d71059800f6cce5375344d0db2930664091be9b8cdc838200e
-EBUILD git-sources-4.18_rc1.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
-EBUILD git-sources-4.18_rc2.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
-EBUILD git-sources-4.18_rc3.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
-EBUILD git-sources-4.18_rc4.ebuild 1179 BLAKE2B 56d626a7ba8ae474be3595f25012e3bd74c51b56775b2fd9267049eb688958dd173a84ee6fabc3df7bb0ef965a19f857bade0029d3e1a83948829e0282caf2e5 SHA512 9f5a1b91752ec426c7b37bf60e3d7cc8b2e8cc8cc77173fd4edb0b46985ea42e244bcd97fb3924d6f635232335894b14193492ce29e11c1f0b39ca934cb50ca0
-EBUILD git-sources-4.18_rc5.ebuild 1179 BLAKE2B dc18094110b5d16f0e7d273eb3f900e37e4b27c3b3bb78dc85a8bd899d0dd131731a113651a3ea8c5435a87a797db07ac6a3792d04717caea66570eb7c6b76cc SHA512 4e078e7c4b66e51fd3624ca7a84564cc535c0a9b390eb13c82ad3254e7076d8699d52951486c3d6def5e1af5de13a64cae40905895bed2499c389c1c14338313
-EBUILD git-sources-4.18_rc6.ebuild 1179 BLAKE2B dc18094110b5d16f0e7d273eb3f900e37e4b27c3b3bb78dc85a8bd899d0dd131731a113651a3ea8c5435a87a797db07ac6a3792d04717caea66570eb7c6b76cc SHA512 4e078e7c4b66e51fd3624ca7a84564cc535c0a9b390eb13c82ad3254e7076d8699d52951486c3d6def5e1af5de13a64cae40905895bed2499c389c1c14338313
-EBUILD git-sources-4.18_rc7.ebuild 1179 BLAKE2B dc18094110b5d16f0e7d273eb3f900e37e4b27c3b3bb78dc85a8bd899d0dd131731a113651a3ea8c5435a87a797db07ac6a3792d04717caea66570eb7c6b76cc SHA512 4e078e7c4b66e51fd3624ca7a84564cc535c0a9b390eb13c82ad3254e7076d8699d52951486c3d6def5e1af5de13a64cae40905895bed2499c389c1c14338313
-EBUILD git-sources-4.18_rc8.ebuild 1179 BLAKE2B dc18094110b5d16f0e7d273eb3f900e37e4b27c3b3bb78dc85a8bd899d0dd131731a113651a3ea8c5435a87a797db07ac6a3792d04717caea66570eb7c6b76cc SHA512 4e078e7c4b66e51fd3624ca7a84564cc535c0a9b390eb13c82ad3254e7076d8699d52951486c3d6def5e1af5de13a64cae40905895bed2499c389c1c14338313
+DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
+DIST patch-4.19-rc1.patch 38084340 BLAKE2B bda832e116f74e04485b1d253b0a01a4838b62725f572009c7be22a7f1323f1910bb7c75793e768404ec5fbc2f48be038523e440fb365aaed4d318e2c8616be7 SHA512 84c2fc3869db3f45b7cc6bbd0d9830c8d5b4a921a887b7b2ed39b332c384ca276b083205d0adee0e2f9ad42650961db642979c57250638126363366629e3fbdc
+EBUILD git-sources-4.19_rc1.ebuild 1179 BLAKE2B 84e8be0dc12da309695bb9ee46080c35c4a3dd0fd1b6f56f86e415886bdda8c51836cacffbb2ec19da06070952168c346d2648aadc2e9acb307c19ef082a5757 SHA512 dce7854f70a9da74dfe4ac0f923314b36378634b1fc2906ab09165338d930eca5016bd26abd88968ff964d79a4b4e257a941a57de5d7ce8fbd0420dcde660a58
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-4.18_rc1.ebuild b/sys-kernel/git-sources/git-sources-4.18_rc1.ebuild
deleted file mode 100644
index 25e1d9d7bdbe..000000000000
--- a/sys-kernel/git-sources/git-sources-4.18_rc1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.17"
-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/git-sources/git-sources-4.18_rc2.ebuild b/sys-kernel/git-sources/git-sources-4.18_rc2.ebuild
deleted file mode 100644
index 25e1d9d7bdbe..000000000000
--- a/sys-kernel/git-sources/git-sources-4.18_rc2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.17"
-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/git-sources/git-sources-4.18_rc3.ebuild b/sys-kernel/git-sources/git-sources-4.18_rc3.ebuild
deleted file mode 100644
index 25e1d9d7bdbe..000000000000
--- a/sys-kernel/git-sources/git-sources-4.18_rc3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.17"
-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/git-sources/git-sources-4.18_rc4.ebuild b/sys-kernel/git-sources/git-sources-4.18_rc4.ebuild
deleted file mode 100644
index 25e1d9d7bdbe..000000000000
--- a/sys-kernel/git-sources/git-sources-4.18_rc4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.17"
-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/git-sources/git-sources-4.18_rc6.ebuild b/sys-kernel/git-sources/git-sources-4.18_rc6.ebuild
deleted file mode 100644
index d7f883a43cc3..000000000000
--- a/sys-kernel/git-sources/git-sources-4.18_rc6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.17"
-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/git-sources/git-sources-4.18_rc7.ebuild b/sys-kernel/git-sources/git-sources-4.18_rc7.ebuild
deleted file mode 100644
index d7f883a43cc3..000000000000
--- a/sys-kernel/git-sources/git-sources-4.18_rc7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.17"
-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/git-sources/git-sources-4.18_rc8.ebuild b/sys-kernel/git-sources/git-sources-4.18_rc8.ebuild
deleted file mode 100644
index d7f883a43cc3..000000000000
--- a/sys-kernel/git-sources/git-sources-4.18_rc8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.17"
-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/git-sources/git-sources-4.18_rc5.ebuild b/sys-kernel/git-sources/git-sources-4.19_rc1.ebuild
index d7f883a43cc3..d03b0ba0d27b 100644
--- a/sys-kernel/git-sources/git-sources-4.18_rc5.ebuild
+++ b/sys-kernel/git-sources/git-sources-4.19_rc1.ebuild
@@ -7,7 +7,7 @@ K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
 K_NOUSEPR="yes"
 K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.17"
+K_BASE_VER="4.18"
 K_EXP_GENPATCHES_NOUSE="1"
 K_FROM_GIT="yes"
 ETYPE="sources"
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 7cb8afacac18..952f151f3a73 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -2,10 +2,12 @@ DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403
 DIST linux-firmware-20180606.tar.gz 152670671 BLAKE2B 7c4fb07451c1c459bd0bf8bec15e3bff41bdb64166decfd7776650c85f0b373c97dfa23330ebb7ddd4bc144bffb57751f3a94bb4a352e5f8ef1dd0b8a3679c81 SHA512 4eb02e11beffde5bf8daff45af78304881e01eb51004ff0758bfff3a4a4cb59f6a2e081b7a3c3e07734a29954f09fa6277f920c2bdab6aeb608065936861c650
 DIST linux-firmware-20180717.tar.gz 155038756 BLAKE2B be94a60c95b23ad14008ed2c1d6eb1e126ef4b959bb9375b9d6c7374d16de0b503c434c00975cb9be74cc8d191db826ec58312a1405c558eb476807dfcf247cd SHA512 e885b31d01c7aa7864742dc3f2b67888aa93166390d5572ae56d191656991876e4aea1e412e452f4caa6ee031d0ab10c26f615f639cfde6f15bdea47a9819816
 DIST linux-firmware-20180730.tar.gz 156004891 BLAKE2B 38472066f4af965f5d3186d719b324e65874d4c25cec335fa522555e29d9a67d7cd22594977cb8800f10915da122cfe9906e0e64675c3733b9659c2338eaee69 SHA512 dc1a5b118b7f4f7760115ba45ab6c836661f5b1d68f4daad294c88f9f7448a0e42ee0de5be27cca418acf57c2d214ca166b6e7ab6711f8a68b6c8c3e68c2812e
+DIST linux-firmware-20180825.tar.gz 156618714 BLAKE2B 1bf44c456a87dce2e0622c8ef80bacae9d1aa76efacbb1519718be4a2c3e36a72b8baced8dc17953515052be923b85a8368179dfad591fbc7402521bce564e20 SHA512 583623fedf18a987a20cb6f5337146131a7b17a95ee79cb4b35199b6ecf42af039b824623235501685db18839c0d7e9e81cd79ed47fb993b4e72346bf9159021
 DIST microcode_amd_fam17h.tar.gz 2204 BLAKE2B 20f3b006587f49fced335fd38711da2384a1f5cd0b93a483d7022d8aa211dc855427a637583dd2eae9f108120f2fda4b80db081d48d3332da906de8e10b94464 SHA512 d3b52797a5968f8da76d39322780e61d04bab5d810b0b07d64e469fcd67998e4191b0e0a9ab7e4c27189941369ef1b2850bbbb1458fd9bbeb958c98f6e378510
 EBUILD linux-firmware-20180103-r2.ebuild 3512 BLAKE2B 9a1d555f59836c93fe8a5f5ae0eeb456bd6ea0f7d9b41d09f20b28d0b52c54f9639e66b8ad840885f06ecb3223d6f6bda73f38a6c6b62ea5650b9adae5d69a88 SHA512 57157b529e2cf627b9647b317138730dc36a442bdfb2bb20db99681288c403eb537fdb84866885d5a892169ad643fd478832cfcdbe892dde5818b24f09dc60ef
 EBUILD linux-firmware-20180606-r1.ebuild 3326 BLAKE2B 8208b7bc4e4a3b8e8f187ed7932140ba2dbc5fc5ccb5e058760d06d880953b9b51d4b39ccdb7199689f4adce8d05c33e0992100b43746e92f3892e02bc8ec193 SHA512 1baf9e596d161c3694bc1922bbbde5607f0f87a0ee4e17bf54e4cf44f528f1a3fd87e11575d4b58010a6e70ef35942babaa1f097b27ced724e00d64a90312728
 EBUILD linux-firmware-20180717-r1.ebuild 3326 BLAKE2B 2c126d139f2d020994da7fe8f82820c43e5b3a5df8f3fa8352f1528fbd47ed063eff68b43f5c5820016c724764edd6d81e3e8e2b95144892a64417d9128629b5 SHA512 2a3230bc6c2eb87670cdaccb066bfe138263401d09652dae5fe9f8ad166beeba506c4a5c2016a993e8cd481c4aa26e731f5ee173c206afcd3071aa03bbb2f15d
 EBUILD linux-firmware-20180730.ebuild 3270 BLAKE2B 70b783c4344dc509e8334ba51041f4f5311b87bec8fe0231c2013cdde1fb6e1002950d6933c1bb3b1ddc8b4703e2e16649f2479a8cfa417fa8036f5d58e8b734 SHA512 65d09c46fb1cf4aae22a760127a12b5489dcae2f15d1fe34c65be512e0e01b86393ab66be15f0fcba6a4d614ea83591f71e8bde829675fc6ee20c204a6f50520
+EBUILD linux-firmware-20180825.ebuild 3280 BLAKE2B 259a70a20f1a0637368b81a0ef9d75016c8e41dce52321d315ff73fb38836cb2608c4dd86ad1aa707b2b3240eb006844b75a5c2a57914ba845cafc4f90dfda20 SHA512 5da9edbce7cc2a7aa6493aa1c60dc009603058da1e72125c72002d4f748672a0c16ba21f482f71a688601f4ca81e68386edf8ebf8a1a4dbcd0e2e7dcca43e442
 EBUILD linux-firmware-99999999.ebuild 3240 BLAKE2B 672dd57268adc5adfbf53809ff5bd270d890fffd7b1fa243d706ef4d5ae314b827078514f76c4c6e972982c5df122542ef406ef258315376f94ae9f06d8f1cf3 SHA512 a72f9a5b5e3900be6ea59d38cd9ab6c76811cc68a4dedaade883fe932cf3742f36b4c7246c6057938a4011939d8b54f2bded6f67e5879aa4a8faf1c437fe0171
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180825.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180825.ebuild
new file mode 100644
index 000000000000..520053a9db00
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20180825.ebuild
@@ -0,0 +1,114 @@
+# 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"
+else
+	GIT_COMMIT="fea76a04f25fd0a217c0d566ff5ff8f23ad3e648"
+	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
+
+RESTRICT="binchecks strip"
+
+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/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 4e2ad64db256..9aada3db99b6 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,16 +1,21 @@
-DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
+DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
+DIST linux-4.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b634a402c07e0fa5518a2b271293d97c5a7a8e3c30c9c4d78df16bf20a4f0befe998c9a9393bb3290d2df1dda3 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST mips-sources-4.13.0-patches-v1.tar.xz 170004 BLAKE2B ea5b8827c4bfb0d437dd27dfb2ab6451119527c1fd6bd8d05fe3384e22fcb6a58bf7003e04a9388f5f8a27dcb5e0a4dffa4bbbc2edec8a7c11b7760803ec3d17 SHA512 9c05223a5fe3853b4b9f07378c9c2f8f527ef41cba5111e52ca556b694811b47cfc2840db025fce233cb2909e3ab63bf8920583956552915e310532f173d9f14
+DIST mips-sources-4.14.0-patches-v1.tar.xz 287968 BLAKE2B c0bd76f91f823516fbb39fbba02f3bd12aba25b289170c8ae46866d60c24c7e92584addbc270b349872c5acadfe17da62179e15b72796ec62cadc66e0c3b7dd1 SHA512 a78375e8b7c5007f26a5ff517eeecf088636ad571c24eee986773b6039a7b4168b4c8821e6245b2c8c33c7647b75376a81d3ce8cc50d6a22d864d07f517ac640
+DIST mips-sources-4.17.0-patches-v1.tar.xz 288188 BLAKE2B 774b9c4b68d719a8f7dada28c926a4a52680081d770e896013a2e037e96d3ad15ae30ebdddedf105c0db27cd63488d915efb794922c5b3349baa2bd042544df4 SHA512 24c7a708b42beb39e039bdbebe6dbca3aad5a7c24134f2b05b0d3afe2dc8736c97520ed279075bec538322ff53517fa2ec6a0f0828369e28e8efd0996dd0b678
 DIST mips-sources-4.4.0-patches-v2.tar.xz 156396 BLAKE2B 7b6a50e3768d7d67b525457a8a1b7ed024b3c8762e37734d250478bb0fc4d9d4c76598a45afcd239a5dc1dcf6052c24c69111aeccec11951093396212910c5a9 SHA512 4186ee382037ec32126976ba453f78fc80c627a4ebdd79d8462f12559eb06dce25f926f3c205c7c4e5032cb501942ee10c8cb3a17339352cec3cf565c669dd52
 DIST mips-sources-4.9.0-patches-v1.tar.xz 233620 BLAKE2B c976ddb9cc53c07c8c3077999a324746fafed3c7d913434d403baf08396196216aeb58ca61c434180e00a6b14ef939b3e86497236e44f9a5e1365357ea0f64ff SHA512 d786705277e1837f725c7b5a239a19744a7bdf8767c0ee75613270eb9592aeaee1cd0c6f05edb67abf93597d0f5c6fc3826d76847cd6b2aaa6cb21256720d19f
-DIST mipsgit-4.13.0-20171007.diff.xz 1008 BLAKE2B dfbd93a92ff6a925223dec22936d40281e5a1054f9dcb8a3e44159d1ec6ea5c76e0ae57b2f50e92d414185ffa7b94749a9182c56589512208fdb57ed7d0105a5 SHA512 0c6244a7346018fbfcdab6537ee33931682c168a15c10f26f84615c29ea90ee77d6a4ca402109d6e5b66cd09c8925325a484dbfcbb50f8002a1a4d4ef4ab61c9
+DIST mipsgit-4.14.0-20180128.diff.xz 1008 BLAKE2B 2a317ff97aab096883680c6b653e993aee31994e6caec52c52dfbbb61f1dc1f25d03ebd3182fa122923a67aeee0aa598b36e603692333e4c9ccdc741fd456d96 SHA512 378deb1bc1d10a6b4912e5e4a0d6fcab28952e2e59c35fc879601841cf8160081b318a2598ef74db225e95f0f26483f6b9a56a348811b1ee7b8934391dd271ae
+DIST mipsgit-4.17.0-20180705.diff.xz 1008 BLAKE2B 07d316dd9dd0c16033763d066e4d703ee8e2a107ce0eb43dbabf96dccaebb7efb62d6b77e17adb59effd14f6af1b5b6bbc8bcfdb14fc4036eef2f41752bfee9b SHA512 9d5c85716de6da8880d8221673957aa528cb59e3e882d8471ec253943501d5accd9197a7358d933060ebea344c3b50fdf53ca28792f291beb587df52a7febd9a
 DIST mipsgit-4.4.0-20160123.diff.xz 1908 BLAKE2B a8be92376d1360246359e8d3674fa30727363297d0f3c1f1fa41ad031235fcd59cfca3fa8645d2fd8ab34fcb79b49f622a28eaddd80da76cf23afc05970d7bae SHA512 0086c470064dd4e5c2fefd8161b70200475659fe925e68d374ff139b506147c39163f366be689bbb92a9aaf72e8c58cdaaaff5def6718c5e87ff7e047551a1f8
 DIST mipsgit-4.9.0-20161216.diff.xz 1120 BLAKE2B 1207d943aa39d157cf1ed87918082fe53c26e5342f8249cce1c21b47d38d9a33ec3fb024cb6358cb659e8630e58840d67570be731fb05e9124d86387793e045b SHA512 d1d8d95661d349826e2978d2259df9e30dbd6779a6506fe769dd8e60699e8461920b290a2064a432b8c3bd95888854f4dbcc2ba40929c58f0dd165fcb7894e15
-DIST patch-4.13.16.xz 271596 BLAKE2B 3ff4ae40c1ea5f9b547ff3d6bf59a065f84cdc66e9b6423b344c8fd7ea5ba96bd60e18861be64d2c6027b3b73fd30dcda99ada9b19f4a2daa8f7917fae0f1bb2 SHA512 6d9e6593477fb7aa663e6b9cdccb1d30df8d3bb3721b93afa9ddefce539d267bee062809dd6c50135ba113cf5220ef4b2799f25eca73c791ff59f4480189d211
-DIST patch-4.4.110.xz 1553352 BLAKE2B eb4e37d1deee89586db12a56dab415a985a678291b74fd4c0c5ded3214e47ca7f9019e572db79ed2d534f737dac01ecf065460c998de5e902b49fbe2d8631be9 SHA512 c247b8258d203448f5f8e0595475a4ac73c9550dadf2cd910c3179aaffb43cf11580647146e6e27d9fbcb33d869be91d4c206f3f1090492123973e3f239324fd
-DIST patch-4.9.75.xz 1339980 BLAKE2B 9f644981b4a1c173b505b9828a012417c0536732844ee9034e868b8679feadb40db5cfba1f1bffd31bb2f97960b13e3f682b01a27009d9fcca924e4dbe72d11a SHA512 4dbf9b7c6da142b63506542c0f1c5f0f3d4bb22c5291d4d99bcfc3945691ab5f969ce16b1d1a30553ba002feb3de66a9c39c1cf9c51a6c315e8820bc8853d221
-EBUILD mips-sources-4.13.16.ebuild 13140 BLAKE2B 8f08b6b870d092a5b678c1a73c01ac252a4f3045496e25be72060922307b42fe44c2f33efb36815734e5a0fa14651833c8516b73998c929b465f3d5d231d1476 SHA512 81209ba1b342529ecc14172630574b11fbc2313042b4ab5e24d8f8b541071c51fcd74eebce5d5b9c74ae07cfb04f068a1851fc49ce0dbbe05fe7ea5e3d996c8e
-EBUILD mips-sources-4.4.110.ebuild 13233 BLAKE2B 1f6b8e4f13a245bbd86cfe3f81d4fc242d64279ab73b4944a2a00292d27e4e1e2dc6c14fd82fd33c2e75fc2dd900cee332a62660fff8a6514741d476154172c5 SHA512 866f79fdd9740b64a1f8b08aaaa6e77b92ed458bddee5f98ee3865112625f4cc9d6993bd7e4119052bb33229197d5f164f8b35819790ba0bdc5630b5c7f37360
-EBUILD mips-sources-4.9.75.ebuild 13135 BLAKE2B 01aadc5f38e521000e359a678109ab6ec92868810ae3a7009e1178fe39e588ea019e606c4e91887f1e1343aa50aeee273e7d20186e3a4e3c8ded702c25cde2c9 SHA512 bb30cc2249f70de0688bd0ec1b319b36922de9a6a391baf124d32ceaa4e43279224fc340f0c90b60993230f7011cb7539eb82d77f81791f31f328a06a01b8e83
+DIST patch-4.14.67.xz 1650468 BLAKE2B 538e1abaa2401fb988be642a1c80e23821f7132e821322c1c82ad8c0ba3f3ff7f68713ee7b9a3d5a391d2ada9c08db2cc799e45f36d10df1abd839c20eb27dfc SHA512 fa55874353fb4aec12fc50d39e24ebfebcbcdf84f8602511f6bb5afca9585e4be63691599bed29a97e34901487f380bc1bcdb260e14b3709c81c715fa86e8579
+DIST patch-4.17.19.xz 463572 BLAKE2B 6097f24f8663ade71204d83e4b89bc15f3d0b0f906cb4a0e6a9aa32705fdbd7e8855337acca37697ef93bb3f2c696ce60bab2d4e02f1e20a0113ca02c7df61a7 SHA512 57fab939df862c3807d1ddd6461b19f85b3c0aba83203f327cf174f9d6e33c79e996362cabbb44014e03fe1eb77cf0232944927ae95aa1e51ef43b153d6343ab
+DIST patch-4.4.152.xz 2100204 BLAKE2B 3f9c9d7929b1e318a6a429b462c9011994fa201ca5f8ab7911e8356b02f634a2df6a6e49c7112988d5b7b6273bac2f02ded29093a9728275d84bec99bda1fb92 SHA512 3885257de141a3e4c95a772ed678f54707eea2dcd9dd6fe2108fefe8c18be34b1c0b3a22f29914d89e6bdf2548e27542c4a61ec96552fd7370b5a014faa12dcc
+DIST patch-4.9.124.xz 2175868 BLAKE2B 0dc5c27d85d696670ef86051015260cc36603fe3dda0626ac82b9f364cc8c562ca5155e4cd30c499febd85710c620683bbda67293e0f9be5799e78cf89b991d1 SHA512 6ae8e557ea4c72c04e9fd99fdae4f69a8f4cb1edb2cf4647de43b288f07069c0b54f9b0e8c45dc14165c48d58690e239d626d9503693decdc2b33903b79f421d
+EBUILD mips-sources-4.14.67.ebuild 13153 BLAKE2B cb8374f4c041ac1999dd79cd95add78b3895377366a11f97640579ccb20d38d418d7c76f82a5c22ba8a3096dd2b920447e510e86f9ddd7fe18baa83be6d4a809 SHA512 6fdb8376b96a39064945f6a77a0a2f0eb2a87a748ab0e73b206715df63a611d468055b0e692dec0d3d84273067f06bf0ca4b7660b02d8ab3d3fd423203e48a49
+EBUILD mips-sources-4.17.19.ebuild 13153 BLAKE2B 7731959134d8ed3c69ce521be818b74208fbfe8e2df636351bcf167a05e9cdd882aad7fddb59d1f56c79334be721cdd01b353123832d192e726cfdfcd1ce78d7 SHA512 d200632ff5c6b7cec9b72d93ac7ed7f3225f4ec5886543eb62f6416ee4d2678429b0e013f6f7f87c0093ef6e088060523523d7e13db4d99088fb64f67b2cf973
+EBUILD mips-sources-4.4.152.ebuild 13247 BLAKE2B 0fbd9c89cb5db74be02d239a34dbd6e84f8cb802decc1b550396df79a3ee41a14274e3c805eb38d26d4e8cf647cb65b6029ade1a0e017bde38a99f432e221a94 SHA512 5a829ca527c0ae20ead5461fb2888b9d7877167b5412d5f8baf7bb4184a2dabc11ae5c8f48fa5cbf93580d44c0e350db0e43d537e5116767196cbf18cbebe3f2
+EBUILD mips-sources-4.9.124.ebuild 13149 BLAKE2B d81460502bcb1e5c8d7e450da2ef00a013ca08c27235e95ee97b80af6acfb666ee930e6a21ea3155be76ff32b2f1386db3293b9ef9315d7c6c63a6e7d618eb2d SHA512 97a26f1b8143b199fe1a04d0b54d4b4ef66e8d682b81dc383556cb0e0fa920eab7fef15883e58aef6cd8de9360b7c5c319bb1a4e5b1aaf70a6713be83b860252
 MISC metadata.xml 791 BLAKE2B 8f6a800e1ce23fc8d8fa9a2e93f29c7161c30770ed2ed7345e1175d06a44298c645020317f6e21eac3d798edf4b2a72eaca8ae32207ad62c2e151e9d87c8cd07 SHA512 8a8f75a760d1ca13dc53038271236e16801136db499d52f97cedf0120077d06870750f51440f5cf765bbc8bc1cbc8745b354f467c582e219c58be3e700ee29cf
diff --git a/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild b/sys-kernel/mips-sources/mips-sources-4.14.67.ebuild
index 2aa774a33d25..4162d7a9c3fa 100644
--- a/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.14.67.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # EAPI Version
-EAPI="5"
+EAPI="6"
 
 #//------------------------------------------------------------------------------
 
 # Version Data
-GITDATE="20171007"			# Date of diff between kernel.org and lmo GIT
+GITDATE="20180128"			# Date of diff between kernel.org and lmo GIT
 GENPATCHREV="1"				# Tarball revision for patches
 
 # Directories
@@ -19,12 +19,12 @@ K_SECURITY_UNSUPPORTED="yes"
 K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
 K_NOUSEPR="yes"
-K_BASE_VER="4.12"
+K_BASE_VER="4.13"
 K_FROM_GIT="yes"
 ETYPE="sources"
 
 # Inherit Eclasses
-inherit eapi7-ver eutils kernel-2
+inherit kernel-2 eutils eapi7-ver
 detect_version
 
 # Version Data
@@ -284,7 +284,7 @@ src_unpack() {
 	cd "${WORKDIR}"
 	unpack "${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
 
-	# Create a new folder called  'patch-symlinks' and create symlinks to
+	# Create a new folder called 'patch-symlinks' and create symlinks to
 	# all mips-patches in there.  If we want to exclude a patch, we'll
 	# just delete the symlink instead of the actual patch.
 	local psym="patch-symlinks"
@@ -339,6 +339,8 @@ src_prepare() {
 	# Now go into the kernel source and patch it.
 	cd "${S}"
 	epatch -p1 "${WORKDIR}/${psym}"/*.patch
+
+	eapply_user
 }
 
 #//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-4.17.19.ebuild b/sys-kernel/mips-sources/mips-sources-4.17.19.ebuild
new file mode 100644
index 000000000000..cd1ccaadfa6e
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-4.17.19.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# EAPI Version
+EAPI="6"
+
+#//------------------------------------------------------------------------------
+
+# Version Data
+GITDATE="20180705"			# Date of diff between kernel.org and lmo GIT
+GENPATCHREV="1"				# Tarball revision for patches
+
+# Directories
+S="${WORKDIR}/linux-${OKV}-${GITDATE}"
+MIPS_PATCHES="${WORKDIR}/mips-patches"
+
+# Kernel-2 Vars
+K_SECURITY_UNSUPPORTED="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_BASE_VER="4.16"
+K_FROM_GIT="yes"
+ETYPE="sources"
+
+# Inherit Eclasses
+inherit kernel-2 eutils eapi7-ver
+detect_version
+
+# Version Data
+F_KV="${PVR}"
+BASE_KV="$(ver_cut 1-2).0"
+[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
+
+# Portage Vars
+HOMEPAGE="https://www.linux-mips.org/ https://www.gentoo.org/"
+KEYWORDS="-* ~mips"
+IUSE="experimental ip27 ip28 ip30"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.7.0
+	>=sys-devel/patch-2.7.4"
+
+# Specify any patches or patch familes to NOT apply here.
+# Use only the 4-digit number followed by a '*'.
+P_EXCLUDE=""
+
+# Machine Support Control Variables
+DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
+DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
+DO_IP28="test"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
+DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
+DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
+
+# Machine Stable Version Variables
+SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
+SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
+SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
+SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
+SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
+
+DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
+SRC_URI="${KERNEL_URI}
+	 mirror://gentoo/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz
+	 mirror://gentoo/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
+
+UNIPATCH_STRICTORDER="yes"
+UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
+
+#//------------------------------------------------------------------------------
+
+err_disabled_mach() {
+	# Get args
+	local m_name="${1}"
+	local m_abbr="${2}"
+	local m_use="${3}"
+	local is_test="${4}"
+
+	# Get stable version, if exists
+	local stable_ver="SV_${m_abbr}"
+	stable_ver="${!stable_ver}"
+
+	# See if this machine needs a USE passed or skip dying
+	local has_use
+	[ ! -z "${m_use}" -a "${m_use}" != "skip" ] && has_use="USE=\"${m_use}\" "
+
+	# Print error && (maybe) die
+	echo -e ""
+	if [ "${is_test}" != "test" ]; then
+		eerror "${m_name} Support has been disabled in this ebuild"
+		eerror "revision.  If you wish to merge ${m_name} sources, then"
+		eerror "run ${has_use}emerge =mips-sources-${stable_ver}"
+		[ "${m_use}" != "skip" ] && die "${m_name} Support disabled."
+	else
+		ewarn "${m_name} Support has been marked as needing testing in this"
+		ewarn "ebuild revision.  This usually means that any patches to support"
+		ewarn "${m_name} have been forward ported and maybe even compile-tested,"
+		ewarn "but not yet booted on real hardware, possibly due to a lack of access"
+		ewarn "to such hardware.  If you happen to boot this kernel and have no"
+		ewarn "problems at all, then please inform the maintainer.  Otherwise, if"
+		ewarn "experience a bug, an oops/panic, or some other oddity, then please"
+		ewarn "file a bug at bugs.gentoo.org, and assign it to the mips team."
+	fi
+
+	return 0
+}
+
+err_only_one_mach_allowed() {
+	echo -e ""
+	eerror "A patchset for a specific machine-type has already been selected."
+	eerror "No other patches for machines-types are permitted.  You will need a"
+	eerror "separate copy of the kernel sources for each different machine-type"
+	eerror "you want to build a kernel for."
+	die "Only one machine-type patchset allowed"
+}
+
+pkg_postinst() {
+	# Symlink /usr/src/linux as appropriate
+	local my_ksrc="${S##*/}"
+	for x in {ip27,ip28,ip30}; do
+		use ${x} && my_ksrc="${my_ksrc}.${x}"
+	done
+
+	if [ ! -e "${ROOT}usr/src/linux" ]; then
+		rm -f "${ROOT}usr/src/linux"
+		ln -sf "${my_ksrc}" "${ROOT}/usr/src/linux"
+	fi
+}
+
+pkg_setup() {
+	local arch_is_selected="no"
+	local m_ip m_enable m_name
+
+	# Exclusive machine patchsets
+	# These are not allowed to be mixed together, thus only one of them may be applied
+	# to a tree per merge.
+	for x in									\
+		"ip27 SGI Origin 200/2000"						\
+		"ip28 SGI Indigo2 Impact R10000"					\
+		"ip30 SGI Octane"
+	do
+		set -- ${x}		# Set positional params
+		m_ip="${1}"		# Grab the first param (HW IP for SGI)
+		shift			# Shift the positions
+		m_name="${*}"		# Get the rest (Name)
+
+		if use ${m_ip}; then
+			# Fetch the value indiciating if the machine is enabled or not
+			m_enable="DO_${m_ip/ip/IP}"
+			m_enable="${!m_enable}"
+
+			# Make sure only one of these exclusive machine patches is selected
+			[ "${arch_is_selected}" = "no" ]				\
+				&& arch_is_selected="yes"				\
+				|| err_only_one_mach_allowed
+
+			# Is the machine support disabled or marked as needing testing?
+			[ "${m_enable}" = "test" ]					\
+				&& err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}" "test"
+			[ "${m_enable}" = "no" ]					\
+				&& err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}"
+
+			# Show relevant information about the machine
+			show_${m_ip}_info
+		fi
+	done
+
+	# All other systems that don't have a USE flag go here
+	# These systems have base-line support included in linux-mips git, so
+	# instead of failing, if disabled, we simply warn the user
+	if [ "${arch_is_selected}" = "no" ]; then
+		[ "${DO_IP22}" = "no" ]							\
+			&& err_disabled_mach "SGI Indy/Indigo2 R4x00" "IP22" "skip"	\
+			|| show_ip22_info
+		[ "${DO_IP32}" = "no" ]							\
+			&& err_disabled_mach "SGI O2" "IP32" "skip"			\
+			|| show_ip32_info
+
+	fi
+}
+
+show_ip22_info() {
+	echo -e ""
+	einfo "IP22 systems with an R5000 processor should work with this release."
+	einfo "The R4x00 series of processors tend to be rather flaky, especially the"
+	einfo "R4600.  If you have to run an R4x00 processor, then try to use an R4400."
+	einfo ""
+	einfo "Some Notes:"
+	einfo "\t- Supported graphics card right now is Newport (XL)."
+	einfo "\t- A driver for Extreme (XZ) does not exist at present."
+	echo -e ""
+}
+
+show_ip27_info() {
+	echo -e ""
+	ewarn "Heavy disk I/O on recent kernels may randomly trigger a VM_BUG_ON_PAGE()"
+	ewarn "in move_freepages() in mm/page_alloc.c.  The exact trigger cause is"
+	ewarn "unknown at this time.  Please report any oops messages from this"
+	ewarn "bug to bugs.gentoo.org (assign to mips@gentoo.org)"
+	echo -e ""
+}
+
+show_ip28_info() {
+	echo -e ""
+	einfo "Support for the Indigo2 Impact R10000 is now in the mainline kernel.  However,"
+	einfo "due to the R10000 Speculative Execution issue that exists with this machine,"
+	einfo "nothing is guaranteed to work correctly.  Consider enabling ${HILITE}CONFIG_KALLSYMS${NORMAL}"
+	einfo "in your kernel so that if the machine Oopes, you'll be able to provide valuable"
+	einfo "feedback that can be used to trace down the crash."
+	echo -e ""
+}
+
+show_ip30_info() {
+	echo -e ""
+	eerror "Things that DON'T work:"
+	eerror "\t- Do not use CONFIG_SLUB, otherwise, you'll get errors when booting"
+	eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in sysfs."
+	eerror "\t- Impact (MGRAS) Xorg driver no longer functions due to severe bitrot."
+	eerror "\t- Octane is limited to a maximum of 2GB of memory right now due to a"
+	eerror "\t\040\040hardware quirk in the BRIDGE PCI chip that limits BRIDGE DMA"
+	eerror "\t\040\040addresses to 31-bits when converted into physical addresses."
+	eerror "\t\040\040Patches that attempt to fix the issue are highly welcome."
+	echo -e ""
+	ewarn "Things that might work, but have problems, or are unknown:"
+	ewarn "\t- CONFIG_TRANSPARENT_HUGEPAGE should work now, but there may still be"
+	ewarn "\t\040\040intermittent issues.  Additionally, CONFIG_HUGETLBFS must also be"
+	ewarn "\t\040\040selected for hugepages to work.  If use of this feature continues"
+	ewarn "\t\040\040to trigger random Instruction Bus Errors (IBEs), then it is best to"
+	ewarn "\t\040\040disable the functionality and perform a cold reset of the machine"
+	ewarn "\t\040\040after powering it down for at least 30 seconds."
+	ewarn "\t- Serial support on the Octane uses a very basic UART driver that drives"
+	ewarn "\t\040\040the 16550A chip on the IOC3 directly.  It does not use interrupts,"
+	ewarn "\t\040\040only a polling routine on a timer, which makes it slow and CPU-"
+	ewarn "\t\040\040intensive.  The baud rate is limited to no more than 38.4kbps on"
+	ewarn "\t\040\040this driver.  Patches for getting the Altix IOC3 serial driver to"
+	ewarn "\t\040\040work (which uses DMA and supports faster baud rates) are welcome."
+	ewarn "\t- UHCI Cards are known to have issues, but should still function."
+	ewarn "\t\040\040This issue primarily manifests itself when using pl2303 USB->Serial"
+	ewarn "\t\040\040adapters."
+	ewarn "\t- MENET boards appear to have the four ethernet ports detected, however"
+	ewarn "\t\040\040the six serial ports don't appear to get picked up by the IOC3"
+	ewarn "\t\040\040UART driver.  The NIC part number is also not read correctly"
+	ewarn "\t\040\040from the four Number-In-a-Cans.  Additional testing would be"
+	ewarn "\t\040\040appreciated and patches welcome."
+	ewarn "\t- Other XIO-based devices, like various Impact addons, remain untested"
+	ewarn "\t\040\040and are not guaranteed to work.  This applies to various digital"
+	ewarn "\t\040\040video conversion boards as well."
+	echo -e ""
+	einfo "Things that DO work:"
+	einfo "\t- SMP works again, celebrate!"
+	einfo "\t- Impact (MGRAS) console only."
+	einfo "\t- VPro (Odyssey) console only (no X driver exists yet)."
+	einfo "\t- PCI Card Cages should work for many devices, except certain types like"
+	einfo "\t\040\040PCI-to-PCI bridges (USB hubs, USB flash card readers for example)."
+	einfo "\t- SCSI, RTC, basic PCI, IOC3 Ethernet, keyboard, and mouse.  Please"
+	einfo "\t\040\040report any problems with these devices."
+	echo -e ""
+}
+
+show_ip32_info() {
+	echo -e ""
+	einfo "IP32 systems function well, however there are some notes:"
+	einfo "\t- A sound driver now exists for IP32.  Celebrate!"
+	einfo "\t- Framebuffer console is limited to 4MB.  Anything greater"
+	einfo "\t\040\040specified when building the kernel will likely oops"
+	einfo "\t\040\040or panic the kernel."
+	einfo "\t- X support is limited to the generic fbdev driver.  No X"
+	einfo "\t\040\040gbefb driver exists for O2 yet.  Feel free to submit"
+	einfo "\t\040\040patches!"
+	echo -e ""
+
+	einfo "To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)"
+	einfo "systems, you need to use the ${GOOD}vmlinux.32${NORMAL} make target."
+	einfo "Once done, boot the ${GOOD}vmlinux.32${NORMAL} file (NOT vmlinux)."
+}
+
+src_unpack() {
+	# Unpack the kernel sources, update to the latest rev (if needed),
+	# and apply the latest patch from linux-mips git.
+	kernel-2_src_unpack
+
+	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${BASE_KV}.
+	echo -e ""
+	cd "${WORKDIR}"
+	unpack "${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
+
+	# Create a new folder called 'patch-symlinks' and create symlinks to
+	# all mips-patches in there.  If we want to exclude a patch, we'll
+	# just delete the symlink instead of the actual patch.
+	local psym="patch-symlinks"
+	mkdir "${psym}"
+	cd "${psym}"
+	for x in ../mips-patches-${BASE_KV}/*.patch; do
+		ln -s "${x}" "${x##../mips-patches-*/}"
+	done
+
+	# With symlinks created, setup the variables referencing external
+	# machine patches and if a machine USE flag is enabled, then unset
+	# its corresponding variable.
+	# See 0000_README for the patch numbers and their meanings.
+	local p_generic="51*"
+	local p_ip27="52*" p_ip28="53*" p_ip30="54*"
+	local p_xp="80*"
+	use ip27 && unset p_generic p_ip27
+	use ip28 && unset p_ip28
+	use ip30 && unset p_generic p_ip30
+	use experimental && unset p_xp
+
+	# Remove symlinks for any patches that we don't want applied.  We
+	# do this by looping through all the above variables, and deleting
+	# matching symlinks that point to the corresponding patches.
+	# The remaining symlinks will be applied to the kernel source.
+	#
+	# $P_EXCLUDE is a new var that can be set in an ebuild to exclude
+	# specific patches by wildcarding the patch number.
+	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_xp} ${P_EXCLUDE}"
+	for x in $patchlist;
+		do rm -f "./${x}"
+	done
+
+	# Rename the source tree to match the linux-mips git checkout date and
+	# machine type.
+	local fkv="${F_KV%-*}"
+	local v="${fkv}-${GITDATE}"
+	for x in {ip27,ip28,ip30}; do
+		use ${x} && v="${v}.${x}" && break
+	done
+	mv "${WORKDIR}/linux-${fkv/_/-}" "${WORKDIR}/linux-${v}" || die
+	S="${WORKDIR}/linux-${v}"
+
+	# Set the EXTRAVERSION to linux-VERSION-mipsgit-GITDATE
+	EXTRAVERSION="${EXTRAVERSION}-mipsgit-${GITDATE}"
+	unpack_set_extraversion
+}
+
+src_prepare() {
+	local psym="patch-symlinks"
+
+	# Now go into the kernel source and patch it.
+	cd "${S}"
+	epatch -p1 "${WORKDIR}/${psym}"/*.patch
+
+	eapply_user
+}
+
+#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild b/sys-kernel/mips-sources/mips-sources-4.4.152.ebuild
index 79d5f1e3cf28..9d25a5dca63e 100644
--- a/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.4.152.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # EAPI Version
-EAPI="5"
+EAPI="6"
 
 #//------------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@ K_FROM_GIT="yes"
 ETYPE="sources"
 
 # Inherit Eclasses
-inherit eapi7-ver eutils kernel-2
+inherit kernel-2 eutils eapi7-ver
 detect_version
 
 # EPATCH Vars
@@ -343,6 +343,8 @@ src_prepare() {
 	# Now go into the kernel source and patch it.
 	cd "${S}"
 	epatch "${WORKDIR}/${psym}"/*.patch
+
+	eapply_user
 }
 
 #//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild b/sys-kernel/mips-sources/mips-sources-4.9.124.ebuild
index 124b95b19f6d..367089311a06 100644
--- a/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.9.124.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # EAPI Version
-EAPI="5"
+EAPI="6"
 
 #//------------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@ K_FROM_GIT="yes"
 ETYPE="sources"
 
 # Inherit Eclasses
-inherit eapi7-ver eutils kernel-2
+inherit kernel-2 eutils eapi7-ver
 detect_version
 
 # Version Data
@@ -339,6 +339,8 @@ src_prepare() {
 	# Now go into the kernel source and patch it.
 	cd "${S}"
 	epatch "${WORKDIR}/${psym}"/*.patch
+
+	eapply_user
 }
 
 #//------------------------------------------------------------------------------
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 653a02cb91d7..d23998238c40 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -8,7 +8,7 @@ DIST patch-3.16.57.xz 2026584 BLAKE2B 275c631a26fd7832f5845f2bb74ec053b2e289e72b
 DIST patch-4.14.63.xz 1598940 BLAKE2B 532af2963b6be9361b8acda05d59c942e69ee27656c47cec3f078a8932a967c8f1a171c0e6688b6ceba656407f577f2b334533bea348720353de06ed39375e01 SHA512 09871bb57e36b15859cfe67691d9cf60831f73e10a8bc43dfe89d22aebf249a84326293612dd620b6ee118b0e60daead76acd93eb1c2a0eb15613836fed5e7b7
 DIST patch-4.14.67.xz 1650468 BLAKE2B 538e1abaa2401fb988be642a1c80e23821f7132e821322c1c82ad8c0ba3f3ff7f68713ee7b9a3d5a391d2ada9c08db2cc799e45f36d10df1abd839c20eb27dfc SHA512 fa55874353fb4aec12fc50d39e24ebfebcbcdf84f8602511f6bb5afca9585e4be63691599bed29a97e34901487f380bc1bcdb260e14b3709c81c715fa86e8579
 DIST patch-4.17.15.xz 368596 BLAKE2B 30f45922c280d6742f6cefca828deb17602c684e86e2e072e8a42890439f9d317fd4357ae2a1d5b0809b81f6c0e2c4ed54a29c06a43246c7d940c72f973b5f40 SHA512 3e9c0bee00992bf857419ec628e4e3a7651deaf6b4d598cbd50c2fc758ae342d372ff04704737b8eb585e926807ea19c1da3e8a62b3c87583ab2cff0785e331a
-DIST patch-4.17.18.xz 388184 BLAKE2B 65a2e62c3b5d8d32c2ed6d2bd3e4cb14e784d2566583664ae2c24147fb594f5f66061e3eeb4753fb5ea905b37994131725feb9febe382b3d3bf966ac47bafefa SHA512 d3f73cca96d5bd7a2b85d070248771e8ee7de911ca34e7698325c71d28c01207cd6266879e2cddb2e924f706cd7c8f294e3a9724e7095fbbc359d17828507253
+DIST patch-4.17.19.xz 463572 BLAKE2B 6097f24f8663ade71204d83e4b89bc15f3d0b0f906cb4a0e6a9aa32705fdbd7e8855337acca37697ef93bb3f2c696ce60bab2d4e02f1e20a0113ca02c7df61a7 SHA512 57fab939df862c3807d1ddd6461b19f85b3c0aba83203f327cf174f9d6e33c79e996362cabbb44014e03fe1eb77cf0232944927ae95aa1e51ef43b153d6343ab
 DIST patch-4.18.1.xz 34024 BLAKE2B 182b92aae211b30ebd4f4a3bcafa8a085366479ed5c6258be2155fa654c63f4d8176122802e39bc4ba5fb719d5760215b2c03b75e4f951eb5dcdb3c07694e757 SHA512 a32d22444c50ffda857e81711c976934f34219f3ab73bcf4739fa7a2a901fba33d5a08829f327982a1afc2b2cb44cd517c159e99dc4e4dccc9ae27b93cb2027d
 DIST patch-4.18.5.xz 58136 BLAKE2B dfcd74b39247ff1983086e93b675ec7d4a5e2914517c4536c47ba04a0f5431374991765e0568c907921bd441ca08e50f341171f6b252b963095f8c165034895e SHA512 b7c1457b92051d79a6dfe1d1acbe3e9cf589ba1aac0db61d76a500f0966854307c35e91016b6175f2a863a4cd63e0c99fa879eea2e5467d38e86afa44bfcfd52
 DIST patch-4.4.148.xz 2078624 BLAKE2B bd77d546ed28a2f6f9d79be6487d39ad38a774c81e38b10bf61ae25185a13b076081fc650dc2bceb36b3ff5ba8ecb4ef6f31fdd2850a71a6747798b1e183f625 SHA512 9448779b00090f997a690b142917fb1236a2fc5ee938f6822e6b9713c51415c483f2cfb7f8af42ef0ed2eeb3fd7468d2d38e69efdc2622a9433b888a19ab1677
@@ -19,7 +19,7 @@ EBUILD vanilla-sources-3.16.57.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073e
 EBUILD vanilla-sources-4.14.63.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.14.67.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.17.15.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.17.18.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.17.19.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.18.1.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.18.5.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.4.148.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.17.18.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.17.19.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.17.18.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.17.19.ebuild