From eb76f5d1ecce29b7d62cfbdb0c19e56d3a2ce2d3 Mon Sep 17 00:00:00 2001
From: Alarig Le Lay <alarig@swordarmor.fr>
Date: Wed, 8 Jul 2020 19:33:04 +0200
Subject: [PATCH] net-dialup/freeradius-client: Try #2 to fix AR

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Alarig Le Lay <alarig@swordarmor.fr>
---
 .../freeradius-client-1.1.7-ar-configure.in.patch | 10 ++++++++++
 .../freeradius-client-1.1.7-r1.ebuild             | 15 +++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 net-dialup/freeradius-client/files/freeradius-client-1.1.7-ar-configure.in.patch

diff --git a/net-dialup/freeradius-client/files/freeradius-client-1.1.7-ar-configure.in.patch b/net-dialup/freeradius-client/files/freeradius-client-1.1.7-ar-configure.in.patch
new file mode 100644
index 0000000..3eae07d
--- /dev/null
+++ b/net-dialup/freeradius-client/files/freeradius-client-1.1.7-ar-configure.in.patch
@@ -0,0 +1,10 @@
+--- a/configure.in	2020-07-08 19:20:38.180447370 +0200
++++ b/configure.in	2020-07-08 19:21:00.840479965 +0200
+@@ -33,6 +33,7 @@
+ 
+ dnl Needed for normal compile
+ AC_PATH_PROG(AR, ar)
++AS_IF([test "${AR}" = ""], [AC_PATH_PROG(AR, x86_64-pc-linux-gnu-ar)])
+ AM_PROG_LIBTOOL
+ 
+ dnl HAVE_SHADOW_PASSWORDS
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
index e05d08c..564fb5f 100644
--- a/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
+++ b/net-dialup/freeradius-client/freeradius-client-1.1.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools toolchain-funcs
+inherit autotools
 
 DESCRIPTION="FreeRADIUS Client framework"
 HOMEPAGE="https://wiki.freeradius.org/project/Radiusclient"
@@ -23,21 +23,16 @@ DOCS=(
 	README.{radexample,rst}
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-ar-configure.in.patch"
+)
+
 src_prepare() {
 	default
 	mv configure.in configure.ac || die \
 		"Renaming configure.in to configure.ac failed"
 
-	echo "AM_PROG_AR = ${AR}" >> Makefile.am
-
 	eautoreconf
-
-	tc-export AR
-
-	for MAKEFILE in $(find -name Makefile.in); do
-		sed -i "s|@AR@|${AR}|" "${MAKEFILE}" || \
-			die "Patching ${MAKEFILE} for ${AR} failed"
-	done
 }
 
 src_configure() {