sys-kernel/aufs-sources: Bump to latest aufs, genpatches and linux release

Package-Manager: portage-2.3.2
Signed-off-by: Justin Lecher <jlec@gentoo.org>

13 files changed, 668 insertions, 131 deletions

diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 44a56f2b2e7f..625517e6758e 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,31 +1,49 @@
-DIST aufs-sources-3.18.25+_p20160627.tar.xz 170100 SHA256 8d22f32fb944c239ca37a1a33b4c05241391e8d499fddf2eefa36b94a53e0304 SHA512 3e0a6e356f92918bd9810007f711629ecb2804003445a6e5179b2773d027cc3d7705cbc125444f5b9fab5771d1332dba337d6f682490447761fe83b38c1157d8 WHIRLPOOL ff37794dce145e9eea89de76714c13f9d69e7210f06337e8d103ad8305d370003c6c1d4272f8e568f4a32466ea1f5f38816174dedc180a5500b5bc08097fea81
-DIST aufs-sources-3.18.25+_p20160801.tar.xz 171144 SHA256 05dcb15e13b29244f9cd1a5ad0b6b649e0b5da1eb1cad45083fddb11a236ee43 SHA512 5a8b22076ea2d8456cbe55034ec52735008b4ab09c01c35d6673322d2ebb0c40981fe94ea814aba8f3a959edaacd6377c25c243fb3d6bedc6ac43dd85e287ded WHIRLPOOL 0f629288cb66f30120c59a52a038eefaac93ad51e82257771fc4f6cf80b867fcd4c6bf3a753ca18b5a47a8cdf9e79e440965c8a3af9b3633df755936866a5cb5
-DIST aufs-sources-3.18.25+_p20160815.tar.xz 171104 SHA256 d2c48508f8997e6c171bad2609e12bbb166e1079afa1646488850340311ed71f SHA512 765401a16a820a011077a2089a295509442e88e403e99c51c592f42603f9c6c2d53f29e13e6965872cbf5efc16c5df15ed44bb0c3f594aa48f30811d81e6cad4 WHIRLPOOL a1967d54fff71d43809c7dfa1350d35558324bf4d8de9c6e7d817de3d8e159a1f798fb77996bcc6e755a0c444958391bb65989179f9ed06891074bbd0f3b5087
 DIST aufs-sources-3.18.25+_p20160822.tar.xz 171116 SHA256 824a1ef783c4091c20e80b478aef8d75bca5c85db79eaa15cdf7fea00416d916 SHA512 045c48c4c4935c22637c39540fc89bfa8ead69b2993c9d258a88466860c4227b99e4dc75234ec2402bdee0119d2554129cd76719423d01ed5a4d74768dee0347 WHIRLPOOL 446cf17e62468e668b1f88cb1ba9901e8030b968b0ec5a4f76cc3b2921962fd3e3a550441ce65cbf4d13152ee08d27640ca9ae5cddd287a1d416f665ac46ebe7
 DIST aufs-sources-4.4_p20160328.tar.xz 169384 SHA256 0e9b22ab0b36ef88ee464be70fdb1d22081dd34a4b5891d1b236056141267793 SHA512 bc055618c54ff5a7fb209458ca55b92fdb9c59044a7c395297e7b9340d0de3ff2e9d8230886dbbbfa503fb1e1ea2f048142a9b6983c1d65f09c348d71caecb1c WHIRLPOOL 0f4befa1bb71b9f8deec1dd0750100484745d1a6b7aa007dce890e24b77defd2aff48803e93f3d7eeda1f32d0132d75abdc2820869c080f7b4e75d7a8e370404
 DIST aufs-sources-4.4_p20160905.tar.xz 171064 SHA256 dbab7b93189fc0c5c29e3e8d9f7535d872e2da1eae0709f24592faf0ef181b33 SHA512 1e308ce5f966217f0f38eab9bcb8cfdf7e56119688183a226a48aa7e6256796628ccab7e9c53f531cf6c4bc1f5c08a7dd6b683ba6b061ef95a793528b3701a98 WHIRLPOOL ed647f202eaa6a869a37527a4dd70eb23b88fef23a9e2f511748277882392f744f242d12fd6d4d006f1030f963297d41ce9e5b400d54d064a9068711c40fd6dc
