gentoo resync : 02.05.2018

24 files changed, 142 insertions, 22 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 18a8f3f8cce3..cf6fa0dfd297 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/arm-fdisk/Manifest b/sys-fs/arm-fdisk/Manifest
index bc42917e8348..0b6199e071b9 100644
--- a/sys-fs/arm-fdisk/Manifest
+++ b/sys-fs/arm-fdisk/Manifest
@@ -1,4 +1,4 @@
 DIST acorn-fdisk_3.0.6-6.2.diff.gz 5580 BLAKE2B d4c70c874cb60b02403edadd51a2547781f78efe7a09f3d776c1ce3a135a07f1c856e640f5cf0e2a1308ff80541f9a0c68cadfa44f10000bd81f576fc823ce2a SHA512 076587945548f10fef92a93910aee670927a2de9b1b32fd1b4ab72b1cfc26440177745f09b62f9b903987e3802060f4e278e1647ee12b7e2f29a0fd7b36ff188
 DIST arm-fdisk-3.0.6.tar.gz 62266 BLAKE2B e9554325562fd8fa03b896927fd9dca4cd61b86a4dd1a9d0bcc8aff638e0f0d1a9bca5c5b4bdf7bc9f1799f712497c8677af74f5204646bd505bc107818dfecf SHA512 954c1112c8108da676a0c4223de3a7b0320a37286b0ed099f3000bf4777ebb483b0b62eb0a5dd480f775c503020e7d9ed6ef737ef7bbc5bce858ae68aa471a3f
-EBUILD arm-fdisk-3.0.6-r1.ebuild 1001 BLAKE2B 9d3c1554fa2266d3111dcf5a76923d5408d03821f6c0871e9a270822205037210cd203b2381e58f474f3e6907255b0e21d3c2ed146de55045dc58e3ca9695237 SHA512 5b7043ff93c0e50b87db06cff3f73b856ce3110eddfd1da3305acee0d76f8366ba06860e8af787ed4c52e2037f99236dfcde2b8d8899e857ef50529a8b2bc220
+EBUILD arm-fdisk-3.0.6-r1.ebuild 1009 BLAKE2B 9daf8c01c3914d99d242acca9385818d3e8c7b8315fe7d8a6654e217ef7f53fbf74abc548b5c48c839eeee2f181f104ddf580c6b6cd8053be8c10e4426cd7026 SHA512 fb14969b30e477a45516ab1aac866ac4caf3f6f6aeb8bc9cc3561c7ad9ba16c0486f74d0acafe429c9125d55a7eb5747027afe198c2260a4c80399f3da7d4a16
 MISC metadata.xml 255 BLAKE2B a9541f4bfab6e4a12975e8b3d56e433e65828b6376510448f11930d35451e23cad5bbf264180f150629ce9c1dea24eb7fb4f2b3f950ee5ff5d345811e017773a SHA512 4408b5018e974df4d7508f29e255f318bbd09b4056927cae6406ff1f427c06d5d655f677a28440cb84af04e411c88e4582f9ad1ea76829afeee0bbe4e3841c2f
