From e0d7fc6a25fcbe8dfc7853e3e878bd42148422dc Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 31 Dec 2018 01:08:27 -0800
Subject: [PATCH] dev-util/android-tools: fix 9.9.0_p3 CC bug 674162
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported-by: Toralf Förster <toralf@gentoo.org>
Closes: https://bugs.gentoo.org/674162
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Zac Medico <zmedico@gentoo.org>
---
 .../android-tools-9.0.0_p3.ebuild             | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index 6399a1eb13cc5..5a8c4c5ac0ce1 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -95,6 +95,16 @@ src_prepare() {
 	cd "${S}" || die
 	default
 
+	sed -E \
+		-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \
+		-e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \
+		-e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \
+		-e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \
+		-e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \
+		-e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \
+		-e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
+		-i build.ninja || die
+
 	# The pregenerated ninja file expects the build/ dir.
 	BUILD_DIR="${CMAKE_USE_DIR}/build"
 	cmake-utils_src_prepare
@@ -104,16 +114,6 @@ src_configure() {
 	append-lfs-flags
 
 	cmake-utils_src_configure
-
-	sed -i \
-		-e "s:@CC@:$(tc-getCC):g" \
-		-e "s:@CXX@:$(tc-getCXX):g" \
-		-e "s:@CFLAGS@:${CFLAGS}:g" \
-		-e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
-		-e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
-		-e "s:@LDFLAGS@:${LDFLAGS}:g" \
-		-e "s:@PV@:${PV}:g" \
-		build.ninja || die
 }
 
 src_compile() {