-DIST aufs-sources-4.7_p20160905.tar.xz 170608 SHA256 45ffbdf81384da74b2217df63b6f94ebf1126d282f68a332183e21096207f708 SHA512 ff9e8b807f64b2377a2638c819df5116047a1857be52c8d26237360c16a423bb92eed6e44879aabf3b7a789443bf89011ca299305c91c05cd647ab33313d1a5d WHIRLPOOL a9fc7da64bcaa506a45551f209c82011ad7096ade329d76b979ce465960f5c22d9dfb4ae7b044a14fa3ee523fee07a7e78af9231f6917fef7b7108f5b3dcbdcd
-DIST genpatches-3.18-36.base.tar.xz 989348 SHA256 927971c003aa92f373d6a3d8e8adeafa7d423feb36f1e258e21f7349561e0b9b SHA512 f2357160e5358efbdc4c1f92996fe4958d1b93340b975bb077d5ff997bcbb7054dd145821174d102bcf42c4bc996a45008f157a919693f76ca03755ff67e331c WHIRLPOOL 424d95b03f514f0ed9661303a9211aa1c07a7fafa18bb43a70f2965ab86743efe7df52c35664be596c79ee8b13d7dee1cf9550987f8f60618b9b4676537c7e6d
-DIST genpatches-3.18-36.experimental.tar.xz 61588 SHA256 1b0a9d09e0640935550c05291a1781e1125656575d072104e0481eaccd27fb3e SHA512 97f9e9343e1089c711d1d1607044ffd026e991d3999699bc3398fc7989c296528e4a55996067c441be8fda77e7e92da99c644fd81d944babf9f54c6154dfb8a0 WHIRLPOOL 8d1797909ed854168efa58790cd1438355ffa37807f14f8757774720a3fe96bd54fcb6331e3e4e2ce1f8f60e8fc817ecf37d0c028e47259c0cfe11a7a574a165
-DIST genpatches-3.18-36.extras.tar.xz 16180 SHA256 e8928932e41ff9f86d396df8260d3144d47ed1004a683ecfd04454acf02e87a0 SHA512 1155b2f629c4d80415dfd9925a0c115bdbdc4cfd1984bdcef55ac40b33b602837172624ea04aa08d213147f78e6e674793bee465ef75662a69850aff04b15f6e WHIRLPOOL 67a0bec3e880ffa1163b679b145f14d9e77fda01d01fc4fba7e4b720c1e79b3d2f5dab1856bc7cf214811eb323ec3e81e110bced99a44738c1ba7e0276b16f46
-DIST genpatches-3.18-38.base.tar.xz 1056800 SHA256 640ef44bc1ea758c6c1eb5a8982f1184b895bdd45d0acfe13938fb13dfe61520 SHA512 6ee254a594354516edc7c38ff64f15675d101433c8c1a37ec982ebbc0a6a96cbdb990c8f1efcbd9e64c8810ddbac4af938a0964b3ef163c6505dd40e3bf9c71d WHIRLPOOL 601bab089e611239a6e30c536eeda8d16cb7761697c0161dcc7f1f85f7e0df575d5295bd8f219649dc2142edc2c0d125b0279fdbbb9006eba7ab6fab9bcb2f4a
-DIST genpatches-3.18-38.experimental.tar.xz 61756 SHA256 c54a6bf89a6ab07bb378942bd2926de7bad637672b6d68e3acb2bae8a0665818 SHA512 d400f35b0c8d2be08d61cafa72f460eefcb813052edef619ada875bf664273564bc40352a18d91506eb975a4a2b7e7b11827b0c93a3168965e1c8c20e3bca44d WHIRLPOOL 6d38e4083ecd2076c7436a25a7290f4265f31300ff1ae760a7ac6f5c5c1715bc5d80b7df7d11221c5aa157eb22b1ab1c854f3e0686eeb3d9ae209ac7bbbeef4c
-DIST genpatches-3.18-38.extras.tar.xz 16192 SHA256 f30c135fd6b6d0739ea10fc5086d12493b2075516d6f1ad5e6bd951c22908b44 SHA512 745f9c89ff751128a2276a9d54b3b75d4e392279ccb54eed871281cb615dae870b2d8f5f66bab4301b93828de9d9e5bfa1495d9876ee4d14b34ce6f0b0279a37 WHIRLPOOL 2178c15e32835634c6ca2556c79948c3fff8c44e414c932037b80f095602b95e4c448c6deb5a5970ca2942791715a4ce7583e37166599c5e7b87969f2aa82791
-DIST genpatches-3.18-39.base.tar.xz 1063424 SHA256 1b894c5766a8cb21c553e467668ec8b1295ff96f37b25b0a9ea750ced30c611a SHA512 523da4c6413204ce6dce46626359b50cd4c31988424fba8546ef3bbb75a3ce61af068dc35ddc1f240a177192b715cff62608f95ce3ac453a5eb84ff12c79fb7d WHIRLPOOL 10d90308afd912266a91e9dd4cfb724cf11f0dfd46103a832126cfc0728deb6f7a09516e9f5e8ab7fb64aa0fba9d06acf5645df42289867e29b42c6642a0c000
-DIST genpatches-3.18-39.experimental.tar.xz 61724 SHA256 196f3ad4cab22c70035584b49e308a6486d5cf0b5f6915f8c368e7d55fce4e73 SHA512 f91f1150630322067d37835e00c70b68dc58b9ca09f34900a9206103d3304bc83cf40ee4cada16ff6ca65148d67aafd3b2b2f298f96df1321f45e48200dfa766 WHIRLPOOL ea8a14dc9be196e250491cc76c08ed8eb470d8c406722c8cf0af14b16ee00a74edafddf7663095d99826d9240631fb312e14aff9614437699304cf7d72380bf4
-DIST genpatches-3.18-39.extras.tar.xz 16192 SHA256 2cd12e21f1fc9513d12d1dd9c42db1cc72a6140c6e7af4deec6abae0c3ee335f SHA512 04aab296a48a49c0228c4e22c0a4f2aa9390b66970f2975424b1d2ff4ecd3ee4448ec282de7ccf72e1828d1a29cd9ef213f2fbb81f178554fb1b0c1c2db2476c WHIRLPOOL 0d51d0fab944e7f38e0a5ed80dfafafc92e5ed2ba745a284ea97738d3ff6e20dc38863b8641c3c2316e0374ba15194ec85c6ee7fedb3e9fa245d16b40e7ed591
-DIST genpatches-3.18-40.base.tar.xz 1089632 SHA256 66615737fa4633df2b2061f6dbd09c4e67bbb503599ccc312f557e7a8af5928e SHA512 6ccc0994071328a732c00ef919317a97ded933175231de8f3edf8a3319d7885a2265822a6c64402221b4a45ee683c14042f88595442dc1f83c2e35a11f929f69 WHIRLPOOL 0a8da82756274dac9fa32f7b2c93a5321948e20d5af90e61cc801a60644b84e586e9df1c3f9bdfa3763356ccdfd716ff2e453b4c84192f416d994af77aa5f71c
-DIST genpatches-3.18-40.experimental.tar.xz 61756 SHA256 c54a6bf89a6ab07bb378942bd2926de7bad637672b6d68e3acb2bae8a0665818 SHA512 d400f35b0c8d2be08d61cafa72f460eefcb813052edef619ada875bf664273564bc40352a18d91506eb975a4a2b7e7b11827b0c93a3168965e1c8c20e3bca44d WHIRLPOOL 6d38e4083ecd2076c7436a25a7290f4265f31300ff1ae760a7ac6f5c5c1715bc5d80b7df7d11221c5aa157eb22b1ab1c854f3e0686eeb3d9ae209ac7bbbeef4c
-DIST genpatches-3.18-40.extras.tar.xz 16192 SHA256 f30c135fd6b6d0739ea10fc5086d12493b2075516d6f1ad5e6bd951c22908b44 SHA512 745f9c89ff751128a2276a9d54b3b75d4e392279ccb54eed871281cb615dae870b2d8f5f66bab4301b93828de9d9e5bfa1495d9876ee4d14b34ce6f0b0279a37 WHIRLPOOL 2178c15e32835634c6ca2556c79948c3fff8c44e414c932037b80f095602b95e4c448c6deb5a5970ca2942791715a4ce7583e37166599c5e7b87969f2aa82791
+DIST aufs-sources-4.4_p20161010.tar.xz 171280 SHA256 87c6499fc960338ba1119b0b6487f803c20405f0c5fd569cb41bc26300a75ada SHA512 6029c2e053c739821db56b6e1b014206087c820dce9e884fff559ea1f3bd2ede6d455232165ed6f801754beff71ee9ec351162523d5b6f18c8250a38f2f6f5c3 WHIRLPOOL 3b38396832c9bbe3f53d5c2d0275c47d1b6feb55649ca914cc84173916026b6a4252e9ea9b6067544347affb07b587858f8bef06e61f501a4c7b101c14edd7b1
+DIST aufs-sources-4.7_p20161010.tar.xz 170860 SHA256 f10e69a8d71bd94455510b5a4079dc6496b8c0d3b7c8f7aea15eca7a87526ca1 SHA512 8169ecf613dec0450764d5a7310c2b290fe961a58654e7d15b0ac319f67360e46ac4396b975da9e87f10a82f5e3086960d6e6b04c315cd3f52250a35297cbada WHIRLPOOL f7ca6b4afd5c718473a6bc1921bf8427be3c326c50c8a2167e0fbc66c9b4ac384e5ff49ff28faa834c912a5323aff895f22e1542262069cb6280799c64523bc4
+DIST aufs-sources-4.8_p20161010.tar.xz 170924 SHA256 f80b6f194fcc4ee39c6f5bdcce912839d523d33ed610e729947d841daf2ee84d SHA512 6cf1814dacde202f61be9fdf522990b339952a708372da9d078aabd1a68a5a77e673d74b5d92ae9baa6ada01454636bc0268df474c4dc85408d490543ed9485b WHIRLPOOL 5e0ebb52a4c7bf0951d56f62f85b61ec8821d9d168a0444c439f4bb7b09c6f6c79065157752427d629e35335c3fdcb20a47b0f1f74e18fb926551a7f82226002
+DIST genpatches-3.18-41.base.tar.xz 1101596 SHA256 b9a683468f00c8de13f3e29fadd972bce01cbbdc8616d9689a55a7f067a7d9d5 SHA512 4ec479b6d810eb2bf141c8ec19c363739d548512e81a5a651a8c9ea11e3e46278a544d847c01b253e4d64aa3ee2d029b75c4e3bdc04d8cb71caa06e32e254575 WHIRLPOOL 10aca13e6b9645ef3e0b891d36279e016c3bf3d8fb3b734300f06ec7b8550da689c7937a2ad8f7f5521b9aa3a164d5a07683ce43021dd9053f7a447b126c4c44
+DIST genpatches-3.18-41.experimental.tar.xz 61752 SHA256 d376cba324755d86b26cbdf462da6e28be46063b6a252ede7a20605086c17161 SHA512 91ec04beca0820e1200b235c4f9a1bdc49ac288e78a2eaaa3b4dfe21e81e553ea4d8cfbcf5da261fb5dd8f736b53d0782d033f1c70408b6fba0f644d7bf356a0 WHIRLPOOL cd5029bc5f7ef9cb3b6f9310fad49a4a5ffed34cb995ed1fac81114bf1d542d8c720ec6ceb5fb920f31cdee772d4d623723abdb620ae067f41981cbb21237b16
+DIST genpatches-3.18-41.extras.tar.xz 16184 SHA256 e5b6cae811814629110c1fe46d3446aae3c8b49c0bf99203f5b055d601095a0b SHA512 27d69455dbdcbaf82d6fb24aaefc2212f7f49fe6c511db8527a97515d315ce142d3daec1e7f7d2ce72b96398f6cab8f7e51f193b61294029a71ab591075f0288 WHIRLPOOL 34eabbc6e0fd9667d145230e411b4cae7565e67bb110a08b5bff3cb11460f060676f0b10c48595f2bd48075f19d107eaa19021039db8ddbd3e2d903618e07beb
 DIST genpatches-4.4-22.base.tar.xz 644548 SHA256 5baced2ab2eb8b511d8c6d760e1fab1048c4b4a08e0e317e9a02815143582e08 SHA512 aeb751aad975c393c32be7dc637aa276308a296bed15a7ce825d7f6e478beae5b5cdfe728ede25f7e3c3e09f65d2f2490483cfa0abcfcc8a5607606cdbed6d36 WHIRLPOOL fbaace97e76482bf1cf69d4069b07aee317d98e50b894aeeefbaa5bf5f4d001727ce819a8a28c0555a35a9534f9fb8c8f3740bbfbaabb8cd46f656da68da8004
 DIST genpatches-4.4-22.experimental.tar.xz 62732 SHA256 bc2b45d3a36864d3867d7732d98efa02045da605677046519ffd62bcbbacd592 SHA512 20f00f35eeeb1b4592430275ca207d0217b2e70ea469a655e05df14147ffcaccb94c5c4229a491d6b68d4d19968e601ca78173dca8e39620b07179b1a59817a0 WHIRLPOOL f3d3763cba232be28c5327857b4da6b81e9ee4ed3d2d263a9742ff9d5278218bb78b2671307bf30c39fab9718a5f1110d131dfbaf534b212efcb41da40ddb3d4
 DIST genpatches-4.4-22.extras.tar.xz 16360 SHA256 a3335977ecc84df581ebb7dcf40fa342ff1be0a99a42b29d13fe3a1fc88a0cb3 SHA512 7ca83e63bc52736fe6d465d231a3953e02f9430a9c78e87ef114ddc19cba6abe2c45bc0cdf82c833f0b750a27330bd990ac2a1e763b2fdc2b6dd3aa7e34df367 WHIRLPOOL dc90646ecd24bd49fe192b899b743402a298ad1cd447cb6a2c6a94069c218acc353f53b4d22c01bb739fca9d82f62ac74fe827d554cc157295853d53a174c3b4