diff --git a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
index 263933596f93..3a85f525491e 100644
--- a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
+++ b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DEB_VER=6.2
diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index a8a915d1648d..7aa8b60a473d 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -2,6 +2,6 @@ AUX diskdev_cmds-respect-cflags.patch 384 BLAKE2B c4fb56e72868554f8f90841f00a88d
 DIST diskdev_cmds-332.14.patch.bz2 40477 BLAKE2B d628f7f8d7e4e845183d70d7455aa043cc1f1273f0a59ce75f4a61b9a44ca0b27f5db87eb4844c79425a3e06375346994727cff63b59f399f13ff4775fe8d860 SHA512 def4966fd638e5d6602ad3170347e657ff5a44d45e5075cb6d355575fad5a5c654618e658d00c98b055426d12dfac27b7ca4c1924625b58a6778f32413cb65be
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
-EBUILD diskdev_cmds-332.14.ebuild 1103 BLAKE2B c9bbaccb5bbbdc89b0b404d577a57dc100a727ec47a5fbad1894899746dd52cebb26726aa213e38edf9bf10ddc3d7646221c46478c694cd178a0295cb5180bdd SHA512 aee2bc4879d4603e789bceb978f84fb76e94843ab7cf8361bfc173626192c1c3e3105d8ed6a93fe5830882dc68d8504c2909c3de65efbeedb2416dda6d3d5267
-EBUILD diskdev_cmds-332.14_p1.ebuild 1646 BLAKE2B f0589ce7a2485b2de18d6717083a17a909553bb72e1d80b2aeb1aa867fa19faf4ba9edbbcca2e6502cbbde4e331f459af705c2f15297e2519acccd1136dcdde5 SHA512 e1993149d84f0fa8d1eeb4521209db934d1e7019a83e5aebf2ee9da365b5c126019dae82f22a29d5c2697de2c8d4139741ce335e08362148d7ad4b1e79b9224e
+EBUILD diskdev_cmds-332.14.ebuild 1111 BLAKE2B a6bed339cdadf1457118adcd4f632a34efdeac5f9f1dddc42c9f6c022ae5997b2c7ec42cc8d9d32abf20f2df9627077da7542a4c842c0aff280fde44116504e9 SHA512 7cd3f2aca57e3dc9d771356b52486f487c03f97047c47c2f9e3a9e9c1d1b52d1b0caddc131a4a45997fc0b08297a7905e730401601260afb8e2449231c394911
+EBUILD diskdev_cmds-332.14_p1.ebuild 1654 BLAKE2B 3e646ab16b11b1f91bf538049ef2a555e2b0ad46f29f5f5f86140c74ba26538eac0182402d12d3a8924d88de89206c0eaf83159d270d7cb0475f2278114ed95e SHA512 4a460db7f3bfbfcf8e747f0df1b4f3c451fafe7abba16cc6423ca6dfc01cd5a31034cf809a3aa90f627ef32d11f22c10beb4289609f58f8a61178d884a064678
 MISC metadata.xml 390 BLAKE2B e64b93c1e1bc559fd8ee2b08df7760111f5e6a16ba5da382a8544fc30f619235b1faf36f3dc34af6db04d55a8e55b8898c5c11648d7f08a0aa2d084fe936a539 SHA512 713593a494fe0722fc1ea9984450a392585e57d2e317d99bbac73a2f713ff87950d52b11124ce2f3c7536755302c364d94ca38389b93789d3af5f5d19d8fc0fa
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild
index ac35ce661d49..59e2b17e28eb 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild
index a9d5501cfc90..0931223de2a3 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 MY_PV=${PV%_p*}
diff --git a/sys-fs/fuse4bsd/Manifest b/sys-fs/fuse4bsd/Manifest
index cf759014f4fc..b1354529e445 100644
--- a/sys-fs/fuse4bsd/Manifest
+++ b/sys-fs/fuse4bsd/Manifest
@@ -6,6 +6,6 @@ DIST 498acaef33b0.tar.gz 116035 BLAKE2B f5f7b3ded2e65422c9df771a62590e71803884ac
 DIST freebsd-sbin-6.2.tar.bz2 1162548 BLAKE2B e00eaa3de0e4136ff6c95e64d1909ac0ea9543c653a3492e761ad7017512b0ad62e0f49c6808aa2f8721bd0a7f21ef221cfea12f5c863df567612a0d1104ad4f SHA512 db46b03f324713ea03d38f453426b2b8d683e64e0b8bec7de70332a62855f5d3b81169c8bad37d8f3d2a35edf191165894e9e450200d9795d2c03d7675d17329
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
 DIST fuse4bsd-0.3.0.tar.gz 168068 BLAKE2B e5beb73d1eff5cb87378cb6d3c1ed502038e55ad310716aaeb7d2f030e55b7febb09b29f978735e63a55b3dfafac7051472814455ee6a38b5a43d1eca7f5a583 SHA512 1e65150ed5aa798e92007c95b4588f1d8c19e04ce7433d28ccdbc1b1492e319e0108641b41d7d6846494da6af4473d5d76ff81f4068b3dfda9d1463d8d995d3e
-EBUILD fuse4bsd-0.3.0.ebuild 1308 BLAKE2B a0892f045644e7c3e94b4ed8ef90b7a9d7e101ae5f605a47108af2cff22d219f6649960690527edfb0ba6471c4bf0d0489ebee1dcd9ce23ae4788619db6002aa SHA512 5d7a0f4d529c259b3c784c61a1d6173d3b0fe7d3668a0c056d6931bd9e118f52f655e43e43a1862f41161f8b643a0757e5140fe0d9a097f8e6b0e6a064c14b52
+EBUILD fuse4bsd-0.3.0.ebuild 1316 BLAKE2B 18fdcc5076e8090ce6064727e39145c4d994eafdb8e51a8e75c958a2b7983c1af2f29c25cfca01674c25c1903cf48f58c8e554153fe742ec3b2550a0a7a6b251 SHA512 98468b7b26a499a72959ff6310ed915ac37307128c91eb8858c4bee1fb613377fd2953da46515381bbb22e7b69810ecddc2f939c4e7d38c6fd680087eebd45f3
 EBUILD fuse4bsd-0.3.9_pre1.ebuild 1880 BLAKE2B cb84caa4d1beec93af3e9c43dfb0ae7532bbf2743f6c525acd744e6ea0f1ae024abcf1ff51b42128454151dafc464d6d3c1add6ca335069dd6332657bd2f058e SHA512 3ef2aabe3fbdaee4dbd8fff11434101cb0759025f9e90146b3d9dae2bd37e8e239f000b3819de0f9878015963aa31e248f67539326362ea8c4a534878d2b6730
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-fs/fuse4bsd/fuse4bsd-0.3.0.ebuild b/sys-fs/fuse4bsd/fuse4bsd-0.3.0.ebuild
index a04605e252f7..48be31201d91 100644
--- a/sys-fs/fuse4bsd/fuse4bsd-0.3.0.ebuild
+++ b/sys-fs/fuse4bsd/fuse4bsd-0.3.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit portability toolchain-funcs eutils flag-o-matic
 
 DESCRIPTION="Fuse for FreeBSD"
