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

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

12 files changed, 27 insertions, 745 deletions

diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 979bd348b39a..44a56f2b2e7f 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,14 +1,10 @@
 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_p20160627.tar.xz 169684 SHA256 ba23c870c2132922629012ffd697ce8ee7c0937f711192471874e7a6b4c66fb4 SHA512 f4bdddd429de2e3df7e482c3df917633ed638cfa8fe31e9410af8c0d3dc40265a45f198b25368b904320248caa89a1e9cd869abab1be1d0f17eeec5b57ef50b3 WHIRLPOOL f39de6d8babb28fea0b29c88c6a0e52006ce499412ea29d29ad51a7db1ea2c402514593ec6f5acce2cc6a9014b2972b1b0a9f71edb8707f8bd1d8d79423d6596
-DIST aufs-sources-4.4_p20160801.tar.xz 170812 SHA256 6633f46e69ada7bdc21eebdc9868889e482166b4fef99da73a673c40fcd1c0e0 SHA512 8c741c3d775352ebbe097687cc38f7140ac192dd5f1b6782aa7e111c8bddbd5f1a908b8a1e50db19efe8e188dc2be4923c95c7a8d985cdc6d3863a3d9863e64a WHIRLPOOL 5f051dfea653b9c2f4b6f1ed7f55e36ebe336858100b9f161c7ba5c5382bc65550db29a4dd335fcf1a9b64d1bc14f6e58e24cda79a5e42958b095cce92e10b87
-DIST aufs-sources-4.4_p20160815.tar.xz 170720 SHA256 52b37ccc0f2966c244de5d7d4cb0b86b72e667ebf02658257ad0ec3970f09b98 SHA512 777b6f2dad6b23b6ffca04a86817b2b09988fa245ed05b0ddcc0bfb08e597aac1d8a9679b154d5423487e8f8e4ef305a338186f6278cf3e46bc78f7cc8e4a1d6 WHIRLPOOL 9b82b5221f958a1e63459f48fcb0df668239f21dc6126b68d70e85612fd190b3e3abf2df025753bec63ee55cfbd266bf47226b77ec900053c02dfb92977640c6
-DIST aufs-sources-4.6_p20160627.tar.xz 169172 SHA256 9af36ceb3a249d5cfa6cb7e2886819e93d3f0e7f0d2e205ed175021fe18068f9 SHA512 b0b81afd408ba2c72767029d657f098545219098ba7ad59cf0a8a7306daa67232e2c965021a891929e6493119acc11a42666b2711bacfb48f2c26d2449199edd WHIRLPOOL 8a966764997a67052e19811ce854d456339a6e35744c1a0241b8e8d672e2785f2812250d750398596f552eb8d0bcd624437abc50d8b7210c8ad2266eca6c254e
-DIST aufs-sources-4.6_p20160801.tar.xz 170232 SHA256 23eecb2ae5d1d6ccff68e2693cc4c1232fc7493b363e469d269f12ec2c166673 SHA512 591cbba31c27074d89bc254169cc2d3d992afbcb26b28a64d09c2c67b4eee4aa359c718548f344b14c49a29bcb9d2454e3a91f4df8a86c6f6f1d7ec26ce1b10d WHIRLPOOL 495f0673f81c578ecd02f726ca979cfcb22fc2e23abc824042c8ef11a3c310480eebe6fff2bf4a6c61964265cf2987616e6d9badb6c37ef3105f9c5eca86d1e1
-DIST aufs-sources-4.6_p20160815.tar.xz 170176 SHA256 7f8341b069950a62291939f6f997d3b0b80b7fd8b387781f9302f382e7dba703 SHA512 015efb2822a8c6d9e3e3dfa9ecba4a9b17ed2b9b9e5fedc7e519c9fd879f56c79f8fc90be07b5977ea9573ad17a0cc6c2de60c7a836e7eac9c37aea7bb74b5b4 WHIRLPOOL 3000f50b5526b0fe81c79848951d80934214ae300e1311d9d3e6fa0c8dc7cd153c21dea42f0321627216a06611c51e6e153de1e8ff7bc504ff48a27cafe18ea0
-DIST aufs-sources-4.7_p20160801.tar.xz 170264 SHA256 fbfd571332e82accd8618bc13f7187a69bc3b0bc8ac16656ceb5a48e14170d01 SHA512 f4c382316f934b3e81b3f024feba06be6f1c66ed7de60c316f709ed67723e9234eb0a81c5f6a77506d80639b5aa0c7700e827adcfefff127fa1ea9b3ee8948c4 WHIRLPOOL 788eb5e22ac697cbf7dfa72efcd4df145f18e7cecc5a710dcb352dc848d8dba54fc3dc4edd32222fd33adb9cb76665e434b4dfcf8397f133d065908c07dd8d1e
+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
@@ -18,43 +14,18 @@ DIST genpatches-3.18-38.extras.tar.xz 16192 SHA256 f30c135fd6b6d0739ea10fc5086d1
 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-4.4-14.base.tar.xz 450668 SHA256 7d6da245348f8168a831c45ac528e7cc25b0cf30b3d3df497e621e975078392a SHA512 3d5b1e3ff79312e7572027e2f9f8d983af25241641a4b2dbe06cd37f83f1ebedbd1b239663953e2f7ec089e147c98e59da4d8150809ead62ab5f76803225ea8b WHIRLPOOL 3eba605e664d10ec0bed2d0811318da17a501d350e22bc85e09a5cfe146f1d0f13464ef4ac8141aeab92db817c4039222e6834b236c61bc22f71ef0f83d1973b
