gentoo auto-resync : 07:12:2022 - 03:12:11

3 files changed, 48 insertions, 16 deletions

diff --git a/net-analyzer/netpipe/Manifest b/net-analyzer/netpipe/Manifest
index 108fc3f47e66..2a3c47c2a9e0 100644
--- a/net-analyzer/netpipe/Manifest
+++ b/net-analyzer/netpipe/Manifest
@@ -1,4 +1,4 @@
-AUX netpipe-3.7.2-fix-makefile.patch 316 BLAKE2B f34de8edff9f7f9f108e0d97bd177d564b1609abeab39359706225a3487f2afe677813668ab8622cae85dd27d9dba19e1afe4374a978918a3758918ada44cc63 SHA512 5d31cfd8e4007cb0bf0fd5e921c92bfb8f8a1342176091fcd98d35a41a0dfef4125073ff309df1cc6e8682099ce08bfc521bbde900978578dddcc5507482b07b
+AUX netpipe-3.7.2-fix-makefile.patch 1697 BLAKE2B b5e817e1dd6ef7a08ec1e538006449cdadf366d8004c981fcb038b6814e4337b9efebdc29dab54508fde739e65d4f8a06ae5656b3a6eb3fca82bbcb8d2c102de SHA512 8dd77a5c65dc5f311d99f42d31324efb1d6a3d77635c7ddffee7b977193c4ad1d98cdf712ca93fdceaa507b53cb22b078488f64002a183d2dacdf39789c0c8cf
 DIST NetPIPE-3.7.2.tar.gz 400248 BLAKE2B 151bf98e67b9dbd9724c51a247ba9ffdb13d622f6c4959e05e3acf0072b895ada385f4cb12c6ebddaf9bdc96666471a75d574c1aa5b0e817cf306239d0cac714 SHA512 158c24665bcc55144452c2aeff067e0d853ffca1ecd130d52c3ea7d4068c53e81f9a1133d0cca847d28f597f68b20f01e79811f81ab1396dd18ba2eaaf691430
-EBUILD netpipe-3.7.2.ebuild 794 BLAKE2B e1b3731e224ac526d67166bc80a4f5dfb71db9433dff40f6fd9b6e8d1b1caa48525a262fd488583770ac73b759c61101c1403f03cf93fd9b9ca3cdd9cceffa64 SHA512 a7a232057fdf359bb9838b29574f5c1af4ee9389998253ef1920628fe584e84dbcaa0014d3aa60d44aba55ec50747e0ff989f360506b11449cb0aa3054130ebe
+EBUILD netpipe-3.7.2-r1.ebuild 784 BLAKE2B 36bf288ea581bdcb634b639eb7648299d23c6ef97c928baba7d744be26bb0f57ea5ab2ced476e406186c1b6f34a635939e728d634e70633fae25f5f065602304 SHA512 8ba7c10b2de1452bc3d470a331152ae9cb65bcac71d18fb82113952f570cf9fffaa2e45c26e6558c277b81776a8724396eed6c3c1627155cac4f298182bb5a5a
 MISC metadata.xml 908 BLAKE2B 978bb4ecce731989696d62ace0d689df2666267748fda11060513ae3cefa1485ba12b2e7f7bacaaf8eaf758153d6c95c8c719139f8e8d7433982d30cd4f5e75d SHA512 2c8dac1a5d7bacb0b0d47ff3d1621d63727c15910bafb97fa91f086eae05bf21e463f107f92fe11aee519dddce7a74e29215ead1871305d884e4ba5fd505999b
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
 }