gentoo resync : 02.01.2018

11 files changed, 142 insertions, 163 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 54a8523e1d3a..2c66a1d046a3 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index 62d943bdd6bb..e9fc2cff114c 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,16 +1,6 @@
 AUX duperemove-0.11_beta4-sysmacros.patch 259 BLAKE2B f2749d5b372244aae43d54698a33175546c434718eaf205bc55984652a28a6607d34457a840c4500e12a1bc3b088e658665627364cf2a141d6a39a96cbddc310 SHA512 59decd2c3d761faf683edf807454f3a00f4c71ce60302b2fb9e4ce7408f449659f714ec71488f4a69dd1d1a12bd1e5715f2d897e66fc947adf3cd1d70ac63790
-DIST duperemove-0.09.1.tar.gz 54978 BLAKE2B b1575dbd2720f4001f2a1f53637f171063b0195b2c7cc4c01597948e447991d3a13079d54f7a1133ac1a937a5ce82e14a3724909aa820da8ea06a4e78dcf8055 SHA512 49de99b64c8b0a71a47474480f33b07f2e6602c355621a9d0c6c92a3b7c2f2f5e6c03abc4e2459a1b96fa9543767c0abe48c5c63daf53962a3033a3b1984a037
-DIST duperemove-0.09.2.tar.gz 55715 BLAKE2B 32232e9da10dd41dcc9bbabe8ddc0d147525310feabe362592ad2b2ad16c25b66110ab73d0d7fcb779fb2d27d3222b3fda0f89a438989ff3c67354a59b8fd0d1 SHA512 acc1c16ed3faf08e54d4adfcc9f852d2c967981bc461ab45b0673f46f2e86109020d56e641da9764d46f2cc53cbcad5d2aa014357a819ae170375d784b2c08c5
-DIST duperemove-0.09.3.tar.gz 55722 BLAKE2B fde83eb04fd531ac01d48bee2945fec73004b716cbbdcdb34047286daab3fe0f07d9941d4792f5c67a92407ac3688df21d0dce8e18e43690d1faf70c4225b090 SHA512 fe2a19088ec9ac3dda35da8b9580ddcc1c3b49e60824f2c1bbf8c013756c060b4c9663d1977bb6622c4de19754fd4a1011cc09ef3c785c2b4b218e0c9fb15b87
-DIST duperemove-0.09.4.tar.gz 55725 BLAKE2B 92b91cd650be46da61b55c0b43e11f26f4861ef13f8703c3246b9610c66235effd05199740104f1903a237beaf5b726415fb72e4a49adbd696563b9db3d41d56 SHA512 dff728a34bdf8df71aa13b7f9c8ffae8ce643337f4dafacb3ceeb778d326b1885f63ae03215c6d714c4fcd7b2f26b03e47d7ad3a42eca3f2d5de5b596b653bf1
-DIST duperemove-0.09.5.tar.gz 56175 BLAKE2B 0805503720434193e7929d8fa74283db459949648e9df1ddfeb7aead6ecf28f86f0e550a415173daaea0b73d8bc7c1a19394941344ca52d9f5e1e0ba1f43047d SHA512 111127d9ab7d5567de8393197cf5bc977db1f64b7405fd848e1ca5aaa5ca7a3057fa06b61b161d0dfc45e0c5ebcc2406218d9a834db519c7ca348cdc7a0fe2f2
 DIST duperemove-0.10.tar.gz 95656 BLAKE2B d52916f21f48a929db98a4cb132b41030b4f8b884851242690aad8b0b4faef12bb176aee51bb16cab940495d033b2467e0572e0b54d9533c920b8da4d3a1f719 SHA512 11bb1a9937b9ca7969b9176bb4cfc8fff91c257a8645baa0ca0ec6b634ae3c464712414f856d5a75ed16c6d13f0ae85ac3584df1f474575a975cb20ae0d7a9f1
 DIST duperemove-0.11.beta4.tar.gz 114532 BLAKE2B 76301204c87c0978421ede7652dbb9cbc273f5ef4a99c709517b1421ec7bb94bafed9465a744c9a42c74c6ee936de1a1e5510a58ed36c7ec783436cefeacec69 SHA512 e3879f558026a11d34c996243eeeab267bebec508a0bafa76ad563fe81c3bf911650745f27bd449c4d788c302b08324bb780e4d86dc5996678e06a1df233a286