diff --git a/sys-fs/genext2fs/Manifest b/sys-fs/genext2fs/Manifest
index 4f5005b22227..e4f37c74d7d7 100644
--- a/sys-fs/genext2fs/Manifest
+++ b/sys-fs/genext2fs/Manifest
@@ -1,3 +1,3 @@
 DIST genext2fs-1.4.1.tar.gz 103283 BLAKE2B cacb6e5e5e69f9fbb8550e2b9d79e41d4dd58e2bcc5516a79476918203e5b8ebee0d12a6a6463ff4ec659249a6647881b2728a8d6936fadc298a1e0e68833bdc SHA512 1b9ec7044014423345ae6b09862ba6903f5b3e0f68fb8bbcf97daf2705471cc1633a9fdbc5e00afe1b191e1af7bed87bde2e538bc7365469218f2a00b062845c
-EBUILD genext2fs-1.4.1.ebuild 447 BLAKE2B fe130a958759f6e97616c0472c34ccc22224dc4052c5891700197436d62c4b4e0c7ee6fef1d6e1cbd6aa79fef88b09a3433c1855ea6a4d29a2275bd0c3707e8c SHA512 80fd0ec26d8e640354de35832e715dd17d5f85523669c50365609d7243f1fc0dc9ddaed7697562993d8e3fbc2b3c306c0c508223720867c408b313a83a82e4a5
+EBUILD genext2fs-1.4.1.ebuild 455 BLAKE2B 307010396b46e9c17b3548cc035381da2409bd5e3601187cf281dc9b5b0fd387bebe9328b7e7b6513646d79c26ff4201f597e62a1fbdffdd0b4017a90c7d3787 SHA512 b5bf6f82ff1ff7afe62824bb19643b4bbcfee42d4eff6ae68b42fff33b7728c2df36ed8c26ce3e844cb0a5325ca84d615f2c436821e845c974558eefb28a56bb
 MISC metadata.xml 330 BLAKE2B b21c94403f0372dce68388b52978890823a6a6b50bd20c2b1ff4691b713f9a29b66018401773ffec48c9bd1c4a4528977e9b3a1c89e9e097ad53d79f85a92f52 SHA512 8e48e07c5c2ca3b935067bbf1b66524f1c9d83393df4efe704afdd37abd7041688a63ba59b3a3441fdf62dc97d75da625b89a0125f2872e63f9643f2f1845dbf
diff --git a/sys-fs/genext2fs/genext2fs-1.4.1.ebuild b/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
index c9db85526b7a..7702d2c004c2 100644
--- a/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
+++ b/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="generate ext2 file systems"
 HOMEPAGE="https://sourceforge.net/projects/genext2fs"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
diff --git a/sys-fs/gt5/Manifest b/sys-fs/gt5/Manifest
index a9539d599503..ed57d7dbd67f 100644
--- a/sys-fs/gt5/Manifest
+++ b/sys-fs/gt5/Manifest
@@ -1,5 +1,5 @@
 AUX gt5-1.4.0-bash-shabang.patch 292 BLAKE2B a02a35d8c11c8faad446b0f498569b21d6f7d25f974ae811bd3fd923bb50cda827b26360956a952f7f1c61013f4a2b7701603c0bd7d45126c3ff3cdcefcaaa18 SHA512 d8e58bd47e3e2a867b54852ac73148618679d286a9d5ea93d19038be2ad34375ed150eaa33b095a18724cd40f0d0df61df31630cbb8dd936615ec7e6b595e032
 AUX gt5-1.4.0-empty-dirs.patch 339 BLAKE2B 3c2aa49043136fbaa1e95323418c7908cb40f1ed6c8a7a8537e282a67d440fb04e4d076a1edede9f1d6957e8ca4ba3eef658f2d295d70e47c1b5cef73d2fc19d SHA512 4a494660e10ee7ecdd8aa56ac8a25d6e544c42a535466119fd2702ff9bf0cf0e26e492f2e98a34ea4b5741c20357fa6d2b600dea76f9ead89b20cd9461f86b9c
 DIST gt5-1.4.0.tar.gz 16504 BLAKE2B 67d8b7dabc269268cb220b3f7c954dc71ccdb563dc5da89fd185ab65f3c67c6268fec8930f09f01591d6c192194134ea389cc84b6246d5e8704439d6935df5be SHA512 5006a033ec203e229cc56db90af6b92d20b6cf0de4602abf3dec65e91906991d80e8682767ab10348ff8351baf919e515e2e950cf0d9d9210956916e26ce10fa