+DIST genpatches-4.4-23.base.tar.xz 712492 SHA256 d3b4ef9cf44fcf37354d81c6469a01c343a2c06dd6fc8fd8fe726d9239f04b30 SHA512 9ab017865f0d8c104782cb23b470e488e709112a5c478902c1c18b329ab39afd3c71cdb780f68bc7a203e7a9958706aaa6a576c346776a666c94095fcb61d1dd WHIRLPOOL 1bda5363e119a1df5bbb5438b36c1a5f9eaf772e9060b3593807f8c6594fe4db8e320bca5bbeb1b7f36b47db1927f750deb236ca5a25b523723bae8605393e78
+DIST genpatches-4.4-23.experimental.tar.xz 87780 SHA256 af359db57d4ceab7bc17d6cae2d4d1536b2b15150e26971f9e4f5b1bd14a2055 SHA512 6df00844070687423c3cd115679197b2084641050f1ddc96c8d547600f7008107b0b4786809ad8f9456ebb7470d3217a36a5bfe19612b33bc50c6ccac1082388 WHIRLPOOL 32a5be0dd74bf8a4e1a78bcdfdd4bdfdafa755384dfd174b9c9c0cef55ea7eeebbd6b9fd92a5121d61bbc0ca3554825fa179c94c577dbe05c8f1d229cbfdca21
+DIST genpatches-4.4-23.extras.tar.xz 16364 SHA256 d199bce4c41bfc44a262f308780ef87ba0112fcb72986337f225ec86cc88b5f7 SHA512 6644c01a7fa07a40420937366f40dcb688b8bb85a6453b708c80c8a50575e3ccb194e3c91515c8eafe45e23aedd4302dc539aad479c731893f208523fee670b6 WHIRLPOOL 8cd8fce7584e5c5ec3abd844ac447acce57bef210db57b65956d81b1bf2abcbc020053bd9bf0d4e795a1820e086845720356d934fab8381370c2c435aaec1e00
+DIST genpatches-4.4-24.base.tar.xz 736504 SHA256 d3ab89ce6d980a8d123a4cdfe13f20cc974671ccbdde364537d70a8b3ae1515b SHA512 803b22480286be7685abb9613c2547c5bd76a629ec3161ff5e842c098c9c9a95dc4332eceacc288b9eb87ac79da6ba188ae913c4501002911ff312befd66c123 WHIRLPOOL 9f5d1fe450d20e8867c1425b38091a09c9e2ff7a25de4946d62df20991398f3deebf78be3bd3f5c1879b1a9bfda57a1b57164adabef8e50b71030cd5358842fb
+DIST genpatches-4.4-24.experimental.tar.xz 87772 SHA256 ed2cf78308d336094f194ff3d6ef3ec6b209176b255844f447dfb8d516d29812 SHA512 52b38450da1f9a912fbc8d7a745acd715ccbfe245b06e88a0dfdc39c92db555b99f9a54b65a5baf19745f0f8f69585d279f9b350739a0131564292d58c94b80e WHIRLPOOL e949365d1923a7d242a40659d8439903b29f4da9e2ea36c0bbb07e22b7b226ad1763b605e9ecaedb0b2ce37d5601dd27402afd3fd2106bbcf21ec5068776ef46
+DIST genpatches-4.4-24.extras.tar.xz 16360 SHA256 95f8a4fd9ba8d35a1c1c403a84ea45ba459b9d3a5cd059453539671182d6448b SHA512 644fd6b4f11f46f00d81e34e45ccce9eebd5b16c59eb38e30d390d5fa0ff12c39800061a12fdd7b7b41a00f31a797ad8e7777cd62c01d37fd3d14bb165aba869 WHIRLPOOL 6a6ed1fb9959fbfc5df0bea7bed4a68b2b247d7212c21b1bfb6886a0ad4cff23330e0bce6ea28ed599d86d2d9840c772c954e997d0ae8f533aeb6ea582416d0b
+DIST genpatches-4.4-25.base.tar.xz 756768 SHA256 9853a7f9007ff4d7d8de8bbcd6e4cb6c0c2d99d9078da6d65d2f43ebcac48f08 SHA512 3334dd2e5eb65849030194bda7c988311d6738e8f14eb8ee5c8a355ccf435065e199319f372fb914f8c6ee9bbb982ef6211680b7978ebf1f70d77afb15be4e66 WHIRLPOOL 548374c79d60625a8ef40d25f1981aa4270a11ff8d5385ff338c90a11c721da49d9ad34eb54f62ee5d2949fb0d6aa3f6819f5a2bd4de8ee8666a6912801b0397
+DIST genpatches-4.4-25.experimental.tar.xz 87772 SHA256 63bde84dd01cd77406bb1a6ec86fb3e3e24197687de083964595f9724f2d0a68 SHA512 b8ecb52c5dabf961c35eda18b0c9e8952fbe6a84345ab1ef0564d8b3130c2effa9206e105b86186f4ada72108e6c0b097b5ea263c6247c664f33113e23b30d1d WHIRLPOOL 0348dc8f607635bcd137b02d32fd1c3e4c87c9c4311f40308c6f3c360cacc8091e98d890a177c15fc0f7b43c897985f9b4bde307fb9497e8ebb072a1b415b50a
+DIST genpatches-4.4-25.extras.tar.xz 16364 SHA256 dff8e760aeb405d6511f0e7e668bf836aa87d120f8cf5df248746b93e5f9f6a9 SHA512 47212ae845ebe1e53b17fa24520e6ce170a5af9c476bea041ae4d5ea1df6457d8613045550372fe49df11f8c85e3f19980bfe6b01e563cb1d43b5d738b41a02f WHIRLPOOL 0a2383f709414777bc276cbfc2ad88fc512754f0c09946a3112437b0321b6829ce5bda9ca78b00d827fd67655469050450a675a30bd99ab4bd63b4a889b2ce02
+DIST genpatches-4.4-26.base.tar.xz 775660 SHA256 9cd4157fb255a1fcf9baddde9bcd104a3c8976dc358b6075d6e64deba7cbfabb SHA512 affe3ab126e4ba32e67abc39999347f08ec77339f87b1ec57a687a82a17165c00714bacef2041c64eb9514b1d0981023a941d1ba1894fd6c20ac3609b4a8df3c WHIRLPOOL 3e0b5cf212a5e2ceabdfe935a5a04f53616de17bf997bb382581f2660e95a5a0659d6fb188a41e71cfed947ac10db0b4a38ba87ad5eb3533f7c6122ef8af041b
+DIST genpatches-4.4-26.experimental.tar.xz 87776 SHA256 06d13a711c158659e76ebca44f4992eb4ed6edd169e3981473088c29103428fc SHA512 e97c11fb1314033a4d6fa3016195d4d06f71653f5c564aa5c3e1f0a38227e830f552f6de485b117debff2ebeda74ec2be8d8552aefa3bc453dacb2db2c56f7db WHIRLPOOL b72538fc747b2ae0d0f7cb29c1ce7392b5b846c660ad6f1be396e460fb29d0830fe30a87891e74e2f87c8ec18cc080b32a440448a3d2f83315b33b0a22ecf670
+DIST genpatches-4.4-26.extras.tar.xz 16352 SHA256 9f5160cc9d52ed33e5f57d29f87b77b1d83b2521f9a1dd69842512d06e7b42d8 SHA512 c1d7deb4173d586d205bafd3bbb2a21f17948ee9dc85032c15b7dc5c17923a7685ac230be8006fc6874d9785c2040ee6bdafc11d5bcd595895efd7ed89b14421 WHIRLPOOL 9d12baf0bcf772d409f4624488267e46771e8f7fc38edcc08019e81c295361f66b3ee53054fac7b83a72372ee31d9a693de0cb836721ef8ac87fc30c6827778d
+DIST genpatches-4.4-27.base.tar.xz 782832 SHA256 6933459148b119ca09750c30d0a77e9a074004897d2f4eafecdaf2154a1bccc9 SHA512 4045d4b889fb0de642b36031af3071f8c9f1ef87ee0491d82626e86a3caf335a512684f6fc1c4780784bbd36df8decc01aa9ea1a7eb29d686aa1181bdd315544 WHIRLPOOL 2181565f30bdc9453d52ac2cf4a16573ff1625cdbe48504e825032dbab765b78a97f9ebbc33a6c470e80df1a3435631c63c2b030478fe4bf09ea04d17fbcf2aa
+DIST genpatches-4.4-27.experimental.tar.xz 87788 SHA256 14bf426c45e1f680b3ef6e7fa67fb9046cb72da64b4b36d9736cefce6e979282 SHA512 4e53cfcc0faedcf3040cd31f1291388f1fb4d50873b1bdd4cb376e52ac608855f608ae9b5849e717632266bfa096d5117515ff2e0ca8e608a06cd97b1717710f WHIRLPOOL b02da5f954e588bd6144f89820ff449469b05629ca3992c6fff505b312bf9ef5bcd2d8db2a97922801db7fa2ec52f6d4f376bd29a49378f0cf8391fddac38bae
+DIST genpatches-4.4-27.extras.tar.xz 16360 SHA256 6c1331851468c372e7f9ea2c456b458e2842aec4752d67817be2a9305df27fc8 SHA512 ca7b353f31e0b0460c78420b26ca8d82ae04f0efe5a395097471bd30d16744ba39e6e1e53ae857e2d4d1773a2ee30c9ce80ae855fc0d33c1d2c93e8ff5b35a66 WHIRLPOOL 16a92ff57cb514bd5b5942b293d290eb631bbeec7bfc13905dedbde83c1abe18050374c6217706d17a4b20dbc0d9f399b4fe10c304c14fefa460cdd95c920e6d
 DIST genpatches-4.4-8.base.tar.xz 243736 SHA256 70a54851283def9013601bd8ea299c04850410001e36d619fa6e83b64a4f0907 SHA512 fde00c28bc8da96aee2378d7ea36c85a5f8520c271e0251c7bc7472cd3c395dc2c3f5168f38b1bd10e6b5189bedc8b10780899468a368f8e9be1811bc31c0ab1 WHIRLPOOL 1190d8167c05062a53a7cc66a36310b42f6b90a711a497543b68626e1d6ca3fbc1c57a37dfa2a1fc98ed4f3b1dae5d7e77b74f3d708bc830b2bd5c31fc797b74
 DIST genpatches-4.4-8.experimental.tar.xz 62604 SHA256 35148c3d46a256819b5d214203b7365316694e85a729ddec2e5c229e48b9091d SHA512 e1e5b31d35a851f446645a2ac403ab238d63fb540e8443d36a30dd8a5d32016b077c4cfdcb30976e5facc511c0a6116037efb0af0a4840e00a1d8cf6be3fe310 WHIRLPOOL 4b65738d20969d5098feb66e416af450f0be87fa8c1770381165f70ca99e019400ff9e92c92d8f6dc1b641f4a400fa6165f0573aeb68ecba05f8934a348e6cc7
 DIST genpatches-4.4-8.extras.tar.xz 16284 SHA256 50b6dc7b842191a49a77d0f54302ebd1c7334e5f60cccc91e2a02db51ae074f8 SHA512 478e31f23742a99e4b3a2d24c93f0880c1794d40e5b05b80cc472ce237e14f28a83cb31554b686c8ec78e80b776fca363a1aabe450add7a3142ad30a4b586841 WHIRLPOOL 2ff0a37edadfd391b59bbe5158c463ee4b411fcd06e8f5bf53f58b19f88a564a40fabe690d5ac12f108e02d3a001d8b928372aa453f060d530ff2e30d0617113
