gentoo resync : 17.10.2017

16 files changed, 25 insertions, 443 deletions

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 6217b1daff27..0eef3f2b2056 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,6 +1,4 @@
 AUX btrfs-progs-3.14.2-install-man.patch 451 SHA256 95245d802fb3d69e027b9f1d08afcb04aa5877f7f713c7ee820d68bf36bce3c8 SHA512 75e232199b0fc79e622cd016f6a6adaaa6880522cde78210b805813ddd57f1fb546eb8cf31f65fd79fd73628bf9d56d0a98ad2ca32661e0320cdac200ee4b171 WHIRLPOOL f0fb586ae46969d245d2a27cc3e7fb19f6581e4a1ba6c943f97f8483677ddba13e5da91d0aaf8ffada464c7a318c914a26e511d944e826694cf987c380c2885c
-AUX btrfs-progs-4.8.1-fix-ioctl.h 1071 SHA256 579758c11f1b8a8e3276018f14a011af9a6ef45762ead00487cc617c416b26db SHA512 8cd7c9cc34924905e81694c38ba3900a08d30b41b7d2eb9d3a682ca82a7493f8809254758765b834a437d89bdade5346d98bba438ad76fb9cedfc97520a13391 WHIRLPOOL b98aaf139fc1fc47df9dc29a7beaad29d3dbb7ff6da579fe7124773328ab036effd94c400744d9a758fa2ffd682e0c389cd403de96e8b42c156c51183ea6c6d7
-AUX btrfs-progs-4.8.3-fix-ioctl-again.patch 220 SHA256 73ed9cff29344987274f3bde6fab0daf40bfbe9f029bf2ecd0ec8440b9e50fa3 SHA512 3a16591d5aa9db10203a3f0ae49cff05883162bbe25cf72304e7366b11de114828b8c50132665db5965d1a254754b601ae530a930fe5046c347d3868cc4cd287 WHIRLPOOL 104fab567706cfe82c8d40644ff022c96880bae322089b4b282c147780e6a7b97573d206c9b765bc7921d44efda585f21c879c10cc51434201382fb895c19720
 DIST btrfs-progs-v3.14.2.tar.xz 275372 SHA256 70e1d0ca887bfa5062dc74cc5d4556c19adb08453fbfa57edae6802d9c917793 SHA512 02f0cf7581b41143707769e53debecfdd3f5a1dd717530c33d4a657b09feafd73bb43408516a58fb6d2754365803018673321c7c1898b81bb36194f05a0d8955 WHIRLPOOL 4561adf84b6570e165be04c8c7b014646f4be11b7f9840a5929103271cb7e121006b515645968f9a4b7cbaf8b0a407c2e74b82b91bd6688b7f58b06fedf70e95
 DIST btrfs-progs-v3.16.2.tar.xz 291604 SHA256 d4d62abe0c2b8e86888f96e4bd21ca7e25c2d53120a3b9e8c6f987344147732b SHA512 7dc0f2f8f0bbddbbf1d4d99854425341c4b3997334c65d7e936bcec1ee5ca880101b8b45498721502857b478edae6237a934c7d4acb735de43c6d8ff35efe53b WHIRLPOOL 19e1fadeefcd40bfecf1b957c37da3387351e1f6cae04add59fd689524338c165e3547b799520e74bacc351ef236eec2481c1043159b58358b77cd74cf3db281
 DIST btrfs-progs-v3.17.3.tar.xz 588424 SHA256 e7bd9ff8d95b515973d3a1255c17fd481bcd75e4420f00c6c9c99489d1ddac2c SHA512 faa9b0d5281f72777d4b64b96774dcb1d6f579fd84e3bac3c256e779bf6fd67ee17aaf8f904dd29a8a8592f504e3e8af0caf1ab261689457a30467d3c1fb6a71 WHIRLPOOL 6ce02a7b078a277b882a2249ea4b628ce7b5dd16572d618b8cb999f88115c84ac30c9c9928525754edd458f86a458c9cf5c1753cb293c49e0d000795fae31604
@@ -11,20 +9,16 @@ DIST btrfs-progs-v4.1.2.tar.xz 1123080 SHA256 62db60c6a0868afb6302112cea54c75687
 DIST btrfs-progs-v4.10.2.tar.xz 1508304 SHA256 ed09df670338562a52d9e7d76a362cc932737e2a67adca4c09395374be1de60a SHA512 1a21ca29d03c8d0e697ce075b841e38b021771a67da20087c80ab84bb87c5f56ea80695f9b2a25a2a159fba8b01d74a364435f5462545ec00ebd6f335d3fcd6f WHIRLPOOL 621f1af0273ca3b27e63e20b8a6ec9a3f6519f67fb669f1295be7f742b68362f3c7295be5e4d12ce48e9bc5753d1099b03e52b71fdf878d02664cf1e59720de6
 DIST btrfs-progs-v4.11.tar.xz 1508580 SHA256 e17a68cc52a27d905b715445e91ddbaa4d42de4847d54836d6ed21e012dabf0e SHA512 914fb415f7ddec4d3ee203b67cde135dcc4c62d3e25e76e920b9a0ee5099d1cf75d21611795ce5aee78908ed466dc74b0b7ab2e036224b7e357e421f13e4f6c8 WHIRLPOOL 54b8d129ab0bd931dd7dab3c00c0b33cfeabaeaa9f9526d6a48adefc2b58537e8e8302538a7072820d21646360979f3b7fe78049f0244068f46cf6f7eeb6d18e
 DIST btrfs-progs-v4.12.tar.xz 1587604 SHA256 917710c84a9d529c92038390ddf8ace19ad409f61cdcf93c38ccaf2678472ece SHA512 6a9b13241edda68c866249874189aafb121f73515bf71e46f1f574eff858405d9ce22a251a07c6437f0dc21ca6ee55b4b57c15b431ce63faa3c16d1c8112616e WHIRLPOOL c929a5f453af005004b858873b3f5c78c8d51372644b3611cf2fc4900c45fee7a6153cf2f09fdf16336928b2427160c4393697751429dc4f1a405721f9ea70e5