-EBUILD duperemove-0.09.1.ebuild 473 BLAKE2B 13976a991f35495f6c968a38ba84d45513ccdf3d09dd49ec3217cddced5b948919f0e6095105828af0bc22b5459b104862243c7284103489bea52bcf8af89c46 SHA512 4170bf829851b9b372519f21e9d9fb2d973477f8694b785a46de92fb94498650d12127a0b15900e795d521ad86f99fcb580f6fce685700573ee9d8c0c0ecb948
-EBUILD duperemove-0.09.2.ebuild 909 BLAKE2B 680ec2cea3c169c0a67361bd5e9760165f4e85211e6e1d505831fc4b8f83b2b2b9dff20ab1479f5cbcea38dcc1b39f9c781af5b26e5c0cc697f221b080b7b966 SHA512 1141d45db5cb3d3cc2d891552ca36c9c40a439cf8e27529857dc579e72fceadfe891ce336fa16ecd88367363e5d69dad2abb19ca95c2b2441f18c2b7befc5a7d
-EBUILD duperemove-0.09.3.ebuild 734 BLAKE2B d124776c64576eafedfd2f54c7236cce40305b76f5f7bd5cfb78446667427127079cb1261954bdc785eec1e09fce8a6136ddb26e0f9159556285cbb4c65dcd1e SHA512 f36634414470f80342f41b1aaa766f2fc8d4e1c027636512cd0f9f4d0e3cfdfb8908d434ae4d609d99c36c2d92d273aa2664d406f3d1bd491670a83614fd9894
-EBUILD duperemove-0.09.4.ebuild 734 BLAKE2B d124776c64576eafedfd2f54c7236cce40305b76f5f7bd5cfb78446667427127079cb1261954bdc785eec1e09fce8a6136ddb26e0f9159556285cbb4c65dcd1e SHA512 f36634414470f80342f41b1aaa766f2fc8d4e1c027636512cd0f9f4d0e3cfdfb8908d434ae4d609d99c36c2d92d273aa2664d406f3d1bd491670a83614fd9894
-EBUILD duperemove-0.09.5.ebuild 734 BLAKE2B d124776c64576eafedfd2f54c7236cce40305b76f5f7bd5cfb78446667427127079cb1261954bdc785eec1e09fce8a6136ddb26e0f9159556285cbb4c65dcd1e SHA512 f36634414470f80342f41b1aaa766f2fc8d4e1c027636512cd0f9f4d0e3cfdfb8908d434ae4d609d99c36c2d92d273aa2664d406f3d1bd491670a83614fd9894
 EBUILD duperemove-0.10.ebuild 831 BLAKE2B 2f7902dd16acba90da55cebce325e6717b3af806ec55466d7e4bd91dad3d814f01b9818433ef6e59dac5d532888e1152e6a3e4d4ae040d438a0709a5b0f754f8 SHA512 1869181a31a17d9ae5a85d4034bc8d87105b2e05cb49071476b195ada90787b01ab1e6c42dd04771d6189aed03a512b410db77409a349a8af968fc3b4cc8c7e5
 EBUILD duperemove-0.11_beta4.ebuild 766 BLAKE2B c31b61f19033d159d6e0c8c91841027dc5cbea3f85a2098b2f34487eb035c6141f8b241e62587f7eeda5ad5a88865a38a0c3224bef90ba40b3587a47b55b077c SHA512 1b480cc6b94e974bd32ffd8f912d00f2bd1b542046bd0885d725de4fe7ae7fe4645d2f8b533fb182bf8437f3e77f9a1ffb79fe8dec2ce4db450c740538a4674c
 MISC metadata.xml 475 BLAKE2B 53dbd2deecde55b464cd06ba45fdc917e4a1b17232cb312400192be505a0ff870be87503857c513bfeaccf4c256748ad91af42d3e7a1cd1268f3e1c01ad9d86f SHA512 dc74d3d2be21f9cc6ac03cd6812d6e90bccd26bdcaf0a4e22f16ec7bae30e8cd252ac4b191aee2d4d94d45401ac680b9ee9ce8c7adad7a92afac908c9ab24de1
