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

Signed-off-by: Justin Lecher <jlec@gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9

11 files changed, 285 insertions, 283 deletions

diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 88e12ff0c8a0..7b385e37b7e9 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,8 +1,9 @@
 DIST aufs-sources-4.14_p20180409.tar.xz 181264 BLAKE2B 580de640580fcc15c6d7e1de0e480b803aca878d087aee63455674f0a74156849882331805cf70c8df439c8b6ce67b7883930c0f388c8e7ed1f643028ce98140 SHA512 b7bbb239d5681479ad822c9bcc28c78bc8e713cd5577192c630bf2363e9dbc1009c05d11fe01668735651f602d111ee59fe0b1c259f56e8485f9cc25b0865b38
 DIST aufs-sources-4.14_p20180611.tar.xz 181208 BLAKE2B c915c145092df4608e2ba5a8346328114912c10974561e3c5fa1135a8eb53b04d222d0f0948e7fb15ee376c5d61a098747ca37dfba494061261f32dbdc621a83 SHA512 f350cc8d67aa8b99ca7a44f3c665d9f4b5a345dc330ac4e8bf26e4355a033e21d6c04953bffa78e9f8c093131b84a82432b18db020e4b55b0e609692f0dcc217
-DIST aufs-sources-4.16_p20180409.tar.xz 181240 BLAKE2B 9ffa894a0db452a25d4c538a5b4dae8eb57a54262d13c29c4af499ec6949a0422fe834af24d70740ae08e363757e306d3b499f1f903f8a95667df53009c899e4 SHA512 d8422b44c21ab981485e585690bf5fdb7978b13e37ff85fc8314cf0373b1340756b63a84a0884a7d52001c2cbfd94fb6506e798b46284b8a8f6f9209df816c75
-DIST aufs-sources-4.16_p20180611.tar.xz 181220 BLAKE2B c38d2aad867bec768bbc433e04adc6a5dcf62887ee953ff62933179703b601822bdcf123f526f81aee4b0e3779c3bc4ea865ede133ffe75b52b508087e728ee5 SHA512 cbc0fdf7fdf22392e55bc4b3f97f3dce34eeff55a1d3105e75a2f0066c11e90897cf64e6115d3ecc0e6f43a222fcbc0f963e59e492eb64632650a62ac0a9ff2a
+DIST aufs-sources-4.14_p20180702.tar.xz 182024 BLAKE2B f57a26a6d28b3ca347e2aa96d1b54579c3f195b9020f26ca618f228e061d6d9d2c1d93269a2927753c407b83cae91602cc751a345c20f4f6c08a93928160a1f6 SHA512 423e31e290e92dae1cd57e2caabc31ccc2026a027bdaa363d37686b5c0087da5346785ebe0560d5a9cb6def0c019d41734e0ede84a6fe1472ab0581a9d6e3c27
+DIST aufs-sources-4.16_p20180702.tar.xz 182028 BLAKE2B e6ef948079c59a96a13c3d56ee6a84c30e97a4e30e3d3440e6122bdeedcbe2afd3ebda8e9a10fea1c0ecde8584282f6fbcc961e21c96993bda465e1bd2d79425 SHA512 2302d55d63de82fe4926140f049fd427f37b550b24e82558a72adc87eb96f22ec88c459667118898e4b28c6a466e5038fe835fc6ab3a6c83b2fb86499bc3b2dd
 DIST aufs-sources-4.17_p20180611.tar.xz 181272 BLAKE2B 3e1cd5f0d9ab42dd8fb06f62a68503c6b486724e4bc0df165ab43765ce43957d3df7771e95d6320af7e6957c8a0a61f334f65bc4b830fb88339226d4180fb4c2 SHA512 cafddc580e9b73b39efe9197a75d8325d0c52118409684f66b9f0f2a13e3436a75d1f63118132ddf3db58849bb01be1e11412cbebfb28e99fbf37d6e0741f28a
+DIST aufs-sources-4.17_p20180702.tar.xz 181992 BLAKE2B 9d0193e1db4fa97959b1a2308474c250fad6173ac76c31a70f3b980f44b2ef1da6093da955acfce62876cb19e15d2f1e56f0fa5fa543173b03613ed57577a42b SHA512 805c21bf49c857d66a8b42c889e623d9c779ee466bf06e7cf4719e80e1a2e3a85793aae8ce3266fdaebcc8c962be073c0dfd6581a786924bb8bc225e708176a9
 DIST aufs-sources-4.4_p20170925.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
 DIST aufs-sources-4.4_p20171127.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
 DIST aufs-sources-4.4_p20180409.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
