From c7eff13dda8811f88acda894360f181a61c9b96b Mon Sep 17 00:00:00 2001
From: "Ronny (tastytea) Gutbrod" <gentoo@tastytea.de>
Date: Fri, 30 Apr 2021 18:05:42 +0200
Subject: [PATCH] net-libs/kcgi: Export CC and AR in src_prepare().

Build system falls back to hard-coded defaults otherwise.

Closes: https://bugs.gentoo.org/785181
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo@tastytea.de>
---
 net-libs/kcgi/kcgi-0.12.3.ebuild | 14 +++++++++-----
 net-libs/kcgi/kcgi-0.12.4.ebuild | 14 +++++++++-----
 net-libs/kcgi/kcgi-9999.ebuild   | 14 +++++++++-----
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/net-libs/kcgi/kcgi-0.12.3.ebuild b/net-libs/kcgi/kcgi-0.12.3.ebuild
index abebd56bce..418ef22f23 100644
--- a/net-libs/kcgi/kcgi-0.12.3.ebuild
+++ b/net-libs/kcgi/kcgi-0.12.3.ebuild
@@ -26,6 +26,13 @@ DEPEND="
 	test? ( net-misc/curl[static-libs] )
 "
 
+src_prepare() {
+	export CC="$(tc-getCC)"
+	export AR="$(tc-getAR)"
+
+	default
+}
+
 src_configure() {
 	./configure PREFIX="${EPREFIX}/usr" \
 		MANDIR="${EPREFIX}/usr/share/man" \
@@ -35,18 +42,15 @@ src_configure() {
 }
 
 src_compile() {
-	bmake -j$(makeopts_jobs) \
-		CC="$(tc-getCC)" || die
+	bmake -j$(makeopts_jobs) || die
 }
 
 src_test() {
-	bmake -j$(makeopts_jobs) \
-		CC="$(tc-getCC)" regress || die
+	bmake -j$(makeopts_jobs)  regress || die
 }
 
 src_install() {
 	bmake -j$(makeopts_jobs) \
-		CC="$(tc-getCC)" \
 		DESTDIR="${D}" \
 		MANDIR=/usr/share/man \
 		install || die
diff --git a/net-libs/kcgi/kcgi-0.12.4.ebuild b/net-libs/kcgi/kcgi-0.12.4.ebuild
index abebd56bce..418ef22f23 100644
--- a/net-libs/kcgi/kcgi-0.12.4.ebuild
+++ b/net-libs/kcgi/kcgi-0.12.4.ebuild
@@ -26,6 +26,13 @@ DEPEND="
 	test? ( net-misc/curl[static-libs] )
 "
 
+src_prepare() {
+	export CC="$(tc-getCC)"
+	export AR="$(tc-getAR)"
+
+	default
+}
+
 src_configure() {
 	./configure PREFIX="${EPREFIX}/usr" \
 		MANDIR="${EPREFIX}/usr/share/man" \
@@ -35,18 +42,15 @@ src_configure() {
 }
 
 src_compile() {
-	bmake -j$(makeopts_jobs) \
-		CC="$(tc-getCC)" || die
+	bmake -j$(makeopts_jobs) || die
 }
 
 src_test() {
-	bmake -j$(makeopts_jobs) \
-		CC="$(tc-getCC)" regress || die
+	bmake -j$(makeopts_jobs)  regress || die
 }
 
 src_install() {
 	bmake -j$(makeopts_jobs) \
-		CC="$(tc-getCC)" \
 		DESTDIR="${D}" \
 		MANDIR=/usr/share/man \
 		install || die
diff --git a/net-libs/kcgi/kcgi-9999.ebuild b/net-libs/kcgi/kcgi-9999.ebuild
index abebd56bce..418ef22f23 100644
--- a/net-libs/kcgi/kcgi-9999.ebuild
+++ b/net-libs/kcgi/kcgi-9999.ebuild
@@ -26,6 +26,13 @@ DEPEND="
 	test? ( net-misc/curl[static-libs] )
 "
 
+src_prepare() {
+	export CC="$(tc-getCC)"
+	export AR="$(tc-getAR)"
+
+	default
+}
+
 src_configure() {
 	./configure PREFIX="${EPREFIX}/usr" \
 		MANDIR="${EPREFIX}/usr/share/man" \
@@ -35,18 +42,15 @@ src_configure() {
 }
 
 src_compile() {
-	bmake -j$(makeopts_jobs) \
-		CC="$(tc-getCC)" || die
+	bmake -j$(makeopts_jobs) || die
 }
 
 src_test() {
-	bmake -j$(makeopts_jobs) \
-		CC="$(tc-getCC)" regress || die
+	bmake -j$(makeopts_jobs)  regress || die
 }
 
 src_install() {
 	bmake -j$(makeopts_jobs) \
-		CC="$(tc-getCC)" \
 		DESTDIR="${D}" \
 		MANDIR=/usr/share/man \
 		install || die