-DIST genpatches-4.4-14.experimental.tar.xz 62632 SHA256 48339c300d271eb355394d15985b80720c36c92fd8bbc9e5d2196d042b9518d4 SHA512 e98ca9b75bde2857ad8ef0ff6f84b3389f1071c2a34ce319daf8fdd3cfcb22990b198b33643ad0a2395841f5c4bb413cf4d7952a6ef2686b3cc92c91cca1a405 WHIRLPOOL 370b865907d97ffd4d1ec7d2f3c3d705669aa5321bceb636b826e97412c1121ddbebd79e7b4fcc7107fe508322d27d20f1d84ad5252a9cbcaf3300b19d82153c
-DIST genpatches-4.4-14.extras.tar.xz 16284 SHA256 fa731c56b2ef13c98ec21714dbfe6902de90e5bc50a9be65e3c9ce34e934674c SHA512 0aa85413fc225e86405ad79ca96345eb2cd1bfa91ee15d0167700208fdaa86c6ca9af4461f9f9c29371b000bc0b769504161b21c9dcf8e24cd7db222f3c4b99f WHIRLPOOL 167c7bea5b1a6c978a1e4b01b524dd43e85973c1df095a16e5c7f8defab18cc2b5a1dc9cfceceecc834595c8f98c18feed950f858f5e81967d31c216f3181639
-DIST genpatches-4.4-15.base.tar.xz 475448 SHA256 d5da1dbfeeaa31bc49c2087e2f594d1d20b88f6bfc85500f1c4b9ea6f5c481d6 SHA512 72d8ffc65b4ea18a90d3d198f8a95d1e9215fc546da87bee76ad3bc740962d1531b4b79851d5bbb5fcd6b2c25af02e0b75f9f5ff43c010533dde0530fd000751 WHIRLPOOL 66723d839aafe08c0128a47be6fe23803e594e72c30753d55a707ddd8dcc9c3a98abf6be37e4586a0193dbee9d35d130644b34fe29f2616675cf4e182a001173
-DIST genpatches-4.4-15.experimental.tar.xz 62596 SHA256 20fdf04022034241dacf8c82fc0c9eb89f0eabc491fe58390f9f6e8ed2660c5d SHA512 3a3436390b9c20151a5be784ccf3b5369cb9dfba5e6e8338b73a7a1cede87a25d32ecbcad300b60497a3b1d39ce812e9e8ee4202d7a754905b717ceeaaf93609 WHIRLPOOL b3d2fac5faae8a6a89288f69a7a4b82526ed28ab68257c29666946ea63431cb45d552c4eb8e28e25cb794f3fbd0b1d8e46058b5c9dad9eaa4dc94eaec259abe5
-DIST genpatches-4.4-15.extras.tar.xz 16276 SHA256 8a64849ebfcc329e98358970f26e1d2a0fcf526e725d7f81dc2583e1810056f3 SHA512 bc999d7afecab481398b5933ab22835f53cf580bf601da5fda87e749adacb74889e667c08367dec39f2c8072601e38e2494c48f9eefb685749f0f651148cfb7f WHIRLPOOL 0832c001db9641ff78eb1ac1b10a5325359db29471208fee63ea76049687dcac6e68727a82d4f5933453571cf12092fefa4b1c3dc7de902dac4fe1828dde3585
-DIST genpatches-4.4-16.base.tar.xz 502036 SHA256 1b26f6891a70ab81b12e283379b7cbc98774656dd78a0d95377988c2820c29f5 SHA512 464223d3af4eb8ad06bd2ed2d85a5263447a5cc9db2039b9d41a61fa08e5db2d776f1810be4d9f342ae32e1ae195119497dfd85e0d3fb92e2ef437292a7259a7 WHIRLPOOL 03b86310b9b9621f9129077dd8b2d989c8efd779abf99a4bb59701a5312b2e46125cd6c15bdb8f9bf2cf856605fe9c5ca9a8328b2dbd551466afea775b6ae9bf
-DIST genpatches-4.4-16.experimental.tar.xz 62616 SHA256 efe6a2cbfc66990f4543858ee5187b047154dc1b030a950c629a650834396135 SHA512 93229b1daebe27a11d42b1de6f70ea64876b4b148869e89f79fc2d25feb9ed2425f9b985cf0e257315c48c735300b7a17f8e5ad7a4b9c19c47a30f7f46172aca WHIRLPOOL fa5157423fb59eb520d913293ebe2f7991487dd20dcbf2038a76c5f98859b954325e59726d6a7285621cf33d02c85826b72d6fa23d6ff03c5983c20dfc5b1780
-DIST genpatches-4.4-16.extras.tar.xz 16292 SHA256 3c6ba4c5c30ee786c0909aa0f8a68f00c15584eb52ab91ab01810be36716eb07 SHA512 7f1a57ffc8c7e432f46cdf28b97a44207a77fca86231874489c82a01652ddc7e2027a1a8c3fbd53dc36a8d302faf0bfed123af367dac173df215598a08548ab2 WHIRLPOOL 94179e36ac0dc1bbf8d402cf7a7f40d37d53129a8211f59a5afc43121be3b698aedd297bbbb0e04a5d488398cc1c59a431ec5d048b040d3f57bb817392a1a915
-DIST genpatches-4.4-17.base.tar.xz 510308 SHA256 bad69283e22b77a97c572afb848cb3b4610924d6cc7557b46c926380f320ba26 SHA512 3b572253e78528d4a6aaef9f8899890a1e8439f8e41ec821ca0eb9b99fdccede508a66526d4893e7bd67155f60b57cda6629017854500b5af6174bc8f49feff0 WHIRLPOOL 621d99cbe4253e7dd502e94fafb9d8460356bf8f8358e458663c61decc5ea12959110175190b6d9537a76476b8ce4d986ca350965c7fd89850c03c41493b594d
-DIST genpatches-4.4-17.experimental.tar.xz 62736 SHA256 6a5ab4cba3055c7984903019e9695461be7e137179a7e045d938cc08a47f9267 SHA512 f64ceb9f0257dc399ba219681c018113dd8512b8ebdd8a5462dc60c69db9da13b55ddd6ebea45dc08540396d68af8af16eb992404b1e151d8db06679a2000eca WHIRLPOOL 9b8eab1ea47412317929e9ff0539422023e9d521c12b6ee8bb4a7ed177944e4f02f2ef767cfa893a5c882b1ec0affa050abe78e47c88fb1ef507be8655ff52bd
-DIST genpatches-4.4-17.extras.tar.xz 16376 SHA256 07b7ef68c9cd60b5e913c4a0793b7a7bf70e4324990c49df8420ab6017140871 SHA512 053deab96a0c481deb447a8a427a3c321312a61616c5ac7dfe9c5a3fc30369848eda5e4606141839cfd79a5ba9b88e206bfa1a7056af6d4886c5289d997edd8c WHIRLPOOL 2f290ed641745b89203d24b7fe9b7964704480e257d3d618a12ec87ebed9f0680be65b80f569073d3085f0009f8986f4878f7c8ad7bcf19b697382a0e275ad62
-DIST genpatches-4.4-18.base.tar.xz 550920 SHA256 9e2400aa9719b896594e6858fddccf68180ef0e71068ddda45f2ea8ab256f2d1 SHA512 7a223c38fb71a33f4bdde007c357ea361921920e02fef398d0537061fdb36ed1a7cc06d083f63456f4e628ee5b3c0c7b96183d6b21582fa88c304592ccf1ba06 WHIRLPOOL 279c9ee34fd06e09885387f8eef97340d24336d7e5b20cb03ccdeeb8c1942e72ead2934bc3b578dd5d39624b562d31cdb643d41624fbf9c39129bc5ecaab6f6f
-DIST genpatches-4.4-18.experimental.tar.xz 62748 SHA256 a289967a87732f9726a70b9f1b8fc52bf23de7d5e4aa632016726a719005c823 SHA512 65b16b611f58e36872afcb04c75021a9351eade6fcd9977a861a5e4e2e0a3fa118bc33041901d549d5a8f36d4a6112b347a60a5f41d52a634a048a163d09c954 WHIRLPOOL 866e5b08f12a44b9ab94b69b86591c065b5b73dff866a1630c2f044a88401b81220e37595092ced5edaef7c167c1a896674822af8db7e7ea63378125e38889a2
-DIST genpatches-4.4-18.extras.tar.xz 16364 SHA256 061d2094e28be6d1048ebfa0aff3220bd76786257d957f7e56176f4081229855 SHA512 a82512c71b31e975a5290746c58a89135c3c106966c327bbd9854d011fa850592a086d53527c0e98a9b4eabd40c0e62f3a1eaf071edf0e9fd98c37906e0ede81 WHIRLPOOL 176eaf5260f077b581dc178b81bdf21cd0f6ebbb4258706cc3895ec786fad470ebd66a1596be168c38bd803aa4c91f5b87b7248d80696aa11e322e1a9f3a4254
-DIST genpatches-4.4-19.base.tar.xz 565524 SHA256 3a8cf8120a5574f8a08b9255530a06873957c74aac0e805547965c38bad08422 SHA512 fee9ba9cf495ab7f8767df5704ed9ecdf6e864b5084ba1d6ae451d9327a67bf22e65352670149c2fd0c6cf4a48a9b495040f9b3cc09cbc757eecfe76e63373e4 WHIRLPOOL 7a2367c594db5402ac1f1c87ca25269ac45ababa412ba5d387316d614c1471b71c8e51499f9378c351d39c68fe4c2ecbe9a27745770f5cdb196c57973b5ae9b6
-DIST genpatches-4.4-19.experimental.tar.xz 62748 SHA256 55e24470e34c912f70b0a951cecf235bd4ab0dba7665498e0a4ea87aa366b2ea SHA512 0cc699cdaeded8a852f439a2f21fdef5d3279af7ef01f24f9c575d75d0abcd18edf765a14a56950f837e17e36b67f5088c9f43d58a98ed9b1e2cd9d54ffeb795 WHIRLPOOL 022b4f6f0aec1107432b3103cf23677126740b66a226ab5d075e9d9aa3cc5fb66d677ca96b57bfeb5546b5aea814cd227e93abb028cc982daba893c35903b61f
-DIST genpatches-4.4-19.extras.tar.xz 16356 SHA256 d7d7d862befd6a649023d104af39e53e7f4c09ed6b1e560679ede7e31105db81 SHA512 dc6cc91ceea8773c462326b2f11233fb1bd71633058610132cc06afce33ae8b73086c3ff415056d24fba03c57d5d5f0a2eaafa2eeb52807c17aa84923dea9a3c WHIRLPOOL 138da0553d1aa62b57e4f7ddfeadb9556cdc5964a6f646ac1bc54ba7f0ec56ad58ec112b4aecb96ec3b9153e557346bb0ed7f07a3ce30500e6faf2a69dc6103d
+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 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-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.6-4.base.tar.xz 107012 SHA256 a46dd5b15d0cdd327266cab2d20bdb40ed6659c4317bf6c29ac4dbe69f5a2977 SHA512 b123b2739fef62217fb6f4608475654f8c525d4accfbd9b84145d114c9b8e216aa83e0729c6a066167ab7a69e59f5260d3d39b57891f29ed99a0d2a740d76e99 WHIRLPOOL 6af056f77dc8036c8f41bd861a6abc989246dd461b2df6bb568ab5f42679dc3ed8310560718697e840adf1f7438be7b42a4a6df04958b1d8e6ed9f8a5413b927
-DIST genpatches-4.6-4.experimental.tar.xz 4896 SHA256 a982b90888267511036037df15bd03530fe79b60fc15c68ef68100195c0c02de SHA512 a2c886b16744637d4d7b0464835c5d2b8efa07f485908a802021b0e3f9601aa141f7fd9096f700b498bf6cdc3d3f9b9133309f6c72af880284f95cd1f4af779b WHIRLPOOL a5bbb7a687c394adb9f0ac9a866bb84f3092ac665ea8a809bd35748c93bc215c4109af2beaa2fd24a5695159104d1c54ab599a68a2ec92b57d516cf2d995a078
-DIST genpatches-4.6-4.extras.tar.xz 16292 SHA256 3c6ba4c5c30ee786c0909aa0f8a68f00c15584eb52ab91ab01810be36716eb07 SHA512 7f1a57ffc8c7e432f46cdf28b97a44207a77fca86231874489c82a01652ddc7e2027a1a8c3fbd53dc36a8d302faf0bfed123af367dac173df215598a08548ab2 WHIRLPOOL 94179e36ac0dc1bbf8d402cf7a7f40d37d53129a8211f59a5afc43121be3b698aedd297bbbb0e04a5d488398cc1c59a431ec5d048b040d3f57bb817392a1a915
-DIST genpatches-4.6-5.base.tar.xz 115176 SHA256 b796ca7aa71164f1cbb077d34f158b3756d978944e3bf858c56091d2ed9bd2a3 SHA512 1e3ad1df5da7eb67c2c7c1d491c1fe893b99adf508c61cb9a8837199aac237756f41cd5d95b787d7166b456852bd832504daba78d89d48f1e9a7cde66618b2d9 WHIRLPOOL 93404b230f47594f54db7866b3455a0c3015165373ce9d15778d72a7d2fd5e9830ecb7be8f3ebb373eb1a7c61f83d2b9d6d6a9b884b5e8c8b46f0a4266f65a60
-DIST genpatches-4.6-5.experimental.tar.xz 5036 SHA256 79a0f5d0dc78229a42cea0cc3eb3798e9edb16ba992a5b84b651887b6bd7cdf9 SHA512 4e989bb8bb2821f2efb67c8f6b723989b1ec8f75b2345d06adda6ebfd4cd69edc42ea45ec5541edfaed5649a5ac28cdae60c30df43a7e747319c14a02fa8607d WHIRLPOOL 5df3e279d49cdd139906f72c81925744e5eef6bc1dfd4588f48a118f6612bf8c9e6d23bc249edd5ac57ed4b76d960f77eaf935478cd7ed02319aaf45f61210a8
-DIST genpatches-4.6-5.extras.tar.xz 16376 SHA256 07b7ef68c9cd60b5e913c4a0793b7a7bf70e4324990c49df8420ab6017140871 SHA512 053deab96a0c481deb447a8a427a3c321312a61616c5ac7dfe9c5a3fc30369848eda5e4606141839cfd79a5ba9b88e206bfa1a7056af6d4886c5289d997edd8c WHIRLPOOL 2f290ed641745b89203d24b7fe9b7964704480e257d3d618a12ec87ebed9f0680be65b80f569073d3085f0009f8986f4878f7c8ad7bcf19b697382a0e275ad62
-DIST genpatches-4.6-6.base.tar.xz 171880 SHA256 a45e224100ecc8586a9c72861bb64ad98be2ef0ed06341e8d186d0cd60ef6fc0 SHA512 c64470416bd9e432bdc781a56731c7d8eb02130ac4e5a30dd21a837bfc16e361c7db1d0b2b2b19becc5e6982e11c1f619d3982975506337ac44d4daac6c46c43 WHIRLPOOL 480232a11440a2e883b84536dfcc89d3ae7fd9e7cd3794762b1825e892167c1527e5597be44080c9ba8ea366d175bc221362fbfbd850f5e39279d9ba81234acc
-DIST genpatches-4.6-6.experimental.tar.xz 5028 SHA256 55681fea125c614906403abfb690cb22695855fddfc2716da70363789cd57f99 SHA512 795bfee209f9774a68195f4a19f791ce24a7ccbb02c4144c674cc227116407e75240c37ba2f255eb8a250fb4efc82cfa829b9543bd0af1e8bdbf550038d87dff WHIRLPOOL 021bfa8d322f00be1bdd2c48357ddc276ba88139dc74615e7726b7b23a538640e1367600de2a76d5cfec74a4bd9e20f72521cc50b3f7651a79330ff62ada11a0
-DIST genpatches-4.6-6.extras.tar.xz 16364 SHA256 061d2094e28be6d1048ebfa0aff3220bd76786257d957f7e56176f4081229855 SHA512 a82512c71b31e975a5290746c58a89135c3c106966c327bbd9854d011fa850592a086d53527c0e98a9b4eabd40c0e62f3a1eaf071edf0e9fd98c37906e0ede81 WHIRLPOOL 176eaf5260f077b581dc178b81bdf21cd0f6ebbb4258706cc3895ec786fad470ebd66a1596be168c38bd803aa4c91f5b87b7248d80696aa11e322e1a9f3a4254
-DIST genpatches-4.6-8.base.tar.xz 199204 SHA256 6cc99bf90f8d28460426cc2b2748167f6e040d3a453d5abb51e962e8865f2c59 SHA512 29c4a39bae68fdd75ac59f23f90b90da62d59d8d1ad5665238015a9c08ab159f619cb8488fd8b76adcb512f214b27df9738ddfda9a70c54ef23497221f3db689 WHIRLPOOL 0c679f810b4618788185098529b4fd798a65ee4ac988b603db9b5a7c880dd1d35b5e72d9359d7351a4306eff6a250b0e0d52e7fcb2265269c528ff4615ab1938
-DIST genpatches-4.6-8.experimental.tar.xz 87320 SHA256 5ab4451aebba331a7277e6c0420c9135c962c5e49b69e3c10f7cf6d0d621ddf2 SHA512 e0a749c51111364115f42b605996f6910566426727eabb6e85ba00f10001d000963eeabc732622fc0f219afa8e590f071c1f90c45d5432119abb5ada7e4dcfd0 WHIRLPOOL 0a111f9038ab1f0c583954690e543d7edd2dec906d8ad028897c3b3f307e76b337d743c0d24a3f8e4d6501a421f6200455a5a76dc9039e482ecc48eec4555fc4
-DIST genpatches-4.6-8.extras.tar.xz 16356 SHA256 d7d7d862befd6a649023d104af39e53e7f4c09ed6b1e560679ede7e31105db81 SHA512 dc6cc91ceea8773c462326b2f11233fb1bd71633058610132cc06afce33ae8b73086c3ff415056d24fba03c57d5d5f0a2eaafa2eeb52807c17aa84923dea9a3c WHIRLPOOL 138da0553d1aa62b57e4f7ddfeadb9556cdc5964a6f646ac1bc54ba7f0ec56ad58ec112b4aecb96ec3b9153e557346bb0ed7f07a3ce30500e6faf2a69dc6103d
-DIST genpatches-4.7-1.base.tar.xz 3000 SHA256 55ec2087f5bcd466060a057c1bb2ce5b6f4559023fb09b31f2a7ca69b2080b35 SHA512 28bb8961aa32f7dbabc9a25088b66b351b288c39b8d0148bba0158884cddc603080db1049f807a20beb6cdab75442b09a11624cdf1f22a25dc9b025028d2a875 WHIRLPOOL 0bb9c1f0f7472a1c5c22c1610a2c6a64c9b0f997f1a5bab0f1a1ef7d51025ae5b7ba91543f6d679dd261ac3c8ba178f8e4e7fc514ca69d1696325bf284843177
-DIST genpatches-4.7-1.experimental.tar.xz 5032 SHA256 4aa6efbf46c295d276cfc5554b957b69f8db0ca194f90be31e648ff8992febc5 SHA512 91f0ab766270ca05ac2b94c4d93be977ffebd2f8011bb36669d7073a81526bc586e195e109017cc9b15269e222e1f6e316004abd9bb3f9f309d0799056909ebd WHIRLPOOL 461eaa66bd629fae87ff0614dad96f8df1df519df182ac3c3c2fbbc011b7350bccce8213ef59ed727a33443631671cb46bc91ee3f82aebd63f1730811599767e
-DIST genpatches-4.7-1.extras.tar.xz 16360 SHA256 61ea55475df5d3b4ff1a9e485e26105c2f04b9a500d48e3ab7ca0cc49cc80fb5 SHA512 01fe6e6f34e31520d71ef47a326a91cf381e38e1b1a215abdb7067b8b8cd08a35c8a799373ad48fdd97efc6ae084e90c4d17acd3953c337c7f435de70ca57b8e WHIRLPOOL ce8957e26e49e140b1bf943476c36e1b4c5dd118d9a3c0ad40f292db02aa5aa66fd618546c2a4c1a92a5035e6e2feaa56146d54fa9c5c43d0226a57dca930266
+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 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.6.tar.xz 89461728 SHA256 a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866 SHA512 df5ee40b0ebd89914a900f63c32a481cb4f405d8f792b2d03ea167ce9c5bdf75154c7bd8ecd7ebac77a8dbf2b077c972cbfe6b95163e27c38c1fefc6ddbdfa0b WHIRLPOOL 50ee28a06930ffb29ade1aa5fb4e3bf165ead92cb660dc6771a265cdbc2240713ebf14fe235fa153d8b6e3ab853852ea06c2525209cd7989aa3d6f6fad5b7edf
 DIST linux-4.7.tar.xz 90412100 SHA256 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10 SHA512 e8c02583e17e4fc4214fef694825fcb78c898266f1624deb1cdf56ab5c5fdfa669c5221122a7cf0d502ed6f921ff3797634acd9d294d29e98e3faa8a21920185 WHIRLPOOL e968c89ce714c8d918db6074dabac4b0200c57ff111260313cf5798eeefb8b5b10c1509b64e2ee611a78e81075c588a473b67f9802609b2fef9ebb87ae514d98
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.6.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.40.ebuild
index 4c8e90ef1249..6d91a628b223 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.6.4.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.40.ebuild
@@ -6,22 +6,21 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=5
+K_GENPATCHES_VER=40
 K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.6_p20160801