@@ -12,6 +13,7 @@ DIST aufs-sources-4.9_p20171127.tar.xz 180656 BLAKE2B 35826be242a2da7c1bb47aa81e
 DIST aufs-sources-4.9_p20180219.tar.xz 180636 BLAKE2B 836f895dd6124faaf875b029826d3b19891253e143f8a7e71ffea6584ce67cc1cdcc8d09cbb9f1e942ece86d4e95934d542d21dd4bf5dbc310cca207b8a0a8b1 SHA512 bf3b64d5e77ad96710e3c333c7e3a095bfd150e6af90d295ce5d09ababf7d64f4e9892859d21decefa59842ec68c6fb761d9bc8cca2d12f7a53e45b0b71fa1d6
 DIST aufs-sources-4.9_p20180409.tar.xz 180656 BLAKE2B 373fcebfaed2b8ab4c831fbdd640136ac542e22db0d3b30b6d59db647459f327b7b3c6c2f130d83359107922441288da83a8632523bb94fd7d0287173a0da995 SHA512 0b11775389a22905e941c87d74fa95e7142e80ace7c734623c09fff4709f4ddaa8806a0dfe3a3eae8a01d6a4f1591ffcdacc32e5e5d3d7f7715edba342f45d10
 DIST aufs-sources-4.9_p20180611.tar.xz 180692 BLAKE2B 8958283914bc66199a68eb1289722ee4fa8ec05f3a827e2c0f8886d02ce395609870fae5623357f4b957e17e7cc6dbe3d26af22ecd4d002bfb4fc44b73ecc1a1 SHA512 8cde580a66bbe5374d9662e16de62d220201568c31971a96854bf2d593b28a29eca93de7575396939cd349d9c0f17cdf1805e189d7c272e08a84350f8f3fd0e2
+DIST aufs-sources-4.9_p20180702.tar.xz 181400 BLAKE2B 3fbaf2efa9f1b3a26c999498bc63c9d0ae8587343bf12d8635dc3569f125c2130787b3f6ccdda9270673b06b8a51a9524f10197fee9e015f5ae4608862ddaba6 SHA512 58b0b8be91ed6601a8ef488c842f702de6ab060bd1e1f487bd8710d5d12e3681bc772c2a37fd7d8e40b0948740502dad54909c9d9039d995ff7cf21fa3c84c6a
 DIST genpatches-4.14-49.base.tar.xz 1263704 BLAKE2B ee928e64ea2fc44b7d7a4e9ae91cc133b53c6976a3861f9a92fc4edfbded92737967f1f7f6c4d292b41228a67479ff4260f7366387a7e4a7892fc4b930b3ed7d SHA512 59cd1e3c873a78b088fb64baf92f84f6cfc1d3590e7b367ea881cfb41bf0264127f0056553a84bbb62fd69eca3d58ae29620ff9c52aec2ebab34ca370e371889
 DIST genpatches-4.14-49.experimental.tar.xz 5180 BLAKE2B fdcca0bdd975b24542eec8a67c3693ce8c27f889231025711d0a221a6e23a20256444f3b9320cdd58646c345e10dcb1817bb6e98528e5cc421d00b63a2b8a65d SHA512 f2ef797aec3c6c0376e7e9a1a974db7d8f439988f82ee4af07984bc71ae88eee03d49f2e450f49120255d38f8087497c7fa92da16064992692d0460629af9c72
 DIST genpatches-4.14-49.extras.tar.xz 17500 BLAKE2B f4c4d6408999934c03b2d0543b12fc6b227ac994201f9b31872342c63d930d4280bd1f93625c148eefb126f9269fc1fea1872ac4920ba679938c6aec7d916449 SHA512 a32823c41c47b26110da59d63bd6104d8b38ae9ecac43e87ec03ecef726349475e40fe88354a1680bf816a12f6edd0dbfb1a2b2865be0a0716047b12d2cfbded
@@ -30,27 +32,15 @@ DIST genpatches-4.14-54.extras.tar.xz 17492 BLAKE2B f993363b6205021049a653828ee3
 DIST genpatches-4.14-56.base.tar.xz 1459612 BLAKE2B cb36e0e5f7c998fb660e320e3a9cf1ad0412bd26fd92af6889c09ce70fbd4a8d7e2f78b8c178828fcfa95859d3cdfc1ed3370b2e8eacb32e8198d91e2bd37480 SHA512 35b1c2c915e7c493e53663c4140fbb0708cb2ae5a95dfdf420009ebe7d7df0890f3c1f66b694f46e033af5f24057e779c406cb510ab24d83e00731c6ad696726
 DIST genpatches-4.14-56.experimental.tar.xz 5224 BLAKE2B b8e988b07ffe7c2fcf93cc5e3d27945b575d6734c3d31df369c5106ae1ca581db760bfa262639cdef7640146811eb395b79d70c21319a0564592c14faa547e5b SHA512 c698bed59b03094e80a59f64a362b0e956237c0004e2e9c5a608889aa14e92d701160ddf149d45e39643cbdb5107d51becca427ed4b0d38219d4b392c27fc31e
 DIST genpatches-4.14-56.extras.tar.xz 17492 BLAKE2B f993363b6205021049a653828ee314cf2da0e5e18612cf0d0361ddd83832a4297fa56fbe7be64ec3dfc164836da41fea1058b930f38bf569dddae0f94a3adbd7 SHA512 886279967efbc449797424e4f5d68ec9982049ae38fe0d7a3b81aaf058ac58971d32d196c6b70c7a382e09307d56cc599c504d5cb63fafb307a5141c7a4e08f3
