gentoo resync : 02.03.2018

22 files changed, 633 insertions, 712 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 39ba004a6cd6..c4000a9fda99 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index e314b42f2aab..840c1126931b 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,17 +1,7 @@
-AUX dd_rescue-1.99-disable-hmac-tests.patch 1098 BLAKE2B 6a475990165d46aa49209eda0f6a7fc60840e2c323aed93089d8a3aa7f64434a0689c49937805b6943d930e206dd78d7e9899f5ea99ff12736ca09a06fcffc6d SHA512 66de8719daf55ca02bc98b6bdbdb02c27cb4632ef981205b5c250511e058bd8d14408c4595b10dd2c3c0c6d0cf66a28a3b3b358d62420739537e221601be1c0f
-AUX dd_rescue-1.99-musl-r1.patch 4012 BLAKE2B a8dc45bf5aa9b596309165a07649d045af4978f05179b50370c9744aa3dbf345068ab071a4955002caad5c5b6cce72689c17e7ad1bc7dce879c37a1386c20973 SHA512 3c49ea2e82d4196213ca9c0db659d5f9e38b299dc6214ba411b81bc7ef333ea8c0981cc1f86b124c06a84179ebb105133620d6a8334f6ff1d0046ffb432d79c0
+AUX dd-rescue-1.99.8-xattr.patch 9308 BLAKE2B 0874806f5394759edacdc4d937619b4ab568cfa501b14f1b56a48f80f7e9777e8be439fe0f1edbe9eb6232344e850360b504dc81ffd1052067c1f68b2152d78e SHA512 b9a2a0c3c035b89c9ef45f52b48d247bcb56f250e86e39bce905826c83823eb855407aeaeadefbf878c946ac019b4f7ec58a46930f0b3450b191b62bd524690a
 AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27dc60f9b3da007969b77d66df599b9c4b9fb02cb2799017c7fb6a0a0f1e8b785c88fb741fb478b6a8f256d0e461bf78 SHA512 a0fe42686852cbdd4ce5a4c55c9dc77cff7165109f3c7d4dfaaec527fa116a17f602ad4fab22410991f05aac6aa8f5b57bb711c05e08f146d532aaa807dbfd66
-AUX dd_rescue-1.99-musl.patch 2224 BLAKE2B 593ccb007bd65c2fcc729ffd9ffc66f3bef94fdf7854cb66440dbbe5dc67903544e4bbb0cd6e776577305bf6d26ce86308a9516d1f22a0cdc7014e3437f523d3 SHA512 51dd97748c96a711682450fd8c3018498fc6a3cc2663b52be6b1205c7cbdcb033d182543c81b5c09130f3ad26a4cd50ac1a16b2845996fe70118556b2804dd5b
-AUX dd_rescue-1.99-test_fix.patch 497 BLAKE2B 7d9c5b0d10adfad4f0a2279c437d5e3a011dd35aae157b0cff5b5233d2aced4059dc49da1d493bdd97eb443656360d951a32ed0ee61ce7301c48cbf04f4527e0 SHA512 2544e1336763d2951eceafed6de7c2155403bf005eb0eb26e813451b5efdefbdc74eacf97e75229da3720414d0df0f0e9c4dddb254f5068e310765057dcc4349
 DIST dd_rescue-1.46.tar.gz 126790 BLAKE2B 027d509349e77fa020757b826184b4a2206c3f5923c797c294ca8caf210cf6af20afa1d518d826413989612295a4365c480d7aa4293686824ee96394cbbe9851 SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28
-DIST dd_rescue-1.99.5.tar.bz2 170712 BLAKE2B f19a91de3acf96759c51361a30262a0c77aad45121fdcaa20e0a38e1b47a3f7a9530d22abed78dd78924cb77e053e19eabc9a6c93ba4a0601f5916468f6ba139 SHA512 a240eb9d50950cefbc65d953c84a8e3782d39282aff4e7fa42364b40cee0eb0a02f61315786a1008cf7ae9c3d758700e9f3a0087b9477b3ffbfcbcef59f07d88
-DIST dd_rescue-1.99.6.tar.bz2 171621 BLAKE2B cee1bfb3014e87fdc083ed956427c91a1329f39215d300171e4dc6a553a81e04dd95c006354e318cf692845becc052db77c1daac54942b019e307bc2ba594b1e SHA512 b91508ebdd5f5a4945fa15a86b530bb03e49e74ffe6d2227c9dac4a5fa1b8e9ccf6f1e68204220b571b4661b78892be3a955005f253fd691a85977f35fc74b5e
-DIST dd_rescue-1.99.7.tar.bz2 172414 BLAKE2B 0f9bd9abd3936eeb4ec22f2c3cf59a3dbf2cb1c2e7fe854b7e0b0c5e3b521541595115952b0d840d739bfb2080a0f2920e867551b3598db62df1f41cb15f3121 SHA512 56e1aca8f068110376ba8b3b7ef7ec203a1632cf943d0b47e415699af67ac29984094a22fb685a4237f6a6962d4aa972714f2ac19e283d209ed3e5c193c9d72d
 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
 EBUILD dd-rescue-1.46.ebuild 1935 BLAKE2B 96cb26dbaf1af6e3653593bb3416b27165a078e2211519dd94ac7bdc889cba2c66ac9f04dee253828b56c00a8aaf9de51091aabe706b0bfe6e27de9d44854066 SHA512 57bdaccabd2da99bb329c82f47e52fbd2066f736c742b8de551671fab294297e45a874daa0ddd701234a3e6c216f52ddee55283d70bf1a166d3538f32485e8c7
