Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/pathload/files/, net-analyzer/pathload/
Date: Wed, 08 Jan 2020 09:44:54
Message-Id: 1578476689.1003503f832060ce6d344c9b80745cf23241a441.jer@gentoo
1 commit: 1003503f832060ce6d344c9b80745cf23241a441
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 8 09:44:35 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 8 09:44:49 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1003503f
7
8 net-analyzer/pathload: EAPI=7
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 net-analyzer/pathload/files/pathload-1.3.2-make.patch | 4 ++--
14 .../{pathload-1.3.2.ebuild => pathload-1.3.2-r1.ebuild} | 11 +++++++----
15 2 files changed, 9 insertions(+), 6 deletions(-)
16
17 diff --git a/net-analyzer/pathload/files/pathload-1.3.2-make.patch b/net-analyzer/pathload/files/pathload-1.3.2-make.patch
18 index f9784883962..451b0eadf53 100644
19 --- a/net-analyzer/pathload/files/pathload-1.3.2-make.patch
20 +++ b/net-analyzer/pathload/files/pathload-1.3.2-make.patch
21 @@ -9,11 +9,11 @@
22
23 pathload_snd: $(SOBJS)
24 - $(CC) $(SOBJS) -o pathload_snd $(LIBS) $(LDFLAGS) $(CFLAGS)
25 -+ $(CC) $(LDFLAGS) $(CFLAGS) $(SOBJS) -o pathload_snd $(LIBS)
26 ++ $(CC) $(CFLAGS) $(LDFLAGS) $(SOBJS) -o pathload_snd $(LIBS)
27
28 pathload_rcv: $(ROBJS)
29 - $(CC) $(ROBJS) -o pathload_rcv $(LIBS) $(LDFLAGS) $(CFLAGS)
30 -+ $(CC) $(LDFLAGS) $(CFLAGS) $(ROBJS) -o pathload_rcv $(LIBS)
31 ++ $(CC) $(CFLAGS) $(LDFLAGS) $(ROBJS) -o pathload_rcv $(LIBS)
32
33 pathload_rcv.o pathload_rcv_func.o: pathload_gbls.h pathload_rcv.h
34
35
36 diff --git a/net-analyzer/pathload/pathload-1.3.2.ebuild b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
37 similarity index 82%
38 rename from net-analyzer/pathload/pathload-1.3.2.ebuild
39 rename to net-analyzer/pathload/pathload-1.3.2-r1.ebuild
40 index 7d839abed19..27b8252d8e5 100644
41 --- a/net-analyzer/pathload/pathload-1.3.2.ebuild
42 +++ b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
43 @@ -1,8 +1,8 @@
44 # Copyright 1999-2020 Gentoo Authors
45 # Distributed under the terms of the GNU General Public License v2
46
47 -EAPI=5
48 -inherit eutils toolchain-funcs
49 +EAPI=7
50 +inherit toolchain-funcs
51
52 DESCRIPTION="Non-intrusive utility for estimation of available bandwidth of Internet paths"
53 HOMEPAGE="https://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.html"
54 @@ -13,10 +13,13 @@ SLOT="0"
55 KEYWORDS="~amd64 ~x86"
56
57 S=${WORKDIR}/${PN}_${PV}
58 +PATCHES=(
59 + "${FILESDIR}"/${PN}-1.3.2-make.patch
60 +)
61
62 -src_prepare() {
63 - epatch "${FILESDIR}"/${P}-make.patch
64 +src_configure() {
65 tc-export CC
66 + default
67 }
68
69 src_install() {