-DIST btrfs-progs-v4.13.1.tar.xz 1672248 SHA256 e04f80fe55429a8a2541ab01951bb29a12c071d7ce8baa318b8feb49f3de8ab2 SHA512 4fabfaa36b67afcc21a3917bd1faae106a82a2bc97a3670dd054a33490ae60e63512a28af5fe27b016de1e7213809f89e096c39a082f0a5d4e48f8e377eba7ba WHIRLPOOL 0adda0f7fa4bd45c433ae988dbeb64774cd0af6e690c9895fea54aca5a71e7d93b2d314f6e09e827b26cbe441e44ea428cb41eac2a6345f04008351d7404c8e9
 DIST btrfs-progs-v4.13.2.tar.xz 1673732 SHA256 75c7331f1306495dfffabe542ef6c5539808f0cdaebdf14fa8b7ab09c59448bd SHA512 50db13868ed43433ec9b655825767e6e76036f407edc0caffecd4b371baf7d817575c2f25c77fe3d5e741bb52d57757c6c762de0c00cbefede615358a803d80a WHIRLPOOL c3dd7b8ee7c3e1b62885b2e1ad8f0bc4e72b24fd55090f43c7e95eaa2517c51c71d299c4f2450267721d41f1fa792ed48896b8e17215b65d50e61c6a1583cd98
+DIST btrfs-progs-v4.13.3.tar.xz 1674084 SHA256 805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783 SHA512 6db18197ab48a43da5212ead2fdd4a6d0c9eb035cd5ce40fdb5e6e39a69dd118aa0112246df8cb4a339665c20c39479d630e03ccc1ffea3017646695e1c5f833 WHIRLPOOL e54a739862f26f2648def2fa0e8fc1d49f7a70f2dd498d29e47b0d74fa826db961ade323cb5039728b42d28a383a0949494aea584a4d53f4abfce449bf6f10cd
 DIST btrfs-progs-v4.2.2.tar.xz 1143760 SHA256 5d87e4ebb2a3a288c167791e489bfa484034d185c704870c484cb0771d921316 SHA512 2ad23546b3bb421faad1f67da37566b6ae1887c5340c0f1d06ca59fc0cd0fb1060d92e74e36ba7bfd85b0aff30811525654cd03b7d3570b0b51c2d8e2d6d9a76 WHIRLPOOL 5051f232bf5d6c2d19bc0fba9f2653546fc09000279863637a7ab44ff5c8bd107e5307aef3d2fbc7113581df3c224965f882045153eb9fa10da5b34cc4318188
 DIST btrfs-progs-v4.3.1.tar.xz 1184416 SHA256 0cb5ff15deed01cdf5a77f3f61b7dc9d2cd6787bcf6b6b7dcef424d16e8afd3a SHA512 661c7c05ee3527cc34f3aa08e88e252e6e836a86752f7e607e3f6dc0a9a861d3bc645a6fa0a5af5f6abfe4f3f2f7e193cffc2bb1c53595e0b7f99c3ff59daeff WHIRLPOOL 503ab00d8362ab2b4b9b91a8de18cca9eba1d76f2331f54cbecc7e89cc491dce3cfbd761d8e6e37773499cea7ef67a66dc7f544d7590d0c82acbef90ebe0c824
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 SHA256 9964e3ae4fb64692e109ddd733de4554e708348ffa18f0fc16a0cbd4bf40a8fc SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a WHIRLPOOL 188c4dec4f699262b023268e4a582312443aeaf0ea798446105d7288f6375cbad92ea2e8514def0b22cc8991c3ca9aefc5220dd8b6922aa4b506572da973ec33
 DIST btrfs-progs-v4.5.3.tar.xz 1207344 SHA256 e6e79608d81ccda62ad877c20e4d0868dc68e570ba42f4c94e66bf5e8ee0ebd3 SHA512 7bb15728577cdc56773e87583196ed36e15a4c417f03816e8a101506070e667b8e51f66fcf98095ddc20c9ce10da0b78de1171e9c8a6cb20a4811fd35d508961 WHIRLPOOL c938f35d4ec74beeb41e8ab56632bb33c7500f283cef3d59ff97494ab957be9f2e309feb80e383c29417ba78d7e2a89704faf6fe2558a06852944790f434172c
 DIST btrfs-progs-v4.6.1.tar.xz 1281240 SHA256 4ed15ccd0fa730c13e52fb930141a0d3f300f2bb34cb1366b32d093eaaa18919 SHA512 7bdf350a3051326f495e1694e11b27b830dce219ddbb0a805f1916f5deecdbd5332c3cd8abe36296832e196eee45e4cdc4695e99e186a51b85ec8b9f6ff5381d WHIRLPOOL d7c06549947278002c4de91f47b2b85d93a714bf1e984ce2b4d7321bcb8b0a11dd60cd84e070c382f61e67e919d3cbc88a723aaa5ab42806ecbe65ae01c4ae34
 DIST btrfs-progs-v4.7.3.tar.xz 1341512 SHA256 90cd6f0ce5a8bed5fcd6ea8a70d81de4a038163035d48a9ae0339bbf51df771c SHA512 2609bfa90483a14daf33b77f4f1560ca75de602ad3d4ce705a95f1aebbec016574db91b0287287622e49d199507c90243eb6739bb5719a5f99557f8f3e8e2c1a WHIRLPOOL 819879310484ba70d96f5492aca5463e5ba0c646dbd5e4b4ca797b76c754a352753641ef4d0f4ffe0109d07c72d99be5a2b1c749b1f03225cd582a83c9cf0d5a
