From ce98255fdb691cf9454eca90bd828d3c12a0b51f Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Tue, 5 Apr 2022 11:28:06 +0200
Subject: [PATCH] sys-cluster/mrnet: respect AR

Bug: https://bugs.gentoo.org/836796
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 ...et-5.0.1_p20180510-respect-AR-CFLAGS.patch | 53 +++++++++++++++++++
 ...ebuild => mrnet-5.0.1_p20180510-r5.ebuild} | 11 ++--
 2 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 sys-cluster/mrnet/files/mrnet-5.0.1_p20180510-respect-AR-CFLAGS.patch
 rename sys-cluster/mrnet/{mrnet-5.0.1_p20180510-r4.ebuild => mrnet-5.0.1_p20180510-r5.ebuild} (88%)

diff --git a/sys-cluster/mrnet/files/mrnet-5.0.1_p20180510-respect-AR-CFLAGS.patch b/sys-cluster/mrnet/files/mrnet-5.0.1_p20180510-respect-AR-CFLAGS.patch
new file mode 100644
index 0000000000..347ea7e948
--- /dev/null
+++ b/sys-cluster/mrnet/files/mrnet-5.0.1_p20180510-respect-AR-CFLAGS.patch
@@ -0,0 +1,53 @@
+--- a/conf/configure.in
++++ b/conf/configure.in
+@@ -215,10 +215,6 @@
+ CXXFLAGS="$CXXFLAGS $STDCFLAGS"
+ CFLAGS="$CFLAGS $STDCFLAGS"
+ 
+-dnl === Ignore user-requested debug/optimization levels
+-CXXFLAGS=`echo $CXXFLAGS | sed 's/-g //; s/-O //; s/-O1 //; s/-O2 //; s/-O3 //'`
+-CFLAGS=`echo $CFLAGS | sed 's/-g //; s/-O //; s/-O1 //; s/-O2 //; s/-O3 //'`
+-
+ dnl === SETTING MRNET PLATFORM VARIABLES ===
+ 
+ dnl MRNET_ARCH is host returned by config.guess with
+@@ -275,7 +271,6 @@
+ 
+     C_AS_CPLUSPLUS="-x c++"
+ 
+-    AC_PATH_PROG(AR, ar)
+     AC_SUBST(AR)
+     ARFLAGS="crv"
+     AC_SUBST(ARFLAGS)
+@@ -292,7 +287,6 @@
+ 
+     C_AS_CPLUSPLUS="-x c++"
+ 
+-    AC_PATH_PROG(AR, ar)
+     AC_SUBST(AR)
+     ARFLAGS="crv"
+     AC_SUBST(ARFLAGS)
+@@ -306,7 +300,6 @@
+ 
+     C_AS_CPLUSPLUS="-+"
+ 
+-    AC_PATH_PROG(AR, ar)
+     AC_SUBST(AR)
+     ARFLAGS="crv"
+     AC_SUBST(ARFLAGS)
+@@ -342,7 +334,6 @@
+ 
+     SOFLAGS="$SOFLAGS -fPIC -shared"
+ 
+-    AC_PATH_PROG(AR, ar)
+     AC_SUBST(AR)
+     ARFLAGS="crv"
+     AC_SUBST(ARFLAGS)
+@@ -357,7 +348,6 @@
+ 
+     SOFLAGS="$SOFLAGS -fPIC -shared"
+ 
+-    AC_PATH_PROG(AR, ar)
+     AC_SUBST(AR)
+     ARFLAGS="crv"
+     AC_SUBST(ARFLAGS)
diff --git a/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r4.ebuild b/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r5.ebuild
similarity index 88%
rename from sys-cluster/mrnet/mrnet-5.0.1_p20180510-r4.ebuild
rename to sys-cluster/mrnet/mrnet-5.0.1_p20180510-r5.ebuild
index 0bc6abcc10..c7d1d29d7f 100644
--- a/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r4.ebuild
+++ b/sys-cluster/mrnet/mrnet-5.0.1_p20180510-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 COMMIT="7375ba5bb0df87c68e58ad15e9e5e351ae020c08"
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="A Multicast/Reduction Network"
 HOMEPAGE="http://www.paradyn.org/mrnet"
@@ -30,19 +30,24 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}/${P}-respect-AR-CFLAGS.patch"
 	"${FILESDIR}/${P}-respect-LDFLAGS.patch"
 	"${FILESDIR}/${PN}-no-libi.patch"
 )
 REQUIRED_USE="slurm? ( libi )"
 
 src_prepare() {
+	tc-export AR CC CXX
 	rm -r external || die
 	default
+	pushd conf || die
+	mv configure.{in,ac} || die
+	eautoreconf
+	popd || die
+	mv conf/configure configure || die
 }
 
 src_configure() {
-	tc-export AR CC CXX
-
 	use libi && append-cxxflags "-llibi"
 	local myconf=(
 		--enable-shared