[gentoo-commits] repo/gentoo:master commit in: net-analyzer/xnetload/files/, net-analyzer/xnetload/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/xnetload/files/, net-analyzer/xnetload/

[Sam James]

commit:     1054f69f75bc586bdceb0001b5a37ed07e0d78d3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 23:56:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 23:56:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1054f69f

net-analyzer/xnetload: update EAPI 5 -> 7, fix libdir, colon-in-CFLAGS

Closes: https://bugs.gentoo.org/731182
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../xnetload/files/xnetload-1.11.3-libdir.patch    | 11 +++++++++++
 net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild    | 23 ++++++++++++++--------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch
new file mode 100644
index 00000000000..3bfbd619c11
--- /dev/null
+++ b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ CC = gcc
+
+ # The next two lines are for building an optimized and stripped program.
+ CFLAGS += -Wall -DNDEBUG -I/usr/include
+-LFLAGS = $(LDFLAGS) -L/usr/lib
++LFLAGS = $(LDFLAGS)
+
+ # These three lines are for building Athlon optimized programs on my system.
+ #CC=gcc-3.1

diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
index d1caa9933a5..1b3e67000f2 100644
--- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
+++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="displays a count and a graph of the traffic over a specified network connection"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.xs4all.nl/~rsmith/software/"
-SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz"
+DESCRIPTION="Displays a count and a graph of the traffic over a specified network connection"
+HOMEPAGE="https://www.xs4all.nl/~rsmith/software/"
+SRC_URI="https://www.xs4all.nl/~rsmith/software/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
@@ -19,13 +20,19 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.3-libdir.patch"
+)
+
 src_prepare() {
 	sed -i \
-		-e 's:CFLAGS = -pipe -O2 -Wall:CFLAGS += -Wall:' \
-		-e 's:LFLAGS = -s -pipe:LFLAGS = $(LDFLAGS):' \
+		-e 's;CFLAGS = -pipe -O2 -Wall;CFLAGS += -Wall;' \
+		-e 's;LFLAGS = -s -pipe;LFLAGS = $(LDFLAGS);' \
 		-e 's:gcc -MM:$(CC) -MM:' \
 		-e 's:/usr/X11R6:/usr:g' \
 		Makefile || die
+
+	default
 }
 
 src_compile() {