-DIST btrfs-progs-v4.8.1.tar.xz 1348472 SHA256 836e6d707abfc155319c072f53d296261cbd17f0e03484a3694b8af48640db83 SHA512 43738c21b7c066fc13af742f61aad54572d5c293acb98915a2aa0ba6ec0e32022bf663155d77435d1179f05fb75b97bd0aba28da2ade04b596ef5348e8b5415c WHIRLPOOL d4b1e4c5ca0c826394b5d95ea92e27f0c625a0f5c940bdd88e310a7328f4ad77b4060f5f61d4b05ef03705fe605591dc7ae6c9368f37aa73b69fedee0ed0d448
-DIST btrfs-progs-v4.8.3.tar.xz 1396920 SHA256 c1a60c317d2fcaf8420779d2d0717ae53882c2bc22bc44e3bdcd5efb7ca68ef2 SHA512 bf6ed0269823bfe385659f652bcc18c76c3cac3ca6f04f76f1ebe1fd5e2212884edeed7f5649979f8d83745256e9555c038eb6713b262759ee424bb9f6f0f4ac WHIRLPOOL 4a4b20308e08ed85f73d70e95f0f971965a7e8abae35e12769a4c697f0f1502cc070240b5319579adf3f8565cf669acdf4b5aa32dfca77148b8f23bd97349f76
-DIST btrfs-progs-v4.8.4.tar.xz 1466164 SHA256 bf26ead666c337a62a74bc9ec7f8dd9ee200e60e5fe5289967d53328eff261c5 SHA512 f53a0bfcbeaa43b00e09b811b1e6eb5159cd8a4c78ddb26a5ce87975d203794cf6d0a026d4a646bed0266fbc2bec1833fe48a3ff3850ea27bc7a19d7aa7ad54b WHIRLPOOL caf015a1ab9411ef5ddfab50a32d11b678b6b931cf871a9bca88925a500612cb5718e8cd411cf39b6e94b2544e222545d24c89470b04545501d87b986ebf3e84
 DIST btrfs-progs-v4.8.5.tar.xz 1466688 SHA256 d247b1c022aca5def3415bfa51e00c566cce36660a3ee517d4b6a1af911a08ef SHA512 497c221fe329febc7cca777e347e8ab6ebb368070d35cb5122214bcf928eb2e7e854f7b0af5bc846f0d34ad84dfb33b372d24bf947ca0b15cb83291c390c664b WHIRLPOOL 3786ddbac699a22359911e89c989e58da7d7b6700f5380560645b6abc0cd46703bf512f8077c64b84fd5552915de1b620c7fe9aa0d96def025e7a3432bdfcd2e
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 SHA256 464a9bfd2b5eda76b0246ee0a4043f4de8d17c10312bc8b84abc5fbf9317fede SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5 WHIRLPOOL 34aa6010ad38b2bd88f22e4308dca587305a9f4c7c0053b60a2cb5d4a7fddcb92ca384152fcffe9c8bfe476de046dae0ab88093f9c9c4a805ebba07d3d8837e2
-DIST btrfs-progs-v4.9.tar.xz 1475844 SHA256 e227baeb4652e83aab33135ec29b30339e2c99bba67d56fb589cd8a6b642c8a3 SHA512 e39abf3808dd8b7ac2424cbf240cec5da12fb3e5d2eeaa2ed6a0e4b7d8bdc28a4c92891236feff70b801ce1e78b65370e05aed252890a076c0b1b9bbfd020f46 WHIRLPOOL 1dc2c98d2aec9dd41a661c6f03d5b0ca4d8e80f53f5951c5071a3fde67ebb72f97ecf89ee3448185d2c33c65f60a6de61e983169fabdf6284a6ef40c770573e6
 EBUILD btrfs-progs-3.14.2.ebuild 1252 SHA256 b66386ca09fd7e82b654058c289e51b9d8ab3b8fd1b2d652cfc6c9a7794aa40a SHA512 7dba479e65e7dc216b4a1b0af1b32561dcaf80f81893c96eef934267c9101c1e1069122ba990515f62fdcf30dc8d174f37a518bbda1679dab63eb5cff19e177a WHIRLPOOL bcc690d28d1592022aec434ecb67fd722e20cc4b943033766d22ed6c9fc48894e9104fa899ec5e0952c2a200397a890c72f9318de3c45ccb6dbdea8fea1fdf8a
 EBUILD btrfs-progs-3.16.2.ebuild 1257 SHA256 a197596356ecbc3368ec6a706bafaa4d4c2b0bae7cb483c91196c4ff0e2e2122 SHA512 2321b579af3ee75282836090bc1c0fa71e2f80fa039a479ea71755674f09cacc18e269430e1617e4b1dadd2a9a80b6155cfd0cf2231b6f3ef6fd58f03934caf2 WHIRLPOOL 674364bea6e68b6619c6a38d5e2b98c619be80f9f25454790d3543b416c56f6ff925137c122b53f04d4da38d9d7c0830efceee9fe3e38025714a9f1c1a4bcb8d
 EBUILD btrfs-progs-3.17.3.ebuild 1257 SHA256 f9e078e57e9db44510766dbc59da7b15a08c2210b5024ae73af4c350bb72bd98 SHA512 7465dc3c0e41bf7d499e897af4a28c2f0af58e382cebc2a4d61e9f4eae80aeed7a8af23d4a2d5d155c1185639b2c467c36101f36c1245b45b7491a9c3152c406 WHIRLPOOL 0601ec09e4d8ee75e194db1cb3b2fe68c9c85e9aaa1533b5ad3fda8bb79e85309b710139a3432d6a5c0ad0afc310dd6caabea69932deb9cbbd22c02a2877b732
@@ -35,20 +29,16 @@ EBUILD btrfs-progs-4.1.2.ebuild 1891 SHA256 4001d1a94da1c6c8aa967fa5049f0eda7d8c
 EBUILD btrfs-progs-4.10.2.ebuild 2196 SHA256 ad1e36ffe7bc55e7839a539fd1438d7b99443e8b97c21ed6239a305ca7d087c7 SHA512 8e0a96dbde8d3d89be0ce9b0941ea2cfb25baeed7eebc35e5f80665cad2aa81a1f71c46bd6c4cd93f68416de18b5a7b783f7aca104ca0a66522f8a51f485e864 WHIRLPOOL 5e02f872904bff7565adecebf4d3602b197982c8d84db65571ffd6b2e5d698fafa564976ea6947cbfc43c46477de04d8d7dc28c4f8bcd6cb1b12e601e017311c
 EBUILD btrfs-progs-4.11.ebuild 2201 SHA256 2bbee37700101d8b7a4decba322c433c3d35304bb0b2289c036e48dedee553a3 SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 WHIRLPOOL a7fbf25f98bf4d6aa9e354b87944439f23826fd3ee1b06943c46595963b1ad9a9e8b187c0a0c12a8a28fcaa7397eb336e651696ecbdffefb6db5377b5bfe1bb4
 EBUILD btrfs-progs-4.12.ebuild 2201 SHA256 2bbee37700101d8b7a4decba322c433c3d35304bb0b2289c036e48dedee553a3 SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 WHIRLPOOL a7fbf25f98bf4d6aa9e354b87944439f23826fd3ee1b06943c46595963b1ad9a9e8b187c0a0c12a8a28fcaa7397eb336e651696ecbdffefb6db5377b5bfe1bb4