-DIST genpatches-4.7-4.base.tar.xz 113672 SHA256 71d3410b6d4867e459ea027aadf2024efdbc9fb78ce0180b47245b69d34b5d50 SHA512 761c306e10eda7482af8f06a1f29e42a4059eee0b8949a03068b20a0908a2c873ac753eaa12164e9672f0befb7361cffc6f0c1683c6c280a983ad8da80b4f02b WHIRLPOOL 93c7394fc66d24f27f8c0690a3626e7ee6aa0968706c26a719e66d5732436bc2ac1260c36086530505517bd81d1d7df8a1eda605cbbe0bb71f3b2d25e96b3476
-DIST genpatches-4.7-4.experimental.tar.xz 87060 SHA256 61ef0410e8e4a49841e2eeb7c5bd0813263816d777a3bad5c92e92e23fb4b249 SHA512 bfda1bac72e1d9aec106369727620565a4ba9a1968e8cd7223e317328062a577b43dadad03b067635d0bfa1bb625606f545690e4bf5163faa9359bfe5d211860 WHIRLPOOL d7501b85ef5602bae04fc4f8b8bced421dc8cd8681f2efbd82b45a57468fa2b970e5a20c6eadfb3c536c74a821e7d8ae9b4713d5c98e69cea2364d77145fe076
-DIST genpatches-4.7-4.extras.tar.xz 17604 SHA256 dfa04eb0b3c9c6abd370231b49781252c914701b5ab7477196a2ae42e894525e SHA512 5e32894dad2a98943cfcab7699561b042fe99acfd4fb6159e04a26af49019a4b847fdc53b8a4e37c194b4c64e491849c3837149007bac93bd9a2cc8c13a9f45f WHIRLPOOL 2da8acd833ac526ea644890bc578f06f78816cd0db7f67311f4f9c5331b446e001ccbf276f5fb16d1b7cf7d605ebd861f4f4432c244f38658b24169242d101a8
+DIST genpatches-4.7-8.base.tar.xz 233032 SHA256 481e35ef24b98241adfd8277b2a9d682b4845721b02063b4b3eacc996c2e00c8 SHA512 0c95980432f2598d6cd94a96ad228a88650ac240e7dc20adea87994d683af02a55dd2e09363d7b2732e098738ddc9151be5c03418b3308cdeb07b00c5a8ec48c WHIRLPOOL b632e17439180e6a498602a1ec0018b7b720ca53dbcf93a3157f667fc4c28816c84325868b0854b927470926e3008cb20f867ff6d4c8c5a93f16c110bf0dee39
+DIST genpatches-4.7-8.experimental.tar.xz 87016 SHA256 f5baf4816e4adac0885c3485732cdf0b4dcda8458388959a94ed002d2b4c67e3 SHA512 7dcf5a4ac69fe1f5db39d8f1b777556587a1695ac16bfa23b82ba60e5f56701b331c552d6efd51a835dba8a74b72a632621369ad6c1305fc9adb6b7fec8478de WHIRLPOOL 83460f7ccac4aa4e926d227bf5161be0fade31401d4ffcca1f6d7410e3c4e8825fa8f10d2b749e2549737efa54c20784b160277a6c9da2c88481d69b30b7a404
+DIST genpatches-4.7-8.extras.tar.xz 17604 SHA256 4b72e52ab0eb2f8cece60c7298566ef5f17266d42dc9fa709b63dc823e052276 SHA512 d9a76128401b8cc6fd089f1fbb1c465e8042969e8e15a4d20c94fa2a041447a69c179b4864fd9f74615e2a78b73b046d14dee9559aa9fd32ca69dc4ef563dbed WHIRLPOOL c35b7eb76e6a99f3583a3ae30fb2e760b68659287087ca01c1a15e97944e57ed178e4c2b840dc480d1ccff5e3f36b7303b8ad159de63b250b9818bd8d5efd3a3
+DIST genpatches-4.7-9.base.tar.xz 245368 SHA256 ed999680066ed7a6f69ade0b84839f730cb45654afe80983ed2eb37b79829655 SHA512 b3613550dab5cb218d3b8a9527e9cfa8551f800eea92c9c63f9f1f227b7d55b9c79eb3eb797470bf55f0f2352f0ae2fd2b649c5b529ecbfa60216e6b763ee063 WHIRLPOOL ffa48ab2ca4cadc26c9249484e072a22658acfdb557043f0ea8d2bb7ad82c0a4d6d1979536eef2cc31c2c625d074a529a82a5c887b6b7a10f45cc2ba9c0e67f8
+DIST genpatches-4.7-9.experimental.tar.xz 87060 SHA256 f24f146a359c90d5b97063b17e832bf7867be2b1f1afd71d1f8a43d44322e6bc SHA512 85e05276823e80e35e43f2bb18831186b679e0cec72c236c0aa68410dd357b2c53164f879ccd0e2e0aec68ca29b424f475ad8937d2daad9a9f9d814ac8e7876f WHIRLPOOL fb4f8186ec0870fd437a4b78ffc225f9e1988f539779a414521cd36c483b3437c0379382a272584f53cb4b38bba9ba15f5f8578df59768948fc394b0c2f6d068
+DIST genpatches-4.7-9.extras.tar.xz 17616 SHA256 7ec0e771b7f939174ee1f0da6e21d7a8e7904b624ea20b64a5efec04f3b918ff SHA512 21f2903299a19f2567b415057fd07fbc05d3640ef3c84afd9de4e1902c1a1e0520084692072da9a7774d39928910e543825aa244c8fc83486ff2557f517bde6d WHIRLPOOL 8ab0a0c4ab148a5dc9c9e8c15728c48285b373d1f3e97426b9cd3519a0d7476df70b6a976e9091124353421289f87ec0e1020454d7525fd3f5c8439aa400c3f5
+DIST genpatches-4.8-1.base.tar.xz 3004 SHA256 068445af57f3c3616463d99898b8582dbb1b3785f68b566fdbabbe2fc5d4e0a5 SHA512 d9b59ec520147a330f40a3af92bdc13fd19bab957393c2027552c3990a14c58584d65cb1b07ee82995922fc85e88be662c3b05dc1eb9a6facbba0bef65846438 WHIRLPOOL 708e92a3a54e1c06ed65723bccc5eb4288cebc9a477fd151402f8b2843a519180078fe4f01718416bd059e2eb59ec0ef1e4a0aca007a53d832283d98dc813019
+DIST genpatches-4.8-1.experimental.tar.xz 4272 SHA256 cf145c633861c24534ca54b217375786494afe813417222b0390829ecfde36ee SHA512 742b11670fa51d8f1adfdfc84a9b0383214d7cf80e90ee4ef28747299c4636233d0ff8428439d149d64b59e1a83404a2d02d8fbcb6b1e4bcc376f4b0b0c530cb WHIRLPOOL fb5adc25dae35e38c09216b7a3b8062434b0ff844904830a8f449667f32738182ad6e68f89901c7314e79a53fa01739772a82d31785ab0ea4565e2419bab045f
+DIST genpatches-4.8-1.extras.tar.xz 3160 SHA256 57ddccc1b1135f5ccff6458f134c67e08e514344c605e6512d5a903e8a203af7 SHA512 890f9fc7d08c9f2e54868e8e220b2637b5f58cce3f771b8bf7cc671688d5b0bb09548e5ae5bdd8a172f3bcb796c5ff315973527f9eb93fa7666f41b253b3349f WHIRLPOOL 35c62a95371e37de0c345adfc20bb35dada62b1858bff472da57889d8b43be029be4e68a3d08e5e8e50a07690a0725b2c50c383052b4c7eff1f2c622ab141043
+DIST genpatches-4.8-2.base.tar.xz 5896 SHA256 37660e5383632850dbf9027ff26aa3db162c8e26919ae4d0f33d84b2df84b6a2 SHA512 bdda813315963fed8fce953bae41a614c10ae269d08ecb5f8b20d7a6d9b585f2bb81714e6a89baad764d4c0f63141beb14d7b74ba53e84b561a5747d22faac1b WHIRLPOOL 5edc0cd3cf04ca6c6174ef8be73920acaec2aa829ebb4e1947e5334672a7829715244678f0aa42e9e2d11aca4e0120c11a2a82dcd9e9380efcbeefe974fce9f6
+DIST genpatches-4.8-2.experimental.tar.xz 4272 SHA256 140b7d30f0b4cac979c432ade39af68e1a7766659cf0da0610e04a89305fd6af SHA512 ed4e9e1d5e2da2e7e0c41f9e7f826edb8d509420ddc8c5f235844349aec51a4095e603a5ec8bd0d347efd3c84a1f1a7e57f8764ef14eff7c8b32cd4633cad3c9 WHIRLPOOL b13282a9ecd2eebaa601b1bb83b596b9f6cfef2570eb6253005da33675a00c295c079d5575ab788ee3db76118f501cf1f54eb3e811721506b2cdc48fd73adfb9
+DIST genpatches-4.8-2.extras.tar.xz 3160 SHA256 279996635140405a0adb328a0fce1b694101a0344f2c36244bf9dd6716f5377b SHA512 7ac14d28f7847b7963a30e69b05bd1eae9f384db7512fbf66816b3d4d1fff9d4024b30de8de2d3586a21a6af1e0cf5ebb91f9b8e35d83642090ffa4c5ef83372 WHIRLPOOL 6d2eb124151374e7f549660248b024fa1571ffb47114e6d0bfb8e428aa987d006bd726a848773f5f43db31eee698ad5da73bb620afd482150a4a1340c2d93925
+DIST genpatches-4.8-3.base.tar.xz 21480 SHA256 67d33011b3df36e2fb48fe2d25e2708d894b659fe50f3bf294e6782a92820e0c SHA512 f97e1f0aa5d90be6812172e5999abc66c08a31b6673f7d2cd678a40a81b2bb7cbed3cce76ace7dbf9300bb60228b018eb690c95757f5dfabced143bf2a309e7e WHIRLPOOL 5883e1c48071bef0b5ebb5a3f7d6aecccf70e624f2419e536bccafe5f33d6f2c98b961c5577a8941625f7b57e9809eef29c3128eaa0b1f7c2cb880b7cbf210f6
+DIST genpatches-4.8-3.experimental.tar.xz 4276 SHA256 e11dcc1a40192e2d1e7d7d8c6eedb67e5a5f76055b2af3cd2dae30c6e88ab4bb SHA512 e7b5ba9298d1982ecb7b40c0ede0a64248882e458cf1ff134a15fe44d4217fb87a0300ae5ef7fed6836ee64c521bb9124b37bf2dc113ab849fc76c92d50e09e9 WHIRLPOOL 19d23d9c8bbb5c2747966d6c53b2715d45015b38743856efd8e4023ee327d9a336c6be180613eb8374d2537912eefb6d56ab31de839eb12a70fc3986e44d3e3d
+DIST genpatches-4.8-3.extras.tar.xz 17232 SHA256 6a31de02033b00d0208106572df3e25ea370d92a4aad276585b0ba06329dadbb SHA512 7269aec3397ce7b4ca5b738ecfa94f84a9c35280843c01a96d2eee6ed564ba97620dab6e6b30d935f4a3dfe9e3dddd5320cd24747a205bb6c3f05fe0467b4105 WHIRLPOOL eb51dcd178f4a53051bef4b0542f9d31893157b12d9a0cfeec39f030cbf3be77a0cb79bca5e52b0e72757af48c48ca2e201fd61ef13d246038b9e19c94091f07
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
 DIST linux-4.7.tar.xz 90412100 SHA256 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10 SHA512 e8c02583e17e4fc4214fef694825fcb78c898266f1624deb1cdf56ab5c5fdfa669c5221122a7cf0d502ed6f921ff3797634acd9d294d29e98e3faa8a21920185 WHIRLPOOL e968c89ce714c8d918db6074dabac4b0200c57ff111260313cf5798eeefb8b5b10c1509b64e2ee611a78e81075c588a473b67f9802609b2fef9ebb87ae514d98
