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

26 files changed, 134 insertions, 377 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8aad43117a85..57637bcb2bc2 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest
index c258771a6e5f..bce5401e08cb 100644
--- a/net-analyzer/dhcp_probe/Manifest
+++ b/net-analyzer/dhcp_probe/Manifest
@@ -1,18 +1,8 @@
-AUX 1.3.0/01_dhcp_probe.5.patch 2148 BLAKE2B 71d2e70afabea13ea5061755ba35fc7b2f40b2d595e12f6923b5deabfb3fb54e780efb7e1ce1e874c9fed75b71355b27e9ce2b419f09607ec3e7984211833918 SHA512 490e9ad1e81e7e89133dfcd44d61806c0751c9b02616258d3037c03376a7277431d9e113aab4f1bc2aca4a9f0a2a93c83d2ebbff8ea3cfdeb3693f77711679e0
-AUX 1.3.0/02_dhcp_probe.8.patch 1467 BLAKE2B 571227aa72f48b67fdfa55c6a5ff2cd29683b0b11bc04aca7c7c99393a1d0949a985bc495fb343b1b53e891893224471bcaa4d5236c0dc7c33cb2700aa7e1de2 SHA512 f5640eb6c81beb6e8060b6e8d76e4bdabf690e2b4f5c2ce230738cf1c3b59c068b15c61816cf903279d79f76c02e31a9ac98cc05ddbee0ce11c3936c0f502e8c
-AUX 1.3.0/03_implicit_point_conv_bootp.c.patch 619 BLAKE2B b4c7aaa7b1aa948b62949889251f17b12532d428233d2e53952835cb779c3278093d46774da697bb13edfa1159037d5cfda858db54a0d551bb3b74939206acbc SHA512 e42f3c97e867c21195875b87577cd3ae9e635da480c4fd7116a2fa2d3ae7a6b90ffd5977aa8a146e20684faa5f4745fb4b55fea6971a6b2661669a8972e1d4e3
-AUX 1.3.0/04_linux_32_or_64bits.patch 1216 BLAKE2B 6de0289e2577799b7cf0a135b07cc93373b6133df9598976ca009af78696f20b46d2d48bf87c7317e0cdfbe1619e1ee8fe0cc7a67fa989e2bbf1aab9ada477b8 SHA512 1a55059f60f56e8bca8a07a0afd4ae472ae81aaf09ba7a2df01654770c1785abc2353bcd06318a96739b523646b17a28eaabf7e4db620c91f18cc371f7045a6c
-AUX 1.3.0/05-cleanup.patch 722 BLAKE2B 503438de3fe4c793616b32142034e9e4e37b0ea579e75fe41189cf45e81cf80fcb3e081c3f985af9ba24528aa0b5ad384531070d4fd397a9d4c289b83a04951a SHA512 7cf04f916fdef88ae245d035b70a7081977f275b3fe8ddb4c43bb1106a82dc282f8caaac6e79d4ffa332ec4f548f90a381283503f09294ad889e0a197ed790be
-AUX 1.3.0/06-return.patch 271 BLAKE2B 958af1f4ec99a02e50d834904a5dffd611c4d949cc77ae3c548021db262dd1c875c384f879aea852ffd19d85e514e913927cc01dcc6f1fea02ae9f4074850225 SHA512 608588d4b6ab9be136493b5bbfd44461525b3e8f767c0a834b502aebcb418ba620792a29b65568e951f38565a2972cac62d09c4c957ef90f2b11a7991cecb726
-AUX 1.3.0/07-comment.patch 747 BLAKE2B 6232a744729796c4cf0b1f27ae7f9b91b079e9bb9b3d24c7f8eb9dfa96ba62def8f5bd0f37ff226971b7c75c91d361b4cee7baeaff88ab3433415e81caa2c242 SHA512 1509363c088d7a30373d3a93dfb8d702154050de5adcd743f370174d113c54330f5728f970f297a4202ad2b1538cb316325adac267e1079ac3710b2c8dfb86d8
-AUX 1.3.0/08-man8.patch 612 BLAKE2B 9d20491e8f4c138f580fef215b2ee1c30b6b02594fe0a7a2d6d1bd60e920338ec3899c228d78f10f961fd6dc3968c03f3494b33932e289e48a0e05467f4a3cb3 SHA512 5bdd6f26bc60624aaa529b57a6290a9c03ef7ebc3f25881025c4b0cd1a69424249920adaa3ec513c5475808744f49e683965a836eea5fea8321b441dfdc9e8b9
 AUX dhcp_probe-1.3.1-fix-configure-CPP.patch 884 BLAKE2B f1d55b1f89b153a654db9c0f38f1189c928fbaf73ca8dee30619da4253ef809dbc8d1619f060fce9ad078d8f184b0b148de13a7037a7f610925d6b00faaedb33 SHA512 0067420ab9f004af3f09deb8c4a478158848155ef5ee561fcb301db762689acb6b92ed95b39f520075d9f79c32f318ab01887c0d62d883396ee7a6edb8438000
 AUX dhcp_probe-1.3.1-respect-AR.patch 285 BLAKE2B c2b9f6afd5845a3e57be9bd7dff1fc8f0ec652ec13ea0a402a7379f62c3ea9015fa1d5dec11b218f28ae1949bed9561710ffbc9531e3e37a9063c74a8312df79 SHA512 b524de3671390e14792a2051703796e1b09c4e5028c739e5b8bb0a49051119656a250e4420a0a583e6fd8d96906d5c8275de7caf34626e937d4e9e5111c525b2
 AUX dhcp_probe.confd 221 BLAKE2B 0d54b9705fc70d1bacffd62b9017d484c6534f737e69ac5b8172f17fa6d3cd682b5458983074456b19f5669aa3d4e09267d0946d5e43637b009d640b1c3059b5 SHA512 c12c574da59c4727470c4add4f1bad1a6787329218f2af5cfa17dac46de1bde546011b24e95c06900c173885eb9d152965d8edaed07117cc36f19755da157f47
 AUX dhcp_probe.initd 1189 BLAKE2B 8b6aa24418782d4efb551f7c6d7e1d78852681034829c1b323636467c4e0cd8c8d642b0dc976641d31bca8485134ac0beb0287b8ee61c25c6b149d140102ff7e SHA512 bca85a97c55625a7a72241edf738b61dc13b2c96b8ef53fef6d7594d744b0b65f0c0b0d3aad209b629906f13bb39591240a224bb0d59a2516a924ec921463742
 AUX dhcp_probe_mail 627 BLAKE2B 830dd02b1e309fc343692d91feb0380a13b8b3889ebf1fea5b29f085b15ad8a8bf4bcf75a9cb836229c503532fc48cfaab6b651b9d578b743a91f96bdfb68b0c SHA512 2a66c702d71835115a0a3b340d2c9e256ce2de6a983247dd4e2c3c0d908a5ac9f0cf7ffbbe45c1e441e906833c7091eb0c19b6c6034ca46edf1d635dfa15b0c0