-EBUILD btrfs-progs-4.13.1.ebuild 2201 SHA256 2bbee37700101d8b7a4decba322c433c3d35304bb0b2289c036e48dedee553a3 SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 WHIRLPOOL a7fbf25f98bf4d6aa9e354b87944439f23826fd3ee1b06943c46595963b1ad9a9e8b187c0a0c12a8a28fcaa7397eb336e651696ecbdffefb6db5377b5bfe1bb4
 EBUILD btrfs-progs-4.13.2.ebuild 2477 SHA256 e2d092311230bdd4b94deed96c0c120fef4ee80c36f4de6d991234da3083bdf0 SHA512 c6309b90e764b71c40d7beb29086faace1b144a748385a83be472c251c354f5d95399c56e56615d530330f2cd1804c70b98d6f8968b63b89026fee5c9372c3ce WHIRLPOOL c72d75ee9d2bfab5ef11671b14f89cd0caeb53ae24bf7431ca4fc159731721a8dd1d062ed830b18dce5c74feeac8869275673da68c3bb2e2447a0f4fb98063aa
+EBUILD btrfs-progs-4.13.3.ebuild 2477 SHA256 e2d092311230bdd4b94deed96c0c120fef4ee80c36f4de6d991234da3083bdf0 SHA512 c6309b90e764b71c40d7beb29086faace1b144a748385a83be472c251c354f5d95399c56e56615d530330f2cd1804c70b98d6f8968b63b89026fee5c9372c3ce WHIRLPOOL c72d75ee9d2bfab5ef11671b14f89cd0caeb53ae24bf7431ca4fc159731721a8dd1d062ed830b18dce5c74feeac8869275673da68c3bb2e2447a0f4fb98063aa
 EBUILD btrfs-progs-4.2.2.ebuild 1891 SHA256 4001d1a94da1c6c8aa967fa5049f0eda7d8c96b35dc54671eca649d2a1d6ff49 SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c WHIRLPOOL 6ec33e86a895b1ad7aa54566e106e620c1f7a00f6fa34fdff23c2fd21ed514d759833f9591c093c45e17a70e8d7770cb64b3231668950b966f664290e3c249ed
 EBUILD btrfs-progs-4.3.1.ebuild 2260 SHA256 16bfad2751d4276db96b21621817d4920a7e2428199de538d155156b7da27ed5 SHA512 8e435e7c541dda1b45e1a0ea4af82143688101bcf5cc3afc83c38429f2c300420bc72f56460dd237cce1cda7c0c84de8fa552cac4b2fa6d5052f7388b5041727 WHIRLPOOL 8de6f8974b685f700318f7155b5d2d1b77dd821e089d328638383c66463efae0f9071b41c3153eb6536ddd7bc14d0da0077760d3fbb18842699522be379cbdb2
 EBUILD btrfs-progs-4.4.1.ebuild 2233 SHA256 724612f14dcf1201b8ee80384de93c4dd67145b27d32e34900fa20d75861bbaa SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd WHIRLPOOL 22e9b8c8e85367d49f338ca80507ac5757a9e8150640b30160f9c209650af6a87cde4dd9f34528b12b1e53029ab7544a82c6ce7bbbefc5ba52b46f60845e2933
 EBUILD btrfs-progs-4.5.3.ebuild 2201 SHA256 768b646d1ffbb970bfcdc32116986b06a58455af3a27f7b354346c493ee3e9e2 SHA512 a2506e9d43d8b408d5d16bafdbfabe4f5ca6861a77e079dad62580418680a34dfb7ccb7ba847b1f05accb8afb8e624c5aeb86a940f354250dc8006884d9a47f1 WHIRLPOOL ffbf60d1effd0a1a901540307e27e91c23afc4603b4ff5762860d5e0af137bd05bcf99d11f74fa527e4a33b9b3f05af4446723ceb10462c2386e6f765aaa7716
 EBUILD btrfs-progs-4.6.1.ebuild 2196 SHA256 ad1e36ffe7bc55e7839a539fd1438d7b99443e8b97c21ed6239a305ca7d087c7 SHA512 8e0a96dbde8d3d89be0ce9b0941ea2cfb25baeed7eebc35e5f80665cad2aa81a1f71c46bd6c4cd93f68416de18b5a7b783f7aca104ca0a66522f8a51f485e864 WHIRLPOOL 5e02f872904bff7565adecebf4d3602b197982c8d84db65571ffd6b2e5d698fafa564976ea6947cbfc43c46477de04d8d7dc28c4f8bcd6cb1b12e601e017311c
 EBUILD btrfs-progs-4.7.3.ebuild 2201 SHA256 768b646d1ffbb970bfcdc32116986b06a58455af3a27f7b354346c493ee3e9e2 SHA512 a2506e9d43d8b408d5d16bafdbfabe4f5ca6861a77e079dad62580418680a34dfb7ccb7ba847b1f05accb8afb8e624c5aeb86a940f354250dc8006884d9a47f1 WHIRLPOOL ffbf60d1effd0a1a901540307e27e91c23afc4603b4ff5762860d5e0af137bd05bcf99d11f74fa527e4a33b9b3f05af4446723ceb10462c2386e6f765aaa7716
