From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 24 Apr 2017 01:59:45 +0000 (-0700)
Subject: dev-util/android-tools: re-apply fix for bug 580686
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=289418fab1a93a03a18851cfed83f0c77e80ad72;p=gentoo.git

dev-util/android-tools: re-apply fix for bug 580686

Package-Manager: Portage-2.3.5, Repoman-2.3.2
---

diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
index 61a84f5ea642..f5e1750c5427 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -52,6 +52,10 @@ src_prepare() {
 	mv core/*/* core/ || die
 	epatch arch/*/trunk/fix_build.patch
 	cp arch/*/trunk/generate_build.rb ./ || die
+	sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
+		-e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
+		-e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
+		-i extras/ext4_utils/sha1.{c,h} || die #580686
 	default
 }