-EBUILD gt5-1.4.0-r2.ebuild 588 BLAKE2B 89f927fd801d343465ca6d70d47e9dab8bf5fc27cbb0ccce14a1f9b8361c8b661b6908b5d435c38b8e6d4826bfeb91be0d5ab02c6a4f7d6161245d8fd292517a SHA512 07a4d6734dcaaa5a2ba8887a9e89b3f9a37ceb348ace8ae3bea503f8e5380d12bef1c9e883a59ed991550b27be46067bb1677138bcb1f21a28cc4b5211a8646b
+EBUILD gt5-1.4.0-r2.ebuild 596 BLAKE2B 97864d416109328080f94e789b0b46a6cce45a4beb7b1e8c4d8d3c332f8226884b7430a9390cff5f4499dcb5ad3a48c3e025f9cc4f7b13c05c22a089961de8d4 SHA512 b8a4e54416d72f319e913c0b2537274ea2443deb6a962d346e5ef7864b4b0f55100e30aa37ef1089bf31a32c10c878151fc9c61a9a61c579516f4c48b6c26979
 MISC metadata.xml 212 BLAKE2B b29985d75b22d59331d01ebabba4317641420983914c178252e4e044d09b5cd735b548902d3fa9519311f645bb60128fceae61f4c3f2f6ea652e56695ff2ee8f SHA512 d2990d0c4d09e385a0bc11dc828709472a395b01ff9a77a08c9317d226fc47bb2bd9839870547220ecfa8993fa73c9f9a78e291e1855ac948494536ed7318d2c
diff --git a/sys-fs/gt5/gt5-1.4.0-r2.ebuild b/sys-fs/gt5/gt5-1.4.0-r2.ebuild
index 8385aa87dfcc..41df9c34df7a 100644
--- a/sys-fs/gt5/gt5-1.4.0-r2.ebuild
+++ b/sys-fs/gt5/gt5-1.4.0-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="a diff-capable 'du-browser'"
diff --git a/sys-fs/lufs/Manifest b/sys-fs/lufs/Manifest
index 845360c87773..7a2d752376e6 100644
--- a/sys-fs/lufs/Manifest
+++ b/sys-fs/lufs/Manifest
@@ -4,5 +4,5 @@ AUX lufs-0.9.7-gcc43.patch 877 BLAKE2B 9cd53781407225cc84b29726412bcfdd924625260
 AUX lufs-automount-port.diff 754 BLAKE2B 83b54abf4afcee61639530d781f18da370420d5dc5f9c52aa07900ee071bb7870b521f52ed42d08a5cd19c4a3dc79236e35b6909d3f171f217f9ba63ab1f9f9c SHA512 006149b123cf052e3b3e16cf301b05ae7604d3415a40c069a536afe5f0c8ab503dcc6e518f6323a0bd25a5597300f16535ce5d9caf3fb781071331271c4cef3f
 AUX lufs-no-kernel.patch 3347 BLAKE2B 3519852a28b8d4d5f38f8e90056272d2f43f896c8118161c5ee7166ea63a42e8b3d2787d2f9baaba3b4ef5446ed824c2eadfe9e334c26a78911dc7fcaec48fd0 SHA512 690e12928f206856859f94bb2ed4a9ca0d6e34fea2a9cb84c17293e54ee0230e2d01bca11cbd3ac5298f442483b3be3fb557129a044905738139b997bcf20743
 DIST lufs-0.9.7.tar.gz 537772 BLAKE2B cc0a22a1711c9d6fabb310e760455fe50d427a323ced7c5289ff00392983a14cf4ab9921fbe33c2889cea4478c16ba448db6877b585d33c5a3795838568edb74 SHA512 c7c70de89bd3f31e4fbae3e4a4acb04a6c29d0dac2b52e18a99dd2563db57ca9b3ff5e3fef53b45b9eea4b689122a30fef887973a9eb6e13b12c38fc957bfb91
-EBUILD lufs-0.9.7-r3.ebuild 1691 BLAKE2B 3f70aacd4c132499bef55acb20e2b5ba41efbf49733ee4ec1c7d95d76bf1c4578ee505d90d8f6095cac7c50eb09a7adfec2bd67d51a08d595efb889f8eb4265c SHA512 8aa699b80adebfc42eb35c380a284fc6e56bcb724ebec310aa9034979932535eb9a593332d9bb5d1c8de3ce5a7811301e09e03e0816a2efdfe0de4c0235cfa29
+EBUILD lufs-0.9.7-r3.ebuild 1699 BLAKE2B 5d55a40b7ba674d24061e36ea5747fe4b3c8d94329ac04a1c23ba7072f37d4531c53e8a7ada9783b805a67d894dbc2315968fef9d046c2c6ec87b81601a3151b SHA512 726daa04c5d0ecfaced8888cd0a1abd9556a5560bc7b967f81fbc2ef20e4a3d864b46c4cc1da0d81d8cd6c6c12c1987a81defd3c7263215654d5c5a11d3b53a1
 MISC metadata.xml 324 BLAKE2B 839b0c3da99be949242c9193de8ae875e6780673053ef5201df7ddeec61df8a921272b9056b5acc63331efab6b02db6d94e441354a7ea68e54188724e2f95375 SHA512 0f93937ea367a04e67b3d03a4a000b4e020a3ac4ca432eaa9dccfd82211a3db52afbeb4f3fd800e2164fa22dfa6f70ffbec6ecea44aad8aac8dc675920f9ac19