-DIST genpatches-4.16-12.base.tar.xz 262212 BLAKE2B 95d70087d1e17fa59498be09fb5f73b26843627e0f858979914123d5ed38c48c3d0b6cc8fdcddb0d0a145342f5664032784793a9076692fe0c260b40299c0fc6 SHA512 3d029c80a1b00dc90f4781c778815bbacae1713f0b5e2af3c9351ee6d56996efc1e048ef2509c8e002fc8c633158886c5abc24a8663eb7daa97bbe2cf0f9363c
-DIST genpatches-4.16-12.experimental.tar.xz 5168 BLAKE2B a65e3d51f96010dc20c5937bdc2d1984c519af9633a2e460a161b2640293ddbec38f2581e0ba6278397d06d9cd9154c8880eb6f31a02ce2f25123ad6b1ff12bd SHA512 1691f82a02d153d5d6f98c53e03db5692693f6e01487b17d025193f973904f488bbe48a73a8e7c9e35ef5f9dfe37e4f3c1087713b891791fad714f18a6a82c49
-DIST genpatches-4.16-12.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
-DIST genpatches-4.16-13.base.tar.xz 310996 BLAKE2B 6d87d807dbb17b2c132279849798c16ffe844e7f9f46e5adfcb5ecf1356ae60ed95d94469db8016d91d1a396aa4ae806fa8ae30a7cf17a9a8229c9546fdd5022 SHA512 450ec9c39cd88e995324b70cd58092f8f588f359cbada6d3c097cfc98c05d15a705c41ed4d9b48d9c2b4b15c79188c172a68a094c2e76b4aa44d83631fe8a486
-DIST genpatches-4.16-13.experimental.tar.xz 5168 BLAKE2B 3c137d43673f5a2eb0169d521c029c160f8f85bbcca212b2b7a0cfdcec48a93ed31c4c0fc0393581d106565db1b65d4e656c3a0b315c98ad7cddd06ac83a64be SHA512 bb5dd9dcee179c3384002f2b6abb3ffb937f8ea19dfe804acc9e248dd056535b03e2fc2655a11d1b0bbd1e3cfcc6d154ad1bb73a73dfd7ca4e517b476d0b1346
-DIST genpatches-4.16-13.extras.tar.xz 17476 BLAKE2B 72ebf7259d9157612350f0e7565cf15c9ca20d993413a81891ad09e4eaad4f8d2cf94cd35ba1439717820cb812a30b964bcb7b6346dbefd138ddcfb568f378c5 SHA512 aab9b7ccc1cde0374ae5c6f364ef89ab2ceb15484307db8cf8157da3066147835d0a0cff06392b4440c59762527065f933586b43b1fe53fe5510ed9514436987
-DIST genpatches-4.16-14.base.tar.xz 387692 BLAKE2B 4dad10e5bdacc39015381129508e15b1c30b6f191b3b3d5e7d66e89f8e7e3f9c40c81fb8596d38ca846c3747cc1ed722ac59a2bfa7984540c6466fe96a419f67 SHA512 70514f91e7575a87121dd7b5c8b2cf545d60253174eb8eef520e57beefc0d5c516fb1d48d963cebd60c85994744c5bb62576844feb9d1fc05aec9a21830aee9e
-DIST genpatches-4.16-14.experimental.tar.xz 5168 BLAKE2B 08bac33d41aeff4e675590484c5bc682cb420b38b3041e055b6c9b12d466b16dfafc5f8186e05b7797eecefaee7357a2a2b5729757a6880cfeb038d62624cbb8 SHA512 74da59061bdcafe29f8fa7142c132896f55597d992ee2ca365998af3f23c0ae48828664c1e435f7ea2d7e8b93682411f8c00cda3aaf79cd6535f5e8bf6ce62d5
-DIST genpatches-4.16-14.extras.tar.xz 17488 BLAKE2B ef216bc2349f04ff2b9f6a0fff48c9b92d18c0a3c6fa343b8b5800131d18f0adb5b59320b478faed7eaae59c760800ca9e324bc82079a017f707771f82c247d2 SHA512 a0e4d0c7dcb4a4d19a37edae9fa4b79913fded0df8c9282e196dceeede283ac15ba59e9a0e4cd92d567fe12f1c5e3394ba1625168bf8d4207ccf4a99a65e894c
-DIST genpatches-4.16-15.base.tar.xz 402268 BLAKE2B 1ce1a4da6e6ed219554adbf9acd0816747298c375a17794831ca9ecacd5bcf8c23c6eb49ab83d04d15b732f5ce6611be98f1d5acf151f3af172cfc6e48dab23d SHA512 2a5d0a8f83597bed7ee6000786d336729d53a2d76b674c14f4f92230cfb4cae6aca688ad70f0aa922e4826eddb0eb5d6d3b8d63ac207c54c52781759dd90c4ce
-DIST genpatches-4.16-15.experimental.tar.xz 5164 BLAKE2B c059c922b3f371ba3fbea51e714ee056d59a7326ddcc122f0c1e94055793d654e8a57faee263fd7b70a088a092e3b1d828befcf406d3d647291ce17782dadcde SHA512 ef3f4590aa9e4801c648b520a49eace811051422c4d849d80dd3d0ada07b71fd955cf520c8f1ce3d1c41d1bcc9f11f0fe05f329ca67f9098e924da3deb65d51b
-DIST genpatches-4.16-15.extras.tar.xz 17500 BLAKE2B f4c4d6408999934c03b2d0543b12fc6b227ac994201f9b31872342c63d930d4280bd1f93625c148eefb126f9269fc1fea1872ac4920ba679938c6aec7d916449 SHA512 a32823c41c47b26110da59d63bd6104d8b38ae9ecac43e87ec03ecef726349475e40fe88354a1680bf816a12f6edd0dbfb1a2b2865be0a0716047b12d2cfbded
-DIST genpatches-4.16-16.base.tar.xz 413996 BLAKE2B 98d16c1a39e3c39c9c0692de34c5e0afc8c5c65b9de442503f66dfad21025ea5266be2567ec9d1699a25095df3f989b36c935fca314fac15a0da0dd54a0d5f28 SHA512 a35a28d60a8409c2b2759f4364c7b177d8a36e4e17daa66117905949789212acdfdd0b11f52bf6b2c199723917a241613ff5a6278359600d987ab8892ed2150d
-DIST genpatches-4.16-16.experimental.tar.xz 5164 BLAKE2B ae06262ea762605224f734183a6b14f2e8919ed00ef7104488cb8a20571e6b00b5de228c9f506013d3df1b82716bd5d0aa3100848feb1da926e2519913689ffa SHA512 126b80ce6eb1c0ea91be5aa0e924ac3fadf983160941177827c6338e0d7ddd1f829812d02bd9a49f5b83587d23dc15ad412e6c3542d2d1c36e244a05053763bd
-DIST genpatches-4.16-16.extras.tar.xz 17496 BLAKE2B 402ab3be4571457aa71ad0e4785abc5ca4ab3b245d7009bb3c89d730f57b4cf78b6e7b0127907c31e4a21e96f3de367e19a71778d3dcf02ec269345d60a02cd2 SHA512 fc3d536bfa95854ddf788de3bd603a44b4aad3cfd11e464e54b7bcdd328513a048ff3a4e882c4a90fd3d21989aa3e5c0b46f4d0f22d58b93f3bab0f95801694f
-DIST genpatches-4.16-17.base.tar.xz 430088 BLAKE2B c61ffb1627bd214aafdc920c70b3e4f31a07d8849673540e6876c84b5fc55f0c4d264fbbdc15e2042d9e1888a8546dc501c05ba63adb8cce1ac0aaf8d2774b0e SHA512 d8e275656332450b63507abfe4ac18814ceed04aa9c0a8ad387787f1ee69a860d18583b91b4149d545deba88c60176129f88e7a97cec91b056ce5e96b6825aac
-DIST genpatches-4.16-17.experimental.tar.xz 5164 BLAKE2B d62882cceced2a9b3ccd1c21d8ace7ebdc1d4fa77caf2c49fa22d8ae087e119d40ed9a9ac88ee5b14d00b9363adaeb7eb1471fbbb30aed1c4b6ee12296102bcc SHA512 78bcca40ba6ccea7d20aab345302895d09d0a61d326268be9e0aa50498fbe341f2aaef9a712a1e3c628e19849314e1cf609a83c92d36b96754865c0eb11e0601
-DIST genpatches-4.16-17.extras.tar.xz 17492 BLAKE2B 9ad1072b3c62c064a72a5406e80eb7d270df3d2b4e2d4fa24c1f4f01d2b651abd06d3ef7d77cbddffff22597e05095f58f1bdf31b36240ec32d3e06aaf01cad7 SHA512 880e0edbbe8897bc638ced47a83dff35fb067596f07e4d6b9bb8b2f0c45bd9a1528cc557ded26ca5fe09fe89414c776f5a852385c2f1657d13c8d26f6fabd20a
-DIST genpatches-4.16-18.base.tar.xz 508740 BLAKE2B bbdd0ef86712ab8561c1d0272ac163cf165ee35ca496f24f8c587f74004085ed058e26b9bcaa900918badfbaa146dec2dfe73d98072fb4b43fb1fdd33a5097af SHA512 5b4841f67241de83e984d9b83a9643a311f8b8bc18e78536db4b1223e0c7daaee60c75b7e551f42d0ccc1b068241d773d720159dc0446375229e38cfa0a9e140
-DIST genpatches-4.16-18.experimental.tar.xz 5168 BLAKE2B 536cd42df508c7b528ca5cdd34f215426d07572455c0e26c678b9f044f53574fe1d2ab1488bde7ac306c9e7a3fd9042755bbb98d988f4389592dbd44ca3b0f47 SHA512 be5c1a1d6e758486b2d5bdeed44750cf6b9d38a42fdb34aa577b36c496ff25e221bf57243a280e1c4315705fc83e340e855614486d2bbff2528b05b1a35721ef
-DIST genpatches-4.16-18.extras.tar.xz 17496 BLAKE2B 926ea0dfe37beb6244da243d2dbf37c4e85118f0d56410b4f80b019228d5702d14e514c5324a1ca455e4d69927f30490b152b746340d0feeeae46342cf7ad1de SHA512 69db081086e60a2eaeb2038b3017b8815c7b2d8b6e1b0f20af04f3e8e783d3b6f67263cdf0988314ed6e91fa3561336c7db1949e3fc51ab00b9d7f62803f65c7
+DIST genpatches-4.14-57.base.tar.xz 1472016 BLAKE2B 1905e983d34220a97bda5eb7b1fff09d7ac42dc129b722611c079418133231d6d41f871c20df94a3db5440c8b1374d09ae3303be9e2cb8b70f5d92b61382f3ed SHA512 bace21a042f6e45512a8ffe3cb329c70b3f3548142fbaddbd76b2be50f50276db8f4cc410a7d05915c30c443cc82934893203d3025cd4653387ff6fd64f0b4ae
+DIST genpatches-4.14-57.experimental.tar.xz 5216 BLAKE2B ac751059eb363f1327b8cc6a9ad6c993cc56e3a57010f6a7d8b30220a401ec2b607b7eda601b39f1d6480fddb45f7a980ba7ffe7cf808ae382a57cc57a785f39 SHA512 efb2bf34ea83789437388b6becb4c51564c885355dffdfe0f902ded0cd0a9dbc534a891a8eddde76418a651f0da41d8a7402e672688b2cccaae5897ce0bfb744
+DIST genpatches-4.14-57.extras.tar.xz 17488 BLAKE2B 6dbe6859eafa2a61d2139572a28046a1278a965aa6a82518b5658c61f18ece4054175116b5907436bc40bd4c32458752fc381cb29806d9e25550a17f81684eab SHA512 49d7a27075e7e113ef39f2da651e9302b51c66d46c4d2960acc648dcd0eb4b608118584dbcbf169d73cf1ed4e105fbae9125f06dda46d346a63f0f35bf23bb4e
+DIST genpatches-4.14-58.base.tar.xz 1514872 BLAKE2B 1ab441025043ce159131d12731adfdb60ab194a1c681d3f93f82b67e22b4451cfe4d50157158607abaf7538e6c148ed8b34deb1f9af92bec91fd20f2d3ad84f3 SHA512 55d50bc2f401ddf9ce903d200ef4216824d6303ad5a3b59e1e07741775b2737dc1b0454ebd1c769953f8365e9d1279417c1c21c1b7192a61b6432d4ece209a76
+DIST genpatches-4.14-58.experimental.tar.xz 5224 BLAKE2B 53ea54483b2e3a2f683baaae6ae116a313fb9c960224fc350c0853f90402d9130e2efd7a3c0dbb8504a125cf5a112a613cb8052195b6393dc07af87990d4664e SHA512 62481c468cb73b443bafb6f222ace0a93f1ab7df79323730235903b75fd91ef15ef410f61115c97baaad89f99feb96811890a37e92d1436b51748fdeeb395687
+DIST genpatches-4.14-58.extras.tar.xz 17492 BLAKE2B d627fe1135d0db2bc4be04bd906f16116544eebd72862f842f14dda66172e5fefaeefa70b482689e97e8aba34473f9460f6ed81e366e711af52ebadeb0380632 SHA512 eb52794c163aa5abdd21b8dec218f8232b38694acaa1415f6082c30373b61f2bae39567da3536c0c22b9309d0cd85f7e5d449e58772ecbb0eaa058e4355ecffd
+DIST genpatches-4.16-19.base.tar.xz 523512 BLAKE2B d28c63e46779861cecc7ef02c0b49a52794d8ab4a369ba9789cb2783af3440121c2e1906eaca15a0973db84c52d2fe52fbfa03734336c9f1b2651ef9ca10325d SHA512 7dc7ff4fe9f0b75dc5ced0ead5dafec43633bcd95b1fe605f6729d1d9a3ac9155bd3bec605edff1563a37654f55123a68c93d7b70b411f1ce22ac1a2e1b24599
+DIST genpatches-4.16-19.experimental.tar.xz 5160 BLAKE2B 101cb9fe2be60a0e9ff7089ccc4c5c808c436fceaadfc40e4e8fa86eaaead8875ef592521f5005e5b8746087aa133236faf80c1a6448d316ef28d2ce7d27ffe1 SHA512 c452893e1778951865d72611b9ebb38edaa3d3de452693ee1c3fe9ab18063e6093f0a115f571f90ed50153b6052f2d4ac396ea4aa2a66ce0d0b27a99f13972b6
+DIST genpatches-4.16-19.extras.tar.xz 17484 BLAKE2B f9a8c00f4fe7fa0853bc358af5a525c5b81638b52dae4ea2ea9fd5cd27bb0d8dfbfa1670c73782a1e45a48319b07cc20b8892da2872fc3d56c2b706961e214b4 SHA512 8bb725a9e0c09ce2ce3130e2f76d4d434216d8f9471e314849d585de192e0943d8583eae93197c541ae5b011a8a2d64ec2b76c2a45cb0f47670483b8ad83e0d3
 DIST genpatches-4.17-1.base.tar.xz 5392 BLAKE2B c0a5d1795ab5ab5dfa064986b53f5f9bdb5ac543795af4a33ce8f3e0e21d0240d7b741caf3971121738963c769f861fbab5744456b350727b29074c6f0f0d090 SHA512 06696fa4ee7a6a5e42a10b83401e25b0c6920ae43ca7f2106dcc208e094c74a82ee769f0d97b5ae04b6a997f7d6bc48a36674477112c74a297d6580b225a6080
 DIST genpatches-4.17-1.experimental.tar.xz 5168 BLAKE2B 679183da1924b81b24e55fad23d57976bd33804f8d2e61bffbb9adf70d2c9d80ea83c2f6db0228baca1adb2ba5c57b8fe528e4e938a45ef9114bbb51a40106c7 SHA512 e7f68bf642616a1604f2d76a2e6310bd3f4147d85c29ddef829d0f59a785fd89f2532d854d32e3f4d132812f84ebb081936d2e5c68941ee5131b3004ed5b411b
 DIST genpatches-4.17-1.extras.tar.xz 17496 BLAKE2B 115e99b501a0119809f2abe84c3bb8a66b2b450f53003441593654c23a4bb653c4b40da1ba31e53f7f4db69c99511b2dd41f53b4adf8bd377714b1ace8abd9e2 SHA512 a01c90e36504f17495c8691ba6fa99870fd03b65299730df57e767e2562a90b6a04da24c50983cb8ea12ac276e6805f3b5fdaa30ad175ae5ee28f147f75dc3ec