-EBUILD btrfs-progs-4.8.1-r1.ebuild 2243 SHA256 c9b4c16130c1385764a7251d41fcc09d71d79ae88093fdc4b1009ff3f013b6bd SHA512 01fe15654d7f31f0d3253d1cabad3d2161bdb677773e0eb591f72dd086da86ac42b56bb350a298ef7d26d329bbddda1a30dac690e9e0501a77fbb61fe4038cbe WHIRLPOOL 61ee900e8a2c6dbeaf80ae4d8827dccd71e581df886e721d6dcb2c87475c9cdaa9b7fb8ec58cca47f544115119e8ed6533585934bba8cbeb2de56f2119a4813b
-EBUILD btrfs-progs-4.8.3.ebuild 2253 SHA256 39cffe68c1d512b6fdd3dfa32bb9c6d7f86eddbec27fe659e641638efd66423c SHA512 b95eb2ad176ca6c7313052d180d1b7d824537044eba5a3dee360449ebb133ec61b1e801c981a4aa47b3e289c1570c6d411b26f0442b792fc921540e531c78d72 WHIRLPOOL 1a68e041e3639d54408d25a5dae812383791d16171298b42ea959984534a7999a93a69acd8c7f52be4a713a99706aadd7d96e93330a5d428c44e6be12316858d
-EBUILD btrfs-progs-4.8.4.ebuild 2201 SHA256 768b646d1ffbb970bfcdc32116986b06a58455af3a27f7b354346c493ee3e9e2 SHA512 a2506e9d43d8b408d5d16bafdbfabe4f5ca6861a77e079dad62580418680a34dfb7ccb7ba847b1f05accb8afb8e624c5aeb86a940f354250dc8006884d9a47f1 WHIRLPOOL ffbf60d1effd0a1a901540307e27e91c23afc4603b4ff5762860d5e0af137bd05bcf99d11f74fa527e4a33b9b3f05af4446723ceb10462c2386e6f765aaa7716
 EBUILD btrfs-progs-4.8.5.ebuild 2201 SHA256 768b646d1ffbb970bfcdc32116986b06a58455af3a27f7b354346c493ee3e9e2 SHA512 a2506e9d43d8b408d5d16bafdbfabe4f5ca6861a77e079dad62580418680a34dfb7ccb7ba847b1f05accb8afb8e624c5aeb86a940f354250dc8006884d9a47f1 WHIRLPOOL ffbf60d1effd0a1a901540307e27e91c23afc4603b4ff5762860d5e0af137bd05bcf99d11f74fa527e4a33b9b3f05af4446723ceb10462c2386e6f765aaa7716
 EBUILD btrfs-progs-4.9.1.ebuild 2201 SHA256 2bbee37700101d8b7a4decba322c433c3d35304bb0b2289c036e48dedee553a3 SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 WHIRLPOOL a7fbf25f98bf4d6aa9e354b87944439f23826fd3ee1b06943c46595963b1ad9a9e8b187c0a0c12a8a28fcaa7397eb336e651696ecbdffefb6db5377b5bfe1bb4
-EBUILD btrfs-progs-4.9.ebuild 2201 SHA256 768b646d1ffbb970bfcdc32116986b06a58455af3a27f7b354346c493ee3e9e2 SHA512 a2506e9d43d8b408d5d16bafdbfabe4f5ca6861a77e079dad62580418680a34dfb7ccb7ba847b1f05accb8afb8e624c5aeb86a940f354250dc8006884d9a47f1 WHIRLPOOL ffbf60d1effd0a1a901540307e27e91c23afc4603b4ff5762860d5e0af137bd05bcf99d11f74fa527e4a33b9b3f05af4446723ceb10462c2386e6f765aaa7716
 EBUILD btrfs-progs-9999.ebuild 2371 SHA256 90f6faa23f0989920e0e01ca883e48496c9668089c8a47fed4c900c4a6b1c55a SHA512 24fcd4ca44a53c2049cca61b71bf2d773b746c2e162e0257b61c5794da644a5d437f67e51555f8089b843ed072f1162fb13a826279af3a8d8b68fedb8792338c WHIRLPOOL 4181ef89a00dd868e38a6f98fd815f788f77562bb4031ce54801e4586a07f7cf226d1476bdf2a8a41c2580dec723ba190c4f935644698a68e31937bceee60d5e
 MISC ChangeLog 11132 SHA256 0c54d2a80dd689f3762685e94ab550f2a27d33ae432435303b9e19b909950475 SHA512 4da361f70e00cf63b34d50d54002d4a3bdd49831f758edc6e989a56e0f4d7b3b13c3e4ed0783f60392826d9e940834a502c1a45289022779529a761b5d82c615 WHIRLPOOL 5f6dc767533b1481f78f62ceb5f22df87ea7f29a28196f388e1371e0cc7b61578cc13aa575e1241d6635a5f549208555ab9852b7c402c854b5de44dededf3dd2
 MISC ChangeLog-2015 17405 SHA256 afad43040420e659470f318b069c989d976b5027c7d0c95ee1fcf4cdfa8990f5 SHA512 bfebbcfc924deb8808fbd11221add329eb01a20675d5c10b7a7a63b7ca7287922601f9b2a213f0832efd1cf2bfb693a1b172459a340b447982517f0e303bed79 WHIRLPOOL a296b422cac0a9e5192bd908b4a670942173f6dae0f85e8a217670ad670f2b9c126fded68b3eac551d8a3d15d58f6683f012006165a8a39190567d2f8e0b79cf
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.13.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild
index 397d271d38c9..0dc40a977f4a 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.13.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
+IUSE="+convert reiserfs static static-libs"
 
 RESTRICT=test # tries to mount repared filesystems
 
@@ -35,6 +35,9 @@ RDEPEND="
 	convert? (
 		sys-fs/e2fsprogs:0=
 		sys-libs/e2fsprogs-libs:0=
+		reiserfs? (
+			sys-fs/reiserfsprogs
+		)
 	)
 "
 DEPEND="${RDEPEND}
@@ -49,6 +52,9 @@ DEPEND="${RDEPEND}
 		convert? (
 			sys-fs/e2fsprogs:0[static-libs(+)]
 			sys-libs/e2fsprogs-libs:0[static-libs(+)]
+			reiserfs? (
+				sys-fs/reiserfsprogs[static-libs(+)]
+			)
 		)
 	)
 "