diff --git a/sys-fs/lufs/lufs-0.9.7-r3.ebuild b/sys-fs/lufs/lufs-0.9.7-r3.ebuild
index 97acfc39d2d9..1946b9ec0eeb 100644
--- a/sys-fs/lufs/lufs-0.9.7-r3.ebuild
+++ b/sys-fs/lufs/lufs-0.9.7-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils autotools
 
 DESCRIPTION="User-mode filesystem implementation"
diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index 99c5b5edc726..136601513592 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -7,6 +7,6 @@ AUX mac-fdisk-amd64.patch 5154 BLAKE2B c8bbc117df448bc4c1181d9c172bc78dd5b1fd021
 DIST mac-fdisk_0.1-13.diff.gz 19615 BLAKE2B 75f81f5adcac44803e581b0959a13e27cb588fb7220c19e2ea07f8784af4eae2b1f39c3e268a0bbed8765fc3d430805b2ef13f87cb7810d1e0a758b1d9c751a3 SHA512 adc34f20e73ae91c39acb073f70f0041a4a0726985fc5e5de34ae433996b3f719ca4193cce51efc6599ba1773ad63fee045a8d72b6bd8a036c188d762626fe57
 DIST mac-fdisk_0.1-16.diff.gz 19896 BLAKE2B 9383a22fb02f44d23802dd57acdf3e956c68aad17927030395f03c0422237fb6420430277b3bd512b8267ce0e36dee7b19355820fb5005db646bc21748221ced SHA512 deb44217afae097594e14dea6cd128f6cb1e8ed6e62e646d2aa311508ea27d164c94187e8eb1f1d018ee6044346f6785770981a655b6ad536dbbce550df13359
 DIST mac-fdisk_0.1.orig.tar.gz 55817 BLAKE2B d193be6b06be562bcb3297300dc009ac28adba41ea5d7c1a5bc0d16b8f9ec8275e1ad015c9bc529c3aafd12cbd9012e1af7baef7259ce0c8cef4d6dc62986dec SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120
-EBUILD mac-fdisk-0.1-r7.ebuild 1340 BLAKE2B acdafaac0f8f66c78235da62e15ec363317561e26ada32a1b9091f3df354d3fb10291595b29b14b75d6d64719a17607bb68e04c615961310f685a948b03167fb SHA512 139a221e8d45b7a96239c7370ae6af216c2c9806aba381ccdb2c666565620614f28af22f016e89fc3762e0f68a27bb1e5173d6d7997b85e54a3334c96fbcfffe
+EBUILD mac-fdisk-0.1-r7.ebuild 1348 BLAKE2B a0b4d9462e7c45a0cf57c1cd8652a5f3ca42a1d9e50f3c601bcb93e99caa666c34a6567bc34b68b4d0c3395934b34394eb70dff13f7d66efac8d40fd8b7ec83e SHA512 4ef48d9a3ef95d08ac60313c40fd7cfbbb41d42940065cebf1961d7705e4510a25ac5eca7732f948692d6bd861ffd019dd436aa55a7dcdf353c0d5dbc2164988
 EBUILD mac-fdisk-0.1_p16.ebuild 1239 BLAKE2B 084b93ee70e4b374b5af24c57f78cdaf03d8247ef57a60bd2235fe0770e5533e5e76f4fc69a13f8dad5f3fbd67399d26690795bc3c1733eca1752cf529a19b3b SHA512 f26c8731ea781eee50c6d08425a812f91128aaf1e5ec1527f793b6ce11acee91420e0ddcd47e2c1785fe06d0e3cfe2c7b7469e00fd9436b99baa66fffe22def1
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1-r7.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1-r7.ebuild
index c8b135ad6cc6..c90e46faee0d 100644
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1-r7.ebuild
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1-r7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DEBRV=13
diff --git a/sys-fs/quotatool/Manifest b/sys-fs/quotatool/Manifest
index 02154e2fa9a0..273673192454 100644
--- a/sys-fs/quotatool/Manifest
+++ b/sys-fs/quotatool/Manifest
@@ -3,6 +3,6 @@ DIST quotatool-1.4.13.tar.gz 130830 BLAKE2B ef0270e5787270343309b084f9d15287e7c6
 DIST quotatool-1.4.6.tar.gz 114836 BLAKE2B d505453798a44b217d740b4d68364e07eb581928803d49d146ddf96e4bf0c83d19ecd3a0c5b85cc3b44911a50890960c0315ae76c73e4ad2419827f0ce20187a SHA512 ba764d4348ec0f4f032758d16dbab9170122556a5bcafd5ef226dd1d924fb029b5ecdffb5a8c1018c26350e239a403e353f56833639e44e1fa51eefa43b263e5
 DIST quotatool-1.6.2.tar.gz 147691 BLAKE2B 22eb1f5012b0dd19d52a795a493e7a51e9bab0d6e71b10d632a4f61faf6b54db5b0b6096fdc38b0fdd2879ebc2a4cb44e7279e735e09436a9def5018814b3478 SHA512 882bdc43e49ef69b1b2899da01faf7853524f67585b716bba195ea89a250a90a7796a225b7d141b68bf45c7524d9fe506000998e6e7dc113b559f95e6ed21e2c
 EBUILD quotatool-1.4.13.ebuild 503 BLAKE2B 5af87c9f8fb7e07e3548b48576012b754cc96752ea9b1c0a80a3d9c16bc95e10d7dfc2c1c7a94b5c69c76b401b5a3acaa708473be216b031581cdc46885550ae SHA512 9cf22fb99b0559c90cbc4a0ff1f57625f78a8388eb439a880a3571b5d42c49b3f58e2b1e8b5c08f631fe69d66b7d7e3131658d204bdfd777c6515012a2f8a0d9