diff --git a/sys-fs/duperemove/duperemove-0.09.1.ebuild b/sys-fs/duperemove/duperemove-0.09.1.ebuild
deleted file mode 100644
index aea32e31e001..000000000000
--- a/sys-fs/duperemove/duperemove-0.09.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-DESCRIPTION="Btrfs deduplication utility."
-
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-DEPEND="dev-libs/glib:2="
-
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.09.2.ebuild b/sys-fs/duperemove/duperemove-0.09.2.ebuild
deleted file mode 100644
index 36b1db08909f..000000000000
--- a/sys-fs/duperemove/duperemove-0.09.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# https://github.com/markfasheh/duperemove/issues/53#issuecomment-89796552
-	sed -i -e '/glib2_mutex_unlock/s:mutex_lock:mutex_unlock:' duperemove.c || die
-}
-
-src_compile() {
-	# CC & CFLAGS are set via = so need to override them
-	# LIBRARY_FLAGS are set via += so need to pass them via env
-	export LIBRARY_FLAGS="${LDFLAGS}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.09.3.ebuild b/sys-fs/duperemove/duperemove-0.09.3.ebuild
deleted file mode 100644
index 17b2c00c5202..000000000000
--- a/sys-fs/duperemove/duperemove-0.09.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# CC & CFLAGS are set via = so need to override them
-	# LIBRARY_FLAGS are set via += so need to pass them via env
-	export LIBRARY_FLAGS="${LDFLAGS}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.09.4.ebuild b/sys-fs/duperemove/duperemove-0.09.4.ebuild
deleted file mode 100644
index 17b2c00c5202..000000000000
--- a/sys-fs/duperemove/duperemove-0.09.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# CC & CFLAGS are set via = so need to override them
-	# LIBRARY_FLAGS are set via += so need to pass them via env
-	export LIBRARY_FLAGS="${LDFLAGS}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.09.5.ebuild b/sys-fs/duperemove/duperemove-0.09.5.ebuild
deleted file mode 100644
index 17b2c00c5202..000000000000
--- a/sys-fs/duperemove/duperemove-0.09.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# CC & CFLAGS are set via = so need to override them
-	# LIBRARY_FLAGS are set via += so need to pass them via env
-	export LIBRARY_FLAGS="${LDFLAGS}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ae0a8447be8c..59fa1fc47360 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -10,7 +10,9 @@ DIST e2fsprogs-1.43.3-missing_uninit_bg.patch 1317 BLAKE2B ec53c0aca102e137fce43
 DIST e2fsprogs-1.43.3.tar.gz 7405892 BLAKE2B 158aeee327a1ca68ce1bda1f97c9fa25ba1bd78ea9ee418c8ad85d2bf422d49ea93ad6c1b33c9b7bdafceacb4c0975da776c6e5b2df8962baf0d368c894db5a8 SHA512 77e753f77222a0a7a334d7d93c900ea6cb339ed40af29952e414fc4e45d8c5c01d67771978a941195effe666df965746c2b31977c5f05ff307429b978dac8dea
 DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66
 DIST e2fsprogs-1.43.7.tar.gz 7492811 BLAKE2B 122158f0824de632b93fab651be60ca45096b5dac20438a6407c69577017a5f117ce402166b529072a81a2b6ac96f9237ea1a0f55d7d23d05ba758d42d86451a SHA512 71694c57d076517f6e1f2a5bffcbc49c32fcf11283e26739304f50ff0aae28646ea7af80dc85b636b87db57a0042a5bce82411e631f7d5c055440ebeadb90282
+DIST e2fsprogs-1.43.8.tar.gz 7474876 BLAKE2B b5d550a646facd2aae9de9758976e987ab6ddfc7c92fc1ea2ca71140010f3e10627a5dee5e17caa77746c6de508a652e26a31df123732603c9cbcc8df5edaa54 SHA512 158e9fa928de61716d57eeac1a64c3c40043c00594ce397419de71fc1f260f1a8f932971b1cef62ed8a01e865f4d97f6bc86289c3a60d33b160874b20744cbe5
 EBUILD e2fsprogs-1.43.3-r1.ebuild 4040 BLAKE2B a6100687d4e3edeb42d0328c592c9dc896aca97b883ead0bc866afe138dfb3a30126fb448fc5c30516d73c1a94c2fcc75dcf3bb6786ff36920850ca88ea5f84b SHA512 5053ec14ad968d6f4f8bb0cf0a227c0f56af71eaf0201fe7d53448c962f6f097aeb92b561381194aea58f5d3d99421d455ad50f280413d83ada6b281e1361c9c
 EBUILD e2fsprogs-1.43.6.ebuild 3794 BLAKE2B 30536b1a22b10fab64223baf79a8717aa6cc736fa94ee74dcbef4ef2a068ff0d5969b1a77fadc324ed8d81fcf1282f8e566faa130975befed2be83e570aaa6ab SHA512 79c0ebff04f84941e0959e52d4a0d5d5804fdca9ccad42c23d9523ce8091a1230f5e50a06d24b0f3bb8e125c9a71c80629d2ed58fc2fc5b49703f97ba176fe77
 EBUILD e2fsprogs-1.43.7.ebuild 3803 BLAKE2B 16d9ba317e345a07bd0505e3d6ebd7a50c2aca6e323bd9ee09e1a6390aa4965e6b5903d66cc52c82b19cbe9928fe4bc31613de5294eef8c521901bb648724ae0 SHA512 5ede2280b2d42c18e14315654f6dc092b02b757927ba1a4973417f514b6dc66f506dec85e69f1a0c00e177a3950b74bb42fe0994d15a50c2c83455cb7baeb7d9
+EBUILD e2fsprogs-1.43.8.ebuild 3825 BLAKE2B 4362d2301f7a41d03bd49ff2220274f4c459b8ea24b8df081a93eb117f605781c26a4578f1d80b9778a986eac6cfe8bc7d0a00e3b72b17d49789e93feaf4f873 SHA512 7cca30321f643180c7b7457e2e577467a0e85f7cf9523a6285c7fd5699db6b4cf04623dfd22712ba6bc2a3957a3976aa3f4300e22225d92108f6a5b0301900f3
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild
new file mode 100644
index 000000000000..ba0347721fd7
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz
+	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+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"
+IUSE="fuse nls static-libs elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+	>=sys-apps/util-linux-2.16
+	fuse? ( sys-fs/fuse )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+	sys-apps/texinfo"
+
+S="${WORKDIR}/${P%_pre*}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.41.8-makefile.patch
+	"${FILESDIR}"/${PN}-1.40-fbsd.patch
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+	# Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-mint* ]] ; then
+		PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+	fi
+
+	default
+
+	# blargh ... trick e2fsprogs into using e2fsprogs-libs
+	rm -rf doc
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
+		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
+		MCONFIG.in || die "muck libs" #122368
+	sed -i -r \
+		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+		Makefile.in || die "remove subdirs"
+	ln -s $(which mk_cmds) lib/ss/ || die
+
+	# Avoid rebuild
+	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
+}
+
+src_configure() {
+	# Keep the package from doing silly things #261411
+	export VARTEXFONTS="${T}/fonts"
+
+	# needs open64() prototypes and friends
+	append-cppflags -D_GNU_SOURCE
+
+	local myeconfargs=(
+		--with-root-prefix="${EPREFIX}/"
+		--enable-symlink-install
+		$(tc-is-static-only || echo --enable-elf-shlibs)
+		$(tc-has-tls || echo --disable-tls)
+		--without-included-gettext
+		$(use_enable fuse fuse2fs)
+		$(use_enable nls)
+		--disable-libblkid
+		--disable-libuuid
+		--disable-fsck
+		--disable-uuidd
+	)
+	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
+	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+		eerror "INTL sanity check failed, aborting build."
+		eerror "Please post your ${S}/config.log file as an"
+		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
+		die "Preventing included intl cruft from building"
+	fi
+}
+
+src_compile() {
+	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
+
+	# Build the FreeBSD helper
+	if use elibc_FreeBSD ; then
+		cp "${FILESDIR}"/fsck_ext2fs.c .
+		emake V=1 fsck_ext2fs
+	fi
+}
+
+src_install() {
+	# need to set root_libdir= manually as any --libdir options in the
+	# econf above (i.e. multilib) will screw up the default #276465
+	emake \
+		STRIP=: \
+		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		install install-libs
+	dodoc README RELEASE-NOTES
+
+	insinto /etc
+	doins "${FILESDIR}"/e2fsck.conf
+
+	# Move shared libraries to /lib/, install static libraries to
+	# /usr/lib/, and install linker scripts to /usr/lib/.
+	gen_usr_ldscript -a e2p ext2fs
+	# configure doesn't have an option to disable static libs :/
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -delete || die
+	fi
+
+	if use elibc_FreeBSD ; then
+		# Install helpers for us
+		into /
+		dosbin "${S}"/fsck_ext2fs
+		doman "${FILESDIR}"/fsck_ext2fs.8
+
+		# filefrag is linux only
+		rm \
+			"${ED%/}"/usr/sbin/filefrag \
+			"${ED%/}"/usr/share/man/man8/filefrag.8 || die
+	fi
+}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index b17b2b54a276..cad52a7156e2 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -14,7 +14,7 @@ DIST xfsprogs-4.5.0.tar.gz 1524382 BLAKE2B 7ff26e6c61081db37c4fb4a15abdeb3ece2c6
 DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62 SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7
 EBUILD xfsprogs-4.12.0.ebuild 2733 BLAKE2B 91254ce021009746a40486f0e2d4697b4b5ee8440b25cb9b0f4ee7166acc9a6a110211268b7485cbfa77bcf8e9f214eb2dad26bb5bd51294ff2ae324109068d2 SHA512 b163f664b954fd6ace1e3ce1ad352deab0a10050c8b0b96dba8446cd4d9cbddb31c6c043ce7bffe86975606682e6e268f0efedda544c107284c92e7b4014d63d
 EBUILD xfsprogs-4.13.1.ebuild 2670 BLAKE2B 12442b0cc0c254617ab5870ff5b4079fdca4b9510a2c43e1bace5128766f983e1a4a3183ffafffc348739f04d2156afe58888718ed8ac7c646c5796857cba129 SHA512 ab45b35a6805c8b55437ae5606f99dcae5edae90c2957c15653095d5efe16a13350d99b9117e13e55df9ea95b94119adb6d24b35e6f12635f2a17189f402f35c