@@ -60,6 +50,12 @@ DIST genpatches-4.17-2.extras.tar.xz 17496 BLAKE2B 402ab3be4571457aa71ad0e4785ab
 DIST genpatches-4.17-3.base.tar.xz 31556 BLAKE2B b680db7d4df57c290396f081c0099e4cd4d782ea44d8a6622fb6c16944a180789c4e1065419955b4945e0496bb5a3e8ad6a569fd62774982c6b0d1bfbb2b346c SHA512 4d303537680ed4b5a4bb7f2e53508a296796864263335233d2b8004b47b1aed17b7d8956e9f8a66449a4fce80308dc0da81d34d19a8e3cd911d201a026983216
 DIST genpatches-4.17-3.experimental.tar.xz 5224 BLAKE2B 937d0356a553c7ac33b5de50ba4f0c4f37166d89d3faefd2cded856481734626529372731ed0bbcf4ce9431a4d6c9a5e1ac417b3766bc68ebb9b37a264e201f2 SHA512 53c0401e6ab6552fdade77586de298124f6aa133fefb7ac908c5c5f5d275c57baf31aa70de8c0c8caadf99b6a40fbaaed0cf9b6e2102d397322163f9a71dd387
 DIST genpatches-4.17-3.extras.tar.xz 17492 BLAKE2B 9ad1072b3c62c064a72a5406e80eb7d270df3d2b4e2d4fa24c1f4f01d2b651abd06d3ef7d77cbddffff22597e05095f58f1bdf31b36240ec32d3e06aaf01cad7 SHA512 880e0edbbe8897bc638ced47a83dff35fb067596f07e4d6b9bb8b2f0c45bd9a1528cc557ded26ca5fe09fe89414c776f5a852385c2f1657d13c8d26f6fabd20a