-EBUILD quotatool-1.4.6.ebuild 438 BLAKE2B a14ed4f50f994e64bad6653c3075705416a24da6917f9b6e073da6893893c2ce879d2081fb4abd35a62d329aa6092c87b6a49db033839e84d2ea4fc648bb9008 SHA512 e2186db37731e41664f54c383bc01ebd3f21ae961c5ac7f9efc46072bc29d7e0fff8fa64402b2478727b8a6adc1b07c84de37bdfdcf64a129343e02522d41d2e
+EBUILD quotatool-1.4.6.ebuild 446 BLAKE2B fe64ad2f171719cd3311c3c1614c3aaa50c5f2392c17da233f934c0cecf5f45c0a62f7a501dd42a4de6d7b06dfd99919914f5c8f8eab19f66e8e73f96d377efc SHA512 9f2e74dc66b950d223ee13f5cbc07a28a32f710e27aa6b6a6423bde2f09ab5f1202954ea8932f8d4b9389bb21a6c933930ef17e6dd18896cbe8acb491259d62e
 EBUILD quotatool-1.6.2.ebuild 503 BLAKE2B fe0ac788b3689aed84276ee14033b041a5c17abfb3ef447a43e69437eccbfe4edcc200dc866e6cb461d6a44b56d6b04f1153863aaf066aabeb5155b037109afe SHA512 aa0b6922e86935e427c7c8f17e152338625eed63dbc3d182e993ceaeb27e9bc33ba45ac3fac60f6e8e0de462b9460651a1571c87f4f99cadf62f0e8d6d1d4314
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/quotatool/quotatool-1.4.6.ebuild b/sys-fs/quotatool/quotatool-1.4.6.ebuild
index 60f8d619aa70..15c31a46421c 100644
--- a/sys-fs/quotatool/quotatool-1.4.6.ebuild
+++ b/sys-fs/quotatool/quotatool-1.4.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="command-line utility for filesystem quotas"
 HOMEPAGE="http://quotatool.ekenberg.se/"
 SRC_URI="http://quotatool.ekenberg.se/${P}.tar.gz"
diff --git a/sys-fs/scan-ffs/Manifest b/sys-fs/scan-ffs/Manifest
index b3184a485636..37fa5ca82712 100644
--- a/sys-fs/scan-ffs/Manifest
+++ b/sys-fs/scan-ffs/Manifest
@@ -1,3 +1,3 @@
 DIST scan_ffs-1.2.tar.bz2 5119 BLAKE2B f6a1f62a01a4bf4cd059b59005178c3625f84117c398a98bf3bcf285a02635b75c031c1bac1fcd78ffe61f4daa2b1912d0b9e76bbc7f714a530a80e4c043fe02 SHA512 5b4260148a6997bd246a69c4c66069d5b0ac811ea0477e58ea2eb8594fceb3013f8f056eeebc703b1bcba8839e16eaeb177af254c7bba264ab791686986eecbf
-EBUILD scan-ffs-1.2.ebuild 455 BLAKE2B f9460249203ba10198e1284db3172dc6813ec5fc5a9e17dd0d932b444ba82f14356b0377a4ccb124c9aa8ac484bde29398f9354035901d3da32574b6e7a018a1 SHA512 f4d53f757045077363479bc23faa8552c7a21a0de4878bb7f9a220209ac037527923edf356927c1e438ec5ac2dd2f1e74f2bb5bcdd07f2a14fb39159eb445046
+EBUILD scan-ffs-1.2.ebuild 463 BLAKE2B 78b10c66cd362288a011fb0c6f9ff8508c90cd7e8b986091d03c2c2b7eee627fd6255bf89b9bf30bdbd83867a3b743b7cfe8571f8f854fd13c32808ed2944497 SHA512 2f4d6789fd4196774b79804f435ec8d4395f6185b61457a217cd506f9b900424d589d6b92a16fbe4f1dbe976f41b46c6bd792ae3f2d10203112d7e78d23146fb
 MISC metadata.xml 898 BLAKE2B ec69447df9e4af5d64415eb71de44ad2b99b3362c9778f48a7acc70084ef4c33a30467e3ba5b620a8b42b776dfcde55679c89bda1cb3ec97086d794437d88995 SHA512 109021dcb944068b630b6df24dba12ea87468ef0f8b6f478751b0c0153e4a0a503fa86bf8abd1fc8d006a9acd8374b555f655939482eef76edebce58cb7cb3a2