@@ -60,7 +66,7 @@ fi
 src_prepare() {
 	default
 	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
+		AT_M4DIR=m4 eautoreconf
 		mkdir config || die
 		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
 		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
@@ -75,6 +81,9 @@ src_configure() {
 		--bindir="${EPREFIX}"/sbin
 		$(use_enable convert)
 		$(use_enable elibc_glibc backtrace)
+		# No whitespace due to 'ext2,reiserfs' being invalid
+		# for configure. TODO: Why it's not valid?
+		--with-convert=ext2$(usex reiserfs 'reiserfs' '')
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild
deleted file mode 100644
index 2d14380ad90f..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-PATCHES=("${FILESDIR}"/${P}-fix-ioctl.h)
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild
deleted file mode 100644
index 8a75a9fca115..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-PATCHES=("${FILESDIR}"/${P}-fix-ioctl-again.patch)
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.8.4.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.4.ebuild
deleted file mode 100644
index fa7bc3eb6b36..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.8.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.9.ebuild
deleted file mode 100644
index fa7bc3eb6b36..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.9.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h
deleted file mode 100644
index 61b60c78faae..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.1-fix-ioctl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 3ddbf895db678fb40f7513bac9dbc36fd4095693
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Mon Oct 24 09:08:53 2016 +0100
-
-    ioctl.h: add missing kernel compatibility header for BUILD_ASSERT
-    
-    Header breakage noticed by cynede. Reproducible as:
-    
-        $ gcc -c /usr/include/btrfs/ioctl.h -o /tmp/a.o
-            /usr/include/btrfs/ioctl.h:42:14: error: expected declaration specifiers or '...' before 'sizeof'
-         BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096);
-                      ^~~~~~
-    
-    Basically gcc tries to say us BUILD_ASSERT is not visible.
-    
-    BUILD_ASSERT lives in kerncompat.h which this change adds.
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/ioctl.h b/ioctl.h
-index a7235c0..abea7ed 100644
---- a/ioctl.h
-+++ b/ioctl.h
-@@ -26,6 +26,12 @@ extern "C" {
- #include <asm/types.h>
- #include <linux/ioctl.h>
- 
-+#if BTRFS_FLAT_INCLUDES
-+#include "kerncompat.h"
-+#else
-+#include <btrfs/kerncompat.h>
-+#endif /* BTRFS_FLAT_INCLUDES */
-+
- #ifndef __user
- #define __user
- #endif
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch
deleted file mode 100644
index 9c894900e4ab..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/ioctl.h b/ioctl.h
-index cdfb888..ad4372c 100644
---- a/ioctl.h
-+++ b/ioctl.h
-@@ -710,3 +710,3 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code)
- 		default:
--			return NULL;
-+			return 0;
- 	}
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index 4cfb7d88dbc3..cdb208fe4c75 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,3 +1,3 @@
 DIST btrfsmaintenance-0.3.1.tar.gz 19698 SHA256 e2f6a6cd433a38407c580630e3f4a0c4747390f0e129d5c9d0f91ec461cfb855 SHA512 89be6da3d6bb3f85f645ac899f173d19cb787e938dd2fc91be16b3202a6784ca33dc4a4d9f9ee78ac6a96468dbaa4f4dc7a2f2e6998d550ea44d7af24198dbfb WHIRLPOOL ee3c73da6a4b88e6b3cd63660fcb1164599e3d09d378f385b6f1ec3613b287d90d2c8be9b4d66472ea56e1755f6a1091bcaec75cb844d376ec98fc54de882f51
-EBUILD btrfsmaintenance-0.3.1.ebuild 1383 SHA256 7cd2486a19feee1a9f8cde3580aaa6b14dbc23384749884a127479f7ede1f053 SHA512 c585bb7588f7d055c8d483d335821ee10135169562654f9e38e88470d35dd2470f334e8f0ff8cc146f978535cdf6fd6f0b867cc449e673408a4af20fbc510e35 WHIRLPOOL 0182777c9b053e8b92c4a2e5a7e8053389245e612f15c6c7de95c4a675862d9675c5f97b65fd235308abfa0a68768973699ffd5eda97d2434558728620a71a60
+EBUILD btrfsmaintenance-0.3.1.ebuild 1382 SHA256 02a8e8a2657f3d94d2381854637256dd80f701e53a0a27f1e0e1b3854a33d99b SHA512 91f92dd324a69c431917f80cf56c19f6c6a4be6ea9195eafc0fd32cb3858a61285df1b24f7b9d6258abcdea5c97450ead8460227c32b33f334421d1554de4bab WHIRLPOOL d762dd825ae9e0955df25208b0dfe8f14ad873dc989e8ba90aa36c27a3877dd457c55ffaffd63560fa8cc26535592f09e29cfd22df8193c3c06c140b7a127a5f
 MISC metadata.xml 454 SHA256 ce3e6ce4d0b96bd7dabcda04b92d8bae042e6c2435ea432efd61036494e3ea16 SHA512 d23ea714ccb28d7f7266fc12c89bafb4b673025e285d1ca6faddaf74b99b39f54aefb043848e2812db5c28ef950ff86ba075d1afac51c0ce23c8c7c9691eb96e WHIRLPOOL 0c2e9ccfbd0e9cdd57bb34ea9d0d6c384b6901782e0586afe64958e6fef6a06d4f261edfc6eb02c5944c017f0613eb54ad8bf5f9cf46e3f9f2b66b79aac7a6a9
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild
index d70dc711e301..ac6b0ae93047 100644
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 25f775e3e6e5..24441deac5d1 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,5 +1,5 @@
 DIST dislocker-0.7.1.tar.gz 103194 SHA256 742fb5c1b3ff540368ced54c29eae8b488ae5a5fcaca092947e17c2d358a6762 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226 WHIRLPOOL 1f8b8769cac08be4df70c953f967c8408d44b34ebc8e7b0b09e400b827e01234b467990ca0f2cee80518cdea63fbf40cadc75faf4caacd723226a27ee6978fe6