+DIST genpatches-4.17-4.base.tar.xz 53932 BLAKE2B b2f31da36c71a4e69d675fc0fdd14b716cc4a6fe1b157ed66f86a51809d2efe82da587a036e61494a3c07b1c13d01516c343cd6b18b57687fa3c4ad47091c0da SHA512 4b265486e5d2111620a4007cc9fafade023e93e94c126bbc94db6f34111f0fd54693c06053b0fdd2ead49cc115c448c2e945c128231230357f7fd7a30ce36fd3
+DIST genpatches-4.17-4.experimental.tar.xz 5216 BLAKE2B ac751059eb363f1327b8cc6a9ad6c993cc56e3a57010f6a7d8b30220a401ec2b607b7eda601b39f1d6480fddb45f7a980ba7ffe7cf808ae382a57cc57a785f39 SHA512 efb2bf34ea83789437388b6becb4c51564c885355dffdfe0f902ded0cd0a9dbc534a891a8eddde76418a651f0da41d8a7402e672688b2cccaae5897ce0bfb744
+DIST genpatches-4.17-4.extras.tar.xz 17488 BLAKE2B 6dbe6859eafa2a61d2139572a28046a1278a965aa6a82518b5658c61f18ece4054175116b5907436bc40bd4c32458752fc381cb29806d9e25550a17f81684eab SHA512 49d7a27075e7e113ef39f2da651e9302b51c66d46c4d2960acc648dcd0eb4b608118584dbcbf169d73cf1ed4e105fbae9125f06dda46d346a63f0f35bf23bb4e
+DIST genpatches-4.17-5.base.tar.xz 112304 BLAKE2B 3f92f0d9298d36cc414d924ac90abffb654f70b95beacb4ebe913f0a2a0fda577af8cfeb6f2e0c5e4a9d5a9942fb1fb16d8aca37dd4f60c1442bbbaec0117b6e SHA512 a928f056ce098e931309fdb6c4004b5426022af3c839ea2d9ea703344cf34291ac688d8c03bc274bfad6cab86020480b8c08d52d2a09744d2fcb0715a8dc9be7
+DIST genpatches-4.17-5.experimental.tar.xz 5224 BLAKE2B 53ea54483b2e3a2f683baaae6ae116a313fb9c960224fc350c0853f90402d9130e2efd7a3c0dbb8504a125cf5a112a613cb8052195b6393dc07af87990d4664e SHA512 62481c468cb73b443bafb6f222ace0a93f1ab7df79323730235903b75fd91ef15ef410f61115c97baaad89f99feb96811890a37e92d1436b51748fdeeb395687
+DIST genpatches-4.17-5.extras.tar.xz 17492 BLAKE2B d627fe1135d0db2bc4be04bd906f16116544eebd72862f842f14dda66172e5fefaeefa70b482689e97e8aba34473f9460f6ed81e366e711af52ebadeb0380632 SHA512 eb52794c163aa5abdd21b8dec218f8232b38694acaa1415f6082c30373b61f2bae39567da3536c0c22b9309d0cd85f7e5d449e58772ecbb0eaa058e4355ecffd
 DIST genpatches-4.4-115.base.tar.xz 1692684 BLAKE2B 8595bbb40d0f0172e5b6f5266d89b3aa67fad3889375c3925a39e01ccccf9dd03e86f934d8d3c0bd93bab58ceee274277aaac4051d09f2edf665c106f2c0e29d SHA512 43dac11a37c6cbef7a4070336bda44beb2d5a9a649188d188e37c4654ce94a71244a7e87652368da5a0f88dc53ad5c8d6194ad614c4033d08295debab0c90eca
 DIST genpatches-4.4-115.experimental.tar.xz 87744 BLAKE2B dc8a9f9ae6e6789e7c072e5c6dfa0e875765d77ffb746060f65cd708124f81f8a269a54ec6bd6f9bd159d0cd5d0d9dabd6ad9489ff5453e01c264b0f34153300 SHA512 e82343f1d4220ecab61503c7cefae9d5d9cd605187f4861eac21f330c39af77e90950badf1896a8fefee57133496f706e2b1905eee1d8c6cf945e77ed3b36094
 DIST genpatches-4.4-115.extras.tar.xz 16456 BLAKE2B 3c854f5619d349eb7b20b8f92787564019769884c28cf8bd3191686e3fc8f5c764ebc3a3c99d3ea7290aab316b8a0a0728a4f679196b80b524943c503fef6705 SHA512 84d76421f1e3d3041ab18a2a6a019b571c1a6f27d2fc880da64ae11398c43e5eab79c538940df82aa02d697983a97145197b127613bb7f4765a26813cc36eacf