diff --git a/sys-fs/scan-ffs/scan-ffs-1.2.ebuild b/sys-fs/scan-ffs/scan-ffs-1.2.ebuild
index fe8ed4e73013..428dbc07f638 100644
--- a/sys-fs/scan-ffs/scan-ffs-1.2.ebuild
+++ b/sys-fs/scan-ffs/scan-ffs-1.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit bsdmk
 
 MY_PN=${PN/-/_}
diff --git a/sys-fs/wpflash/Manifest b/sys-fs/wpflash/Manifest
index d5da7717c0c2..25344f89a39e 100644
--- a/sys-fs/wpflash/Manifest
+++ b/sys-fs/wpflash/Manifest
@@ -1,4 +1,4 @@
 AUX wpflash-gentoo.patch 5050 BLAKE2B 528241546947b4cee097d1b41a9a9aff2b1b14857ab88eb10a0d23ea6fd408ca897ed3f63158400a2f3c22c3e45316c23d5c46d34ee0d7206d165ea48719bacb SHA512 1d6be3acd401a27917ed8da6a773505a3a54983db0e958422d3f75f2042f50d43ef1c5cf6f81a73a9a109f2cbaf5cc0179a5651ff47a224855cbd12583030cee
 DIST wpflash.c 25813 BLAKE2B 904eb93626db284ec16a790f301473f7a5d7b1f6fc5e281ff7f7c0eba121554199c9a8edd129136f85db75eab9310caa83618578db9993193a28a3666c30a33f SHA512 b0605b15d29a96d8dae052131f0a55b09eb230d05543c8a25a727ac3820397459d108c9b19fa95726ca7df12b4a733480f5c01587deee24a5fb8be9d1a0beeba
-EBUILD wpflash-0.ebuild 531 BLAKE2B 8795f15bfef513e81b8974918761feb9af916d99b9c542dd06716863a34194c011ee5962fedb888e5c6871a564c4af3c712bb093e60c0506d9200eaeebb52be3 SHA512 4c1cec44e50284b95cef30ce1abfb5d983d16d6768544db8d678a8206dfed2aeecc4f55e06f2316eed69ba799779ca40d6bb48c044d5e6ee1d6a3cec16ca6c75
+EBUILD wpflash-0.ebuild 539 BLAKE2B 97da1ed5f394ae747794d8d6674c2578aa466359bbd3174027136a05aa430ff98beabbb21f73055ed33786282eddfbdf13b9d3160a5ae43e9bde5224e64bebe5 SHA512 7a3ad33f5c1c4826e2322468ddb3e59de92d81bdb56740b898f986a48ce130de6e5787227003df9a23bd73323f36b4a43365d01507995be9f92db93743fe63fa
 MISC metadata.xml 255 BLAKE2B a9541f4bfab6e4a12975e8b3d56e433e65828b6376510448f11930d35451e23cad5bbf264180f150629ce9c1dea24eb7fb4f2b3f950ee5ff5d345811e017773a SHA512 4408b5018e974df4d7508f29e255f318bbd09b4056927cae6406ff1f427c06d5d655f677a28440cb84af04e411c88e4582f9ad1ea76829afeee0bbe4e3841c2f
diff --git a/sys-fs/wpflash/wpflash-0.ebuild b/sys-fs/wpflash/wpflash-0.ebuild
index b3d5b9b7cd8a..a273f524ebbd 100644
--- a/sys-fs/wpflash/wpflash-0.ebuild
+++ b/sys-fs/wpflash/wpflash-0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils
 
 DESCRIPTION="flash the firmware on a Webpal"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index e3abbea7b671..24a7293592b9 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -8,9 +8,11 @@ AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13f
 DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506
 DIST xfsprogs-4.15.1.tar.xz 1188964 BLAKE2B 7b4d1d2f71a0678f9246045e576262d6f3b3c59322e0b33b37dc46d84cdf5407a4b2fd6f2b99dd7647e9bfe9fe312fefe8162013dec9162f3a071421323aa52d SHA512 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee
 DIST xfsprogs-4.16.0.tar.xz 1199088 BLAKE2B 1de05747164eb695c10644f05845507b0a2daf55563af13b3177588af4114d40c0e72bbfee4cc47aaf86840f648d4fc34837797975aed3490321a1122f86e277 SHA512 0ca0cb3347ccc103f92f496016beaf5e5742fea2a4ca8515f6e340537e446df09483d9d30ce159789eb05a73430f8d517e57d1a8548029f1e73c108484b4e6e8
