sys-fs/dd-rescue: Bump to version 1.99

Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

3 files changed, 98 insertions, 0 deletions

diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 6c917590c3..1b0340a8ea 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -4,3 +4,4 @@ DIST dd_rescue-1.40.tar.gz 47107 SHA256 54545ebbe2be00597d8c9ba3d51abcfdd7ba89f1
 DIST dd_rescue-1.44.tar.gz 114799 SHA256 744fa857fff7beed6d00644ea5786ce0d2e83df315b04f7578008e0a9b2853a3 SHA512 16e9072aeda04fe898d36e13d1dfc871642c7d1d1ac79b787f3ffd24ced2e13c605b4b36f66334ee4e258d01eee286ef74862e498a5a9ea5f9bd65a66a6ec213 WHIRLPOOL 5f4bfbb4b952552d0418054015fe5940d1a83050a282fad3a42b708caa26501d41ded98024acf9919acb63604e066008ee695ff616a7c9be5abf38613815e5d6
 DIST dd_rescue-1.45.tar.gz 121426 SHA256 2626fa2842916f6861b4e1ce72284c81e1b6e7323a842911aad4082bdaa4f663 SHA512 88022f38ad0e1ea171f1db014ba5e3f421fe9c35782f01220e27beb03618998860694df6b5d2e96ea4927640952c57153f2a1633dee9c13a2227e17ddd46b160 WHIRLPOOL cbe7d227e70c1314ab15c90f4b5ba3f451f421769ebbb13589f8e66f8d09ca0986d50c0cfecdcce53fbd5a70c3aa027a5b20ea4f8c56ee05b5fc9c7be895fa18
 DIST dd_rescue-1.46.tar.gz 126790 SHA256 9e09b5583f778fe43b6c473998fe0455486d5ffeacbb72b022d6cf5ba8241aba SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 WHIRLPOOL ac965019d38539962018bcc5a6d32cbf303b4d00d5ed91d643655a820f17bfa1ca81b5123f95220663823e6622d55099a2da08aaacf60cefc37097aa3354c729
+DIST dd_rescue-1.99.tar.bz2 168200 SHA256 5545f54a5e5bee2b9ac69959b1bc81aafae24939393efb8cc581e68ab1b2e47d SHA512 f484f1a86b3bd7c098eb568e193888d98def35b1bec2f553eb3543a5ae22417dbddb562a5c809613a1493ecac3689dcc2a45e26446a3e16036a19e716e38bd11 WHIRLPOOL 94ca6b49636c3f8b0a0901141a3ca16945f0cb5364b97d5d0d759ee1b034f33019ee0bf4f43f7977f0176832d95cecc0aab9cb89e783eabac14290ada4c9f1e1
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.ebuild
new file mode 100644
index 0000000000..60021df22e
--- /dev/null
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+	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/files/dd_rescue-1.99-test_fix.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch
new file mode 100644
index 0000000000..6ddf7116f9
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch
@@ -0,0 +1,11 @@
+--- 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"