@@ -93,6 +89,12 @@ DIST genpatches-4.9-111.extras.tar.xz 17356 BLAKE2B d493644ea8f452eca55b31a5a46c
 DIST genpatches-4.9-112.base.tar.xz 2194176 BLAKE2B 553bd26548e65098f0866b28ecadfc7b0eb413cf081929aba8c15475762d738dc4d99cac6e69fb8751b3f2564e5ebdb60ff05b829fa9d6200819afaa6e3cffd4 SHA512 d41394381b2a0c78b289822b238712ef04d28bad314b394d9f34194df4cece64ff0036eb3d7553a24abb2ce9b817fcfe0c0a698cdcde7cadc46b9df4ee277600
 DIST genpatches-4.9-112.experimental.tar.xz 106364 BLAKE2B 05842eb8ba76f254a499eeca205280b9756e08b5f9afba9f81199207763a04f3bdd6c4b03c67d74d031672e2c189a3180efef3bc3ff1ebf4b9e7cd6f8bf6e1e3 SHA512 038ec30ba1bb37aab87dd4ddc8226f084d9e01a3a7a99711298e220e71a2b8f188bc46481d653ca7177cb1661d0f24475929c02924cc13af173b4c7fa5a151cc
 DIST genpatches-4.9-112.extras.tar.xz 17344 BLAKE2B 2c5030d5254e954c5def20a4bc35d7531733e59aa23c51bce848d0a3af4372c34d00d42e901f5acbb8499b384d647f1996d6a1d0046f8f15fe6b32791399618b SHA512 98e1e6f0ec8c5f67ee23b63f831e6fb96e3581749a7d0c124b24b4b40d1c5ec89a42cb09d68e926e8e78342d450a20c1feb8b78e9ffb918e4a8bc26bf198c8c7