+DIST xfsprogs-4.16.1.tar.xz 1199632 BLAKE2B 26448ce8ec691d117c0b41aebcb692994ad5a65418ac5af9631eab75191201a265ec9bce92d4076049a4182a879741329f20e5f54343afeef826cf1dfbfcf0d1 SHA512 d3cf3b07e07864341c351a078736ff7c721d86c177e65f131dc6e023cade74a5e07fecbc435d69946d76d587b138e66cddcd763954e15ed0dd17c056a83e2a19
 DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62 SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7
 EBUILD xfsprogs-4.14.0.ebuild 2660 BLAKE2B 04e627acc5c922886524a97463c8da7b56995a12795a2b91bb71f7390bb9c1e7adc55a6ce7c473e819656bab696a6abba5f033b07e9dfec6e8826a4dd1ec730d SHA512 384017672d412e9e27fea265ce818e848c37aa8989c613d2b6849680a00e595bbc79f4fc08f3554da3a29a755122d86fa4ad943af14c2371f2c9fbd93303df36
 EBUILD xfsprogs-4.15.1.ebuild 2778 BLAKE2B 030c61740f4afadb66a9b2bd092a20b5670ac89634fd266289b94e8f0279c7b1890cfd83f907a8d4d3dd8e4658def5b4a8c67f7fdd83e0ab9f0faee65501a1ec SHA512 72a8a669e0b343ae3f8b3ba1ba1d0bcb022a7cefcf3151dda4cfb0cd1cd67a797783b837f3c18fcf61c6e5b6244dee021af1b181d3abb7d26c7f534a932e80a0
 EBUILD xfsprogs-4.16.0.ebuild 2778 BLAKE2B 030c61740f4afadb66a9b2bd092a20b5670ac89634fd266289b94e8f0279c7b1890cfd83f907a8d4d3dd8e4658def5b4a8c67f7fdd83e0ab9f0faee65501a1ec SHA512 72a8a669e0b343ae3f8b3ba1ba1d0bcb022a7cefcf3151dda4cfb0cd1cd67a797783b837f3c18fcf61c6e5b6244dee021af1b181d3abb7d26c7f534a932e80a0
+EBUILD xfsprogs-4.16.1.ebuild 2778 BLAKE2B 030c61740f4afadb66a9b2bd092a20b5670ac89634fd266289b94e8f0279c7b1890cfd83f907a8d4d3dd8e4658def5b4a8c67f7fdd83e0ab9f0faee65501a1ec SHA512 72a8a669e0b343ae3f8b3ba1ba1d0bcb022a7cefcf3151dda4cfb0cd1cd67a797783b837f3c18fcf61c6e5b6244dee021af1b181d3abb7d26c7f534a932e80a0
 EBUILD xfsprogs-4.9.0.ebuild 2717 BLAKE2B f24db0e5c16988192a849e6d42a143e103adb7569dba8a96cb5c6ac08d97663f9259c5b31073f2940b9a2e971c850b7ca200945f1bbd86f879a7a26d2e11f30b SHA512 b604adb4f3e3cbdf8e35d44d53e1c24d6be61552e0f4c14762d2f9f706d33a29226cbd30b11079faa2ecbea35ed85b45fe7908c2f0c9886dd698e2e607ddfe6a
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild
new file mode 100644
index 000000000000..148d4aa1cf89
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib systemd
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="http://oss.sgi.com/projects/xfs/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libedit nls readline static static-libs"
+REQUIRED_USE="static? ( static-libs )"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	readline? ( sys-libs/readline:0=[static-libs(+)] )
+	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}
+	static? (
+		${LIB_DEPEND}
+		readline? ( sys-libs/ncurses:0=[static-libs] )
+	)
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
+	"${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+)
+
+pkg_setup() {
+	if use readline && use libedit ; then
+		ewarn "You have USE='readline libedit' but these are exclusive."
+		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
+	# Clear out -static from all flags since we want to link against dynamic xfs libs.
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
+		include/builddefs.in || die
+	find -name Makefile -exec \
+		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
+
+	# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
+	if use static && use readline ; then
+		sed -i \
+			-e 's|-lreadline|& -lncurses|' \
+			-e 's|-lblkid|& -luuid|' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	export DEBUG=-DNDEBUG
+	export OPTIMIZER=${CFLAGS}
+	unset PLATFORM # if set in user env, this breaks configure
+
+	local myconf=(
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable nls gettext)
+		$(use_enable readline)
+		$(usex readline --disable-editline $(use_enable libedit editline))
+	)
+	if use static || use static-libs ; then
+		myconf+=( --enable-static )
+	else
+		myconf+=( --disable-static )
+	fi
+
+	econf "${myconf[@]}"
+
+	MAKEOPTS+=" V=1"
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install
+	# parallel install fails on this target for >=xfsprogs-3.2.0
+	emake -j1 DIST_ROOT="${ED}" install-dev
+
+	# handle is for xfsdump, the rest for xfsprogs
+	gen_usr_ldscript -a handle xcmd xfs xlog frog
+	# removing unnecessary .la files if not needed
+	use static-libs || find "${ED}" -name '*.la' -delete
+}