+DIST linux-4.8.tar.xz 91966856 SHA256 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a SHA512 a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358 WHIRLPOOL 3888c8c07db0c069f827245d4d7306087f78f7d03e8240eb1fcd13622cd5dbe1c17cd8ed7dc11513f77f3efd5dbd84e2b48e82bdb9b9bfd2242fd62ae32812d5
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.36.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.36.ebuild
deleted file mode 100644
index 551454864e3e..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.36.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="36"
-K_DEBLOB_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=3.18.25+_p20160627
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-3*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.40.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.43.ebuild
index 6d91a628b223..f9d0b683920f 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.40.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.43.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=40
+K_GENPATCHES_VER=41
 K_DEBLOB_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.21.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.21.ebuild
new file mode 100644
index 000000000000..a5f8c02249a6
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.21.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=23
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20161010
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.22.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.22.ebuild
new file mode 100644
index 000000000000..f492b6e5b7ce
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.22.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=24
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20161010
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.23.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.23.ebuild
new file mode 100644
index 000000000000..5430a4b1f4cb
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.23.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=25
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20161010
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.24.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.24.ebuild
new file mode 100644
index 000000000000..db0f2780b28a
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.24.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=26
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20161010
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.25.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.25.ebuild
new file mode 100644
index 000000000000..0c409af7f9e8
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.25.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=27
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20161010
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.7.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.7.7.ebuild
index 82327106f60f..8d11ff62220b 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.7.3.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.7.7.ebuild
@@ -6,13 +6,13 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=4
+K_GENPATCHES_VER=8
 K_DEBLOB_AVAILABLE="0"
 K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.7_p20160905