-EBUILD dd-rescue-1.99.5.ebuild 2039 BLAKE2B 56c620e373fa3bd728741518d4d6823a506d3a2304735cf48646247e7f781aad5c79364b41dbdcac287214aaeebb410e27ce706a22c1078a733c08b966ee4351 SHA512 411b9c56ae10eed02006538bb6f479e671128fca9d77829dbaeb7a5c4395dcf0e8619fdb564be2c3dfdd705ff8e5eab8fe18f653377ecf62da3e0125c74834fb
-EBUILD dd-rescue-1.99.6-r1.ebuild 2157 BLAKE2B 7616006018576f961576315b4875712915bf3530fd4942572244416ee7e49c71f9641b6ad098592ec746fb2376e008ad341592b1b4b324c97213671bff4e730b SHA512 58df8d72ced7136925407f44aa6d182baeb52e8bb45ec4be3df66e9ae5b675e20523c92ef3fb149f21d09812f7d4fb7f27ee8accf1ddf46861d65870f80af047
-EBUILD dd-rescue-1.99.6.ebuild 2012 BLAKE2B 08dfe6918cb605941ca02af08f0343e08ac966ece46089f6facdb4fe77726dc368c071ad1fa7c0fca9e02d58522cae2e31f6eaf39427fe346ffbba54041731df SHA512 cf7ae56d76409c667cdb25e836a0f55461b59427fdb6a78499147a8ffd718bafe68df7eff3047d088a8429396419afdcfb6f436a6d98750c4f6f2444229f6711
-EBUILD dd-rescue-1.99.7.ebuild 2346 BLAKE2B 0d953290411f55c7c0f06d19a33b434bb7f8690f31edd20e14fb4055e74e48c07cbdd3b2545048e3bd415773664fc8db49ee82f3f31fb1617b623410755e71d6 SHA512 aef7a441ef2930252051c7c4ab843cc2c4ac0be8c20c121047fccb9ff6b8bbee9ca91bf9f1c794ee197c7832a22a8cea4e50cf1bfebef184e541f35d59fe8f27
-EBUILD dd-rescue-1.99.8.ebuild 2346 BLAKE2B bc1c9babb6afafcc20b4657dbe8e1519eee1116e5e5a64922e2a8f92c1f9a2d2cab6c9b6eaf45d1f04165cbbf4ccc96afc8680846fbdc7faeaecce6b7e935ff5 SHA512 d29c4b0f21cff639f2827a8252c545fceeb68c9cea19d71aa65a10b0ac798147de4e2985be0ebafb924f8ea1ea24ed9b1da87705b1f359298b2bceeb0eed7933
+EBUILD dd-rescue-1.99.8.ebuild 2386 BLAKE2B 5e54701b73a8197733ee05f807ee76a021455881edb40bdb7c33b5a08064822c265faf58d7d2b106ed603df365051de64f292b45ba71059fbc6149de7f5dc4e7 SHA512 89dc38aa276dafc19324f393a6cf6987998897b35b597e007c16e424af7a1918df8064485e89507c8d95f615520d1211125313d98c5fb97d6c6bbeccecf671ac
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild
deleted file mode 100644
index 6121e84d1aa2..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic multilib autotools
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Similar to dd but can copy from source with errors"
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
-
-RDEPEND="lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${MY_PN}-1.99-test_fix.patch"
-	epatch "${FILESDIR}/${MY_PN}-1.99-musl.patch"
-
-	sed -i \
-		-e 's:-ldl:$(LDFLAGS) -ldl:' \
-		-e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
-		Makefile
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# OpenSSL is only used by a random helper tool we don't install.
-	ac_cv_header_attr_xattr_h=$(usex xattr) \
-	ac_cv_header_openssl_evp_h=no \
-	ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
-	econf
-}
-
-_emake() {
-	local arch
-	case ${ARCH} in
-	x86)   arch=i386;;
-	amd64) arch=x86_64;;
-	arm)   arch=arm;;
-	arm64) arch=aarch64;;
-	esac
-
-	local os=$(usex kernel_linux Linux IDK)
-
-	# The Makefile is a mess.  Override a few vars rather than patch it.
-	emake \
-		MACH="${arch}" \
-		OS="${os}" \
-		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
-		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CFLAGS_OPT='$(CFLAGS)' \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
-		CC="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	# easier to install by hand than trying to make sense of the Makefile.
-	dobin dd_rescue
-	dodir /usr/$(get_libdir)/${PN}
-	cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die
-	dodoc README.dd_rescue
-	doman dd_rescue.1
-	use lzo && doman ddr_lzo.1
-}
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild
deleted file mode 100644
index 1d391a112ea3..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic multilib autotools
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Similar to dd but can copy from source with errors"
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
-
-RDEPEND="lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PN}-1.99-musl-r1.patch
-	"${FILESDIR}"/${MY_PN}-1.99-disable-hmac-tests.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:-ldl:$(LDFLAGS) -ldl:' \
-		-e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
-		Makefile || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# OpenSSL is only used by a random helper tool we don't install.
-	ac_cv_header_attr_xattr_h=$(usex xattr) \
-	ac_cv_header_openssl_evp_h=no \
-	ac_cv_lib_crypto_EVP_aes_192_ctr=no \
-	ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
-	ac_cv_header_lzo_lzo1x_h=$(usex lzo) \
-	econf
-}
-
-_emake() {
-	local arch
-	case ${ARCH} in
-	x86)   arch=i386;;
-	amd64) arch=x86_64;;
-	arm)   arch=arm;;
-	arm64) arch=aarch64;;
-	esac
-
-	local os=$(usex kernel_linux Linux IDK)
-
-	# The Makefile is a mess.  Override a few vars rather than patch it.
-	emake \
-		MACH="${arch}" \
-		OS="${os}" \
-		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
-		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CFLAGS_OPT='$(CFLAGS)' \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \
-		CC="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	# easier to install by hand than trying to make sense of the Makefile.
-	dobin dd_rescue
-	dodir /usr/$(get_libdir)/${PN}
-	cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die
-	dodoc README.dd_rescue
-	doman dd_rescue.1
-	use lzo && doman ddr_lzo.1
-}
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild
deleted file mode 100644
index 858a583dbdd7..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib autotools
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Similar to dd but can copy from source with errors"
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
-
-RDEPEND="lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${MY_PN}-1.99-musl.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:-ldl:$(LDFLAGS) -ldl:' \
-		-e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
-		Makefile
-
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# OpenSSL is only used by a random helper tool we don't install.
-	ac_cv_header_attr_xattr_h=$(usex xattr) \
-	ac_cv_header_openssl_evp_h=no \
-	ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
-	econf
-}
-
-_emake() {
-	local arch
-	case ${ARCH} in
-	x86)   arch=i386;;
-	amd64) arch=x86_64;;
-	arm)   arch=arm;;
-	arm64) arch=aarch64;;
-	esac
-
-	local os=$(usex kernel_linux Linux IDK)
-
-	# The Makefile is a mess.  Override a few vars rather than patch it.
-	emake \
-		MACH="${arch}" \
-		OS="${os}" \
-		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
-		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CFLAGS_OPT='$(CFLAGS)' \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \
-		CC="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	# easier to install by hand than trying to make sense of the Makefile.
-	dobin dd_rescue
-	dodir /usr/$(get_libdir)/${PN}
-	cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die
-	dodoc README.dd_rescue
-	doman dd_rescue.1
-	use lzo && doman ddr_lzo.1
-}
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild
deleted file mode 100644
index 616ff38726c2..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic multilib autotools
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Similar to dd but can copy from source with errors"
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
-
-RDEPEND="lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PN}-1.99-musl-r1.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:-ldl:$(LDFLAGS) -ldl:' \
-		-e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
-		Makefile || die
-
-	if ! use cpu_flags_x86_sse4_2; then
-		sed -i \
-			-e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \
-			configure.in || die
-	fi
-
-	if ! use cpu_flags_x86_avx2; then
-		sed -i \
-			-e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \
-			configure.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# OpenSSL is only used by a random helper tool we don't install.
-	ac_cv_header_attr_xattr_h=$(usex xattr) \
-	ac_cv_header_openssl_evp_h=no \
-	ac_cv_lib_crypto_EVP_aes_192_ctr=no \
-	ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
-	ac_cv_header_lzo_lzo1x_h=$(usex lzo) \
-	econf
-}
-
-_emake() {
-	local arch
-	case ${ARCH} in
-	x86)   arch=i386;;
-	amd64) arch=x86_64;;
-	arm)   arch=arm;;
-	arm64) arch=aarch64;;
-	esac
-
-	local os=$(usex kernel_linux Linux IDK)
-
-	# The Makefile is a mess.  Override a few vars rather than patch it.
-	emake \
-		MACH="${arch}" \
-		OS="${os}" \
-		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
-		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CFLAGS_OPT='$(CFLAGS)' \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \
-		CC="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	# easier to install by hand than trying to make sense of the Makefile.
-	dobin dd_rescue
-	dodir /usr/$(get_libdir)/${PN}
-	cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die
-	dodoc README.dd_rescue
-	doman dd_rescue.1
-	use lzo && doman ddr_lzo.1
-}
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
index 135b53fec881..8f5734a435de 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.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"
@@ -25,6 +25,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${MY_PN}-1.99-musl-r2.patch
+	"${FILESDIR}"/${PN}-1.99.8-xattr.patch
 )
 
 src_prepare() {
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch
new file mode 100644
index 000000000000..39e719c33861
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch
@@ -0,0 +1,300 @@
+--- dd_rescue-1.99.8/configure.in
++++ dd_rescue-1.99.8/configure.in
+@@ -6,7 +6,7 @@
+ AC_HEADER_STDC
+ #AC_PROG_INSTALL
+ #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+-AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
++AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
+ AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports])
+ AC_CHECK_LIB(dl,dlsym)
+ AC_CHECK_LIB(fallocate,linux_fallocate64)
+--- dd_rescue-1.99.8/dd_rescue.c
++++ dd_rescue-1.99.8/dd_rescue.c
+@@ -161,8 +161,8 @@
+ #endif
+ 
+ /* xattrs */
+-#ifdef HAVE_ATTR_XATTR_H
+-# include <attr/xattr.h>
++#ifdef HAVE_SYS_XATTR_H
++# include <sys/xattr.h>
+ #else
+ /* TODO: Could provide the prototypes for the syscalls ourselves ... */
+ # warning No support for copying extended attributes / ACLs
+@@ -1276,7 +1276,7 @@
+ 
+ /** Copy xattrs */
+ int copyxattr(const char* inm, const char* onm)
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ {
+ 	char *attrs = NULL;
+ 	ssize_t aln = listxattr(inm, NULL, 0);
+@@ -2486,7 +2486,7 @@
+ #ifdef FITRIM
+ 	fprintf(stderr, "fitrim ");
+ #endif
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 	fprintf(stderr, "xattr ");
+ #endif
+ #if (defined(__x86_64__) || defined(__i386__)) && !defined(NO_RDRND)
+--- dd_rescue-1.99.8/libddr_crypt.c
++++ dd_rescue-1.99.8/libddr_crypt.c
+@@ -47,8 +47,8 @@
+ #include <endian.h>
+ #include <signal.h>
+ 
+-#ifdef HAVE_ATTR_XATTR_H
+-#include <attr/xattr.h>
++#ifdef HAVE_SYS_XATTR_H
++#include <sys/xattr.h>
+ #endif
+ 
+ #if __WORDSIZE == 64
+@@ -90,7 +90,7 @@
+ 	size_t saltlen;
+ 	loff_t lastpos;
+ 	loff_t processed;
+-#if 1 //def HAVE_ATTR_XATTR_H
++#if 1 //def HAVE_SYS_XATTR_H
+ 	char* salt_xattr_name;
+ 	char sxattr, sxfallback;
+ 	char* key_xattr_name;
+@@ -113,13 +113,13 @@
+ 		" Parameters: [alg[o[rithm]]=]ALG:enc[rypt]:dec[rypt]:engine=STR:pad=STR\n"
+ 		"\t:keyhex=HEX:keyfd=[x]INT[@INT@INT]:keyfile=NAME[@INT@INT]:keygen:keysfile\n"
+ 		"\t:ivhex=HEX:ivfd=[x]INT[@INT@INT]:ivfile=NAME[@INT@INT]:ivgen:ivsfile\n"
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 		"\t:keyxattr[=xattr_name]:kxfallback:ivxattr[=xattr_name]:ixfallback\n"
+ #endif
+ 		"\t:pass=STR:passfd=[x]INT[@INT@INT]:passfile=NAME[@INT@INT]\n"
+ 		"\t:salt=STR:salthex=HEX:saltfd=[x]INT[@INT@INT]:saltfile=NAME[@INT@INT]\n"
+ 		"\t:saltlen=INT:saltgen:saltsfile"
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 		":saltxattr[=xattr_name]:sxfallback"
+ #endif
+ 		"\n\t:pbkdf2[=INT]:opbkdf[11]:debug:bench[mark]:skiphole:weakrnd:outkeyiv:ctrbug198\n"
+@@ -346,7 +346,7 @@
+ 			state->saltlen = ATOL(param+8);
+ 		else if (!strcmp(param, "saltgen"))
+ 			state->sgen = 1;
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 		else if (!strcmp(param, "saltxattr"))
+ 			err += set_flag(&state->sxattr, "saltxattr");
+ 		else if (!memcmp(param, "saltxattr=", 10)) {
+@@ -709,7 +709,7 @@
+ 	return err;
+ }
+ 
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ int get_xattr(crypt_state *state, const char* atrnm,
+ 		unsigned char* data, int dlen,
+ 		char fb, char* fbf, char* flag)
+@@ -883,7 +883,7 @@
+ 	sprintf(ivsnm, "IVS.%s", state->alg->name);
+ 	sprintf(keynm, "KEYS.%s", state->alg->name);
+ 	sprintf(saltnm, "SALT.%s", state->alg->name);
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 	if (state->sxattr && !state->salt_xattr_name) {
+ 		state->salt_xattr_name = malloc(32);
+ 		snprintf(state->salt_xattr_name, 32, "user.salt.%s", state->alg->name);
+@@ -958,7 +958,7 @@
+ 		}
+ 
+ 		/* 5c */
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 		/* Try getting salt from xattr */
+ 		if (!state->sset && state->sxattr && !get_salt_xattr(state) && !state->enc)
+ 			state->sxattr = 0;
+@@ -999,7 +999,7 @@
+ 			if (write_file(state->sec->salt, state->sfnm, 8, 0640))
+ 				return -1;
+ 		}
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 		/* Write salt to xattr */
+ 		if (state->sxattr && state->enc && set_salt_xattr(state)) {
+ 			if (!state->sxfallback)
+@@ -1028,7 +1028,7 @@
+ 			if (!state->keyf && !state->kxattr)
+ 				FPLOG(WARN, "Generated key not written anywhere?\n", NULL);
+ 			else {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 				/* Write key to xattr, failure is fatal */
+ 				if (state->kxattr && state->enc && set_key_xattr(state) && !state->kxfallback)
+ 					return -1;
+@@ -1066,7 +1066,7 @@
+ 				FPLOG(FATAL, "Key generation with pass+salt failed!\n", NULL);
+ 				return -1;
+ 			}
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 			/* Write key to xattr, failure is fatal */
+ 			if (state->kxattr && state->enc && set_key_xattr(state) && !state->kxfallback)
+ 				return -1;
+@@ -1077,7 +1077,7 @@
+ 					return -1;
+ 
+ 		} else {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 			if (state->kxattr)
+ 				get_key_xattr(state);
+ #endif
+@@ -1100,7 +1100,7 @@
+ 			}
+ 		}
+ 	} else {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 		if (state->kxattr && set_key_xattr(state) && !state->kxfallback) {
+ 			FPLOG(FATAL, "Can't save key in xattr");
+ 			return -1;
+@@ -1123,7 +1123,7 @@
+ 			if (!state->ivf && !state->ixattr)
+ 				FPLOG(WARN, "Generated IV not saved?\n", NULL);
+ 			else {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 				/* Write IV to xattr, failure w/o fb is fatal */
+ 				if (state->ixattr && state->enc && set_iv_xattr(state) && !state->ixfallback)
+ 					return -1;
+@@ -1149,7 +1149,7 @@
+ 					return -1;
+ 				}
+ 			}
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 			/* Write IV to xattr, failure w/o fb is fatal */
+ 			if (state->ixattr && state->enc && set_iv_xattr(state) && !state->ixfallback)
+ 				return -1;
+@@ -1159,7 +1159,7 @@
+ 				if (write_keyfile(state, ivsnm, encnm, state->sec->nonce1, BLKSZ, 0640, 1, 0))
+ 					return -1;
+ 		} else { 
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 			if (state->ixattr)
+ 				get_iv_xattr(state);
+ #endif
+@@ -1180,7 +1180,7 @@
+ 			}
+ 		 }
+ 	} else if (state->alg->stream->needs_iv) {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 		if (state->ixattr && set_iv_xattr(state) && !state->ixfallback) {
+ 			FPLOG(FATAL, "Can't save IV in xattr");
+ 			return -1;
+@@ -1454,7 +1454,7 @@
+ 		FPLOG(INFO, "%.2fs CPU time, %.1fMiB/s\n",
+ 			(double)state->cpu/CLOCKS_PER_SEC, 
+ 			state->processed/1024 / (state->cpu/(CLOCKS_PER_SEC/1024.0)));
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 	if (state->salt_xattr_name)
+ 		free(state->salt_xattr_name);
+ 	if (state->key_xattr_name)
+--- dd_rescue-1.99.8/libddr_hash.c
++++ dd_rescue-1.99.8/libddr_hash.c
+@@ -36,8 +36,8 @@
+ #include <netinet/in.h>	/* For ntohl/htonl */
+ #include <endian.h>
+ 
+-#ifdef HAVE_ATTR_XATTR_H
+-#include <attr/xattr.h>
++#ifdef HAVE_SYS_XATTR_H
++#include <sys/xattr.h>
+ #endif
+ // TODO: pass at runtime rather than compile time
+ #define HASH_DEBUG(x) if (state->debug) x
+@@ -75,7 +75,7 @@
+ #endif
+ 	int hmacpln;
+ 	char xfallback;
+-#if 1 //def HAVE_ATTR_XATTR_H
++#if 1 //def HAVE_SYS_XATTR_H
+ 	char chk_xattr, set_xattr, xnmalloc;
+ 	char* xattr_name;
+ #endif
+@@ -90,7 +90,7 @@
+ 		":multipart=size"
+ #endif
+ 		"\n"
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 		"\t:chk_xattr[=xattr_name]:set_xattr[=xattr_name]:fallb[ack][=FILE]\n"
+ #endif
+ 		" Use algorithm=help to get a list of supported hash algorithms\n";
+@@ -167,7 +167,7 @@
+ 			state->append = param+7;
+ 		else if (!memcmp(param, "prepend=", 8))
+ 			state->prepend = param+8;
+-#if 1 //def HAVE_ATTR_XATTR_H
++#if 1 //def HAVE_SYS_XATTR_H
+ 		else if (!memcmp(param, "chk_xattr=", 10)) {
+ 			state->chk_xattr = 1; state->xattr_name = param+10; }
+ 		else if (!strcmp(param, "chk_xattr"))
+@@ -258,7 +258,7 @@
+ 		FPLOG(FATAL, "No hash algorithm specified\n");
+ 		return --err;
+ 	}
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 	if ((state->chk_xattr || state->set_xattr) && !state->xattr_name) {
+ 		state->xattr_name = (char*)malloc(32);
+ 		state->xnmalloc = 1;
+@@ -269,7 +269,7 @@
+ 	}
+ #endif
+ 	if ((!state->chkfnm || !*state->chkfnm) && (state->chkf || state->outf
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 				|| state->xfallback
+ #endif
+ 			     				)) {
+@@ -301,7 +301,7 @@
+ 	if (!stat || !(*stat))
+ 		return -1;
+ 	hash_state *state = (hash_state*)*stat;
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 	if (state->xnmalloc)
+ 		free((void*)state->xattr_name);
+ #endif
+@@ -351,7 +351,7 @@
+ 		strcat(nnm, "->");
+ 		strcat(nnm, opt->oname);
+ 		state->fname = nnm;
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 		if (state->chk_xattr || state->set_xattr) {
+ 			--err;
+ 			FPLOG(WARN, "Can't access xattr in the middle of a plugin chain!");
+@@ -607,7 +607,7 @@
+ 	return err;
+ }
+ 
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ int check_xattr(hash_state* state, const char* res)
+ {
+ 	char xatstr[144];
+@@ -734,7 +734,7 @@
+ 		err += check_chkf(state, res);
+ 	if (state->outf)
+ 		err += write_chkf(state, res);
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ 	if (state->chk_xattr)
+ 		err += check_xattr(state, res);
+ 	if (state->set_xattr)
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-disable-hmac-tests.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-disable-hmac-tests.patch
deleted file mode 100644
index 244f43121399..000000000000
--- a/sys-fs/dd-rescue/files/dd_rescue-1.99-disable-hmac-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://sourceforge.net/p/ddrescue/tickets/3/
-
---- a/Makefile
-+++ b/Makefile
-@@ -500,11 +500,11 @@ check: $(TARGETS) find_nonzero md5 sha1 sha256 sha512 fmt_no
- 	# Extra xattrs (should be preserved)
- 	#make check_xattr_copy
- 	# Tests with HMAC
--	echo -n "what do ya want for nothing?" > TEST
--	echo "750c783e6ab0b503eaa86e310a5db738 *TEST" > HMACS.md5
--	$(VG) ./dd_rescue -L ./libddr_hash.so=md5:hmacpwd=Jefe:chknm= TEST /dev/null
--	rm -f /tmp/dd_rescue CHECKSUMS.sha512 TEST HMACS.md5
--	if ./calchmac.py sha1 pass dd_rescue; then $(MAKE) check_hmac; else echo "Sorry, no more HMAC test due to missing python-hashlib support"; true; fi
-+	#echo -n "what do ya want for nothing?" > TEST
-+	#echo "750c783e6ab0b503eaa86e310a5db738 *TEST" > HMACS.md5
-+	#$(VG) ./dd_rescue -L ./libddr_hash.so=md5:hmacpwd=Jefe:chknm= TEST /dev/null
-+	#rm -f /tmp/dd_rescue CHECKSUMS.sha512 TEST HMACS.md5
-+	#if ./calchmac.py sha1 pass dd_rescue; then $(MAKE) check_hmac; else echo "Sorry, no more HMAC test due to missing python-hashlib support"; true; fi
- 	$(MAKE) check_fault
- 	#$(MAKE) check_aes
- 	$(MAKE) check_crypt
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch
deleted file mode 100644
index 6751cf009866..000000000000
--- a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 66e7503f24b9693ddb20a0873ae054f799c3660f Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Mon, 30 Oct 2017 20:12:10 +0100
-Subject: [PATCH 49/49] loff_t and __WORDSIZE includes for MUSL
-
-Rewrite of Justin Keogh's patch [Link 1] to fix build problems
-on ARM.
-
-Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f
-Fixes: https://bugs.gentoo.org/616364
----
- configure.in  | 2 +-
- ddr_ctrl.h    | 3 +++
- ffs.h         | 3 +++
- fiemap.h      | 4 ++++
- fmt_no.h      | 2 ++
- fstrim.h      | 3 +++
- libddr_hash.c | 4 ++++
- libddr_lzo.c  | 3 +++
- libddr_null.c | 3 +++
- sha512.h      | 4 ++++
- 10 files changed, 30 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index f813d4b..c9d28c5 100644
---- a/configure.in
-+++ b/configure.in
-@@ -6,7 +6,7 @@ AC_C_INLINE
- AC_HEADER_STDC
- #AC_PROG_INSTALL
- #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
--AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
-+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
- AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs])
- AC_CHECK_LIB(dl,dlsym)
- AC_CHECK_LIB(fallocate,linux_fallocate64)
-diff --git a/ddr_ctrl.h b/ddr_ctrl.h
-index ac71e4f..58cffd5 100644
---- a/ddr_ctrl.h
-+++ b/ddr_ctrl.h
-@@ -7,6 +7,9 @@
-  *  License: GNU GPLv2 or v3
-  */
- 
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+
- #ifndef _DDR_CTRL_H
- #define _DDR_CTRL_H
- 
-diff --git a/ffs.h b/ffs.h
-index 2215080..c1f3444 100644
---- a/ffs.h
-+++ b/ffs.h
-@@ -28,6 +28,9 @@
- #include <endian.h>
- #endif
- 
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
- 
- #ifdef HAVE_FFS
- # define myffs(x) ffs(x)
-diff --git a/fiemap.h b/fiemap.h
-index df1ba95..31cde3b 100644
---- a/fiemap.h
-+++ b/fiemap.h
-@@ -29,5 +29,9 @@
- 
- #endif	/* HAVE_LINUX_FS_H */
- 
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
-+
- #endif	/* _FIEMAPH */
- 
-diff --git a/fmt_no.h b/fmt_no.h
-index 329f997..16eda5c 100644
---- a/fmt_no.h
-+++ b/fmt_no.h
-@@ -1,4 +1,6 @@
- /** Decl for int to str conversion with highlighting */
-+#define _GNU_SOURCE
-+#include <fcntl.h>
- 
- #ifndef _FMT_NO_H
- #define _FMT_NO_H
-diff --git a/fstrim.h b/fstrim.h
-index 7447061..b9cdcbb 100644
---- a/fstrim.h
-+++ b/fstrim.h
-@@ -1,3 +1,6 @@
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+
- #ifndef _FSTRIM_H
- #define _FSTRIM_H
- 
-diff --git a/libddr_hash.c b/libddr_hash.c
-index daa806e..264dba1 100644
---- a/libddr_hash.c
-+++ b/libddr_hash.c
-@@ -33,6 +33,10 @@
- #include <unistd.h>
- #include <fcntl.h>
- 
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
-+
- #include <netinet/in.h>	/* For ntohl/htonl */
- #include <endian.h>
- 
-diff --git a/libddr_lzo.c b/libddr_lzo.c
-index 531df11..3220e2a 100644
---- a/libddr_lzo.c
-+++ b/libddr_lzo.c
-@@ -26,6 +26,9 @@
- #include <errno.h>
- #include <netinet/in.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
- #include <signal.h>
- #include <lzo/lzo1x.h>
- #include <lzo/lzo1y.h>
-diff --git a/libddr_null.c b/libddr_null.c
-index 3f0f194..c379961 100644
---- a/libddr_null.c
-+++ b/libddr_null.c
-@@ -10,6 +10,9 @@
- #include "ddr_ctrl.h"
- #include <string.h>
- #include <stdlib.h>
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
- 
- /* fwd decl */
- extern ddr_plugin_t ddr_plug;
-diff --git a/sha512.h b/sha512.h
-index 4d08043..f54d371 100644
---- a/sha512.h
-+++ b/sha512.h
-@@ -3,6 +3,10 @@
- 
- #include "hash.h"
- 
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
-+
- void sha512_init(hash_t *ctx);
- void sha384_init(hash_t *ctx);
- void sha512_128(const uint8_t* msg, hash_t* ctx);
--- 
-2.14.3
-
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch
deleted file mode 100644
index 6647e5f687c6..000000000000
--- a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/ffs.h	2016-02-09 03:37:14.422639513 +0000
-+++ b/ffs.h	2016-02-09 03:38:59.843641094 +0000
-@@ -27,7 +27,8 @@
- #ifdef HAVE_ENDIAN_H
- #include <endian.h>
- #endif
--
-+/* __WORDSIZE */
-+#include <sys/reg.h>
- 
- #ifdef HAVE_FFS
- # define myffs(x) ffs(x)
---- a/fiemap.h	2016-02-09 03:45:05.550646582 +0000
-+++ b/fiemap.h	2016-02-09 03:45:56.683647349 +0000
-@@ -31,3 +31,4 @@
- 
- #endif	/* _FIEMAPH */
- 
-+#include <sys/reg.h>
---- a/libddr_hash.c	2016-02-09 03:49:16.334650345 +0000
-+++ b/libddr_hash.c	2016-02-09 03:50:01.309651020 +0000
-@@ -32,6 +32,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <sys/reg.h>
- 
- #include <netinet/in.h>	/* For ntohl/htonl */
- #include <endian.h>
---- a/libddr_lzo.c	2016-02-09 03:52:31.775653278 +0000
-+++ b/libddr_lzo.c	2016-02-09 03:52:53.537653604 +0000
-@@ -26,6 +26,7 @@
- #include <errno.h>
- #include <netinet/in.h>
- #include <sys/stat.h>
-+#include <sys/reg.h>
- #include <signal.h>
- #include <lzo/lzo1x.h>
- #include <lzo/lzo1y.h>
---- a/libddr_null.c	2016-02-09 03:54:04.110654663 +0000
-+++ b/libddr_null.c	2016-02-09 03:54:18.018654872 +0000
-@@ -10,6 +10,7 @@
- #include "ddr_ctrl.h"
- #include <string.h>
- #include <stdlib.h>
-+#include <sys/reg.h>
- 
- /* fwd decl */
- extern ddr_plugin_t ddr_plug;
---- a/sha512.h	2016-02-09 03:55:33.209656000 +0000
-+++ b/sha512.h	2016-02-09 03:56:39.923657001 +0000
-@@ -2,6 +2,8 @@
- #define _SHA512_H
- 
- #include "hash.h"
-+/* __WORDSIZE */
-+#include <sys/reg.h>
- 
- void sha512_init(hash_t *ctx);
- void sha384_init(hash_t *ctx);
---- a/fmt_no.h	2016-02-09 04:52:13.760707026 +0000
-+++ b/fmt_no.h	2016-02-09 04:52:50.874707583 +0000
-@@ -1,4 +1,6 @@
- /** Decl for int to str conversion with highlighting */
-+#define _GNU_SOURCE
-+#include <fcntl.h>
- 
- #ifndef _FMT_NO_H
- #define _FMT_NO_H
---- a/fstrim.h	2016-02-09 04:55:43.871710178 +0000
-+++ b/fstrim.h	2016-02-09 04:56:11.270710590 +0000
-@@ -1,3 +1,6 @@
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+
- #ifndef _FSTRIM_H
- #define _FSTRIM_H
- 
---- a/ddr_ctrl.h	2016-02-09 04:58:08.442712348 +0000
-+++ b/ddr_ctrl.h	2016-02-09 04:58:50.842712984 +0000
-@@ -7,6 +7,9 @@
-  *  License: GNU GPLv2 or v3
-  */
- 
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+
- #ifndef _DDR_CTRL_H
- #define _DDR_CTRL_H
- 
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch
deleted file mode 100644
index 6ddf7116f9fb..000000000000
--- a/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dd_rescue-1.99/test_crypt.sh
-+++ dd_rescue-1.99/test_crypt.sh
-@@ -97,7 +97,7 @@
- $VG ./dd_rescue -t -m 4096 urandom urandom.new || exit 1
- # Ensure that we don't have 01 or 02 02 or ... at the end,
- # which would trip pad=asneeded
--echo -n "a" | dd_rescue -S 4095 -m 1 - urandom.new
-+echo -n "a" | ./dd_rescue -S 4095 -m 1 - urandom.new
- mv urandom.new urandom
- enc_dec_compare_keys urandom AES192-CBC "" pad=always "" "-qpt"
- enc_dec_compare_keys urandom AES192-CBC "" pad=asneeded "" "-qpt"
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 80f9fbbe2f57..55ac265fb894 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,9 +1,7 @@
 AUX f2fs-tools-1.6.1-sysmacros.patch 1555 BLAKE2B a7cf99912c969492ae6d7d6f2db6bda30caf2fa750530b52543d7b4f5d38acb349d87ac2ec839d86fc32afe172ff989450593e5ce55b3c3eea54f69a32c7e23e SHA512 10e3f473f21d00126fc570ad82f9f6218ed1fba7eb0fe24947c4e67186f82db09fa7563c10ccb74398652f41cda4753afa31d8140cdcb003ce0da0f71bc64415
 AUX f2fs-tools-1.8.0-sysmacros.patch 324 BLAKE2B 7d0304c31c3c843bb324acddb45512383256e65c74be32a66b728983361801d43807d050ea7a55ecb7a7e46db08df888eef7d9d8d81fec20b8017b9c100d60f9 SHA512 15e2e79c34efe001c08d059ad4f6a01e7f066b6e8e2466e8d3c6423f8c59a90582cb345ce62cbc340bd0aac2eff6f21113d2cc8b88135e828f36ce5b08b4b6d2
+DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c7766908bfdbca9f6da7aa134b4a3b5cf2bda3c2e380b3fab46afdda0be9181ae5fe85ed9d085f816a1ff96e847e2a836 SHA512 e6e9fc10bd8051db86880c415ceb50900bf0cc919f1d9fe39026b5320de7c93cbcc1d817fab73130817042ed551fc5fd55ef9b589caeca9fca63fd3098f7a853
 DIST f2fs-tools-1.6.1.tar.xz 282152 BLAKE2B f8535a5415e012834b749bba2123151d8a39c8fa757905c45be20478d6a795ff64dfbcf0cf9679f2bd70cb1d92717d8df70efb4beb4d749677a6c8758ebdde0e SHA512 108327042079d9e864899a20f2dd94019be1b957fd7ffa295af097c5b93a5065ea9c36de9bae83f84a6412ac496340849fc44de041e24461a2919073eed15cf2
-DIST f2fs-tools-1.8.0.tar.xz 301108 BLAKE2B b3c0eebcb4a462c97c01586b46b6b4739c2ebfaf535d146508e9fec6e4fbe442883b89d785d35993fc828eccddf177534dccb449790353557fea2f9f1c6fe24c SHA512 aff27e1113cc3034194e496883570143bd6a3cc7cc077e868255052298a401cc36c423579b4e695fe3e480d770ae05f9d14d9bb4bbc0311bdd5e23e37950a27f
-DIST f2fs-tools-1.9.0.tar.xz 337676 BLAKE2B 4c6895f5faabed427db32c846df462c588acb5ec3cb45d318c1c71d2e5f241047d6871d0bbfa99116b23c26b9223069dc224f4b97c3253a283d79234b2ddd41e SHA512 aa76d4bf595b3d17607846f2531327f2c26c8724b4fdb2572074e028965c2300fcd880d57246f5c15d8dd4b9ae62fc93552edecdd504d7313fca5839590f16e5
+EBUILD f2fs-tools-1.10.0.ebuild 725 BLAKE2B f484d3655649806210352a006d5d60599741f4787620de938ab8110fd287db37b6a4d174cceb9cc7e74c77fe9863a7f494d76e76fabfd2f66b039d31f8b54ab5 SHA512 4770c47549753e24206065cdd87e05b14c8a65bc05054531f7045db20b80246295f501f1e6ff0750832a14930df582c46217619441f4bc951753ce908a0665b6
 EBUILD f2fs-tools-1.6.1.ebuild 737 BLAKE2B fd513f95c8c154cf24f3cf74483a7c0c9fb6094780234c6eda83af63ae66c9c7d059bf0aec26e902aff8c782ae44fdcbc9989852450d07b0b99d21b9fda12225 SHA512 a303cc13d4fee5657d93008d9d189dfcfed920bc80e6f4e383d751e29f83745659ee23d8917abddc733a1f2ed66d991c8b9a10aa93ac2134e7e164899a789d22
-EBUILD f2fs-tools-1.8.0.ebuild 782 BLAKE2B 795a2abcbf385303473b3573c8954811fc5bf2bf962e1b1104e1900f633ca108c171029ffdcea2a0fe428b2bf2fa45d2e6e79f418230060d3400cad82aebb22a SHA512 96814eda2864cad7b00f213e2482f962f08df61d8c7f9af4bbe4a6946735c7680df83ff3729b42d4441caf39b8f32d1490f53a7a4c26c7d36ae5a18dfad55976
-EBUILD f2fs-tools-1.9.0.ebuild 725 BLAKE2B 6d1a37b95fd7e3b91bc2e1bc999cc42ab844459cc8412ab01f335580cdd2cab1adef1f38840554faace3b1412d96207d70f84b81d47bb57a15c350ba7157cd03 SHA512 3786197a4de850e6f385acda8af06a65a7ece57f27cf298fa222ed32b6f52cca4a75948c8e3242d39fb34458bb859939a50017f2efe7a9b87fe0bdc32901550f
 MISC metadata.xml 332 BLAKE2B 0a1956b4d2ecff68b31aff44a40fbab8c11ef95fe0becf8c2262300e73b8b52b3c9cef814ec78a56dc5f39e243a3f746e87b20100ff118f3d3713bcee4faa13b SHA512 bc1094f4316330324f30e1fc02c2ec4c4ac3a4201b3d6203dc24845bcbcd194a2c762b39399aef2f42d9df0064ca75c84495e49832b8fd02038bfba7a177ac7b
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.9.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild
index ed0af30bce68..94561df90d65 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.9.0.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.10.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
@@ -8,7 +8,7 @@ HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/ab
 SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
 
 LICENSE="GPL-2"
-SLOT="0/3"
+SLOT="0/4"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="selinux"
 
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.8.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.8.0.ebuild
deleted file mode 100644
index fe85240c1de3..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.8.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="selinux"
-
-RDEPEND="
-	sys-apps/util-linux
-	selinux? ( sys-libs/libselinux )"
-DEPEND="$RDEPEND"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sysmacros.patch #623660
-)
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--disable-static \
-		$(use_with selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index ea3708804355..17852e7efb57 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -5,5 +5,5 @@ DIST udftools-1.3.tar.gz 447063 BLAKE2B ff23f23dd5b9753d9e4cba6e326d302346233ed0
 DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
 EBUILD udftools-1.1-r1.ebuild 664 BLAKE2B 83cc88c60000a72e00fcbfd8e65ebf00eee41d96945a7ab8498ac691f61025ea20c02f73f654b3df7c5a92af85c82f8ec88b5b1b72da2f6433a64e97e7522dca SHA512 96b9d3d58ed472e9f06de7041b6a379c66439165431435dafe17a7cd8d37796643048d41f2c7e0e219dc930b82fb848659fe13d054bee74fc958dbce026b233c
 EBUILD udftools-1.3-r1.ebuild 668 BLAKE2B 911f0dcb67cfd8fea0503ce0a5ed9369b955d2c67d20903b169465a7a8c053aa3a9486ba71af073b16a675630682df8e0dc6d9e01d9075bc754949a22dccb431 SHA512 67b23bdbd67de34bbfbd444807a8d6cf483d97cfaa6c11587ac86968be887fec4890a27b961f3b4eec0096497cd08622a29d203cf6c43e413bcc4a55612ca58c
-EBUILD udftools-2.0-r1.ebuild 707 BLAKE2B f3e673a67284445436156633d9fcba73a07a2690574c3746ea483caad28d7645d5f646fec82ae9923b1799e90b09c12db11ae76d99eea916c8344e8debcf5b3c SHA512 3385545b56fed68c7c3730d81c9ef2be41f4f85dc319d667895a7730f02c30a16c816798fa7146880fb1776262556d569cc0d44c9c31f78becbe1f5a0a3e3d58
+EBUILD udftools-2.0-r1.ebuild 714 BLAKE2B 1764d0c1c91bcc5e8a09142c6c47e4e41b7e9c5a7d38d03335a92739e732d1064d91a657f70db6d1cae926329fc90b77b71d4808722205e3434e8308424a5324 SHA512 20e455c36377fe65fafa476807f175d87e5c7a46ba8348216ffd0d5555fd610a41a9164eeeedc3ae24c7882e5ad9d92c9eacec06c675a246a7592729823aef30
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/udftools-2.0-r1.ebuild b/sys-fs/udftools/udftools-2.0-r1.ebuild
index c5a2970d94c8..65def21df1b6 100644
--- a/sys-fs/udftools/udftools-2.0-r1.ebuild
+++ b/sys-fs/udftools/udftools-2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 8def4c1f21f4..a1274afd151c 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,10 +1,16 @@
 AUX xfsprogs-4.12.0-sharedlibs.patch 2361 BLAKE2B 3e487d35a858aa4adfdd41a853dab75ca62042710a82432e2dc1a0d23bd6121c2056d201a0e28e3ce538baf5eb1dcf2f72f38086c52955abeb7cc3709c903a62 SHA512 bbf802c54d2c8a2a524a9d4ae0ca66a18bf6b099a00fcc248abee04f84371bd35fc07a2dcc0c1d99c297b474c1f98d92927aa5ca16df5e6caef3abe386f31eba
+AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e
+AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f4b3ea2f401ddebd95aef6d46f9195ac6ab3fb38f5f9d08529d3c2658623a49eadc7db0be68159753025310605fdfc35a6b SHA512 5a6e62f2914e372f2bf679b10c32fe65f60677b4bf0e58f60c40a297ed8974d5ec0af3bcba5801ba19cadbb689a6dad62c1e2cd88587f6f3d30f21f1472f3ac0
 AUX xfsprogs-4.7.0-libxcmd-link.patch 880 BLAKE2B 5c9911aed7bd1579d17aac75f74ff41221e9e7c1d1c2139af4785d570ac612bb338cdcfa246ba690a60a2244ad14d7aa4885bf3d1306cecbf9326c2ff048604f SHA512 4484570c4bb387b6dfde5f31d8527f2222d33e120c365e3cbc6f488403b9e9d969d3f2a883ffcb145a11d57ace70c76fb1ba4a8ed75533f2089a197d463c8dd9
 AUX xfsprogs-4.7.0-sharedlibs.patch 2355 BLAKE2B 03d1dfd738b973d9f904cec83528e6c61f9ebc8090c05ed8e51dc709185196f22b6db416d548fd0fd35296934177660a9d864881d07511f43287d647c392e4ae SHA512 f0006ec0a987e44a1e60d642f9938d35c14ccb765c6a040c80e483a0e073e54608571b53793b7d4c2b9eb1f5c4e2f077fb713dfab9abaa99022d24d8a17443fe
 AUX xfsprogs-4.9.0-cross-compile.patch 3663 BLAKE2B 1fdbc4307c0b177428e5b016321c791736c4cf0dfdfe19a413f0bb20d4f866b5bebe165c58b30132fadef078f5de7cbded1e310bc6871fb65559d00b2ae107fe SHA512 150ebcc26b21eb3e52575dd6b4bf2f451abb4906071b66e79df3697a56345e178f6b9bb11a7bd19283adb47a6b5e9c1dd807775ac2c814f0e2db795788fd1159
 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7
 DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506
+DIST xfsprogs-4.15.0.tar.xz 1186416 BLAKE2B a7d8c74498231e63a0fe7c5a37366852ed8dbe1db6d2deff8c4500c8e113f2e5180e547cdeabc87629922d184982bacb4be40969b78b87fcc07c5c29f22972bd SHA512 78d67a603c45a0d2b69d2cd0f7400b1e2c7b8b9bca3fa78529b8558bebda082e24d683d275ca546bb63c6cfd53d3b6048109b815e9fc5ced34d1c32533c2e77f
+DIST xfsprogs-4.15.1.tar.xz 1188964 BLAKE2B 7b4d1d2f71a0678f9246045e576262d6f3b3c59322e0b33b37dc46d84cdf5407a4b2fd6f2b99dd7647e9bfe9fe312fefe8162013dec9162f3a071421323aa52d SHA512 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee
 DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62 SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7
 EBUILD xfsprogs-4.14.0.ebuild 2662 BLAKE2B e798156785443f5a6b5e283670b3300c84a5189b0204e79cddda32a80e0ee2b0b56e1b591136d5dd2c95240453b9c10f6ff07f970c6d847fc7086597124b8da9 SHA512 7d464a2c5446917aabe9d8f50a60dc43ff6e92bde11999dbd24cbb87f8d90140b60a21a24f26b40fbe6d59c1c1d628591fc7840fc4b903e57bb4e4fdcb0e08a6
+EBUILD xfsprogs-4.15.0.ebuild 2778 BLAKE2B 030c61740f4afadb66a9b2bd092a20b5670ac89634fd266289b94e8f0279c7b1890cfd83f907a8d4d3dd8e4658def5b4a8c67f7fdd83e0ab9f0faee65501a1ec SHA512 72a8a669e0b343ae3f8b3ba1ba1d0bcb022a7cefcf3151dda4cfb0cd1cd67a797783b837f3c18fcf61c6e5b6244dee021af1b181d3abb7d26c7f534a932e80a0
+EBUILD xfsprogs-4.15.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/files/xfsprogs-4.15.0-docdir.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch
new file mode 100644
index 000000000000..53ba3ec0f5d4
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch
@@ -0,0 +1,11 @@
+--- xfsprogs-4.15.0/scrub/Makefile
++++ xfsprogs-4.15.0/scrub/Makefile
+@@ -25,7 +25,7 @@
+ CRONTABS = xfs_scrub_all.cron
+ OPTIONAL_TARGETS += $(CRONTABS)
+ # Don't enable the crontab by default for now
+-CROND_DIR = $(PKG_LIB_DIR)/$(PKG_NAME)
++CROND_DIR = $(PKG_DOC_DIR)
+ endif
+ 
+ endif	# scrub_prereqs
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch
new file mode 100644
index 000000000000..1080e4400944
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch
@@ -0,0 +1,114 @@
+--- xfsprogs-4.15.0/include/buildmacros
++++ xfsprogs-4.15.0/include/buildmacros
+@@ -70,18 +70,9 @@
+ # /usr/lib.
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB_DEV = \
+-	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
+-	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
+-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+-	if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
+-	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
+-		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
+-		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
+-		../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
+-	fi
++	set -e; cd $(TOPDIR)/$(LIBNAME); \
++	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif
+--- xfsprogs-4.15.0/libfrog/Makefile
++++ xfsprogs-4.15.0/libfrog/Makefile
+@@ -5,6 +5,8 @@
+ TOPDIR = ..
+ include $(TOPDIR)/include/builddefs
+ 
++LTLIBS = $(LIBXFS) $(LIBBLKID)
++
+ LTLIBRARY = libfrog.la
+ LT_CURRENT = 0
+ LT_REVISION = 0
+@@ -34,6 +36,9 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev: default
++install: default
++
++install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ -include .ltdep
+--- xfsprogs-4.15.0/libhandle/Makefile
++++ xfsprogs-4.15.0/libhandle/Makefile
+@@ -24,7 +24,6 @@
+ include $(BUILDRULES)
+ 
+ install: default
+-	$(INSTALL_LTLIB)
+ 
+ install-dev: default
+ 	$(INSTALL_LTLIB_DEV)
+--- xfsprogs-4.15.0/libxcmd/Makefile
++++ xfsprogs-4.15.0/libxcmd/Makefile
+@@ -12,6 +12,8 @@
+ 
+ CFILES = command.c input.c help.c quit.c
+ 
++LTLIBS = $(LIBXFS) $(LIBBLKID)
++
+ ifeq ($(ENABLE_READLINE),yes)
+ LCFLAGS += -DENABLE_READLINE
+ LTLIBS += $(LIBREADLINE) $(LIBTERMCAP)
+@@ -26,6 +28,9 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev: default
++install: default
++
++install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ -include .ltdep
+--- xfsprogs-4.15.0/libxfs/Makefile
++++ xfsprogs-4.15.0/libxfs/Makefile
+@@ -151,6 +151,7 @@
+ 
+ install-dev: install
+ 	$(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
++	$(INSTALL_LTLIB_DEV)
+ 
+ # We need to install the headers before building the dependencies.  If we
+ # include the .ltdep file, the makefile decides that it needs to build the
+--- xfsprogs-4.15.0/libxlog/Makefile
++++ xfsprogs-4.15.0/libxlog/Makefile
+@@ -19,6 +19,9 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev: default
++install: default
++
++install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ -include .ltdep
+--- xfsprogs-4.15.0/Makefile
++++ xfsprogs-4.15.0/Makefile
+@@ -92,6 +92,10 @@
+ mkfs: libxcmd
+ spaceman: libxcmd
+ scrub: libhandle libxcmd
++libfrog: libxfs
++libfrog-install-dev: libxfs-install-dev
++libxlog: libxfs
++libxlog-install-dev: libxfs-install-dev
+ 
+ ifeq ($(HAVE_BUILDDEFS), yes)
+ include $(BUILDRULES)
diff --git a/sys-fs/xfsprogs/xfsprogs-4.15.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.15.0.ebuild
new file mode 100644
index 000000000000..148d4aa1cf89
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-4.15.0.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
+}
diff --git a/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild
new file mode 100644
index 000000000000..148d4aa1cf89
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-4.15.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
+}