+DIST genpatches-4.9-113.base.tar.xz 2201076 BLAKE2B 36a36f238cbe1a406929fbcfd3f887c2ab2bec31c7ccefe2ca22a1c4695611de58a3639fca988c09bedf208795f303b5b5baeff5f1e8fba38773b741f63fd163 SHA512 3d3e81bbc35c58d0bb920522092d3490e74371f77678bb94570cb457285a4a66a95a7d96b5c7b3512b80dd39d3c0ad5b7d811b83b8ceabb41be085075ec4cd68
+DIST genpatches-4.9-113.experimental.tar.xz 106472 BLAKE2B 36fea162310280dae65417da6dc722bd539ec6b108efcae16ad0ba79ff131b1e59cd343e5de1a8722b051b0ec55df7c65c9a3db217bdfe879ece8f2b84738552 SHA512 5fce146ab8ecdd8a252ba4a2e28b0bd2274c243d4fa5730228ea27cbf7b0470b40b060e51d7753fe66eac4569be650e383acb8204b383d0bed33b851ff0f26d4
+DIST genpatches-4.9-113.extras.tar.xz 17352 BLAKE2B 48d898c4d97fcf1768abd2a8919b9cdadba7e8d6540f68404cc8597cdb192aa7f11a03193799a65a4492f9fb3cbaea43d80eb3185efa4b49d58ec11b33b85ece SHA512 8da5dc558897efcd724ace128818dc2e460899c1cac229eb131c72a868841f6f25d62bdf7d5f88cee065fb95039ab78b04adfbc9c3a7464c8189c0f8edae3e62
+DIST genpatches-4.9-114.base.tar.xz 2222376 BLAKE2B 8f773b85ab1787ceda8be275bde6c46be29ab27db5105bdb65aaa0be38b369df64ea2ae1af5d324810f6eb7c7853bd52bf2154b83743eeabb753c5c821bee67b SHA512 9f7696a84cf257c23b5f4cb4e57e6291961a7b5ee362ab538754251a01299f2014f0f56442b8be179f20cbd6c0de5520ad72bca1a2805ccbb06b55b889a1d2ae
+DIST genpatches-4.9-114.experimental.tar.xz 106388 BLAKE2B ad5fee26f465efc9ca5b4c8c823c51770f0399d2be95b12ed57e47b0ee8a2c3d63cb4a2ce33946c501c59bcb19c516208d831468202acceed5e3a6355f5f26a0 SHA512 8a3c2a8101988ebc5c05ec34e5369dbfef078f6bb87fe8be744672be895282e1031078c688ec64fa9025c3f3750f0340299cb493b15aded109bb8525955e6200
+DIST genpatches-4.9-114.extras.tar.xz 17356 BLAKE2B 53adee41fa88f2979f1857885f06456947cd0c6872a8962922a27a55a5492f22bf6d90d0213087a15b6b783a3d950c6389fb595eda98b3608084f1ef233899a0 SHA512 c6c9aa4e23351f58ac46ebfb088254f2c9690760b972743273700cd76dc873f63fbddaaeff934b64a29956c1ee951917afaef18ae5dcca44d371baafbf321ecf
 DIST genpatches-4.9-51.base.tar.xz 1001928 BLAKE2B be8a1a304f634b40dba1daa56922473c25fc57cedca73401bc1a142674832bb797f805f883aecc56a4b17fd63dae6aebe42f7c642739e8c5704f130b6675dfde SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5
 DIST genpatches-4.9-51.experimental.tar.xz 106416 BLAKE2B 483d57d8e19a135130e7084238c304e07ddf04e51dba8aa705566d4be3cf3a3b21a1f8a4ed49a7b2b06bc5b70f820788bc22e42ece8e6eb5d3ea3597eaf31289 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3
 DIST genpatches-4.9-51.extras.tar.xz 17356 BLAKE2B 03160cc66db43d543f4bbd3171741cc36ecdd1d3088a143144e8725d1a8452fbb3743dbbd196ba387875cd0eb4fd966821fc9d3b3269a6848d2fda650da5ccbe SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.11.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.52.ebuild