-EBUILD dislocker-0.7.1-r1.ebuild 1190 SHA256 1ae95bb6c27c7c95448bb57acc1bf04dfe888727fa289d745585a929c99e5ec9 SHA512 8a3507ab0641fb0dbbcbfd968e2c9a45531533485a0d38d079975bdcaec1e4ec3228373e6f1600e5195b944534c342015ec684b4815b6adc5c8dd4b04a2f00dd WHIRLPOOL 70708857a6157dd94293af1835b86ed2e183477d2d3b39fc0cfd19bbb3ad7cf7376622b6871eb0b2d5f2158829e342a4c1168f21b022fdd687cb86a25becc9ae
-EBUILD dislocker-9999.ebuild 1190 SHA256 1ae95bb6c27c7c95448bb57acc1bf04dfe888727fa289d745585a929c99e5ec9 SHA512 8a3507ab0641fb0dbbcbfd968e2c9a45531533485a0d38d079975bdcaec1e4ec3228373e6f1600e5195b944534c342015ec684b4815b6adc5c8dd4b04a2f00dd WHIRLPOOL 70708857a6157dd94293af1835b86ed2e183477d2d3b39fc0cfd19bbb3ad7cf7376622b6871eb0b2d5f2158829e342a4c1168f21b022fdd687cb86a25becc9ae
+EBUILD dislocker-0.7.1-r1.ebuild 1216 SHA256 d5e3b2418fbd86d171b30e30aefa4d4aae152fa848963f9d257331c3eee8bf98 SHA512 584dc19550c0f3bb4d1fcd456478562cd8c6e74ce7c46ced408a196e7f3a4c9d07236c12b440221060447b9e54031d583e0c2337a57b32d3c4e34218a5a9ba24 WHIRLPOOL 7c86c4787f64e460aeec60054b6f46dfd175f2d585f72c7cee07f747222bb6693fce1a37d231e94173e1e3a1f644b80ee5d28be7cc0dde72dbb09afee36b68d0
+EBUILD dislocker-9999.ebuild 1216 SHA256 d5e3b2418fbd86d171b30e30aefa4d4aae152fa848963f9d257331c3eee8bf98 SHA512 584dc19550c0f3bb4d1fcd456478562cd8c6e74ce7c46ced408a196e7f3a4c9d07236c12b440221060447b9e54031d583e0c2337a57b32d3c4e34218a5a9ba24 WHIRLPOOL 7c86c4787f64e460aeec60054b6f46dfd175f2d585f72c7cee07f747222bb6693fce1a37d231e94173e1e3a1f644b80ee5d28be7cc0dde72dbb09afee36b68d0
 MISC ChangeLog 1235 SHA256 9a3cab004a19b94da391c99f1b630204d4d0c091636146376a3cf25ce4e3c535 SHA512 5ea9ed0c0cc776369d72f0cabb456f7ba76764ba7f6eeaf17d3969f2ccb13a2d34d293248f02ef5c4016d1ffad44e517742d03cf5389b91b185abc064d6055a0 WHIRLPOOL cf133bf6ae4fc9e8135aafa4712da88a6feb67ac66da0b26ff9f2498a92b6cabb0c46cd66709f41b3cb62a4225f003d2021722bc6a406b2fee65fad9631681d7
 MISC metadata.xml 343 SHA256 ea2f5b27ddce5b54eafbbcded86777bca6b4fe11c64fc8a2811b490b9129ab2c SHA512 479da4294232d9c49530e2ed2c936c824c697b08d722309addb64bc77dd083365b0d4ce063dd331e4dbd13a0185885dca7bf5d62a6a09dfc6e7a38fd7e25f448 WHIRLPOOL d588216ea963e9caf2d03adf2ebeb48135ebb4f082f1a9c32ef9d656506c25803e295f1b18be37a7cca84ecc21142e0ed897ee993c22412041a95b9d6640774e
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
index f0bc602be4d9..7c81c7f8a1ce 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
@@ -27,6 +27,8 @@ DEPEND="sys-fs/fuse:*
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 # We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
 #    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die
 	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index f0bc602be4d9..7c81c7f8a1ce 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -27,6 +27,8 @@ DEPEND="sys-fs/fuse:*
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 # We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
 #    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die
 	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index e936b908fa6c..8c885f954b5e 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -8,11 +8,11 @@ AUX fsck_ext2fs.c 2793 SHA256 7ec106ba31bf93dc334f946a88301d7eb26c2c35a65a7b8938
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7
 DIST e2fsprogs-1.43.3-missing_uninit_bg.patch 1317 SHA256 4a4a59215efde3b0b398a19c9e74f73ae9bbbca954cf3e2aaaaa5f0a9f836313 SHA512 bd80dd679245c4d26837fa5a0f7dc6a05560973d912a3fe8f5c3c8c352675496f21c9b775d37fb190a7fbb3fb61882b6d4d6a20b34918cda0bfe65e7d0cce8e8 WHIRLPOOL a03a7461183b08ac178dc7d0c6a230df93d75902b0abc33ec0c7a19d018fdc4264910e688db4708bd16b23d175a3a9928e38c31f8377f7d28352bac83a8cd90f
 DIST e2fsprogs-1.43.3.tar.gz 7405892 SHA256 ce8ef1bbb0d4730f170167284fda156ac9d6bf18db2750eb94af619a81b19927 SHA512 77e753f77222a0a7a334d7d93c900ea6cb339ed40af29952e414fc4e45d8c5c01d67771978a941195effe666df965746c2b31977c5f05ff307429b978dac8dea WHIRLPOOL c90dea3d01a103b7d11d0611b1b005748065ae90f15a02f3bde4c4baf9403931b40d2024297a2e02a92d11841d35decf8a4715d682212d4641ff34bb2f80d5db
-DIST e2fsprogs-1.43.5.tar.gz 7596581 SHA256 466db1da11e227143fbdf6a401833e0ab17cf43d927f5baa4a7042b3ce8a3932 SHA512 c174a5110d59110cbc5e9982825993e18241a831b26bb5927447ad238172a51b5870b7431b38ce27f26761abf6af0249ddf1229f32be1c2ed58a67a9704991ed WHIRLPOOL 8aec75bd8e103226fb8d92da00cc52cdd86726336a34fd0cc54c0d85d816d190cb0f133aa2f271a637aaccab165a9c5b5feb0ad348d73685f1debd1d9ba91b03
 DIST e2fsprogs-1.43.6.tar.gz 7466907 SHA256 233d70ac434cdfba792dc0f83944c0ec854468d604fb22325ae65c4adfc90239 SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66 WHIRLPOOL 862769b1775d87297c30a242a2578971435115ebf381156f0c16078a2ad0e19f03e8af41c93d00d6324a11af6d4cf333b0a1a8fe3eee76fcbb47fc825f3481c5
