gentoo resync : 20.03.2021

3 files changed, 28 insertions, 9 deletions

diff --git a/net-analyzer/xnetload/Manifest b/net-analyzer/xnetload/Manifest
index 1bc81e279d50..d7caf3ae8805 100644
--- a/net-analyzer/xnetload/Manifest
+++ b/net-analyzer/xnetload/Manifest
@@ -1,3 +1,4 @@
+AUX xnetload-1.11.3-libdir.patch 318 BLAKE2B e36abfc59a4d7266ac2f76b9d5d6d703b55f696e7044b34b3978767cb86355227645f5a245a5df1dea59021434185d9b9b5cab3a0f6feb851d4b1df8b41bd27f SHA512 78f96d5df50d443190516fbea3af6b31496407f38a9a7a45beeda6077e0ba6df8c5484acae5a88dd9bcf59ab8ff0b2efce56c145895f25c67e92cb3da540620f
 DIST xnetload-1.11.3.tar.gz 24551 BLAKE2B f23ebc6609a2824f2b60aa045f505422df87ed21e622e4267f850f2d5954b312019d68a9738512e92f30e7f1745886743a82d3f08fcae1e1adff3acf4294ec6b SHA512 2008102c132ee96b12251b7c2475efcae7926bb16ba032f75d6be42650785fb707bed3696586369c04bb0e9434ee7854de585e7a015f1a15037a7f30c86036b7
-EBUILD xnetload-1.11.3-r1.ebuild 869 BLAKE2B 722f47fcd35ee4f641356e2d4453c979d7b403ee3f18f192f38d5a3034646c419ef7e866b327e4a47467ffd7c159844c00ece122bcf345a587f796c31aacf060 SHA512 1eaa8dcc4591ffb7662045b6056e16489383c740eef4d7d71a703fa1e333fcd208abff9ee6949d965a76e1eec26082fd4ac9eabfc50554027571b9a8071742db
+EBUILD xnetload-1.11.3-r1.ebuild 936 BLAKE2B 2b2c54db22f56a17b84c43c6387ab0374d2989d43b39d68ee286075a31acc8bbe5ccf5869e6dc44dca4ecaad834addf66953c7af8bb691b820cf82c1ce18ab10 SHA512 b85224ee9f90ef7b90da30172e42d02e9d37549aef8980ce8bfcc1934f0f126746a3b27c7bf1eb255d717b4e97fec921feddc1e33a99e75b445c26e5a0f9d06d
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
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 000000000000..3bfbd619c112
--- /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 d1caa9933a52..1b3e67000f2a 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() {