net-analyzer/netpipe: update EAPI 6 -> 8

Closes: https://bugs.gentoo.org/724952
Signed-off-by: David Seifert <soap@gentoo.org>

2 files changed, 46 insertions, 14 deletions

diff --git a/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch b/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch
index f5c61737f7ae..d1f04a33a2dc 100644
--- a/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch
+++ b/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/makefile b/makefile
-index 16f9052..3ada81f 100644
 --- a/makefile
 +++ b/makefile
 @@ -21,8 +21,6 @@
@@ -11,3 +9,36 @@ index 16f9052..3ada81f 100644
  SRC        = ./src
  
  # For MPI, mpicc will set up the proper include and library paths
+@@ -91,26 +89,26 @@
+ 
+ 
+ tcp: $(SRC)/tcp.c $(SRC)/netpipe.c $(SRC)/netpipe.h 
+-	$(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/tcp.c -DTCP -o NPtcp -I$(SRC)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/tcp.c -DTCP -o NPtcp -I$(SRC)
+ 
+ tcp6: $(SRC)/tcp.c $(SRC)/netpipe.c $(SRC)/netpipe.h 
+-	$(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/tcp6.c -DTCP6 \
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/tcp6.c -DTCP6 \
+ 		-o NPtcp6 -I$(SRC)
+ 
+ sctp: $(SRC)/sctp.c $(SRC)/netpipe.c $(SRC)/netpipe.h 
+-	$(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/sctp.c -DSCTP \
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/sctp.c -DSCTP \
+ 		-o NPsctp -I$(SRC)
+ 
+ sctp6: $(SRC)/sctp6.c $(SRC)/netpipe.c $(SRC)/netpipe.h 
+-	$(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/sctp6.c -DSCTP6 \
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/sctp6.c -DSCTP6 \
+ 		-o NPsctp6 -I$(SRC)
+ 
+ ipx: $(SRC)/ipx.c $(SRC)/netpipe.c $(SRC)/netpipe.h 
+-	$(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/ipx.c -DIPX \
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/ipx.c -DIPX \
+ 		-o NPipx -I$(SRC) -lipx
+ 
+ memcpy: $(SRC)/memcpy.c $(SRC)/netpipe.c $(SRC)/netpipe.h
+-	$(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/memcpy.c \
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/memcpy.c \
+               -DMEMCPY -o NPmemcpy -I$(SRC)
+ 
+ MP_memcpy: $(SRC)/memcpy.c $(SRC)/netpipe.c $(SRC)/netpipe.h $(SRC)/MP_memcpy.c
diff --git a/net-analyzer/netpipe/netpipe-3.7.2.ebuild b/net-analyzer/netpipe/netpipe-3.7.2-r1.ebuild
index 894cf55c72a7..1cda1d25fa4a 100644
--- a/net-analyzer/netpipe/netpipe-3.7.2.ebuild
+++ b/net-analyzer/netpipe/netpipe-3.7.2-r1.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
-MY_PN=NetPIPE
-MY_P=${MY_PN}-${PV}
+MY_PN="NetPIPE"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="network protocol independent performance evaluator"
 HOMEPAGE="http://bitspjoule.org/netpipe/"
 SRC_URI="http://bitspjoule.org/netpipe/code/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-1+"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -24,21 +26,20 @@ DOCS=(
 	dox/netpipe_paper.ps
 	dox/np_cluster2002.pdf
 	dox/np_euro.pdf
-	)
+)
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-makefile.patch
-	)
+PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch )
 
-S="${WORKDIR}"/${MY_P}
+src_configure() {
+	tc-export CC
+}
 
 src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" memcpy tcp $(usex ipv6 tcp6 '')
+	emake memcpy tcp $(usev ipv6 tcp6)
 }
 
 src_install() {
-	dobin NPmemcpy NPtcp
-	use ipv6 && dobin NPtcp6
+	dobin NPmemcpy NPtcp $(usev ipv6 NPtcp6)
 	doman dox/netpipe.1
 	einstalldocs
 }