-DIST dhcp_probe-1.3.0.tar.gz 211613 BLAKE2B cbcc43b292fe537216ef40de9e417c1f700be4ad5f34feacd9475eb31866b68957ce66c5abc47db3b7e5a0dc8751ca6e54200b79ab2f1f8c3f308f6c1c7aef4d SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854
 DIST dhcp_probe-1.3.1.tar.gz 246238 BLAKE2B 86c079c4c7951f3a70ced20dbea5d4f0d716335d2f9a18b1b9986965ca0446b5a7b673c7e652405deceeef336218016418a86be1a76d452c7802061403a66e82 SHA512 1002683e6ceb3806289fa9e4879be3d957a9ddc42656d7114942708560f8efba0db058137e04cad092e5a083900987aa1f76c5a7c20db4b57c104dd6a6fcabb6
-EBUILD dhcp_probe-1.3.0-r4.ebuild 1128 BLAKE2B 3b5dcfd15dd977d8f95c5e2cdbc869ee37984c81a503950b3017b40545e86574b82928e785dd4b80599cc283c346abda5cc8031b619cbedf487dcfc47d516a3a SHA512 a43a0cfb7c3c3c784d12ab8b9aef02edc9230f773e8d0ccd07ff46f163d57fede4aae5d84c742ace7578a32053cd1784310cdca200924ad23fff4c0f8d0651e1
-EBUILD dhcp_probe-1.3.1.ebuild 1015 BLAKE2B d21276b135954047bffbafdba70f86e6a00f761ff3bef578391ee19ad786fd2531c654372a8396b3d08228f9214fc964e7f56fafbcf1992a377e5c1f6b47dfd7 SHA512 5fabdf362a49177a36ea72b3d1ab3841d54594c1791885c9d2c66216a7e179bc8c4f4c213e3221fde55de02b1c163035795f73a7f84bc42ce1642c8efd6217e3
+EBUILD dhcp_probe-1.3.1.ebuild 953 BLAKE2B d9f346707a7a8dc00346d5765b6049923f1c00de3cfc2dafc987affe24a2213380e17d6c8da8b884d95bb79433f7ed494c38968fdd6c8c59821de3f2cb52bf9b SHA512 a412f7590a411764a076a50d96207bccd1d4e2b73664152733528be5221ae6cf280d272ec7d8850cb6e60361accff9a58404256115aca05b9a3cafcf32b0c476
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild
deleted file mode 100644
index 3819fc35ca70..000000000000
--- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="discover DHCP and BootP servers on a directly-attached Ethernet network"
-HOMEPAGE="https://www.net.princeton.edu/software/dhcp_probe/"
-SRC_URI="https://www.net.princeton.edu/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	net-libs/libpcap
-	>=net-libs/libnet-1.1.2.1-r2
-"
-RDEPEND="${DEPEND}"
-DOCS=(
-	"${FILESDIR}"/${PN}_mail
-	AUTHORS
-	ChangeLog
-	NEWS
-	README
-	TODO
-	extras/dhcp_probe.cf.sample
-)
-PATCHES=(
-	"${FILESDIR}"/${PV}/01_dhcp_probe.5.patch
-	"${FILESDIR}"/${PV}/02_dhcp_probe.8.patch
-	"${FILESDIR}"/${PV}/03_implicit_point_conv_bootp.c.patch
-	"${FILESDIR}"/${PV}/04_linux_32_or_64bits.patch
-	"${FILESDIR}"/${PV}/05-cleanup.patch
-	"${FILESDIR}"/${PV}/06-return.patch
-	"${FILESDIR}"/${PV}/07-comment.patch
-	"${FILESDIR}"/${PV}/08-man8.patch
-)
-
-src_configure() {
-	use amd64 && append-flags -D__ARCH__=64
-	STRIP=true econf
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild
index 4bcdb5ae2887..c7d6357a1e18 100644
--- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,19 +13,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="net-libs/libpcap
-	>=net-libs/libnet-1.1.2.1-r2"
+DEPEND="
+	net-libs/libnet
+	net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
-DOCS=(
-	AUTHORS
-	ChangeLog
-	NEWS
-	README
-	TODO
-	extras/dhcp_probe.cf.sample
-)
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.1-respect-AR.patch
 	"${FILESDIR}"/${PN}-1.3.1-fix-configure-CPP.patch
@@ -50,7 +42,7 @@ src_configure() {
 src_install() {
 	default
 
-	dodoc "${FILESDIR}"/${PN}_mail
+	dodoc extras/dhcp_probe.cf.sample "${FILESDIR}"/${PN}_mail
 
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch b/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch
deleted file mode 100644
index 2d5599c06224..000000000000
--- a/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_dhcp_probe.5.dpatch by Laurent Guignard <lguignard.debian@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change a syntax problem in groff file for hyphenation problem
-## Note:
-##   Submitted to upstream programmer Irwin Tillman<irwin@princeton.edu>.
-##       This patch will be applied in the next version of the upstream code.
-
-
-@DPATCH@
-diff -urNad trunk~/doc/dhcp_probe.cf.5 trunk/doc/dhcp_probe.cf.5
---- trunk~/doc/dhcp_probe.cf.5	2009-03-30 14:53:40.000000000 +0200
-+++ trunk/doc/dhcp_probe.cf.5	2009-03-30 14:57:05.000000000 +0200
-@@ -472,10 +472,10 @@
- .PP
- .RS
- .nf
---p the name of the calling program (e.g. dhcp_probe),
---I the name of the interface on which the unexpected response packet was received
---i the IP source address of the packet
---m Ethernet source address of the packet
-+\-p the name of the calling program (e.g. dhcp_probe),
-+\-I the name of the interface on which the unexpected response packet was received
-+\-i the IP source address of the packet
-+\-m Ethernet source address of the packet
- .fi
- .RE
- .PP
-@@ -483,7 +483,7 @@
- .PP
- .RS
- .nf
---y the non-zero yiaddr value from the packet, when it falls inside a "Lease Network of Concern"
-+\-y the non-zero yiaddr value from the packet, when it falls inside a "Lease Network of Concern"
- .fi
- .RE
- .PP
-@@ -723,7 +723,7 @@
- #   alert_program_name2 /absolute/path/name
- #
- # The program specified via 'alert_program_name2' will be called as follows:
--#   /absolute/path/name  -p name_of_calling_program  -I name_of_interface_on_which_the_response_was_received  -i IP_source_of_the_response  -m ether_src_of_the_response [-y yiaddr_when_in_lease_networks_of_concern]
-+#   /absolute/path/name  \-p name_of_calling_program  \-I name_of_interface_on_which_the_response_was_received  \-i IP_source_of_the_response  \-m ether_src_of_the_response [\-y yiaddr_when_in_lease_networks_of_concern]
- # The options may appear in any order.
- # The program must silently ignore any options or arguments it does not recognize,
- # so as to be forward-compatible with future enhancements to dhcp_probe.
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch b/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch
deleted file mode 100644
index d9d3d5aa898a..000000000000
--- a/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_dhcp_probe.8.dpatch by Laurent Guignard <lguignard.debian@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change a syntax problem in groff file for hyphenation problem
-## Note:
-##   Submitted to upstream programmer Irwin Tillman<irwin@princeton.edu>.
-##       This patch will be applied in the next version of the upstream code.
-
-
-@DPATCH@
-diff -urNad trunk~/doc/dhcp_probe.8 trunk/doc/dhcp_probe.8
---- trunk~/doc/dhcp_probe.8	2009-03-30 14:53:40.000000000 +0200
-+++ trunk/doc/dhcp_probe.8	2009-03-30 15:18:09.000000000 +0200
-@@ -380,15 +380,15 @@
- file,
- that program is executed, with the following required options:
- .nf
--   -p the name of the calling program (e.g. dhcp_probe)
--   -I the name of the interface on which the unexpected response packet was received
--   -i the IP source address of the packet
--   -m and the Ethernet source address of the packet
-+   \-p the name of the calling program (e.g. dhcp_probe)
-+   \-I the name of the interface on which the unexpected response packet was received
-+   \-i the IP source address of the packet
-+   \-m and the Ethernet source address of the packet
- .fi
- If the response packet's yiaddr is non-zero and falls within a "Lease Networks of Concern",
- the following optional options are also passed:
- .nf
--   -y the non-zero yiaddr value
-+   \-y the non-zero yiaddr value
- .fi
- (We do not wait for the
- .I alert_program_name2
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch b/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch
deleted file mode 100644
index 41af750416bf..000000000000
--- a/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_implicit_point_conv_bootp.c.dpatch by Laurent Guignard <lguignard.debian@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix implicit Pointer Converstion in bootp.c file.
-##     Fix bug #529635 discovered by Dann Frazier <dannf@debian.org>
-##
-
-@DPATCH@
-diff -urNad trunk~/src/bootp.c trunk/src/bootp.c
---- trunk~/src/bootp.c	2009-03-31 14:19:06.000000000 +0200
-+++ trunk/src/bootp.c	2009-05-21 09:51:26.000000000 +0200
-@@ -11,7 +11,7 @@
- #include "bootp.h"
- #include "configfile.h"
- #include "report.h"
--
-+#include "utils.h"
- 
- 
- 
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch b/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch
deleted file mode 100644
index dcd79ffc58b2..000000000000
--- a/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_linux_32_or_64bits.dpatch by Laurent Guignard <lguignard.debian@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: A solution to solve the bug #535361
-##     May be this will be a solution with the right method ???
-
-@DPATCH@
-diff -urNad trunk~/src/get_myipaddr.c trunk/src/get_myipaddr.c
---- trunk~/src/get_myipaddr.c	2009-09-03 13:10:32.000000000 +0200
-+++ trunk/src/get_myipaddr.c	2009-09-03 13:15:39.671451172 +0200
-@@ -118,7 +118,21 @@
- #endif /* not STRUCT_SOCKADDR_HAS_SA_LEN */
- 
- 		/* increment ptr to next interface for next time through the loop */
-+#ifdef __ARCH__	/* Debian GNU/Linux behavior for packaging goal */
-+		switch(__ARCH__) {
-+			case 32:	/* 32 bits architectures */
-+				ptr += sizeof(ifr->ifr_name) + len;
-+				break;
-+			case 64:	/* 64 bits architectures */
-+				ptr += sizeof(struct ifreq);
-+				break;
-+			default:	/* Default dhcp_probe behavior */
-+				ptr += sizeof(ifr->ifr_name) + len;
-+				break;
-+		}
-+#else	/* Default dhcp_probe behavior */
- 		ptr += sizeof(ifr->ifr_name) + len;
-+#endif
- 
- 		if (strcmp(ifname, ifr->ifr_name) != 0 )  /* is this the interface we're looking for? */
- 			continue;
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch b/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch
deleted file mode 100644
index 4151b461bbfd..000000000000
--- a/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- dhcp_probe-1.3.0/src/dhcp_probe.c.orig	2009-03-09 21:17:47.000000000 +0100
-+++ dhcp_probe-1.3.0/src/dhcp_probe.c	2009-11-19 18:09:26.000000000 +0100
-@@ -84,7 +84,6 @@
- 	struct sigaction sa;
- 	FILE *pid_fp;
- 	char *cwd = CWD;
--	int i;
- 
- 	int write_packet_len;
- 	int bytes_written;
-@@ -98,9 +97,6 @@
- 	int linktype;
- 	char pcap_errbuf[PCAP_ERRBUF_SIZE], pcap_errbuf2[PCAP_ERRBUF_SIZE];
- 
--	/* for libnet */
--	char libnet_errbuf[LIBNET_ERRBUF_SIZE];
--
- 	/* get progname = last component of argv[0] */
- 	prog = strrchr(argv[0], '/');
- 	if (prog)
-@@ -987,8 +983,6 @@
-    Must not be called until after initial configuration is complete.
- */
-    
--	int i;
--
- 	if (! read_configfile(config_file)) {
- 		my_exit(1, 1, 1);
- 	}
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch b/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch
deleted file mode 100644
index c27ad646e6c9..000000000000
--- a/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dhcp_probe-1.3.0/src/dhcp_probe.c.orig	2009-11-19 18:13:31.000000000 +0100
-+++ dhcp_probe-1.3.0/src/dhcp_probe.c	2009-11-19 18:13:59.000000000 +0100
-@@ -684,6 +684,8 @@
- 		pcap_close(pd_template); 
- 
- 	my_exit(0, 1, 1);
-+
-+	return 0; /* will not be reached */
- }
- 
- 
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch b/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch
deleted file mode 100644
index c8184144a597..000000000000
--- a/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dhcp_probe-1.3.0/src/configfile.c.orig	2009-03-09 21:17:47.000000000 +0100
-+++ dhcp_probe-1.3.0/src/configfile.c	2009-11-19 18:17:03.000000000 +0100
-@@ -55,7 +55,7 @@
- 
- /* parallel arrays of "lease networks of concern" (address & mask), and number of elems in arrays.
-    We also precompute a parallel array of 'addr & mask' to save computing these repeatedly later.
--/* If a response already identified as being from a rogue DHCP server contains a yiaddr field field
-+   If a response already identified as being from a rogue DHCP server contains a yiaddr field field
-    that falls into one of these networks, it is reported as a matter of special concern.
- */
- struct in_addr lease_networks_of_concern_addr[MAX_LEASE_NETWORKS_OF_CONCERN];
diff --git a/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch b/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch
deleted file mode 100644
index 56f8686eaebd..000000000000
--- a/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dhcp_probe-1.3.0/doc/dhcp_probe.8.orig	2009-11-19 18:27:47.000000000 +0100
-+++ dhcp_probe-1.3.0/doc/dhcp_probe.8	2009-11-19 18:28:50.000000000 +0100
-@@ -141,7 +141,7 @@
- libraries.
- .SH OPTIONS
- .TP
--.IB \-c \ config_file
-+.BI \-c \ config_file
- Specifies the configuration file.
- If not specified, this defaults to
- .BR /etc/dhcp_probe.cf .
-@@ -253,7 +253,7 @@
- .B \-v
- Display the program's version number, then exit.
- .TP
--.IB \-w \ cwd
-+.BI \-w \ cwd
- Specifies the working directory; shortly after starting the
- program changes its current working directory to this.
- If not specified, this defaults to
diff --git a/net-analyzer/hexinject/Manifest b/net-analyzer/hexinject/Manifest
index 77b2dc58c599..c16101320989 100644
--- a/net-analyzer/hexinject/Manifest
+++ b/net-analyzer/hexinject/Manifest
@@ -1,4 +1,4 @@
-AUX hexinject-1.6-fix-build-system.patch 462 BLAKE2B abbd87f2ba9c8005649ab50cb16c0fbe78d0be06beae297a5f68d876059e4f86b42fe985f97f0d8ad1ff5c4224f3cb213f3635d6b30cb932e4d09af59e04aa54 SHA512 5cf816c71789d6c487acd757e62d44c4ca0ada32393d2de138311e61eb22c0ca5c49a9e539a7fe333b4fc8ea48ec29b49c4e14db97bc267c45aaa39f8fab04d1
+AUX hexinject-1.6-fix-build-system.patch 511 BLAKE2B 255448e417a34d57b7bfbf1c3952d6532fce23aaa5c4425f51c1b329420e061c69fd5c9f6ad08d72de2a7e68859db8ab2c7cd448065b9d202c3533d59e710283 SHA512 02338a84ee40b009f76b84c098b6ba62b0a500cc5186e793c8e654a1979dafc9592606e12c62e98da9299baf7067c6c7e996bf6eced27831476b3221ddf1d9bd
 DIST hexinject-1.6.tar.gz 16876 BLAKE2B ac2951a5b4705ec84ed72fa5513e84b8bf031bd7e43b05c76fe83fc601cf3a245352afb0f226cc128bb028124ba898bc67394f2d839554ee01e25ee25c8f0c4d SHA512 7432122a7ca42b7ac066cc55daec2d4a656b08e0f390db1a49f626181080d07687026d04a150573e3341e4e76f87a20b6466deddcc9d022e7d66fadcb8dac1ad
-EBUILD hexinject-1.6-r1.ebuild 697 BLAKE2B fab22b1a5b3d00881da6fe0ddbc91c5678d1ad9dc910fa7689708c4dcf31982c94194279a09475777333e17d17ff8202032d3b8ed59c5693549a5298cf0919fa SHA512 89ca26ae193bca85ca9fe8ca0e5075f96254887666f24d84ae2e194d941d3e50bc7f46a40bbde3c319b3cdf977080e29b5924a1d2e11dfadb601f23c9914f2a8
+EBUILD hexinject-1.6-r2.ebuild 681 BLAKE2B 75413e7334ba2568ededee6808a846074bb8b547167f97bfa4af4f9452bc5a60e83f75b4e72254bbd43dff150e6fe8e9e072653ff18a9f167e6e0e6ab470d88d SHA512 bce460b3150f1b085b1843c88b1a23b9c42f84aa6bee7a777b61ce843cf7a9eaee68b3eecb8af811a043cd488f34431120101f411f09df09a00c5df31b7385e0
 MISC metadata.xml 1035 BLAKE2B 8ac7a78fc672c4c807c91452604e279c6888cfbfb06dc39cdbee550fbfee915f5d8d0ca9afb7cfe3e716345ffdeca2badf9ae30efca1ac50ca7e120414341e0f SHA512 369ff6e44e50127b883d6856a9da810f22fc1454acda1b5b1f762566be53d1530dc011192c97935bdef9ee55d4dbd10137223f464e044f7d8da404f1f48d01ae
diff --git a/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch
index fbe91199bbfa..9d22337afa93 100644
--- a/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch
+++ b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch
@@ -1,18 +1,22 @@
 Author: holgersson <holgersson@posteo.de>
 Date:   Fri Oct 20 18:30:00 2017 +0200
 
-Don’t call gcc directly, and respect CFLAGS. As this project
-is plain C I don’t care fore CXXFLAGS here.
+Respect CC, CFLAGS, CPPFLAGS and LDFLAGS.
 
---- a/Makefile	2017-10-20 18:15:11.743805540 +0200
-+++ b/Makefile	2017-10-20 18:24:55.120009439 +0200
-@@ -1,6 +1,6 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,7 @@
 -CC = gcc
 -CFLAGS = -Wall
 -LDFLAGS = -lpcap
-+CC ?= gcc
 +CFLAGS += -Wall
-+LDFLAGS = -lpcap
++LDLIBS = -lpcap
  
- all:
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o hexinject hexinject.c
+-all:
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o hexinject hexinject.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o prettypacket prettypacket.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o hex2raw hex2raw.c
++all: hexinject prettypacket hex2raw
+ 
+ clean:
+ 	rm -f hexinject prettypacket hex2raw *~
diff --git a/net-analyzer/hexinject/hexinject-1.6-r1.ebuild b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild
index e36c1803461e..bfef01f88b8f 100644
--- a/net-analyzer/hexinject/hexinject-1.6-r1.ebuild
+++ b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild
@@ -1,13 +1,14 @@
-# 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
 
 DESCRIPTION="Network packet sniffer and injector"
 HOMEPAGE="http://hexinject.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -18,13 +19,9 @@ DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}
 	experimental? ( dev-lang/tcl )"
 
-S="${WORKDIR}/${PN}"
-
 PATCHES=( "${FILESDIR}"/${PN}-1.6-fix-build-system.patch )
 
 src_configure() {
-	default
-
 	tc-export CC
 }
 
diff --git a/net-analyzer/ifmetric/Manifest b/net-analyzer/ifmetric/Manifest
index 766b7744202d..2406034e285d 100644
--- a/net-analyzer/ifmetric/Manifest
+++ b/net-analyzer/ifmetric/Manifest
@@ -1,5 +1,5 @@
 AUX ifmetric-0.3-replybuf.patch 300 BLAKE2B f064a42b38c18e1d3ac5813cc150f14b9bf52a12ceacfa4a02b5619dfa882cda1481f7475831b0e490f253b223201c5dfc8378184545cf3cc6c7d5756af6db42 SHA512 9f7695db98234418b3479bee84f04d27dbcc054d96c5f1689a0e321fca25df970113a62a8922a796a333adab769665ab962573cfa9e49b6f999d74918c27900b
 AUX ifmetric-0.3-ul.patch 515 BLAKE2B cf6fb13d0ac5d07374b932dbcb5dcdb1219d0ef46581f4c788566b6eb971b3baf41eff8c06a774c1d436f08e379f3806e3de848b8dfe25957ff7b74678eb9397 SHA512 1129d0131dcdf33e01c624ec40349be024f27ecab0bcba184325bac3f8be3023e8a0cbcaaf999080277df050af0f7c4953505573a9054b7b3eb29161bc506847
 DIST ifmetric-0.3.tar.gz 81502 BLAKE2B f918932edb730e50ee3598eaeaadd036ca970234c955f05d45ba44c719b650c222adf0e6f971ed6c3387900ee019e092d7e313f0da57afcc6cd63ef842c644c9 SHA512 301d6bc1c97a59597fe55d81a04c1b654aee24d12ac10201ab56cf23b5164808270f15c142cc49142787db70b400cc18b96561aefcf212111ba47df28f07aa95
-EBUILD ifmetric-0.3-r2.ebuild 641 BLAKE2B 3ff118ee73ebf56e75cfef096fef212f8b7a57146e61061fa01a0b0b3c1fa0f769e0476330acd0c683a2171b07e8aa523c741c31e4fecad675394f7338bf7451 SHA512 d70ad724c04b80a88051e3cd7f2f318082ce2ed5a08183ecf21b99b43d1b0dd1388a11745485d627141adc686ae75332e3c12071fa697188e09899c0beacdb32
+EBUILD ifmetric-0.3-r3.ebuild 636 BLAKE2B 61224592ff9e8500fddadc667e46eea00fabef0c95dae8bccae812f16bfccdb1a11e81af052b35dc1bfe89a60694d83a056f279f4ae2fc2c324a72d2e368dfe4 SHA512 4d657e249f82844f08346b9d7e8dffec517732e8bf87400f8aac1596b4d237d09fa1de7965844b1d87a0f603de0d88de2e7cd466a8d6cb395eca07728901c82a
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild b/net-analyzer/ifmetric/ifmetric-0.3-r3.ebuild
index f5e962992ffb..df13f75e5942 100644
--- a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild
+++ b/net-analyzer/ifmetric/ifmetric-0.3-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Set metrics of all IPv4 routes attached to a given network interface at once"
 HOMEPAGE="http://0pointer.de/lennart/projects/ifmetric/"
@@ -13,15 +13,11 @@ KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="sys-kernel/linux-headers"
 
-DOCS=(
-	README
-	doc/README.html
-)
-
 PATCHES=(
 	"${FILESDIR}"/${P}-ul.patch
 	"${FILESDIR}"/${P}-replybuf.patch
 )
+HTML_DOCS=( doc/README.html )
 
 src_configure() {
 	# man page and HTML are already generated
diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index 737a6805475e..1270180b58fd 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -3,5 +3,5 @@ AUX ndoutils-2.0.0-asprintf.patch 438 BLAKE2B 2d32a25467123281f8593b464362a66345
 AUX openrc-init.patch 3296 BLAKE2B f07c1c0fda7a0d2e1c3f2b9cbae60568f743d82454179bcb3ee367d8a022a406dd1bf0c775fc9b339524cc5c64e4af6aacb8df8a866809104e39f39d11531f26 SHA512 4beb0e72712909554deaa93aa3fe959e80bed3465f4f0a2153f8b4e994538e6d508e303451cc14425ecb5210845308e9a113f491900a977526327a2701b00eb7
 AUX sample-config-piddir.patch 1098 BLAKE2B 467fab110ef030010acf8e130d91ba1f97424c611ef75ed0a7806d5034f1c8a5ecce2c64832a295347fb3e323342f3afc5f5d1fbbc3584f26bd2f3b226cbf3af SHA512 bae06d6571aa55c5b9f0103d9af861f50b31668f06dc9b9a29cdf961741455384d8c762338dbfb3c75e10bacba360ac5a706b6251a6ef5cec8fa0def4c679344
 DIST ndoutils-2.1.3.tar.gz 2182999 BLAKE2B 390548b9018d4434d5d0f69abee1d1a11f4e240150941f7f2f9e2662eb2cdb2f29b24244e094d5bdf8bfaf6c3be7bc8ebd9e6d510d66edad8bc9cf3245d5c2c3 SHA512 727f2051876ff32cafaf9993a69b721ae4ea81031fade12262dbb4c5399c601f3c1af362d9d550e1d6d56fac8fe044d515dc10fc43e7d4d3e981bc9a89db88de
-EBUILD ndoutils-2.1.3-r2.ebuild 2572 BLAKE2B 29b9f5c3353bc3eb12622ab6bbacb5a62d398a7059c835be0a6e71d66e764188c46971236d96d92d141c7a1ad88a520c8fa0537cde9750fb5f4e8f6a9e467a3b SHA512 82ea4e98d2b97714cfef7155638b4eff269a220330eb9e97767880197f06843e9cdd8775f5df9637ea7d1bebe5eaaba41ba750661d2191d074e3cc266e497c5e
+EBUILD ndoutils-2.1.3-r3.ebuild 2573 BLAKE2B 7bcd8d99544612439dc7d29b6b92d3d6acb9171031132171a49af359622d9b332cbb6bdb858c8fa888699ebc911af5e072e31735aa795f7c817082b51984b896 SHA512 9fe667c562f1602c50ca10bf98d3d18a7979031dc3e065b51d17f0fd4f24c7c6d06dfd828c16bbecbf80f2b7f410a5286cb621d3be6f640230cbdcd8e3620f5e
 MISC metadata.xml 447 BLAKE2B be8b56cbd5627725f06feabb9438129f934e90ee93448dd3154edabc9a32cbe65d0b64c1c2f8c1b9d102b20d21d0a1fb0e10ee5ba96965c239f13439f7ca88b6 SHA512 c712854168abe638e5bbcd7c135ccc2906fe665bc8062fd11caa0a3003c5b6d5ec3e959c8295a74cf471025b0c6b88186261e32d37778222fcb3d72d78badb43
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild
index 784309fee43a..044cb36975f4 100644
--- a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit systemd
 
 DESCRIPTION="Nagios addon to store Nagios data in a MySQL database"
 HOMEPAGE="https://www.nagios.org/"
 SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,30 +16,19 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 # We require the "nagios" user from net-analyzer/nagios-core at build
 # time.
-DEPEND="dev-db/mysql-connector-c
+DEPEND="
+	dev-db/mysql-connector-c
 	dev-perl/DBD-mysql
 	dev-perl/DBI
 	>=net-analyzer/nagios-core-4.4.5"
 RDEPEND="${DEPEND}
 	virtual/mysql"
 
-S="${WORKDIR}/${PN}-${P}"
-
-DOCS=(
-	Changelog
-	README
-	THANKS
-	TODO
-	UPGRADING
-	"docs/NDOUTILS DB Model.pdf"
-	"docs/NDOUtils Documentation.pdf"
-)
-
 PATCHES=(
-	"${FILESDIR}/format-security.patch"
-	"${FILESDIR}/ndoutils-2.0.0-asprintf.patch"
-	"${FILESDIR}/sample-config-piddir.patch"
-	"${FILESDIR}/openrc-init.patch"
+	"${FILESDIR}"/format-security.patch
+	"${FILESDIR}"/ndoutils-2.0.0-asprintf.patch
+	"${FILESDIR}"/sample-config-piddir.patch
+	"${FILESDIR}"/openrc-init.patch
 )
 
 src_configure() {
@@ -58,34 +49,38 @@ src_compile() {
 	# Avoid "emake all" so that we don't build the stuff for nagios-2.x
 	# and nagios-3.x, some of which throws QA warnings. We don't use it
 	# anyway.
-	pushd src
-	emake file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug
-	popd
+	emake -C src file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug
 }
 
 src_install() {
+	# The documentation isn't installed by the build system
+	HTML_DOCS=( docs/html/. )
 	default
+
+	dodoc Changelog UPGRADING \
+		"docs/NDOUTILS DB Model.pdf" "docs/NDOUtils Documentation.pdf"
+
+	systemd_newunit startup/default-service ndoutils.service
+
 	insinto /etc/nagios
 	newins config/ndo2db.cfg-sample ndo2db.cfg
 	newins config/ndomod.cfg-sample ndomod.cfg
-	newinitd "startup/openrc-init" ndo2db
-	newconfd "startup/openrc-conf" ndo2db
-	systemd_newunit "startup/default-service" "${PN}.service"
+	newinitd startup/openrc-init ndo2db
+	newconfd startup/openrc-conf ndo2db
 
-	# The documentation isn't installed by the build system
-	dodoc -r docs/html
-
-	insinto "/usr/share/${PN}"
+	insinto /usr/share/ndoutils
 	doins -r db
 
 	# These need to be executable...
-	exeinto "/usr/share/${PN}/db"
+	exeinto /usr/share/ndoutils/db
 	doexe db/{installdb,prepsql,upgradedb}
 
 	# Use symlinks because the installdb/upgradedb scripts use relative
 	# paths to the SQL queries.
-	dosym "../share/${PN}/db/installdb" /usr/bin/ndoutils-installdb
-	dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb
+	dosym ../share/ndoutils/db/installdb /usr/bin/ndoutils-installdb
+	dosym ../share/ndoutils/db/upgradedb /usr/bin/ndoutils-upgradedb
+
+	keepdir /var/lib/nagios
 }
 
 pkg_postinst() {
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
 }
diff --git a/net-analyzer/tcpreen/Manifest b/net-analyzer/tcpreen/Manifest
index 28a90388a14a..e835d43e6145 100644
--- a/net-analyzer/tcpreen/Manifest
+++ b/net-analyzer/tcpreen/Manifest
@@ -1,4 +1,4 @@
 AUX tcpreen-1.4.4-literal-suffix.patch 498 BLAKE2B 3380254c7dcb97958ec8ddeb9aa2e93fac39643088dd6b5daf686b657764bd8e9cbac442c3b6e2084ae75ca1286ab78e4fe5df3689d08e3eecdbcdf8c6660e0e SHA512 542de59ab2129093b2e4dd56d370e595a82f54eea70c70f764c7f1aced308864f4f594dde37575ec64076d9da76fd7ecf7fd8bf7fb7572c1b978160f220b14c6
 DIST tcpreen-1.4.4.tar.bz2 187979 BLAKE2B ef76c7757c5e630a8b0019ede74314bdf7b0e1e48af00091c8b1a28075499b1e0411b5a7ff8bd01bd54ebb347dfc2169b5efe54d36ef12e6ce31f54c4d278d70 SHA512 94496bbb21218b5acc9e76dd4377f92e35b17e03a2d10a7c42177ba5ccbb6aea1b0b54f49d52c5a97456f8cf77685e1c90c27773f4237c33e95f648d4258b786
-EBUILD tcpreen-1.4.4.ebuild 579 BLAKE2B 2cdeb529f8790ea2b1749111d4c2d95238d769bdfd83edc4634f4ff55763296ce2e439f176c9692ddd2dc5ed054279f64f33b5904db2db8dd32d0f33c9f3b6cd SHA512 cccec9e78ea0e289acd65eb0404f2d9c65e72b471907f364f9376c772186f1d4248bf100afe4c4967b0ed82d7bc772b1b566b4f56b08711d6c5296a86b1f3215
+EBUILD tcpreen-1.4.4-r1.ebuild 535 BLAKE2B 646b090b14206088ebdd7bdc86310bedc00d835aa227ead872fcf85de391c9a894963319d18879dd77816595c97d8544d494639e775cfe68cfaa4fb0c45ad674 SHA512 ec6dd532fa6bcade8806a4774c6efd85738f39430045657f7e0fa4ab3a7f8558faddd73fb70129c798ccefd8b19541f11fe5d733710e9298d122e9d33774f550
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild b/net-analyzer/tcpreen/tcpreen-1.4.4-r1.ebuild
index 3aa79a2d98df..3191689b7a26 100644
--- a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
+++ b/net-analyzer/tcpreen/tcpreen-1.4.4-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 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
 
 DESCRIPTION="TCP network re-engineering tool"
@@ -12,13 +13,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
-DEPEND="
-	nls? ( sys-devel/gettext )
-"
-DOCS=( AUTHORS NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${P}-literal-suffix.patch
-)
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}-literal-suffix.patch )
 
 src_configure() {
 	econf $(use_enable nls)
diff --git a/net-analyzer/ttcp/Manifest b/net-analyzer/ttcp/Manifest
index 45ed518954be..2c6c5e1501ea 100644
--- a/net-analyzer/ttcp/Manifest
+++ b/net-analyzer/ttcp/Manifest
@@ -1,4 +1,4 @@
 DIST ttcp-1.12.c 23690 BLAKE2B 972869da1e2e945702e6852648166eefae224b39715ef8495526ec7cd33cdb1e69fa10bb356a96e701f8b597c547b3090956320f947a02f1fad0b12d027b7e32 SHA512 8fc800b05fcf3590d15a87983ac7abc3646c6d4a89f7cc6b91e495066a90a6ce21f7bd7b6ab21e09f07bfa20c39bdc7bcec479449d7cd2b88639dc6cca4a432e
 DIST ttcp-1.12.tar.bz2 8086 BLAKE2B 42ec3d82d56ef28527c096be7b6ea568997f0028ebf51811974fec8c444a39785996b0a51eedff6cec6c53f215e4300a3dee91e45f54dbe979d1d1c42e792ab1 SHA512 2218f801a04964dcc684bac2957f892569e4458eb7770e26d4ac5a9a5beebb16b9191cacd8e60cceee306b8fe53000248b52457cb679a3d12ad4308bb0066dbb
-EBUILD ttcp-1.12-r2.ebuild 633 BLAKE2B dd298aa4886a2d70ec6d7969fc0dc4aa08b43d8b680c29364e0746b659477e6f13965a7420e4a0895d84b77dba706be6ffddbb730094a32bb8f654b5a245b49b SHA512 40e90723480e231afb4c3ee51fd791ee672d4c8248d24cdc228986c66a208dba2f09b2ad5dfd04d608fcf8dcd72b7b4cca490a417ef3cffab259cc353e42d476
+EBUILD ttcp-1.12-r3.ebuild 675 BLAKE2B dd4693a4b19738e6e35d11920a9940e6534f162f8bf96412a843ff61fc8fe64856075233c107a7efbd764ed653bc21226301fc32863ce5333fd0b249e3d22ea3 SHA512 5ccae2fb95590310d07d7a17c3617e7f82cdded376cfd7e30881fc08a28fcae653151d957632ae226774b896b711f9ef605e5cc43e14f69a6266feccc45b134e
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild b/net-analyzer/ttcp/ttcp-1.12-r3.ebuild
index 6ef77f5b49cc..bd4b1e8b315a 100644
--- a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
+++ b/net-analyzer/ttcp/ttcp-1.12-r3.ebuild
@@ -1,26 +1,36 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="Tool to test TCP and UDP throughput"
 HOMEPAGE="
 	http://ftp.arl.mil/~mike/ttcp.html
-	http://www.netcore.fi/pekkas/linux/ipv6/
-"
+	http://www.netcore.fi/pekkas/linux/ipv6/"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}.c"
+
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-SRC_URI="
-	mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~jsmolic/distfiles/${P}.c
-"
+
+src_prepare() {
+	mv "${DISTDIR}"/${P}.c ${PN}.c || die
+	default
+}
+
+src_configure() {
+	tc-export CC
+}
+
 src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} "${DISTDIR}"/${P}.c || die
+	emake ttcp
 }
 
 src_install() {
-	dobin ${PN}
-	newman sgi-${PN}.1 ${PN}.1
+	dobin ttcp
+	newman sgi-ttcp.1 ttcp.1
 }