-EBUILD xfsprogs-4.14.0.ebuild 2670 BLAKE2B 12442b0cc0c254617ab5870ff5b4079fdca4b9510a2c43e1bace5128766f983e1a4a3183ffafffc348739f04d2156afe58888718ed8ac7c646c5796857cba129 SHA512 ab45b35a6805c8b55437ae5606f99dcae5edae90c2957c15653095d5efe16a13350d99b9117e13e55df9ea95b94119adb6d24b35e6f12635f2a17189f402f35c
+EBUILD xfsprogs-4.14.0.ebuild 2666 BLAKE2B c12465cdf122aaa34eda17dd083807822d5bfca92f9f8ced8050b91321da735f49ccdb6c8f4e2201cded486eb5910ffcb6cffe10dde8b1b181b4bd2bc8faecca SHA512 1dc68589942943c0138c966e9d01c9abd4586c8f96d945c31ed6af6c1e93441bc56857d9229d85d3c9abb407c9461e70e2af2406dbe5a7cda9c3824f5237e07d
 EBUILD xfsprogs-4.5.0.ebuild 2876 BLAKE2B dc897627ade02ec497d20fd761c102737b1fce4cbd62b252ca1a4fd06ae393b87d67c78584c4af8d4c5f3f958e84ee69e808bf46fa7ac29fbe08db0cd03b6af5 SHA512 2b40573bc0cb60c3b2d6e77c1b1b064856cee0e394b371622da66e12c11792b1b48e6ab8615679b18afef3f17a7264680c9787d1fbb243c012ea837c3463a946
 EBUILD xfsprogs-4.9.0.ebuild 2715 BLAKE2B 11f3355289c0801b61a914527182d3488d5d5eb9aef53ce1433db3f3ea7c379b960d1fe7ffea06694dc18bc68ee1b87905b34a3efaf79d41432a7a590818bc2a SHA512 ca6f97b41217d7d1e238d366811c77b2fbf5a43e99c79805999ba25f955e6a76290dedd95a93242777e44410ed07d0ebc1810f40771a43fdffbe90f283e90bf2
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
index a77ca48cb15d..07b9803cbf8d 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+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 )"