index ae0c62022aa3..3f568b1b73c4 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.16.11.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.52.ebuild
@@ -5,11 +5,11 @@ EAPI=6
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=12
+K_GENPATCHES_VER=57
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.16_p20180409
+AUFS_VERSION=4.14_p20180702
 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.16.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.53.ebuild
index 878b5710eef1..bbd7860895c4 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.16.12.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.53.ebuild
@@ -5,11 +5,11 @@ EAPI=6
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=13
+K_GENPATCHES_VER=58
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.16_p20180409
+AUFS_VERSION=4.14_p20180702
 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.16.15.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.15.ebuild
deleted file mode 100644
index d19abf3930cc..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.16.15.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=16
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.16_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.16.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.16.ebuild
deleted file mode 100644
index 3f16e6b8ac12..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.16.16.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=17
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.16_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.17.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.17.ebuild
deleted file mode 100644
index c0101898540a..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.16.17.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=18
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.16_p20180611
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.16.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.16.18.ebuild
index 85c5fa2affb6..2cba18bb6c04 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.16.13.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.16.18.ebuild
@@ -5,11 +5,11 @@ EAPI=6
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=14
+K_GENPATCHES_VER=19
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.16_p20180409
+AUFS_VERSION=4.16_p20180702
 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.16.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.17.3.ebuild
index d8b5b7fd44cd..9dfb20178e65 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.16.14.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.17.3.ebuild
@@ -5,11 +5,11 @@ EAPI=6
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=15
+K_GENPATCHES_VER=4
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.16_p20180409
+AUFS_VERSION=4.17_p20180702
 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.17.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.17.4.ebuild
new file mode 100644
index 000000000000..b113415f6fdd
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.17.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=5
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.17_p20180702
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.110.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.110.ebuild
new file mode 100644
index 000000000000..539cbb66b963
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.110.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=113
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180702
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.111.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.111.ebuild
new file mode 100644
index 000000000000..b4f91545e762
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.111.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=114
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20180702
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}