+AUFS_VERSION=3.18.25+_p20160822
 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
+# 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 aufs4 support"
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs3 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
@@ -29,7 +28,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND="=sys-fs/aufs-util-4*"
+PDEPEND="=sys-fs/aufs-util-3*"
 
 README_GENTOO_SUFFIX="-r1"
 
@@ -43,15 +42,15 @@ src_unpack() {
 	fi
 
 	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
+		"${WORKDIR}"/aufs3-kbuild.patch
+		"${WORKDIR}"/aufs3-base.patch
+		"${WORKDIR}"/aufs3-mmap.patch"
 
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
 
 	unpack ${AUFS_TARBALL}
 
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
+	einfo "Using aufs3 version: ${AUFS_VERSION}"
 
 	kernel-2_src_unpack
 }
@@ -66,8 +65,8 @@ src_prepare() {
 
 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
+	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
 }
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.13.ebuild
deleted file mode 100644
index ac01fb23669b..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.13.ebuild
+++ /dev/null
@@ -1,86 +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=15
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20160627
-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.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.14.ebuild
deleted file mode 100644
index 7a88beb0b5d7..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.14.ebuild
+++ /dev/null
@@ -1,86 +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=16
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20160627
-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.15.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.15.ebuild
deleted file mode 100644
index 2dc837de9e06..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.15.ebuild
+++ /dev/null
@@ -1,86 +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=17
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20160801
-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.16.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.16.ebuild
deleted file mode 100644
index 44bce5266507..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.16.ebuild
+++ /dev/null
@@ -1,86 +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=18
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20160801
-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.17.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.17.ebuild
deleted file mode 100644
index c81615099b6e..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.17.ebuild
+++ /dev/null
@@ -1,86 +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=19
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20160815
-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.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.20.ebuild
index 5c61ac55b2dd..8feff64082f6 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.12.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.20.ebuild
@@ -6,13 +6,13 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=14
+K_GENPATCHES_VER=22
 K_DEBLOB_AVAILABLE="0"
 K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.4_p20160627
+AUFS_VERSION=4.4_p20160905
 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-4.6.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.6.5.ebuild
deleted file mode 100644
index 01c92bc6bce5..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.6.5.ebuild
+++ /dev/null
@@ -1,86 +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=6
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.6_p20160801
-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.6.6-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.6.6-r1.ebuild
deleted file mode 100644
index e5fe93a16dad..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.6.6-r1.ebuild
+++ /dev/null
@@ -1,86 +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=8
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.6_p20160815
-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.0.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.7.0.ebuild
deleted file mode 100644
index 35d09237ddce..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.7.0.ebuild
+++ /dev/null
@@ -1,86 +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=1
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.7_p20160801
-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.6.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.7.3.ebuild
index 7bc6bdb307a1..82327106f60f 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.6.3.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.7.3.ebuild
@@ -12,7 +12,7 @@ K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.6_p20160627
+AUFS_VERSION=4.7_p20160905
 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}"