+AUFS_VERSION=4.7_p20161010
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.38.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.7.8.ebuild
index ec28468db815..87d3bfa6e737 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.38.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.7.8.ebuild
@@ -6,21 +6,22 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="38"
+K_GENPATCHES_VER=9
 K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=3.18.25+_p20160801
+AUFS_VERSION=4.7_p20161010
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
 
 KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="deblob experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs3 support"
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
@@ -28,7 +29,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND="=sys-fs/aufs-util-3*"
+PDEPEND="=sys-fs/aufs-util-4*"
 
 README_GENTOO_SUFFIX="-r1"
 
@@ -42,15 +43,15 @@ src_unpack() {
 	fi
 
 	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
 
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
 
 	unpack ${AUFS_TARBALL}
 
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
 
 	kernel-2_src_unpack
 }
@@ -65,8 +66,8 @@ src_prepare() {
 
 src_install() {
 	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
 	readme.gentoo_create_doc
 }
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.39.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.8.0.ebuild
index a010eeb95c09..c3e92e0a7dcc 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.39.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.8.0.ebuild
@@ -6,21 +6,22 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=39
+K_GENPATCHES_VER=1
 K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=3.18.25+_p20160815
+AUFS_VERSION=4.8_p20161010
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
 
 KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="deblob experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs3 support"
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
@@ -28,7 +29,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND="=sys-fs/aufs-util-3*"
+PDEPEND="=sys-fs/aufs-util-4*"
 
 README_GENTOO_SUFFIX="-r1"
 
@@ -42,15 +43,15 @@ src_unpack() {
 	fi
 
 	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
 
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
 
 	unpack ${AUFS_TARBALL}
 
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
 
 	kernel-2_src_unpack
 }
@@ -65,8 +66,8 @@ src_prepare() {
 
 src_install() {
 	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
 	readme.gentoo_create_doc
 }
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.8.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.8.1.ebuild
new file mode 100644
index 000000000000..0c7cd572b1ba
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.8.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=2
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.8_p20161010
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.8.2.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.8.2.ebuild
new file mode 100644
index 000000000000..5e7e7ea86f5b
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.8.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=3
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.8_p20161010
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}