11 files changed, 304 insertions, 669 deletions
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"