From: Jeroen Roovers <jer@gentoo.org>
Date: Wed, 8 Jan 2020 09:44:35 +0000 (+0100)
Subject: net-analyzer/pathload: EAPI=7
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1003503f832060ce6d344c9b80745cf23241a441;p=gentoo.git

net-analyzer/pathload: EAPI=7

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
---

diff --git a/net-analyzer/pathload/files/pathload-1.3.2-make.patch b/net-analyzer/pathload/files/pathload-1.3.2-make.patch
index f97848839627..451b0eadf538 100644
--- a/net-analyzer/pathload/files/pathload-1.3.2-make.patch
+++ b/net-analyzer/pathload/files/pathload-1.3.2-make.patch
@@ -9,11 +9,11 @@
  
  pathload_snd: $(SOBJS)
 -	 $(CC) $(SOBJS) -o pathload_snd $(LIBS) $(LDFLAGS) $(CFLAGS)
-+	 $(CC) $(LDFLAGS) $(CFLAGS) $(SOBJS) -o pathload_snd $(LIBS)
++	 $(CC) $(CFLAGS) $(LDFLAGS) $(SOBJS) -o pathload_snd $(LIBS)
  
  pathload_rcv: $(ROBJS)
 -	 $(CC) $(ROBJS) -o pathload_rcv $(LIBS) $(LDFLAGS) $(CFLAGS)
-+	 $(CC) $(LDFLAGS) $(CFLAGS) $(ROBJS) -o pathload_rcv $(LIBS)
++	 $(CC) $(CFLAGS) $(LDFLAGS) $(ROBJS) -o pathload_rcv $(LIBS)
  
  pathload_rcv.o pathload_rcv_func.o: pathload_gbls.h pathload_rcv.h
  
diff --git a/net-analyzer/pathload/pathload-1.3.2.ebuild b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
similarity index 82%
rename from net-analyzer/pathload/pathload-1.3.2.ebuild
rename to net-analyzer/pathload/pathload-1.3.2-r1.ebuild
index 7d839abed195..27b8252d8e52 100644
--- a/net-analyzer/pathload/pathload-1.3.2.ebuild
+++ b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="Non-intrusive utility for estimation of available bandwidth of Internet paths"
 HOMEPAGE="https://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.html"
@@ -13,10 +13,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 S=${WORKDIR}/${PN}_${PV}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.2-make.patch
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
+src_configure() {
 	tc-export CC
+	default
 }
 
 src_install() {