+DIST e2fsprogs-1.43.7.tar.gz 7492811 SHA256 87035f2eae8da5f9869f78ffc177969b4e3cf75a5da489521c1ffe4268e1a1c4 SHA512 71694c57d076517f6e1f2a5bffcbc49c32fcf11283e26739304f50ff0aae28646ea7af80dc85b636b87db57a0042a5bce82411e631f7d5c055440ebeadb90282 WHIRLPOOL 5fb000e6bbd4770c0361976c4b3d4874c91b005b5e9c0dad108fe428e56a147361d5d265abd8db4605819eb771740b4a362885cb76bf5661f815a434f3bd9a3a
 EBUILD e2fsprogs-1.43.3-r1.ebuild 4040 SHA256 8eda4767977a467c700bd79f9b4b1b70ccabf76b007db75498101fc6edfe977e SHA512 5053ec14ad968d6f4f8bb0cf0a227c0f56af71eaf0201fe7d53448c962f6f097aeb92b561381194aea58f5d3d99421d455ad50f280413d83ada6b281e1361c9c WHIRLPOOL 278072ab829a9e9ea8810b98d70f43211ab71b187b3500b0c9297ca337a308f1eecc6978ffe685da06988debe2059301b49cb7b67b035b977a200a5fe35d1c7b
-EBUILD e2fsprogs-1.43.5.ebuild 3803 SHA256 25d55af84a2f9710128989a2d3882bac946bd1bef23e4027494f0fc6af5b91da SHA512 5ede2280b2d42c18e14315654f6dc092b02b757927ba1a4973417f514b6dc66f506dec85e69f1a0c00e177a3950b74bb42fe0994d15a50c2c83455cb7baeb7d9 WHIRLPOOL afd8d04b1ccef5a2b532b18992bf609844fb4fb52b74e1c3b5f67677d217d095f20389d089e447af4dd2f9f06a97a390123d1633b17e3dea23533dd985cc714f
-EBUILD e2fsprogs-1.43.6.ebuild 3803 SHA256 25d55af84a2f9710128989a2d3882bac946bd1bef23e4027494f0fc6af5b91da SHA512 5ede2280b2d42c18e14315654f6dc092b02b757927ba1a4973417f514b6dc66f506dec85e69f1a0c00e177a3950b74bb42fe0994d15a50c2c83455cb7baeb7d9 WHIRLPOOL afd8d04b1ccef5a2b532b18992bf609844fb4fb52b74e1c3b5f67677d217d095f20389d089e447af4dd2f9f06a97a390123d1633b17e3dea23533dd985cc714f
+EBUILD e2fsprogs-1.43.6.ebuild 3800 SHA256 09ad6fdfef0dbecba3f3990ed59907a99cf8911480c7123c91122b73ce9f74de SHA512 b303f44bf560a65e998c84737759fd4bad5d3a169f318e0d23a877bee8d0f68f360826ec6711a22a8892e6da18bc01ce8e64de2986ee7eb9701061d46a925087 WHIRLPOOL ceed394146eb2f78f5bda9cfe27c5a60718f1b9a9b720a1ab7442057c2f3d48ab6641ded667fb8e15fa4e6ae52d11e50cf5fb00a498612dd23234865401f1301
+EBUILD e2fsprogs-1.43.7.ebuild 3803 SHA256 25d55af84a2f9710128989a2d3882bac946bd1bef23e4027494f0fc6af5b91da SHA512 5ede2280b2d42c18e14315654f6dc092b02b757927ba1a4973417f514b6dc66f506dec85e69f1a0c00e177a3950b74bb42fe0994d15a50c2c83455cb7baeb7d9 WHIRLPOOL afd8d04b1ccef5a2b532b18992bf609844fb4fb52b74e1c3b5f67677d217d095f20389d089e447af4dd2f9f06a97a390123d1633b17e3dea23533dd985cc714f
 MISC ChangeLog 7643 SHA256 c0cf2dd26e491ad39b3f867c0bd9296e10749d0f1838cb7cec65ba1d15e5956f SHA512 f46d87e5a695385f4642bb03316ceb7b622461d938c3af2c5e15836a07384cae7a573c86750217c3d49bf00b870187c248aaefa2bac1e819a6b21ae9e7f4b2cd WHIRLPOOL 0fe755f687bedb25e32f4d6050f77e6dcc4179e24211589fb6c10ceef98ad12e3bc2733a86db9de11bdaf618cf290901705fe947b30c87bab719f0182e44a036
 MISC ChangeLog-2015 48117 SHA256 fd49ccd4dc8e7a53c8cba64fb936f960ee7c58fcf4150485321b23475a193f84 SHA512 82134fcce2aaa6bf15f3339b79b657b4e0827a132cca8c89a6521f7c6bc1246d3d55cd46d6c9adbd5b3e6f458e9f4e5e267d10f4c9929f15c9cd985949f5ee85 WHIRLPOOL ed9f1377d27424101d492f92a515cdf60f723cd6f519ea8a82b16d46ec86c7f297b8224b6d2833c83a6ca5e4c6f2140e7155beb1ce0d45f503debc51d71b9db2
 MISC metadata.xml 520 SHA256 d7e8aff0886fa1a93bdd7f347cd5850753bc1cf1cf6eefde71e98a8aa6ac5eb4 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905 WHIRLPOOL 2f2712617962a77cc37b8761ec4965fd61654a084de695f72cb1c2a4a678a76dbb9cd4e1b5aed67ac6649f7222cb75f86bc36e24fce96a68f8448d33a733f69a
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
index e3cc852d20ef..e5d937291fb7 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.7.ebuild
index e3cc852d20ef..e3cc852d20ef 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.7.ebuild