gentoo resync : 17.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-17 19:04:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-17 19:04:28 +0100
commit: 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch)
tree: 555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /net-analyzer
parent: 4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff)
62 files changed, 404 insertions, 906 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f8b4fa046cb4..f98129d66ca2 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
index 27c3013b575d..f3e0effcbd06 100644
--- a/net-analyzer/arp-scan/Manifest
+++ b/net-analyzer/arp-scan/Manifest
@@ -1,4 +1,4 @@
 DIST arp-scan-1.9.7.tar.gz 459544 BLAKE2B bd70b2dd9e005096ce80fca07b8f2d8482b1073d25a2a9f82e8f5c1206148dbeab095046292cb46b5823aa18b56c208a5e86d0b7252d8566ddee5cd714b78cc6 SHA512 2aa808521a64cd3e2a6a270c6725f2cffa4cfce5c251e5483053c8ea9f56fb1368dd9aae2afcf8fffe1030fe2fc37723f0701c9eafa7cd1d52df459c07a80870
-EBUILD arp-scan-1.9.7.ebuild 472 BLAKE2B 9e1d1d684de88508e55728e88bbe1983baca6b270553657766df91e6a33ee3d833fb3f3c371d9f706105f207e4412eb7ab9a9c87a1db78cf8d480198ea861625 SHA512 71dff6ec3626642fc15632a2f1e76f50eeb4d0e3ef2503ceb541dcfe4455001040fd601ba3d87240894aac982037a9e27a1e8a4c2de6045e521504ef92faa194
+EBUILD arp-scan-1.9.7.ebuild 479 BLAKE2B fad6f12f076725b94ff61b9c215c5e326d70c41363326066b686659546b6975ad27adb670dd2dc0722bf58b0ea9a20285b6ee66a4119f0fdaf15d1807eb63959 SHA512 7b638d6ceccee9688888eda60f5da27f329444dfdd37499dcd322530dec625fb63722ce4baa0c5d54b06c3658bb74d113ddc2e4b45c0b4408d3624649a65e107
 EBUILD arp-scan-99999.ebuild 437 BLAKE2B 7a306bfc3b31f3da8e1d5974fc50f90e32f3f01d766cbcc7f9b9408347a37a771da8f83df3a8fd0dcffe5ab80528927e5876f584e08361644a282e445c4f7bfe SHA512 eb8d8ac754ec26d4c122586596a649afee8f9de1a701ee36d24838a37dd3f6256a5820c818c8fdcda171eeacc29dbda8e03778b92a300c6b1ee31c7820e467b0
 MISC metadata.xml 362 BLAKE2B 3f812777c8a9dff2088b34b8aee211726af3c08ae94980169a99596cff8cce2f5c3b876a4f059a8b29868d4d7879d8b33237d4544a157611d24b5d428eda02ec SHA512 abdb943e2a29ad44cad2b8bfb4c5479c0d7ba2bf4c7142dac9c156eeafa6e0f779a72a7db253539299f697c3c1c939420ddf1798e696c364ff58c1854d0d463b
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
index 2278aa10e0d5..699942037b59 100644
--- a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
+++ b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64 ~riscv"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/arp-sk/Manifest b/net-analyzer/arp-sk/Manifest
index 59d9b07d63e1..c49a037743cb 100644
--- a/net-analyzer/arp-sk/Manifest
+++ b/net-analyzer/arp-sk/Manifest
@@ -1,4 +1,4 @@
 AUX arp-sk-0.0.16-libnet1_2.patch 1362 BLAKE2B eb3f8387f9d43d957e6a2a111bce2ea336d705d74761f22d4d4adf92f00c00b4f81de66112b4134540aa86847874c8abca19af4bc62fc75635f149d62effa336 SHA512 04cd17513d19f0e70b54840148fb8d603c06385e601f352cfadc381de5109b547e204414830fa195cfac56e662ffdfb234f54b8fec9ab68316cfdd4220bdb922
 DIST arp-sk-0.0.16.tgz 211636 BLAKE2B 9ba786829061161c0c38950a7c374968126d4cfb269b10b67b5a1dce2a7cb1016833a4a2adc9fef0f8fb61dbbdc8d959a7cf63379e69bff3fc4dc9a9201348af SHA512 d827ab5c701e1e3a6444dbe7e1e7c0a73ee2bfb2339a55fc7d3591ee8e9e9aadef4dfd4aaf331251fbe22d83c9b1135068e5afa6303eae934b3fd149ca0819a6
-EBUILD arp-sk-0.0.16-r2.ebuild 760 BLAKE2B 9cc5f1a59cc69023bc4554e42bd4fe3ab0f784b4480663b305f28bf11291b507ade7aeb4a0ad9867656df6c00f35895b94e64003e948b847b2c16d4b84c59587 SHA512 140170f9044b36764c87ceed5db474335bf2489dca4f6b299f5b76aada3c0550961b8e1946de9e3c59bce9503abefadba1e75c01e0c6b64ff8c33712c1bc6091
+EBUILD arp-sk-0.0.16-r2.ebuild 767 BLAKE2B 0f46b731f5c075665a90f047fb4844075ddc71e4bd5190ef10213d9a724503785fd425c96873fb4ab851222d64fe67d31829c56355a335887b4f21831c5e03a3 SHA512 b8feda546f715dfbb97234b049f1d8d1c8676d431c572e9e6b7211b4d4748bafcbaf76f07c4352f232fd1d8e0410c3f3ce4dde341f91f40cde0621317d71bd1a
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
index dd4c76e5f827..e18045a7f774 100644
--- a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
+++ b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sid.rstack.org/arp-sk/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 
 DEPEND=">=net-libs/libnet-1.1"
 RDEPEND="${DEPEND}"
diff --git a/net-analyzer/arpoison/Manifest b/net-analyzer/arpoison/Manifest
index e1f520078481..944b871e1689 100644
--- a/net-analyzer/arpoison/Manifest
+++ b/net-analyzer/arpoison/Manifest
@@ -1,3 +1,3 @@
 DIST arpoison-0.7.tar.gz 8458 BLAKE2B b0050aa6f3246fec9fb4db8bbb3f9f5f1d52b5b6c37851f0c6bec8b6c89fabd7f1811ae40a4c81af6eae16761f38fb749d0f2a58311645ef360d798b6ccbbb50 SHA512 d5af078c8e2c64eb721da75b5d6659ca017267f146d0dca7e0f1ba77bfd93a0f56363428c198e9c46537768d3568d813c150bfbc091430fc355a269f9327108f
-EBUILD arpoison-0.7.ebuild 682 BLAKE2B 07b902eab99e1eb73d41c4c6b969b590ca546af9a67cdaf207cd0fb8cb9afa270ff438e1abc6c59c02412029a21528bf6e00295beb4bca7f545fd1ba84d3e63f SHA512 43f2e47ddbce39799b11f4bf45027f3f3eb8abaa3554719b9b3510fba45ecdc8d4f2448f942581f020cfc22b72042958d2984a653ce5aa6f11fef4db21cd51d0
+EBUILD arpoison-0.7.ebuild 689 BLAKE2B 06b8e83b18b207b64463c8e880a4fdb2e794167a006e806695a471e9368e95e59aa2119ee47eef2573b4ac315f1b80eb47a4b2cc6e782c425be206081f4209da SHA512 2acb0792c5ec6a251acff5fd58ef4ed06410fc44fe4f68c30786eb41cfaf184ce8950804ad3f1a18d8960c95657d93ff476a430793038eec07cd00f02c366b7c
 MISC metadata.xml 358 BLAKE2B 8ef81a7500bfd11eb443af7fdbe30ce89f91875ddd9434367e7eafb73604d13e6702fd34c88bb863bceeeb95822cff1354313d2146117c1ef32166527bd82716 SHA512 9a11704d5314e9ab1a061a179e757146b29c52334511578fe958455d417652c0ab523a58a17580ea6892e528d44b06aa8510293664d78ed01f35e32ef1d7bc18
diff --git a/net-analyzer/arpoison/arpoison-0.7.ebuild b/net-analyzer/arpoison/arpoison-0.7.ebuild
index 811f1ecb2690..edd9d089302e 100644
--- a/net-analyzer/arpoison/arpoison-0.7.ebuild
+++ b/net-analyzer/arpoison/arpoison-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ppc ~riscv x86"
 
 RDEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/arptools/Manifest b/net-analyzer/arptools/Manifest
index 2d3a5bbaf657..74512b2bcfb7 100644
--- a/net-analyzer/arptools/Manifest
+++ b/net-analyzer/arptools/Manifest
@@ -1,3 +1,3 @@
 DIST arptools-1.0.2.tar.gz 87475 BLAKE2B 1bbfa8082db28abaa78a3f9f363ed255909e6c6dc2a9fabc1668f66228977b9ecc5b70d4cf3514affb324daf31b906b40b1ec7d88ecc9568504362789ece42fb SHA512 c976a5a7778a9330ebda6ed69ef045ede3747b98d27a7e575f985646a52bf57e4a6584da280a0a13520a43b5d765b2ddbec2239d7c3ac865ffdf1ae23f5ff347
-EBUILD arptools-1.0.2.ebuild 453 BLAKE2B 773d31baa61523dde742c83e4953a6109cf6596b48d25858b888429bb833d8090bfdf64759dc6d2131ebd62d36424eab2f6e5eb8e27c96caccdc226921d4f74c SHA512 86332d662a4cd15b1b297ccce0c82a32866c291e77253ce78046c8f660bb83c159c766700e41ee74abce583f0eaaf5e390defe959006a87aef24a40cb07a9b4c
+EBUILD arptools-1.0.2.ebuild 460 BLAKE2B d4d61cd148e6164e35bf8d4eeaa0e575934999be543900742cd1354808748302a8375f5c6db9430b0be5b34d4e4ceeea0e998cd3057a585fdc47e87b9949ef9c SHA512 c38c1f7c814d3b8f77244a04601ee679f721b96b1185401aba30513bceee63706c5d483e4e2ba893ec3ed8a4e4fbb218a6b56ce0fbf8d60b1b48a3a1896f4015
 MISC metadata.xml 355 BLAKE2B 6a7a59a25152c35d3e60e6bf42556371caffd13ce3d559a8f5d9117dd9cb45c7b25bca6dbe527f6ad63cccc9bc0eb10e096a5a3bd0dbfefdf94fdd73958e1ef9 SHA512 bc5735d7a66320f39e87c77951652a28e4100b4236cf37ebeed12e62966b1a211f8af0cc78774c537e485488108ee5fb2bada682d4e5da91cfba36483986d1ca
diff --git a/net-analyzer/arptools/arptools-1.0.2.ebuild b/net-analyzer/arptools/arptools-1.0.2.ebuild
index 44c7fa89a834..09eeb07231da 100644
--- a/net-analyzer/arptools/arptools-1.0.2.ebuild
+++ b/net-analyzer/arptools/arptools-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://www.burghardt.pl/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index ffe75b5e2597..048a909aa046 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -4,5 +4,5 @@ AUX arpwatch.initd-r2 828 BLAKE2B fc9836855074520ab6e8e4d7412f9094677fe25dba61bb
 AUX arpwatch.service 362 BLAKE2B 45e527e7b5261a8009acdca0665077422235d5b21ebbb6818d878e21e4869fdf69317306bc4ef02617b8989a38f50a9467d69d904ada80fde1be61f77b806e2c SHA512 06424dea166eac23d4686fb96b1f14bdd46965bf400028f870ea2260e7d54a54663987c62e34e93730e6dea42e0e662578268252b31f29c26c0975bb4cb6873f
 DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
-EBUILD arpwatch-3.1-r3.ebuild 2104 BLAKE2B 18cd2eaf7aa8294e6dc9076af175c40cbcff034faf9f68ddbd54c027098114fa4bb2ece01577f4d6d1284f3ed048ff1ee65fd09aea525483174eebac6ce4e68e SHA512 3f1e239705dce0adc0f7c6c453fcf0785f7718513ea1601816a5406f374a8550a97e0ba649486deef145f7146df15692c789c36685ca379c8d36faf7193f5aa8
+EBUILD arpwatch-3.1-r4.ebuild 1907 BLAKE2B 01289c40c54d5256b4a0126ed6a47f1867b3e3c09eaae502cb99f380db186df6cab0afb62506ff57730c7e8a4f85e8f8256ef03be5f4d6cdd87d41c865898d77 SHA512 a98018fed7d74aa617991db685a16894a2d3c2c06458bf39a3368a745ba651ee18c9e31a74a64ed0e9a8c788bb0c6ef860680b14d452fa4218950e7b92451b58
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r3.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild
index 708a82a43c69..da747fae6e86 100644
--- a/net-analyzer/arpwatch/arpwatch-3.1-r3.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd user
+inherit systemd
 
 DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
 HOMEPAGE="https://ee.lbl.gov/"
@@ -16,30 +16,22 @@ SRC_URI="
 	https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
 "
 
-KEYWORDS="amd64 ~hppa ppc sparc x86"
+KEYWORDS="amd64 ~hppa ppc ~riscv sparc x86"
 IUSE="selinux"
 
 DEPEND="
+	acct-group/arpwatch
 	net-libs/libpcap
 	sys-libs/ncurses:=
 "
+
 RDEPEND="
 	${DEPEND}
+	acct-user/arpwatch
 	selinux? ( sec-policy/selinux-arpwatch )
 	virtual/mta
 "
 
-pkg_setup() {
-	# We need to create /var/lib/arpwatch with this group, so it must
-	# exist during src_install.
-	enewgroup arpwatch
-}
-
-pkg_postinst() {
-	# The user, however, is not needed until runtime.
-	enewuser arpwatch -1 -1 -1 arpwatch
-}
-
 src_install() {
 	dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh
 	doman arpsnmp.8 arpwatch.8
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index 22f60973c8bc..c0f45a49aa5d 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,5 +1,5 @@
 AUX bmon-3.6-docdir-examples.patch 235 BLAKE2B f187f4bbc8b7e4de5e9bb1f289ef201ed17e6a64e0062ad370f5dcce1160da1774590aa824f2adf9b73c058b95ac2428e24bf8c5e78a1c16b45f4f1f33a889ca SHA512 2b74637c6dacfa03e680774787d8287ae084ba426a3e0e178b74f1468179916509ee5de2e0c93f7abe04356d0146ad6dd8e191d9a66718ec8eaf50cb6126afc8
 DIST bmon-4.0.tar.gz 61843 BLAKE2B d376cc6ca9f64c71cd7f8aa281e36e0f8717939c2ada3d9ed6d1231e1f6bc489146fa5f88a327abd6bc63803d2ed21eafff2888427bfd11d51156380ed6d6d1c SHA512 2a5b527a78cc1084c3b96d8d621b002ee86d377776d7e25f711dc2869e59bcd6277cc5f103549fe0b635b1368228a66941d5069fd1240cff678b308d7e17218d
-EBUILD bmon-4.0.ebuild 929 BLAKE2B 61446651eb9067c74cad0600a06f89dc18ed8af70575f0fe6a499581f2667a3cb77aaadfc1d0a032901e282d85085f6b9eb28923b20a370a93f3803ee0412bb3 SHA512 710bb706b73528474c23b200a6edf6f66c9dd8d023ee3d41e4d99de1eaf755e60830b7676ba833a84a227d303f908be7e2208180a7ec537a84d120695d679088
+EBUILD bmon-4.0.ebuild 936 BLAKE2B dd032963664c08effde8d1c436818acb81072405e908d9edf72afa5ade6a1423cff70ab91288261c8ab9afd51bc02bb37269c6f95be64d4b17f2ea59bc60b10c SHA512 a0eb82a484b50b1c28ec9951dfcb751e4ca608d0668c98d30fa21c56a3374f139ba015ed7eaf342777f391f6dbf488c0470ab9007824d8698065d95942c1fd49
 EBUILD bmon-999.ebuild 853 BLAKE2B 4deb4540fd1df9306c8f80aa1d6e03565294465ad8764bc22d2c2ef27679da665b11b472f86462aa27df2889dea88789ce4f98737d7d81fd20664ee18001c590 SHA512 75cffd2603d9ea72ffdffd9bf0ba6f40eb6d275804cc45f228be44897b89aff2edb07997b931446302276c1723bc8009e50dde1e9713fd7a4f41d5d97d1a8a9c
 MISC metadata.xml 355 BLAKE2B 7d9ea44a97e5083c50bf60c34b30057ef90fd3263133f0600940747444d7485fccf3b47d988eb4cf968aee96bfff6b551b72adb003ca4fb6a2b58e31781fa936 SHA512 44b31fb1a2801c74cd4ba7260566447df31b9dd7bd55ed1ffdabc0bcfef8d5459e753cbbb0a2a31c5f2d87e7853972281cb9412b642e282be9a02be2f519fcef
diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild
index 13ecfa5de9dd..aa90421f0516 100644
--- a/net-analyzer/bmon/bmon-4.0.ebuild
+++ b/net-analyzer/bmon/bmon-4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.3-r2:0=
diff --git a/net-analyzer/ibmonitor/Manifest b/net-analyzer/ibmonitor/Manifest
index ac954d84bfbd..c61499128804 100644
--- a/net-analyzer/ibmonitor/Manifest
+++ b/net-analyzer/ibmonitor/Manifest
@@ -1,3 +1,3 @@
 DIST ibmonitor-1.4.tar.gz 17025 BLAKE2B 33dcd54d3750b5e0dc70caaaf30f58f1dc2215cb2ba24174fafbfa356f27ae98133407505038df19104e9f8e1971ed4f8bf9ffeff37196d4640e90a4054970c6 SHA512 ef74dee22dbb88d07c37af9aaa0a0a49b6c49ff1b45a1637d06acbe32e4bc4e84d79cfe06ee7ba2b04d62fa3cfa0a10605eccde549d2fe04890dfa179adf20db
-EBUILD ibmonitor-1.4-r1.ebuild 433 BLAKE2B 76b16d31ee5e6f44923651c2161762dd0772210f6142a2df332d81027045c8ce41539ac4a532d12247db9bb0eb83dc9c23de50f6796ae5f5a106cfa14e90084e SHA512 7bddd623b45008ff4500af1f14e515f2fec75402d354a3f77b4200798e78240064d846fcb9afaccdd2d2ac7832b28ef84712a9490ec0a95d3f58eb8f61a3a31c
+EBUILD ibmonitor-1.4-r1.ebuild 440 BLAKE2B 7cbd7eecaefa395271e0f9ad01d3b29db08abe10a88e67795543bdcdbce3344554b7c585cf27ec59aaf6b4cdb953ffa69dcaf0a7eab6236ecd65261901eb1cdf SHA512 56f8a994071b3646cc188e562cb67b6c64fc56eaec5cb7f5069586c3edff245ac6d05d6c6a7d28bbf88557f8652d62f1b0b2ea69470d3d31fecea0517c220802
 MISC metadata.xml 359 BLAKE2B 8885ea2805f5ef76dbec58e1cddbbaf2df2ae0447ed5448788afeff96f35b51d62f07fe05e86f7ff34f6890b2b88bd66155c815c6681c6dc7753e08c70b8b0cd SHA512 a86cf3607c903fcc1ce55ab441ddc138653d40eb196e175d211998e11bc850427789d00ad466a3d2ddf990e9a61876938914499992b5a1b56595e7b220a8a31d
diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
index 4b5b559a57ba..d5cc1beaa4c3 100644
--- a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
+++ b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="Interactive bandwidth monitor"
 HOMEPAGE="http://ibmonitor.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~hppa ~ppc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~riscv x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 06f453a779f1..71032a053203 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
-AUX icinga2-2.12.1-boost-1.74.0.patch 19210 BLAKE2B e6e09b631dc70b740212ad20d4e1bb38c7c8cf75c535f8935531bb02d0d3a9c3917bc272046315782aca2aa9e9f541c6686ef14810acfd854af9c64d647a554d SHA512 6f5b457dd4ef8d08fd4063a1a9babdc81d8f6789547448180795a30b46c4868ff1c520cc6e9b9140c866e0b62c9caae30ef4af53a963e29a0d2b4280acac1360
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.12.4.tar.gz 7535804 BLAKE2B 495a53fc0887ff2e1b5e058c52af63c155da600b4c82e38653a56c4b1dab497ef477254b19727c6c366b48c41a052b68c9910cb4bc4782605612a3d63ccf646c SHA512 3a817eb6f1be256f6eca5136e3d74c49e1cc2a7af382a906abebc6d573579e755decf72bfce62fad48f9c5a37fe6bc304c5849d1008ab7ce4939213f720ab37b
diff --git a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch b/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
deleted file mode 100644
index e6ad4807993a..000000000000
--- a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
+++ /dev/null
@@ -1,436 +0,0 @@
-From c30bae2994f1e5f33f6da51eb96d423e9bf0f75c Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Thu, 20 Aug 2020 18:25:48 +0200
-Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=98fs::copy=5Foption=E2=80=99=20has?=
- =?UTF-8?q?=20not=20been=20declared=20with=20boost=201.74.0?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It was deprecated in
-https://github.com/boostorg/filesystem/commit/f199152b7df036ff1606c85e4ea1b28edfeda6cc
----
- lib/base/utility.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
-index 1add7616c6..d8e6f20b0c 100644
---- a/lib/base/utility.cpp
-+++ b/lib/base/utility.cpp
-@@ -725,7 +725,11 @@ void Utility::CopyFile(const String& source, const String& target)
- {
- 	namespace fs = boost::filesystem;
- 
-+#if BOOST_VERSION >= 107400
-+	fs::copy_file(fs::path(source.Begin(), source.End()), fs::path(target.Begin(), target.End()), fs::copy_options::overwrite_existing);
-+#else /* BOOST_VERSION */
- 	fs::copy_file(fs::path(source.Begin(), source.End()), fs::path(target.Begin(), target.End()), fs::copy_option::overwrite_if_exists);
-+#endif /* BOOST_VERSION */
- }
- 
- /*
-From 45dd71e0f9a93369e08d6cb26f97940f9c9594aa Mon Sep 17 00:00:00 2001
-From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
-Date: Wed, 26 Aug 2020 13:56:26 +0200
-Subject: [PATCH] Introduce HttpUtility::Set()
-
-refs #8185
----
- lib/cli/consolecommand.cpp           |  9 ++++---
- lib/perfdata/elasticsearchwriter.cpp | 13 ++++-----
- lib/perfdata/influxdbwriter.cpp      |  7 ++---
- lib/remote/configfileshandler.cpp    |  4 +--
- lib/remote/eventshandler.cpp         |  2 +-
- lib/remote/httpserverconnection.cpp  | 40 ++++++++++++++--------------
- lib/remote/httputility.cpp           |  4 +--
- lib/remote/httputility.hpp           | 28 +++++++++++++++++++
- lib/remote/infohandler.cpp           |  6 ++---
- plugins/check_nscp_api.cpp           |  9 ++++---
- 10 files changed, 77 insertions(+), 45 deletions(-)
-
-diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp
-index 41b6590e4c..42c5c63133 100644
---- a/lib/cli/consolecommand.cpp
-+++ b/lib/cli/consolecommand.cpp
-@@ -3,6 +3,7 @@
- #include "cli/consolecommand.hpp"
- #include "config/configcompiler.hpp"
- #include "remote/consolehandler.hpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include "base/configwriter.hpp"
- #include "base/serializer.hpp"
-@@ -580,11 +581,11 @@ Dictionary::Ptr ConsoleCommand::SendRequest()
- 
- 	http::request<http::string_body> request(http::verb::post, std::string(l_Url->Format(false)), 10);
- 
--	request.set(http::field::user_agent, "Icinga/DebugConsole/" + Application::GetAppVersion());
--	request.set(http::field::host, l_Url->GetHost() + ":" + l_Url->GetPort());
-+	HttpUtility::Set(request, http::field::user_agent, "Icinga/DebugConsole/" + Application::GetAppVersion());
-+	HttpUtility::Set(request, http::field::host, l_Url->GetHost() + ":" + l_Url->GetPort());
- 
--	request.set(http::field::accept, "application/json");
--	request.set(http::field::authorization, "Basic " + Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword()));
-+	HttpUtility::Set(request, http::field::accept, "application/json");
-+	HttpUtility::Set(request, http::field::authorization, "Basic " + Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword()));
- 
- 	try {
- 		http::write(*l_TlsStream, request);
-diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp
-index 6870198e45..3764bf536b 100644
---- a/lib/perfdata/elasticsearchwriter.cpp
-+++ b/lib/perfdata/elasticsearchwriter.cpp
-@@ -2,6 +2,7 @@
- 
- #include "perfdata/elasticsearchwriter.hpp"
- #include "perfdata/elasticsearchwriter-ti.cpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include "icinga/compatutility.hpp"
- #include "icinga/service.hpp"
-@@ -474,27 +475,27 @@ void ElasticsearchWriter::SendRequest(const String& body)
- 
- 	http::request<http::string_body> request (http::verb::post, std::string(url->Format(true)), 10);
- 
--	request.set(http::field::user_agent, "Icinga/" + Application::GetAppVersion());
--	request.set(http::field::host, url->GetHost() + ":" + url->GetPort());
-+	HttpUtility::Set(request, http::field::user_agent, "Icinga/" + Application::GetAppVersion());
-+	HttpUtility::Set(request, http::field::host, url->GetHost() + ":" + url->GetPort());
- 
- 	/* Specify required headers by Elasticsearch. */
--	request.set(http::field::accept, "application/json");
-+	HttpUtility::Set(request, http::field::accept, "application/json");
- 
- 	/* Use application/x-ndjson for bulk streams. While ES
- 	 * is able to handle application/json, the newline separator
- 	 * causes problems with Logstash (#6609).
- 	 */
--	request.set(http::field::content_type, "application/x-ndjson");
-+	HttpUtility::Set(request, http::field::content_type, "application/x-ndjson");
- 
- 	/* Send authentication if configured. */
- 	String username = GetUsername();
- 	String password = GetPassword();
- 
- 	if (!username.IsEmpty() && !password.IsEmpty())
--		request.set(http::field::authorization, "Basic " + Base64::Encode(username + ":" + password));
-+		HttpUtility::Set(request, http::field::authorization, "Basic " + Base64::Encode(username + ":" + password));
- 
- 	request.body() = body;
--	request.set(http::field::content_length, request.body().size());
-+	HttpUtility::Set(request, http::field::content_length, request.body().size());
- 
- 	/* Don't log the request body to debug log, this is already done above. */
- 	Log(LogDebug, "ElasticsearchWriter")
-diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
-index 4692b8b5df..0ddd582447 100644
---- a/lib/perfdata/influxdbwriter.cpp
-+++ b/lib/perfdata/influxdbwriter.cpp
-@@ -2,6 +2,7 @@
- 
- #include "perfdata/influxdbwriter.hpp"
- #include "perfdata/influxdbwriter-ti.cpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include "icinga/service.hpp"
- #include "icinga/macroprocessor.hpp"
-@@ -501,11 +502,11 @@ void InfluxdbWriter::Flush()
- 
- 	http::request<http::string_body> request (http::verb::post, std::string(url->Format(true)), 10);
- 
--	request.set(http::field::user_agent, "Icinga/" + Application::GetAppVersion());
--	request.set(http::field::host, url->GetHost() + ":" + url->GetPort());
-+	HttpUtility::Set(request, http::field::user_agent, "Icinga/" + Application::GetAppVersion());
-+	HttpUtility::Set(request, http::field::host, url->GetHost() + ":" + url->GetPort());
- 
- 	request.body() = body;
--	request.set(http::field::content_length, request.body().size());
-+	HttpUtility::Set(request, http::field::content_length, request.body().size());
- 
- 	try {
- 		if (stream.first) {
-diff --git a/lib/remote/configfileshandler.cpp b/lib/remote/configfileshandler.cpp
-index d714f4d864..5c2bfdb405 100644
---- a/lib/remote/configfileshandler.cpp
-+++ b/lib/remote/configfileshandler.cpp
-@@ -82,9 +82,9 @@ bool ConfigFilesHandler::HandleRequest(
- 
- 		String content((std::istreambuf_iterator<char>(fp)), std::istreambuf_iterator<char>());
- 		response.result(http::status::ok);
--		response.set(http::field::content_type, "application/octet-stream");
-+		HttpUtility::Set(response, http::field::content_type, "application/octet-stream");
- 		response.body() = content;
--		response.set(http::field::content_length, response.body().size());
-+		HttpUtility::Set(response, http::field::content_length, response.body().size());
- 	} catch (const std::exception& ex) {
- 		HttpUtility::SendJsonError(response, params, 500, "Could not read file.",
- 			DiagnosticInformation(ex));
-diff --git a/lib/remote/eventshandler.cpp b/lib/remote/eventshandler.cpp
-index e92b14a2d4..e41b4711c6 100644
---- a/lib/remote/eventshandler.cpp
-+++ b/lib/remote/eventshandler.cpp
-@@ -100,7 +100,7 @@ bool EventsHandler::HandleRequest(
- 	server.StartStreaming();
- 
- 	response.result(http::status::ok);
--	response.set(http::field::content_type, "application/json");
-+	HttpUtility::Set(response, http::field::content_type, "application/json");
- 
- 	IoBoundWorkSlot dontLockTheIoThread (yc);
- 
-diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
-index d4eac7d074..688392c821 100644
---- a/lib/remote/httpserverconnection.cpp
-+++ b/lib/remote/httpserverconnection.cpp
-@@ -184,12 +184,12 @@ bool EnsureValidHeaders(
- 				{ "status", String("Bad Request: ") + errorMsg }
- 			}));
- 		} else {
--			response.set(http::field::content_type, "text/html");
-+			HttpUtility::Set(response, http::field::content_type, "text/html");
- 			response.body() = String("<h1>Bad Request</h1><p><pre>") + errorMsg + "</pre></p>";
--			response.set(http::field::content_length, response.body().size());
-+			HttpUtility::Set(response, http::field::content_length, response.body().size());
- 		}
- 
--		response.set(http::field::connection, "close");
-+		HttpUtility::Set(response, http::field::connection, "close");
- 
- 		boost::system::error_code ec;
- 
-@@ -247,20 +247,20 @@ bool HandleAccessControl(
- 				auto& origin (request[http::field::origin]);
- 
- 				if (allowedOrigins.find(origin.to_string()) != allowedOrigins.end()) {
--					response.set(http::field::access_control_allow_origin, origin);
-+					HttpUtility::Set(response, http::field::access_control_allow_origin, origin);
- 				}
- 
- 				allowOriginHeader.Done();
- 
--				response.set(http::field::access_control_allow_credentials, "true");
-+				HttpUtility::Set(response, http::field::access_control_allow_credentials, "true");
- 
- 				if (request.method() == http::verb::options && !request[http::field::access_control_request_method].empty()) {
- 					response.result(http::status::ok);
--					response.set(http::field::access_control_allow_methods, "GET, POST, PUT, DELETE");
--					response.set(http::field::access_control_allow_headers, "Authorization, X-HTTP-Method-Override");
-+					HttpUtility::Set(response, http::field::access_control_allow_methods, "GET, POST, PUT, DELETE");
-+					HttpUtility::Set(response, http::field::access_control_allow_headers, "Authorization, X-HTTP-Method-Override");
- 					response.body() = "Preflight OK";
--					response.set(http::field::content_length, response.body().size());
--					response.set(http::field::connection, "close");
-+					HttpUtility::Set(response, http::field::content_length, response.body().size());
-+					HttpUtility::Set(response, http::field::connection, "close");
- 
- 					boost::system::error_code ec;
- 
-@@ -288,10 +288,10 @@ bool EnsureAcceptHeader(
- 
- 	if (request.method() != http::verb::get && request[http::field::accept] != "application/json") {
- 		response.result(http::status::bad_request);
--		response.set(http::field::content_type, "text/html");
-+		HttpUtility::Set(response, http::field::content_type, "text/html");
- 		response.body() = "<h1>Accept header is missing or not set to 'application/json'.</h1>";
--		response.set(http::field::content_length, response.body().size());
--		response.set(http::field::connection, "close");
-+		HttpUtility::Set(response, http::field::content_length, response.body().size());
-+		HttpUtility::Set(response, http::field::connection, "close");
- 
- 		boost::system::error_code ec;
- 
-@@ -320,8 +320,8 @@ bool EnsureAuthenticatedUser(
- 			<< "Unauthorized request: " << request.method_string() << ' ' << request.target();
- 
- 		response.result(http::status::unauthorized);
--		response.set(http::field::www_authenticate, "Basic realm=\"Icinga 2\"");
--		response.set(http::field::connection, "close");
-+		HttpUtility::Set(response, http::field::www_authenticate, "Basic realm=\"Icinga 2\"");
-+		HttpUtility::Set(response, http::field::connection, "close");
- 
- 		if (request[http::field::accept] == "application/json") {
- 			HttpUtility::SendJsonBody(response, nullptr, new Dictionary({
-@@ -329,9 +329,9 @@ bool EnsureAuthenticatedUser(
- 				{ "status", "Unauthorized. Please check your user credentials." }
- 			}));
- 		} else {
--			response.set(http::field::content_type, "text/html");
-+			HttpUtility::Set(response, http::field::content_type, "text/html");
- 			response.body() = "<h1>Unauthorized. Please check your user credentials.</h1>";
--			response.set(http::field::content_length, response.body().size());
-+			HttpUtility::Set(response, http::field::content_length, response.body().size());
- 		}
- 
- 		boost::system::error_code ec;
-@@ -421,12 +421,12 @@ bool EnsureValidBody(
- 				{ "status", String("Bad Request: ") + ec.message() }
- 			}));
- 		} else {
--			response.set(http::field::content_type, "text/html");
-+			HttpUtility::Set(response, http::field::content_type, "text/html");
- 			response.body() = String("<h1>Bad Request</h1><p><pre>") + ec.message() + "</pre></p>";
--			response.set(http::field::content_length, response.body().size());
-+			HttpUtility::Set(response, http::field::content_length, response.body().size());
- 		}
- 
--		response.set(http::field::connection, "close");
-+		HttpUtility::Set(response, http::field::connection, "close");
- 
- 		http::async_write(stream, response, yc[ec]);
- 		stream.async_flush(yc[ec]);
-@@ -511,7 +511,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
- 			parser.header_limit(1024 * 1024);
- 			parser.body_limit(-1);
- 
--			response.set(http::field::server, l_ServerHeader);
-+			HttpUtility::Set(response, http::field::server, l_ServerHeader);
- 
- 			if (!EnsureValidHeaders(*m_Stream, buf, parser, response, m_ShuttingDown, yc)) {
- 				break;
-diff --git a/lib/remote/httputility.cpp b/lib/remote/httputility.cpp
-index 91902ba501..e46e990ecf 100644
---- a/lib/remote/httputility.cpp
-+++ b/lib/remote/httputility.cpp
-@@ -56,9 +56,9 @@ void HttpUtility::SendJsonBody(boost::beast::http::response<boost::beast::http::
- {
- 	namespace http = boost::beast::http;
- 
--	response.set(http::field::content_type, "application/json");
-+	HttpUtility::Set(response, http::field::content_type, "application/json");
- 	response.body() = JsonEncode(val, params && GetLastParameter(params, "pretty"));
--	response.set(http::field::content_length, response.body().size());
-+	HttpUtility::Set(response, http::field::content_length, response.body().size());
- }
- 
- void HttpUtility::SendJsonError(boost::beast::http::response<boost::beast::http::string_body>& response,
-diff --git a/lib/remote/httputility.hpp b/lib/remote/httputility.hpp
-index 6465b4af92..be600d4090 100644
---- a/lib/remote/httputility.hpp
-+++ b/lib/remote/httputility.hpp
-@@ -5,8 +5,12 @@
- 
- #include "remote/url.hpp"
- #include "base/dictionary.hpp"
-+#include "base/string.hpp"
- #include <boost/beast/http.hpp>
-+#include <boost/lexical_cast.hpp>
- #include <string>
-+#include <type_traits>
-+#include <utility>
- 
- namespace icinga
- {
-@@ -26,6 +30,30 @@ class HttpUtility
- 	static void SendJsonBody(boost::beast::http::response<boost::beast::http::string_body>& response, const Dictionary::Ptr& params, const Value& val);
- 	static void SendJsonError(boost::beast::http::response<boost::beast::http::string_body>& response, const Dictionary::Ptr& params, const int code,
- 		const String& verbose = String(), const String& diagnosticInformation = String());
-+
-+	template<class Message, class Key, class Value, typename std::enable_if<std::is_arithmetic<Value>::value, int>::type = 0>
-+	static void Set(Message& message, Key&& key, Value value)
-+	{
-+		Set(message, std::forward<Key>(key), boost::lexical_cast<std::string>(value));
-+	}
-+
-+	template<class Message, class Key>
-+	static void Set(Message& message, Key&& key, const String& value)
-+	{
-+		Set(message, std::forward<Key>(key), value.GetData());
-+	}
-+
-+	template<class Message, class Key>
-+	static void Set(Message& message, Key&& key, String&& value)
-+	{
-+		Set(message, std::forward<Key>(key), value.GetData());
-+	}
-+
-+	template<class Message, class Key, class Value, typename std::enable_if<!std::is_arithmetic<Value>::value, int>::type = 0>
-+	static void Set(Message& message, Key&& key, Value&& value)
-+	{
-+		message.set(std::forward<Key>(key), std::forward<Value>(value));
-+	}
- };
- 
- }
-diff --git a/lib/remote/infohandler.cpp b/lib/remote/infohandler.cpp
-index 18c18c0e04..daec628047 100644
---- a/lib/remote/infohandler.cpp
-+++ b/lib/remote/infohandler.cpp
-@@ -29,7 +29,7 @@ bool InfoHandler::HandleRequest(
- 
- 	if (url->GetPath().empty()) {
- 		response.result(http::status::found);
--		response.set(http::field::location, "/v1");
-+		HttpUtility::Set(response, http::field::location, "/v1");
- 		return true;
- 	}
- 
-@@ -74,7 +74,7 @@ bool InfoHandler::HandleRequest(
- 
- 		HttpUtility::SendJsonBody(response, params, result);
- 	} else {
--		response.set(http::field::content_type, "text/html");
-+		HttpUtility::Set(response, http::field::content_type, "text/html");
- 
- 		String body = "<html><head><title>Icinga 2</title></head><h1>Hello from Icinga 2 (Version: " + Application::GetAppVersion() + ")!</h1>";
- 		body += "<p>You are authenticated as <b>" + user->GetName() + "</b>. ";
-@@ -92,7 +92,7 @@ bool InfoHandler::HandleRequest(
- 
- 		body += R"(<p>More information about API requests is available in the <a href="https://icinga.com/docs/icinga2/latest/" target="_blank">documentation</a>.</p></html>)";
- 		response.body() = body;
--		response.set(http::field::content_length, response.body().size());
-+		HttpUtility::Set(response, http::field::content_length, response.body().size());
- 	}
- 
- 	return true;
-diff --git a/plugins/check_nscp_api.cpp b/plugins/check_nscp_api.cpp
-index 3f6843ec29..ad15e62527 100644
---- a/plugins/check_nscp_api.cpp
-+++ b/plugins/check_nscp_api.cpp
-@@ -16,6 +16,7 @@
- #include "base/tcpsocket.hpp" /* include global icinga::Connect */
- #include "base/tlsstream.hpp"
- #include "base/base64.hpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include <remote/url-characters.hpp>
- #include <boost/program_options.hpp>
-@@ -365,11 +366,11 @@ static Dictionary::Ptr FetchData(const String& host, const String& port, const S
- 
- 	http::request<http::string_body> request (http::verb::get, std::string(url->Format(true)), 10);
- 
--	request.set(http::field::user_agent, "Icinga/check_nscp_api/" + String(VERSION));
--	request.set(http::field::host, host + ":" + port);
-+	HttpUtility::Set(request, http::field::user_agent, "Icinga/check_nscp_api/" + String(VERSION));
-+	HttpUtility::Set(request, http::field::host, host + ":" + port);
- 
--	request.set(http::field::accept, "application/json");
--	request.set("password", password);
-+	HttpUtility::Set(request, http::field::accept, "application/json");
-+	HttpUtility::Set(request, "password", password);
- 
- 	if (l_Debug) {
- 		std::cout << "Sending request to " << url->Format(false, false) << "'.\n";
-From 7e62a68eadada58e762d3f4261750796adffd440 Mon Sep 17 00:00:00 2001
-From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
-Date: Wed, 26 Aug 2020 13:48:39 +0200
-Subject: [PATCH] Define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
-
-refs #8185
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 046f23cf22..46e765415e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -172,6 +172,9 @@ add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
- 
- add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
- 
-+# Required for Boost v1.74+
-+add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
-+
- link_directories(${Boost_LIBRARY_DIRS})
- include_directories(${Boost_INCLUDE_DIRS})
- 
diff --git a/net-analyzer/ifstat/Manifest b/net-analyzer/ifstat/Manifest
index c19aaff461f7..620d7aa6e2fc 100644
--- a/net-analyzer/ifstat/Manifest
+++ b/net-analyzer/ifstat/Manifest
@@ -1,5 +1,5 @@
 AUX ifstat-1.1-hardened.patch 416 BLAKE2B f7cd655039a5fd68d49b8885b954dc1655551b8d9e120e698f1831e65b6d65ff7175b7cfe91cd58f117df8ac64eb05b17820ca963c078855989a5820b1d5da2c SHA512 64ff9119a6c492f0d011fcc0868425479b4b9bb8520b4f5e8323b106b9be555e763a9e73ef1e6833f652ebb51d048611d3504b26a94adebf5e21cd695c4417fc
 AUX ifstat-1.1-make.patch 4110 BLAKE2B b7495a19db3dde53c3172bdf44e1b4381df2dfcc58a000236b458cc962d017ecd5e8c08f036d964d706f33d9f77d3b870655245d5b74d3d43c333a46fa0d7bac SHA512 28b292b00b465a44344556c8f96bb237a0185ac176f0bea2374a0d6c03bc834997450c0c152a00a469f2a6837c3f60aa66cc85615d50cb5aeec1a379e155775a
 DIST ifstat-1.1.tar.gz 67920 BLAKE2B b9aeb18488f419fd6a03f698ed41d442b812765d5c1636dc6ea1e0484b5b1a6bc40b484bf88a715c63417d52db92927c128477714264ee3fe14ceb482330cb06 SHA512 b1aef8e7b14cbf265e2d42277478fd12a565287f90f37b0a826ba3e7d29640df757c7d56f149e406bf5890663ed734b2c658c4f1e2b258ded3649f2fc3e9ac64
-EBUILD ifstat-1.1-r2.ebuild 675 BLAKE2B 68dd58ffd07dbdf52a6abd89fdc527f51b1c0bcf8896d8599e42ff56ee3b2f25465a120880140d7e98f8bc5e51be252511dc5ef71dbc6dc9fb2ecc0714252bd2 SHA512 4267310e3125f76fda4565fb419af4eb44e9e341cc2cc01d3d199032566267bbdcd6811c145ff7e9f8db6f8707223822d27b0ee1e24556f44fa81639c70157ac
+EBUILD ifstat-1.1-r2.ebuild 682 BLAKE2B 2f84fbb0374caa09801848df5bc6576ced62a07ee76287c052d725f4fd12d4ae0b5a15d46ea5a505600c4c35bcb266f42e6a0b74a7e4082e6026805db2568260 SHA512 7551ce3d83f1f83e452eab22ef099fc5827d243e5c6ba9cd8f3f70de7c1a6eafe74ef2962d89ad317ec765f9535884e2cca2d69c30a6987f5bcec665737b848e
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
index 616e7250a9ca..6ece35858b77 100644
--- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
+++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://gael.roualland.free.fr/ifstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="snmp"
 
 DEPEND="snmp? ( >=net-analyzer/net-snmp-5.0 )"
diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
index 1d766ec1611d..856f9877e50d 100644
--- a/net-analyzer/ifstatus/Manifest
+++ b/net-analyzer/ifstatus/Manifest
@@ -5,5 +5,5 @@ AUX ifstatus-2.0.0-tinfo.patch 191 BLAKE2B 3294763f55f0219c9f19d317b931470aaa15b
 DIST ifstatus-v1.1.0.tar.gz 25233 BLAKE2B de9d088bf7001799c3a54775c0c63d5dcf4f1f3f4998ce02b82a11bea7a6dabb1263829ff42ba1cd05ebd6b202827196757727c24db022ffa7d06ece38db6616 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766
 DIST ifstatus-v2.0.0.tar.gz 24058 BLAKE2B 09a2b0af26cb05dfc24eefdbb6ac52b0ac289a687301f5fa67f0fcaf2622da96e149af3f7c08257e0ef8418f4f08b5ca1b77af71ba7c00dabddcb87cc95ddce7 SHA512 e1720f5dcc26788149cc72ccb72b85fffc72b367f2268e1e4f06a8fe4d80685146d310746c0b1a913e24995f6e93011d7d75ea5b4f9ca479af2d79264b89e27d
 EBUILD ifstatus-1.1.0-r2.ebuild 923 BLAKE2B 94fbf50de6b256cf4752b7aa589004d8b2f740e0f7a6b0c9809a7368a129fd3015bb0430a448787f2ffb01e77ba6402e9d4ecdee5263bc3b832cbecb7c582007 SHA512 f83e52bf3eeebbd30b7a50dd7b88d0c659bce4515d93481ec9349c03fe251a7a209a7ee9d5839e08bbeb807d47309de324189cc2aa684c483c8247ef62204ce4
-EBUILD ifstatus-2.0.0.ebuild 897 BLAKE2B 54a12fd4efefd2a57b95b813e7fd781b549b71fb54109afd11b675a1995b7ef7a815cfe1c83e3ac4aaa44fb7f5a63d488215332b269e43d34ca48812e9e55c2a SHA512 ffdb8ca33899b719854ce7aac7ede18d140713fa3d2337850d893b1513af2723dee4bdc81c77bc185892f484d345750d1c8ce9b9d4885b8d98b746536eb1453d
+EBUILD ifstatus-2.0.0.ebuild 904 BLAKE2B 35a7c27dc34bee5079597b98fc6697880a609f7131c51a013df95fbca6839923229e0b838b15e1c812c1e9a3211e84dc8d3aa18bf7f1a06a8b815c599a2c8bcf SHA512 d884bb335fbcf282f4f90c02988a3d4db86875957e1dc1fb8d704fd64d652c1bbc9eb95d6807828b02612c209f40ac36d30e03e32eda9af4c0c6edbcdf0130ea
 MISC metadata.xml 358 BLAKE2B e6d48885bc56f4b4057509378e2f84fe2468c417805bcaca14686a250420762c76bd3a656612019d5784a65df12e85b4dbaf89265d9b91d9455190d234f28813 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005
diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
index 400d6a60c000..89f9ddd12d83 100644
--- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
+KEYWORDS="amd64 arm ~ppc ~riscv x86"
 
 RDEPEND=">=sys-libs/ncurses-4.2:0="
 DEPEND="${RDEPEND}"
diff --git a/net-analyzer/iplog/Manifest b/net-analyzer/iplog/Manifest
index 97d7dcc672cb..098900827ba4 100644
--- a/net-analyzer/iplog/Manifest
+++ b/net-analyzer/iplog/Manifest
@@ -2,4 +2,5 @@ AUX 2.2.3-DLT_LINUX_SSL.patch 7265 BLAKE2B a20edebe47d65d066b1b3e214d8365b4a5811
 AUX iplog.rc6 776 BLAKE2B fba34208b2d16ba508cc9c3592e21eb7f0a479a89bf4617320bd9627047024f0cadde7fef55304baf25f7ccc56836e899b71801141b1802facc8b885b9b121ad SHA512 f0c3965810f7005e1ae183a2f3ed66ba06c054fcfd78da6277eaa364518ebffb9f44a0c99200b0d3042a63d4c57141d5b29823e8bc1d3f030e00d8e913021a34
 DIST iplog-2.2.3.tar.gz 133639 BLAKE2B f8108259f3f9b662297785988c40711d9d4ce6381377ed9a797f441c84fd1dcd9f0c3832e07ed9a660ddcc41bc52777136204274de873b72bce151327738ec2d SHA512 d7669e39b728af366b5199c58d396c6907496b4895ffb1ba0cba54fae0646f9792170f932de1eae9634b5ac356644a5d6d0ccaf7bc77a62641695992245c9aed
 EBUILD iplog-2.2.3-r2.ebuild 711 BLAKE2B d316c3319b05b81dc972e9bbfaa9b995de0d8efc184d4452ad9d88391f62a115db5f3ab9efee212dd2fd20d99f4fec7f41cfd14b03cfb455274dbe5bd9e2761a SHA512 bd905fd7a0a16565c57fc1e127756deef649c3b5ac8ff9f362bc305190070be9aab391db1bde97b4f7f8d5c8a9687d05aa611222d0bde46b1d992ded2022d106
+EBUILD iplog-2.2.3-r3.ebuild 705 BLAKE2B 6c0684735df2d67fdc627638ebc444c040cafb26fc545f00f6f4d3c76ac2899245ffc6cd5373da2a2d6130837b343f625fe5cd694e0058e00525c1e67ac4188e SHA512 8427570ca75e36dcbc79e711c9fab08d1ea24bf71b9d3d90e6980ccbe64c5233452ef12e87aa4996144665b966d30ca7e1cb826d63dbb176de6d7fbc1d8e6d99
 MISC metadata.xml 354 BLAKE2B df8c5f493f148b6744299baaaa5aba3f014c69968c7db943873938efaee876b21c85049573a2c0371bb5c525d89e060256616c15d381876b1e9942b5d39b8577 SHA512 fd3b53459e130f0350e47e4e677afaa53773c45a22963c22cb61aa2fc14401867eeb07efb09ff17db75814aeb65dff8715719209d74706a0ec616ec817a3d648
diff --git a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
new file mode 100644
index 000000000000..09cfb969491a
--- /dev/null
+++ b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="TCP/IP traffic logger"
+HOMEPAGE="http://ojnk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 FDL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PV}-DLT_LINUX_SSL.patch )
+
+DOCS=( AUTHORS NEWS README TODO example-iplog.conf )
+
+src_compile() {
+	append-cppflags -D_REENTRANT
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" all
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/iplog.rc6 iplog
+}
diff --git a/net-analyzer/kapacitor/Manifest b/net-analyzer/kapacitor/Manifest
index 2de96a10214c..426764d9b84e 100644
--- a/net-analyzer/kapacitor/Manifest
+++ b/net-analyzer/kapacitor/Manifest
@@ -1,9 +1,5 @@
 AUX kapacitor.confd 336 BLAKE2B c5bef1b3d07b7473121ab1693e33393dfdf2f086d0a5d114952b9c526cac1a17e4c39a3c601ab573187f65bf9b13392cb90b2333d18f8b2ce70a9e2b117a09b1 SHA512 feb56f42b5dd734004762a08760be81d0f38697ee23bcab7e33f94573e1742da91589b4c0307e0e9d5f72a757793b3e6b59636350447afe03e315486231e699e
 AUX kapacitor.rc 710 BLAKE2B 6229b4a729d623794dbee189be53d1485d9f5c7a2728b7cf0842e49eb51e48490ea868667728d6ccc38287e6f4e2079ce5db6bb86bdd608f9491bbbb195df9ca SHA512 ad1780dac6fc4ad899e88a5e66466ef7a5d54fe77ff3326e37c75506a3de5496a20610035ce7cd860a4b043fdad1f8c0a71c47533e0e9ddcab387d31e6086711
-DIST kapacitor-1.4.1.tar.gz 7543899 BLAKE2B 142ea7899be3728d2e857a83beebb8ff32dae6b7a71097de1474878a1728c6597937d03a828746af2464d6406ae80796b11579a10baacb66843bd535f971d940 SHA512 315e01e97f6a89afbbd0e36c17ee64d2744bc8ccce2e318f17ad5fba75599fdc55c303069c32aed07ba73c8ba9cdbacdb76c7ffe0c81681c1ef0be0ba405802e
-DIST kapacitor-1.5.1.tar.gz 5668659 BLAKE2B 5caf7a51945d84010f25dcbe198d4a1b7fc21f2ef7036a0489d6274212068937942f0490637a11ab05399d3a95ec1d96f3d42f0a2b3e3b7b4ff1377ef1e220e6 SHA512 6e25f89d9b75c6c14350a189be7bcd4210a331025a4bd0a8fa363dee8abbe8c582013a9c3020e638e9490ded12d70212963dc01bd3570395412641e2911d93f5
 DIST kapacitor-1.5.5.tar.gz 5708426 BLAKE2B 432d24f3bbe0f42e36b881e0c709cebd96dd3674ddf752f6a25cfb333108c903073b887e12d630d6c9e33a77b1256ea090cfe216cd9eb30b9bee53c48b7ab154 SHA512 34a2577a9c6f069ab8f747b9bd2f80f941bbedcccd740c24ec9f308804ec259e78cf14c924fcee3315b6f9f7f59adb9c50aedf06587898b8a0fb54f721d79212
-EBUILD kapacitor-1.4.1-r1.ebuild 1257 BLAKE2B fd245b633ce69fc8b9ba050952ef8be7be86576ef62a3ea9ce2f4141bc5c8725419230bd6f7ddcbc6efa34e59f75fd8ff9696c37939cf5a9d5f38a73cc5a64bc SHA512 db7bee7212c8871a8d73f1d3bf40d12acf40925f6d7cc4a5dcfed60a8a9a446129c3752565ef105a396b177501d4327bf3234814b32985b92c4245528519e9d8
-EBUILD kapacitor-1.5.1.ebuild 1257 BLAKE2B fd245b633ce69fc8b9ba050952ef8be7be86576ef62a3ea9ce2f4141bc5c8725419230bd6f7ddcbc6efa34e59f75fd8ff9696c37939cf5a9d5f38a73cc5a64bc SHA512 db7bee7212c8871a8d73f1d3bf40d12acf40925f6d7cc4a5dcfed60a8a9a446129c3752565ef105a396b177501d4327bf3234814b32985b92c4245528519e9d8
 EBUILD kapacitor-1.5.5.ebuild 1291 BLAKE2B 2358a6e632ff90c5d81e8c5b6aac80b51556a8a1b227c613066136b963a5544cc7b8a98c5d7512d78f0d63d779cf29f0f479a070fcc94618abcc3154471bb02a SHA512 21fb950d58cee3883fe29da65f44a015fa3ee09bf981c7a2d72d7cd9c4ad10391a96d1b695c9641c93e87f41fb2a32431fa82a28fdafda243c81697b508d6e74
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild b/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild
deleted file mode 100644
index dd499480fbdd..000000000000
--- a/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/kapacitor
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
-	enewgroup kapacitor
-	enewuser kapacitor -1 -1 /var/lib/kapacitor kapacitor
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go build -v -work -x ./...
-	echo "$@"
-	"$@" || die "compile failed"
-	popd > /dev/null
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go install -v -work -x ./...
-	echo "$@"
-	"$@" || die
-	dobin "${S}"/bin/kapacitor{,d}
-	insinto /etc/kapacitor
-doins etc/kapacitor/kapacitor.conf
-keepdir /etc/kapacitor/load
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/kapacitor
-	systemd_dounit scripts/kapacitor.service
-	keepdir /var/log/kapacitor
-	fowners kapacitor:kapacitor /var/log/kapacitor
-	newconfd "${FILESDIR}"/kapacitor.confd kapacitor
-	newinitd "${FILESDIR}"/kapacitor.rc kapacitor
-	popd > /dev/null || die
-}
diff --git a/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild b/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild
deleted file mode 100644
index dd499480fbdd..000000000000
--- a/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/influxdata/kapacitor
-
-inherit golang-build golang-vcs-snapshot systemd user
-
-DESCRIPTION="Monitoring, processing and alerting on time series data"
-HOMEPAGE="https://www.influxdata.com"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-pkg_setup() {
-	enewgroup kapacitor
-	enewuser kapacitor -1 -1 /var/lib/kapacitor kapacitor
-}
-
-src_compile() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go build -v -work -x ./...
-	echo "$@"
-	"$@" || die "compile failed"
-	popd > /dev/null
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" > /dev/null || die
-	set -- env GOPATH="${S}" go install -v -work -x ./...
-	echo "$@"
-	"$@" || die
-	dobin "${S}"/bin/kapacitor{,d}
-	insinto /etc/kapacitor
-doins etc/kapacitor/kapacitor.conf
-keepdir /etc/kapacitor/load
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/kapacitor
-	systemd_dounit scripts/kapacitor.service
-	keepdir /var/log/kapacitor
-	fowners kapacitor:kapacitor /var/log/kapacitor
-	newconfd "${FILESDIR}"/kapacitor.confd kapacitor
-	newinitd "${FILESDIR}"/kapacitor.rc kapacitor
-	popd > /dev/null || die
-}
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 6f4a67f30a76..cfaec065f941 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,8 +1,4 @@
 AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad202c2d2dbf3ede5af55dbe46cc15a064d37178b27670e30aa7bea07147456ce4d3e1ce9f495fa6df9deb4095367a7427e217719 SHA512 3ead6340800ac15fbe76e223599a5b3dbc6b6b13b72b684919aa43487838564ad7117b4e67fa7f36f0f58554fd8b8d6233efbcb82e6927a0c31f22c6a9ab5dbb
-DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
 DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070 SHA512 0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7
-DIST monitoring-plugins-2.3.tar.gz 2528556 BLAKE2B d8c8886aea900a172e5693de766edb6b7ef7aac5ee94fec1f5c14cb0e9873623b14a965cc8852abb4ed44934d5111a86e130e7c37201a03de42bc996797302de SHA512 926065667dff6c608ae5b7da39f6416bfc2443b9e1cdef68cd5d19be99da1b6fc6f23ef87b05731312b5d7ad76d01f0242fc9e544dbb4dd00dbafa0e27434d2e
-EBUILD monitoring-plugins-2.2-r4.ebuild 2949 BLAKE2B ddde634c6dc7c986e4d08c80dd4d6d1024c1bcf8957810a1323e7ca4d6951d096efdd331e88b7ab39e3efc5421eb17769330b2a4868245559eea207db5fe9408 SHA512 a3e2b240dcc91492325cb6c24672cbaf481a43f0bffc241c13faf682e87aa1c27f1a1369614592784d6cb0e2ce2708a85109ae98a52d5703e245fd3dcef1c9d1
-EBUILD monitoring-plugins-2.3.1.ebuild 3037 BLAKE2B 07312abcb23007ba40f6be8d03e6884f2b0a5b69bd6c33d4e960aa7c482ad325499a00ff9f99a8c0dcb3a49d4e9ce174d65efbe0ca473e867ba66f540de0643b SHA512 fd969ca834c14f3443e43e7b49f917accd1cbfac84a5a87495faff56d404c406de0eb8521138579a50c533ab161e0002bcff37bd0734ec9fe83e7c75976a0e66
-EBUILD monitoring-plugins-2.3.ebuild 3037 BLAKE2B 07312abcb23007ba40f6be8d03e6884f2b0a5b69bd6c33d4e960aa7c482ad325499a00ff9f99a8c0dcb3a49d4e9ce174d65efbe0ca473e867ba66f540de0643b SHA512 fd969ca834c14f3443e43e7b49f917accd1cbfac84a5a87495faff56d404c406de0eb8521138579a50c533ab161e0002bcff37bd0734ec9fe83e7c75976a0e66
+EBUILD monitoring-plugins-2.3.1.ebuild 3034 BLAKE2B d9c3b074d9fe133c3cccb3679aac0edff0690fbe5b0f7e67b8b8a232008188ad020fa1f6ddcf753c045ff2d1834f0134c3f3ca2a5856104ac14ba12834c2d026 SHA512 e82fc24872ee362fce26de6836fa912ab0582222c10179d8e159ce678fb0f9455f5b7c5e41a2991711ab6305eaa0a7bebf0cd38926b8fd4ea4cedbe9682fa73d
 MISC metadata.xml 1434 BLAKE2B 0d6304a4cc6f3d5b9ea268d7c6613f4613ac68ee1ae9d40079796716eb845ea97a1d8d6418d5dbaccdb7686754913f06dee8255ea12d91d3d8dc94e12fb55970 SHA512 0a9e64da453edddc864fc8b1c0fb13c63976f99968060a9ef2dc1d5e36b84dda9a79ac7dbe795401ef0680b35e397b08920a9a5ea4f861575bc61a76e89cde42
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
deleted file mode 100644
index 62c9fc037488..000000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic user
-
-DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
-HOMEPAGE="https://www.monitoring-plugins.org/"
-SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 sparc x86"
-IUSE="gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-		gnutls? ( net-libs/gnutls )
-	)
-	radius? ( net-dialup/freeradius-client )"
-
-DEPEND="${REAL_DEPEND}
-	dns? ( net-dns/bind-tools )
-	game? ( games-util/qstat )
-	fping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( net-misc/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-	!net-analyzer/nagios-plugins"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with !gnutls openssl /usr)
-				  $(use_with gnutls gnutls /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		$(use_with radius) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-		NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_preinst() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
index 8beced678194..1e9762f79b2b 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 sparc x86"
 IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
deleted file mode 100644
index 8beced678194..000000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
-HOMEPAGE="https://www.monitoring-plugins.org/"
-SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-	curl? (
-		dev-libs/uriparser
-		net-misc/curl
-	)
-	ldap? ( net-nds/openldap )
-	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-		gnutls? ( net-libs/gnutls )
-	)
-	radius? ( net-dialup/freeradius-client )"
-
-DEPEND="${REAL_DEPEND}
-	dns? ( net-dns/bind-tools )
-	game? ( games-util/qstat )
-	fping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( net-misc/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-	acct-group/nagios
-	acct-user/nagios
-	!net-analyzer/nagios-plugins"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with !gnutls openssl /usr)
-				  $(use_with gnutls gnutls /usr) )
-	else
-		myconf+=( --without-openssl )
-		myconf+=( --without-gnutls )
-	fi
-
-	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with curl libcurl) \
-		$(use_with curl uriparser) \
-		$(use_with mysql) \
-		$(use_with ipv6) \
-		$(use_with ldap) \
-		$(use_with postgres pgsql /usr) \
-		$(use_with radius) \
-		"${myconf[@]}" \
-		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
-		--sysconfdir="/etc/nagios"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-		NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_postinst() {
-	elog "This ebuild has a number of USE flags that determine what you"
-	elog "are able to monitor. Depending on what you want to monitor, some"
-	elog "or all of these USE flags need to be set."
-	elog
-	elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 8a0ebd8d3e26..0c0d977ec8cc 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -17,8 +17,8 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.1.tar.gz 6781346 BLAKE2B 4242ca77372005f995dfd228bec51d35b6b0f8c0ab0e44ed40cdb3cc0578b64e97444ffcb074dceca30739deadb46e68f1c75e87d3f1768d81b5e084b0fc0f5f SHA512 ae158ab41961ee2064d85187337979e6ff6ba90f3136b8a960e9ae46ee1408d9d2f0c5c4dfc3a3302e6dbb357cddf1221489435288c4f52182a03e94a9e450c3
 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
-EBUILD net-snmp-5.9-r2.ebuild 5608 BLAKE2B 17feaec47a68f5665973fe3e4fcd15af4e7c4573b8f9f6a84afe92672bdf307105d34045229b288afccaea0e16af8f23e3ad969518e6ef82d523b513e94b1401 SHA512 a7300befc2a3881a35cc93a02d7220ffc00fc17a2381a43a0f2a4125087db5b9bc43df33dbacaa7369a13fc4d5b2c4d9cf69eb64fd2ee4d6df915385274e0d5a
-EBUILD net-snmp-5.9-r3.ebuild 5635 BLAKE2B 8fb50677140ae8caf1a56b48dce264f8365defb02c15520136c0e3a5918584fa32f2746e84273818f938c55299a3fdf1a4ec2b163cf8aa455016783a5caa0675 SHA512 2a67bfaa5f11412afa6554f90ae16f39bc3363b0e24f4a4e79e719988c013915870621f25f35c20124b94d4d61d163baa12ca07ce18400172f74ef5fdd6c3501
-EBUILD net-snmp-5.9.1.ebuild 5614 BLAKE2B af8ab61e148bc9365b8699ece5f3187f71dc89aa92b74581ab7ba2fd1c3fc78af031c0f37e695c4911245c49049e884bf70e854b2bb1c7eb3e9e2c17f68be67c SHA512 2abbabb0770c21d55f743701a658a962c799b638c0fb59acde91a46561c6f89d6cb7da9b4695670d08379d7d3d55e7f7b7473f225968e8831615611455f7ba54
-EBUILD net-snmp-99999999.ebuild 5549 BLAKE2B b64e1ae224dda1392ae768d0c56dcd6a09d5cf55fe7c5634a0939f855e181984dd5d05796bed0008b3255fbb4db52275a1ace5fa45216153f9ebbb399f31bc2b SHA512 a46dea376c2ff87316ea32d6af07e2a7f24b862d53ef5044570cdd942574b7a728b637416f0c051f7e8360046045991165abc13f64ebfc7143e8396d5c3a255f
+EBUILD net-snmp-5.9-r4.ebuild 5629 BLAKE2B 439d9cd186268992d80e9eb16a2bf6e12f0de8b90a2ab26aa2e2dff051935eca0ba311b1846d8d2cf1e36bf0eb6e4e01970a41c70bf6db18b7aa4921a5ff7206 SHA512 6d7f7dd284a1e2c7d1e51baa7859730e6d9c2377c1d0b5a47da2a91c64f61eac022670f7753a584033957420b70ca7eef337d114481450c7b79605d38d960649
+EBUILD net-snmp-5.9-r5.ebuild 5662 BLAKE2B d14240cfddbef0c37f02bbbd1c800150bfcbcdf7f6393b623fa46c68db6d73c959b0fca8c0061d6c47f06de8b66cd9fcb8c764b5d00737691ada8b355139502a SHA512 9d49e677d6043923dab24b4f6d16d7cdb95654b4821cbcecb8ea78482945f6be628feeb97f06566bfb7711e694ac9f1c4048917053a798fdf255ce7e4e5f4131
+EBUILD net-snmp-5.9.1-r1.ebuild 5634 BLAKE2B 58de0495733237de84445e4f58916c8ad33f094b3b604ebf81eb3fa2848ea3b702403981a9a86b952b01777d9a28a2446ffdfac2b70cb9e568fb1f928e0f349f SHA512 b9843b80740af9b420fd6995862b5d5e0908d58de62b1ee1c83ee28269b54843742b20b518d0623fa073b56826627cab09ecc3ce641f0be53887eef53952bb6d
+EBUILD net-snmp-99999999.ebuild 5569 BLAKE2B 480033a169a3b41ebd885b4509f9fbc7dc2bddaa1c92a15b49dd9404873164b820c1848231e7ad85aec518077a25c3b710a2dce1f0d93e41f6be75719b47df2f SHA512 0fcef63310424172ce656f5317089571b8d3193e33754f13ecb9dbd6c63745b0bd5f60db8d0f626658362becec6a7a05f1eb45e64025c4db9ba0051ab292a3b5
 MISC metadata.xml 1383 BLAKE2B 66b4b2fb72a10c172e0ccdc89aa8903176393f381762e467b1bf7f16be20896b94ea68c67d125f5db7c42c85093f8b4208ded932afebee4a52e47bb691cf708b SHA512 6468e1fcfcbf83104c6165728825d36160e8df8975bc88a8933b6bfd4b28185ba08608e01d7721858760d47bb70d637ca36c6a3e443f02fb799a27fd89a60627
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
index 5ee941602786..85e04734976d 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 DISTUTILS_OPTIONAL=yesplz
 DISTUTILS_SINGLE_IMPL=yesplz
 GENTOO_DEPEND_ON_PERL=no
@@ -31,6 +32,7 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
+	virtual/libcrypt:=
 	bzip2? ( app-arch/bzip2 )
 	elf? ( dev-libs/elfutils )
 	lm-sensors? ( sys-apps/lm-sensors )
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
index 3a88621c46cb..2446c7771b5c 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0/40"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
 	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
@@ -33,6 +33,7 @@ REQUIRED_USE="
 RESTRICT="test"
 
 COMMON_DEPEND="
+	virtual/libcrypt:=
 	bzip2? ( app-arch/bzip2 )
 	elf? ( dev-libs/elfutils )
 	lm-sensors? ( sys-apps/lm-sensors )
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
index a33f94b2f9ae..ac38c56a767e 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
@@ -33,6 +33,7 @@ REQUIRED_USE="
 RESTRICT="test"
 
 COMMON_DEPEND="
+	virtual/libcrypt:=
 	bzip2? ( app-arch/bzip2 )
 	elf? ( dev-libs/elfutils )
 	lm-sensors? ( sys-apps/lm-sensors )
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 652062a60647..5517dfe32065 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -32,6 +32,7 @@ REQUIRED_USE="
 RESTRICT="test"
 
 COMMON_DEPEND="
+	virtual/libcrypt:=
 	bzip2? ( app-arch/bzip2 )
 	elf? ( dev-libs/elfutils )
 	lm-sensors? ( sys-apps/lm-sensors )
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index f1fdd52fdd34..702e9b4eb5e7 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -3,5 +3,5 @@ DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c572
 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
 EBUILD netcat-110-r9.ebuild 1648 BLAKE2B fa3fc6c694fc056d1f55d96855784ff492a40d312639820519a786b24549e9031e43016ea791d99fdc82c06fd7c4e0d2ffa59d85e9159948d4f1fd830ae53645 SHA512 2d35b812bafa2865c55370c4825e78e53a5c9f2bb7add8f64194713312856872ac2a37de4b5aa69a23fc45fa96c413ee77e450c2e93c750c8f01c0ca93be956c
-EBUILD netcat-110.20180111-r1.ebuild 1313 BLAKE2B 0a8c5670241d928d62dc4bd180fc32f368b158cd983a59b84bcd41c6a89fe3d4dcbeec067dd28fb506f1cc9e6771d350d7390cf412d9ef920173b36c9204106e SHA512 73b1be505bfccfa2e150cb9618f69c27db596ed1ca6f845ee187c864b8ef153ddc3bf835eb31522308fc0894cabc96240999be24e8f906ab898435efc67b6f34
+EBUILD netcat-110.20180111-r1.ebuild 1320 BLAKE2B bcbffe3eb6c486b9500b8ab08c1ad097ece37ddb05966814d3e55a0cf9af501f146307bc489e9fcd9a2cc427be66d6125c12a730ecee65d83056d29334cd9f28 SHA512 9407ca2c7173f8faa09716ebf1f42e61349a125643af6f7318080cf8899626c85db707df0c9fef64fdce5166fa32ecedbad95ce4f68bfb829869600d72930225
 MISC metadata.xml 520 BLAKE2B 554d3e1e5b791ebc008ad728157d01fd711b4e57d96ef0294c55e43bb21d6b0bd6a606aa9e5b5cfd6b768d362f260dea119f662bd31b24594a55652a1c5ddd22 SHA512 1b5f4d4aa398bbe08e2bb73c609624e6ed320d39e96531a328fb0547e6a0dda5bbf72aaee358948e2f06c60d578f91a51965fc268601b044c16cc62a2829a3e9
diff --git a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
index bbbdcf9ba346..3e8c204b0133 100644
--- a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
+++ b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/nc110"
 
 LICENSE="netcat"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ipv6 static"
 
 src_prepare() {
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index d37121cccec6..bdf0f2ba6379 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -6,5 +6,5 @@ AUX netperf-2.7.0-inline.patch 902 BLAKE2B d31b677da87044cc87779013e3c12b88ea82e
 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc
 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
-EBUILD netperf-2.7.0-r2.ebuild 1898 BLAKE2B 6910a1658dc4576594b8df29a0fc4280cde378832330afe791fec3c1b50c58b0669a2a29f1c08a39573ca0d27076b4b5bdfac79b3b89b7238f43929add57873c SHA512 1e7bf240e650e62a2b7e59570a1aa04ea67e79e6895a9b88b6ae1ad24df44c44d224dac6456e2ab4ffa43efe511c8329ceb127574343a655587ca0e31aba8f47
+EBUILD netperf-2.7.0-r3.ebuild 1910 BLAKE2B 2201aa7888ebbbfe4d999d1e76c161966d01b8a4e6b5f89e23569d705e2409361166ac7d6facd2b811ed483a585ed14abf03d0e6273ff812de587bc6b6a4ae0a SHA512 beeac77a9eecfe95f3db6be742022c9d0b36261a167ff77203dcff251b7a154615a9c39690c4cb0a4e019b913127aa996f8d81399889647f786ec3bb1b8e6e64
 MISC metadata.xml 855 BLAKE2B 20c4b64a1abe9e4f83a56e759b9d7cfb161886dd06a4672dc96828a80d3f91c064665138a87c263815c217091a869e7ced811fca059405bf047de337814c52a5 SHA512 628efc289da10094d7fab1c0c47e8acd67260fffc036e2d4eaa1430e1b91fd2610d681134211cff4dcd5f84858199a4bbf36aaaa73f3e507bef1114a64b4e588
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
index 6a56ebb79e3c..93441fc7cb54 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic user
+inherit flag-o-matic
 
 DESCRIPTION="Network performance benchmark"
 SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
@@ -14,6 +14,12 @@ LICENSE="netperf"
 SLOT="0"
 IUSE="demo sctp"
 
+DEPEND="
+	acct-group/netperf
+	acct-user/netperf
+"
+RDEPEND="${DEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-fix-scripts.patch
 	"${FILESDIR}"/${PN}-2.6.0-log-dir.patch
@@ -22,11 +28,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.0-inline.patch
 )
 
-pkg_setup() {
-	enewuser netperf
-	enewgroup netperf
-}
-
 src_prepare() {
 	# Fixing paths in scripts
 	sed -i \
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 2e31899b5ba2..0d46c108bd10 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -2,7 +2,6 @@ AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2
 AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab
 AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
-AUX nfdump-1.6.21-remove-strict-rfc-7011-handling.patch 1726 BLAKE2B 6f2d2c0ebb336eafba60aabec9bc2eb120c61b67401704786ed105eaeba090d893004ea4c8be4e40b360cf91c2b306c4cbb9ef9f60dc6b5c3b92fe1c5c5d904f SHA512 e7ca0512b01a0838ec9a6d52710da23ce6db5021af19a354bc59cbaf7c6b246fee50e7c3ae9b71eb34e94396cffba7f1069140c0f476c8a2b61fa9a06113f425
 AUX nfdump-1.6.22-libtool-archives-slibtool.patch 3503 BLAKE2B 1118f50a17b134dfbd93cbb66e54c3228906782fabc6e0df174c912569120c588a03170a8bfd715389611b0dcc5b469415d2932f610f8b5398b8424f6e0c5342 SHA512 646606077ef1771b8f4c776939773ab7b2875c4f28710f44df826b7d8d5e5b8a163fff60eb6869ee4dfab8a7edc0f277e19ed88511719d2455b9bc5133e81124
 DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61
 DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch
deleted file mode 100644
index a36af2242d42..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f5ae2b821c22ebe0c96f3516d4e90f4255633828 Mon Sep 17 00:00:00 2001
-From: Peter Haag <peter@people.ops-trust.net>
-Date: Sat, 8 Aug 2020 16:46:04 +0200
-Subject: [PATCH] Re-address issue #231 - remove strict rule rfc 7011
-
----
- ChangeLog   | 3 +++
- bin/ipfix.c | 3 ---
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index a0b2b67..8b92e58 100755
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+2020-08-02
-+- Re-address issue #231 - remove strict rule rfc 7011
-+
- 2020-08-02
- - Release 1.6.21
- - Address issue #159. Implement rfc 7011 and include sender UDP port into unique template identification
-diff --git a/bin/ipfix.c b/bin/ipfix.c
-index a730a8b..19c9d63 100644
---- a/bin/ipfix.c
-+++ b/bin/ipfix.c
-@@ -158,7 +158,6 @@ typedef struct exporterDomain_s {
- 
- 	// exporter information
- 	exporter_info_record_t info;
--	in_port_t	port;				// follow rfc 7011 - matching src port
- 
- 	uint64_t	packets;			// number of packets sent by this exporter
- 	uint64_t	flows;				// number of flow records sent by this exporter
-@@ -383,7 +382,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain);
- 
- 	while ( *e ) {
- 		if ( (*e)->info.id == ObservationDomain && (*e)->info.version == 10 && 
--			 (*e)->port == fs->port &&
- 			 (*e)->info.ip.V6[0] == fs->ip.V6[0] && (*e)->info.ip.V6[1] == fs->ip.V6[1]) 
- 			return *e;
- 		e = &((*e)->next);
-@@ -412,7 +410,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain);
- 	(*e)->info.header.size  = sizeof(exporter_info_record_t);
- 	(*e)->info.id 			= ObservationDomain;
- 	(*e)->info.ip			= fs->ip;
--	(*e)->port				= fs->port;
- 	(*e)->info.sa_family	= fs->sa_family;
- 	(*e)->info.version 		= 10;
- 	(*e)->info.sysid	 	= 0;
diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest
index 4394008cc7bf..41f71b6fb5b0 100644
--- a/net-analyzer/scanlogd/Manifest
+++ b/net-analyzer/scanlogd/Manifest
@@ -2,6 +2,6 @@ AUX scanlogd-2.2.7-gentoo.patch 407 BLAKE2B e859b5d31f0a599f7a7a10863b1a88344055
 AUX scanlogd.rc 382 BLAKE2B 086a833826e21d94c5e8d8bca522dcd69f8a1d42164094b0bcbf9141353e9b3dcb09d718a6c0b4e2b3c4ba7a2dda1fe01700085a3c910b7b169cda79382ce1d2 SHA512 d4f5a640fa9a6a44370fafb621ee8fd91357b0870d04d6852017ca4c108a50a1d76a6e1ac09dcf76f3238893c6084fb998e69b5f5f227b72b8307c8e1d6dc170
 DIST scanlogd-2.2.7.tar.gz 11352 BLAKE2B 480e1ef78ac35ff04fb44961aa501f997786e20a3501f54f74b9e5761edba4736341d364a9a10772d795cb6025b88399bf3b56b0a980a0d2d0787f7a66eeeb22 SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b
 DIST scanlogd-2.2.8.tar.gz 12190 BLAKE2B 26396c3174de3d3cceed9833354cae7d7bbcf3078a81472ae1fa28856f011e6984fa8182a994d5a10632c19f15f86e31f1ee73309273cad04e05fec942afa0a4 SHA512 92f7a28dd40593dad6afae4fd0572efeceea3f43f334ff82c349538d4a28e9ab624912f82fc5c102a4a9937009bbf7b76a81029588e2815ff9b305144143572a
-EBUILD scanlogd-2.2.7.ebuild 947 BLAKE2B 20bef542281a5979bb04919116210524eef1d4115013f645d6eb9514f70ca4d70dbc691036f2a14cf68b1a6aa501e99ab1c749931921ed658b015f62b679ef78 SHA512 fbb3e20a7d7e91fff05c0093593a599f76393635518dc1313ff520a392e4238f199de538400a2ede78a30a4ae9956f14d59b70e18833b654b0ac15c783b58208
-EBUILD scanlogd-2.2.8.ebuild 963 BLAKE2B 327c2ba0abf77d73676381e6731ec3108859feda67063cadd95650335ba53f5b17419cbe7e53953df10148c54de8920921727eb438d0d7f9a08ebfa7994e5632 SHA512 cc1285616e9700f2b0b607593f41b501ca62ab61ca4694b5debd70203933fa6b188cc738175640d5ab84af73029b176e3744705226de6fd44a057b92997f168d
+EBUILD scanlogd-2.2.7-r1.ebuild 903 BLAKE2B 81092044beb603269002db1767c42c2d9a1028842307f012699ca8f2d2c5673f7d4ffe30346e349e667b9c7d0a3e901fbdaf7ea5eddbbb75b52a4e68807a7625 SHA512 eceb8f2d589dbcc0e4786a34e6f8c9ef3a7037715cdfa133da2e4e1b697222ae224056a537124b95e7032e684165c99e47661561d9342a8d64d5c1e0342ca3f7
+EBUILD scanlogd-2.2.8-r1.ebuild 919 BLAKE2B b0b643c645c3158a1d221a0783ab975667818a01c72aa2782348a45c5c53be6c4f2389485e204ed5044f1c722f85ef9a0bb47acabcd8bab2c5669cd7453bc4bc SHA512 197f6aba10a39537aa2d561df78fdd44ac770de8f65a49d2526d46787b4a8c4bbcfbfd4c73f5d9e90623bc23291e8fb7f52ae022912c8a79f9d7c03e425bd806
 MISC metadata.xml 443 BLAKE2B d202f0eaa045670664aaf485c576200a334ba1345a0b03f551e2aa6501e489fbbbd76a9e2fb848a5e8a8e1f8817997c0a00ee41dd048d7a3786d1db90506f92c SHA512 85a26f92ab115fb66fe3d6658ec35891b7a2a45a27e44aa02bf0524e61ee3b517cc3cefa2ffb72c7c1ba8ca306e209e8c411da0e5071b3fc6781747e407f7526
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
index 7fb4b5b2a9d4..7598563d3815 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.2.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit savedconfig toolchain-funcs user
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="A port scan detection tool"
 SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz"
@@ -19,7 +19,11 @@ DEPEND="
 	nids? ( net-libs/libnids )
 	pcap? ( net-libs/libpcap )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	acct-group/scanlogd
+	acct-user/scanlogd
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
@@ -44,8 +48,3 @@ src_install() {
 	newinitd "${FILESDIR}"/scanlogd.rc scanlogd
 	save_config params.h
 }
-
-pkg_preinst() {
-	enewgroup scanlogd
-	enewuser scanlogd -1 -1 /dev/null scanlogd
-}
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.8.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
index c21dc3ec5c8f..df7a9b460ecc 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.8.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit savedconfig toolchain-funcs user
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="A port scan detection tool"
 SRC_URI="https://www.openwall.com/scanlogd/${P}.tar.gz"
@@ -19,7 +19,11 @@ DEPEND="
 	nids? ( net-libs/libnids )
 	pcap? ( net-libs/libpcap )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	acct-group/scanlogd
+	acct-user/scanlogd
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.7-gentoo.patch
@@ -49,8 +53,3 @@ src_install() {
 
 	save_config params.h
 }
-
-pkg_preinst() {
-	enewgroup scanlogd
-	enewuser scanlogd -1 -1 /dev/null scanlogd
-}
diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
index a509c5b73df6..81af2aaf51c5 100644
--- a/net-analyzer/scanssh/Manifest
+++ b/net-analyzer/scanssh/Manifest
@@ -1,5 +1,5 @@
 AUX scanssh-2.0-fix-warnings.diff 1071 BLAKE2B c92997cd26cd03ec451ebf83a54f19ba86d6b33f90dd666c8637fceb222849b3d2703ca9c8c1645a95186059ccf049ae462d7a4c58486ee8c0d086cb8f73e625 SHA512 b9080dbe7551e905db0744ca36b8690d05d784ad7c4c77f4fcbe64ff603353e998cc28ae45c26e230f594278cdb6f130029aa633166e6636933be44845c27b06
 AUX scanssh-2.0-libdir.diff 4916 BLAKE2B 23fb00f8880e9a2407e919c626328430fc7c09d21bcdb535cf2411b41fc4c623ab04e2411dbdd239e62cc4f6545b9d67d29bab879f6ac268c241d1cd884b2592 SHA512 be01518f156b724439837150f9f02148d6f92c0bac2557419f2f9def9244d29006a6c84ceecf193b6f57830c697d9b650102625cf78787fc59709a2ef2b7847f
 DIST scanssh-2.1.2.tar.gz 147470 BLAKE2B 4cb31a27dd925f071bcb958fc72bef7b7f0455b7d718a15536dae40cee969739628da64a3972e2c5cc9813ef24c5634ca019571783ea20df87c7df80f32da876 SHA512 af4e705c43156b907d6864b12f5832bb4e43d0ff284e34e96b32bbe7986299954d1175880ffe7588f91a939d140b45592fc72dc2bf397f140aed929dbe44a453
-EBUILD scanssh-2.1.2.ebuild 853 BLAKE2B f0d75a289370b7d1dca290e1865181eb758bae4a2f740f7cfd8e327ef054262306f74033e0c9bf7551cd57901e83c17bb10155d24068dd0a31dde53c05cb8cab SHA512 c0d3d279f685f27aa46e8194fe00af6b93354157deefb1ec926e38203409a7312b58b9305c96cb3bf5457adbe118f5343f969004fcdb2bedb99b006c18cdcf8d
+EBUILD scanssh-2.1.2.ebuild 860 BLAKE2B 0d8ba021d32cf1656aa6823c96e716f3120ee3406de26bd78f827d13257c88a9acf54865c1b191a65c89c194bffd1e3dc34de664eb2f17bfe0bee9c9dbb31135 SHA512 acfa6e2a2f041773d15d8894ce95c2be194f100c9276f47081b5ad371299190620813f20c989ce065de6eb6950e1478ea5df35a607c81f86b8d43246869273d9
 MISC metadata.xml 436 BLAKE2B a9ebfd202e124281faf98318aafe911ae9e32201540c68b5e0bc4246d56af9695bb1f3f55b50bf04ffb13afddc8128fb15d75e7995a986577529c2c527278595 SHA512 98f0bb0894f2208336cb9e42bc4445a13c01a851d1a0f964519029c639ec37d7d476cc128e0e9acc0558ad23f2312c8189784f7e08a4cd0e80fb92823fce1da7
diff --git a/net-analyzer/scanssh/scanssh-2.1.2.ebuild b/net-analyzer/scanssh/scanssh-2.1.2.ebuild
index 54e673333041..02520623012d 100644
--- a/net-analyzer/scanssh/scanssh-2.1.2.ebuild
+++ b/net-analyzer/scanssh/scanssh-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~riscv sparc x86"
 
 DEPEND="
 	dev-libs/libdnet
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
index 135abdcaf99d..b89822176e00 100644
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -2,5 +2,5 @@ AUX log_packets.confd 527 BLAKE2B 568a785fab6f027218269378d345986c354246dad66673
 AUX log_packets.initd 2093 BLAKE2B a251bc9692a599e66943d5b3f6615f281d7872da22a76699875853f72836102cdb94fdf558250ee74e8618f8c45725dea0410e5fb635f153aadf5499575b4fe9 SHA512 43bc027f4769e986641a9820a1dfcb8a794ae417cb49efe333fd6a960953e1f9854c660e95ae9c0e14f4c1ec59da9e3096ae7352bbbb77805dc71729ed76514d
 AUX sensor_agent.initd 742 BLAKE2B 6d8a1aee38f81f4d9d971ec3a2d56112c0789ca60d5ee51ff7444109e55ddac889db81199e5883070031fe247cc06506febcb3ae27b5a215974a4f953121b887 SHA512 3a025479579ee9eec6a26d2a2c70efc362d37b7821dfa211236d8fe9dc2ea7b7b0694dccfd9b208655702401c1b0e3ecb08bac9e3b177ee77f161e5c774c1611
 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-EBUILD sguil-sensor-1.0.0-r1.ebuild 2221 BLAKE2B 43bfb72e7e71d1439b1ed4a69f7266bb48c27e70f56250cfe61b15586be71bcca8159103db13c0b303ff5d43aa1f999db1c4418ef6f17c37679b82748bda42d2 SHA512 6153b71c0dbba34bfba56d4d760ee6fa7b9b82c9e5e9932401454398f2620fe01ce44e80556bcf8d4e67fe28c95f05d5c3adf411ade18978cf7f708d059a289b
+EBUILD sguil-sensor-1.0.0-r2.ebuild 2172 BLAKE2B 593b13514336c426aab68cd358755fc1d69e56c4aeff981cf695a12518fcffdca896d783e050e40187606fe8620da165f3fc4cc8486427bab0353710698a2d15 SHA512 f91c13a27f86830e127a01bfe051c36aad9e18e8dd3e3c86cc6f49c530b18fa8555e5ef50f3dea6c6c3646c93c5dcefd8189b18462f962f892712875e672e94c
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r2.ebuild
index 7007abd7517f..d783b8e9738b 100644
--- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild
+++ b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r2.ebuild
@@ -3,18 +3,23 @@
 
 EAPI=7
 
-inherit user
-
 MY_PV="${PV/_p/p}"
 DESCRIPTION="Sensor part of sguil Network Security Monitoring"
 HOMEPAGE="https://github.com/bammv/sguil"
 SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
+S="${WORKDIR}/sguil-${MY_PV}"
 
 LICENSE="GPL-3 GPL-2+ QPL-1.0 GPL-2"    # GPL-2 for init script
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+DEPEND="
+	acct-group/sguil
+	acct-user/sguil
+"
+
 RDEPEND="
+	${DEPEND}
 	>=dev-lang/tcl-8.3:0=[-threads]
 	>=dev-tcltk/tclx-8.3
 	dev-tcltk/tls
@@ -24,13 +29,6 @@ RDEPEND="
 	net-analyzer/sancp
 "
 
-S="${WORKDIR}/sguil-${MY_PV}"
-
-pkg_setup() {
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
 src_prepare() {
 	default
 
@@ -59,7 +57,7 @@ src_install() {
 
 	# Create the directory structure
 	diropts -g sguil -o sguil
-	keepdir /var/lib/sguil /var/lib/sguil/archive \
+	keepdir /var/lib/sguil/archive \
 		"/var/lib/sguil/${HOSTNAME}" \
 		"/var/lib/sguil/${HOSTNAME}/portscans" \
 		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 52d564d41520..3f50ba420da4 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -3,5 +3,5 @@ AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731
 AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f
 AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344
 DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
-EBUILD smokeping-2.7.3.ebuild 4197 BLAKE2B ba54d0bbf60fdf40623a98015425bac299c8b864cc8c60ecd2f377089c6cd9b7c1708afd6b1525bb426b427b9259e37dff15ec5935554424fb0f9d570cbeb983 SHA512 0d405286984f37e95c2d51a9a19b0223097dd9b06489c65ef00a612bc1df0b2cdca21d91a055f0520d1c354a6fa392d37506d94079a0ba866c9a69440a74f18a
+EBUILD smokeping-2.7.3-r1.ebuild 4020 BLAKE2B 4bd615ccfeb02ead87f489c2fed34973359bb0922337d7386f2c4053e5ee325e6949d220058ef1e84e94613c7f43bacbfa48e720ea278307bd1aee2a13b18d13 SHA512 951cdd387b25a9a918e01dc6d959b129ba4a9be9fe9dc3d487d3014720dd7acf2faac9a276e13b74d0813ab7dad5ca4e8e391c8ed16970b4ddf3995f0babd9a7
 MISC metadata.xml 468 BLAKE2B d219af56f99fd891f8990b2298c9daa86d8fa3f8433b04eeabab1d47492a4ba186906a265612422517f9fb373217473fd047412dc08b7b1bf3f2aaccc92ec2d9 SHA512 0ca877d24981625a5d601cd19fc18fe37b48526c7266c248ee0ba955ecc873b31ea5f06d3feb692566d228a481193fab1f70c53aaa0be089aee490d80f80e815
diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
index ec3971888746..497f430571fb 100644
--- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools systemd tmpfiles user
+inherit autotools systemd tmpfiles
 
 DESCRIPTION="A powerful latency measurement tool"
 HOMEPAGE="https://oss.oetiker.ch/smokeping/"
@@ -15,6 +15,8 @@ KEYWORDS="amd64 x86"
 IUSE="apache2 curl dig echoping ipv6 radius"
 
 DEPEND="
+	acct-group/smokeping
+	acct-user/smokeping
 	>=dev-lang/perl-5.8.8-r8
 	>=dev-perl/SNMP_Session-1.13
 	>=net-analyzer/fping-2.4_beta2-r2[suid]
@@ -47,11 +49,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
 src_prepare() {
 	default
 
@@ -140,8 +137,3 @@ src_install() {
 
 	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
 }
-
-pkg_postinst() {
-	chown smokeping:smokeping "${EROOT}"/var/lib/${PN} || die
-	chmod 755 "${EROOT}"/var/lib/${PN} || die
-}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index d4276f45dcae..0dee5dd858d0 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -7,6 +7,6 @@ DIST tcpdump-4.99.1-upstream.tar.gz 2014324 BLAKE2B 0a10fe68afdfe80d3e7e661352fc
 DIST tcpdump-4.99.1-upstream.tar.gz.sig 442 BLAKE2B 9a80b1796ef777bd06d0b8953fe1ff446431d0ff1dffcd58e29a0b771f6734f70f3f0da7c36a1eaa1b6e57719d79c601872a84b7734208a7e8951cad9aca86ee SHA512 b438643701efbbb5579d9d51ed48756a47dd644e0acb10b0edff6d04f3ae4cea6528b40820a656407b73f983b2a634e0165a6c8c0fca3b557394a14e2f2384ab
 EBUILD tcpdump-4.9.3-r4.ebuild 1700 BLAKE2B 807df788ac7f23cfe14a7c8116607bdb8bbdf346df552feeb8b72bd23f6f4867b8701e2b72ff585be5f5a658c12cb1dc955d205437bf9ec80e5e969c9aa7103b SHA512 4f1ea4403015d9b0e01c155f0df4695c4e71a997ac2e35334f3cb2f9cdff6f79dc23e29a963d9305c3d946b98dbd59ee45a22e91c0de13bdac502511bf1b65ef
 EBUILD tcpdump-4.99.0.ebuild 2299 BLAKE2B b12600c20ca80aed3aef1c0206be94cd61cfca8a4ecadb25f1de82b748d416daaa1772533c688a06a609edc4d8fc19f6b526041f6d57a6da8210974cb743cf1d SHA512 8eaed7d2f02b9e1fd3d517f09fce49a5e46c60e027f951a61c2ef7cf2bc51b3c8e2def33703a1104e48f12f02cdd633895f7d83bddb871b1c8ca082d9222c436
-EBUILD tcpdump-4.99.1.ebuild 2334 BLAKE2B 65fb84d912677ab22d69486393fbd393f533e4f5139539db9d747691eb235de69ae9c5e42ee73df8380ded0886b6b087ef2ed74722854a6c295a6f23f89062d4 SHA512 0635653eb3c24cb6032c19c48b4fa0cdef6c86d72eec132d77a9e8cd63dcec0a544870fb609e1b85e1ce9761e9a8ded6c9488321cdaa9ca327f3ec30c4b8c944
+EBUILD tcpdump-4.99.1.ebuild 2327 BLAKE2B aa7b320f779d6f686fd9d966182615887795c24c714fd5919ea9b34ac87f3d02bfb10e3bb349a8702e3779cdb66f9a0f7103267a69162340fad4baa89eac552a SHA512 820f8ce08e064cf52cd7a652eacfa27c2fcf5b93c9ddb2041fce5cecd32ab6fc11db47cd2f253f16e50e31a0945dc27b119dd98d2b721336171cbe6b34f3d916
 EBUILD tcpdump-9999.ebuild 2144 BLAKE2B f1291e3a4d1f0244dbe4a7e80b40b9ce1f44b5d1f5e76a6888f4cbf77c704497bc316e25f8785faa75319e658e3f162dcde20ce86e2ba497481dfae0c7def580 SHA512 5a64ffdb86df8529d264554aa097cd824e5c26690a9b1a258f5b56238f6af5ee80920109cd1c9e3c128eeb0acfbceffb889ecf2a1310865615c73da1186a3c0c
 MISC metadata.xml 700 BLAKE2B 75eb9e5a825df6e9f4d4ef871e18eeaf6960ee25bbb42d5cb4bcd78775a7ead3ca45c76dd54ccee34c30e56d39303ee4d374a13bbaf449cbcf72242b7c9306f0 SHA512 c248231c288d69b2f71e86054095b599d72e971b9f8e67bacd851907b70b6a252fbf85a47f2b7f0cd3422ec7ef69410e2b3dbbe6de6b96320718dd5400900c74
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
index aa2fc80a8e54..d23c0f647d4e 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
@@ -21,7 +21,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="BSD"
diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
index d32a0aee6ff6..ef3a0c7e4304 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,4 +1,4 @@
 AUX tcptraceroute-1.5_beta7-cross-compile-checks.patch 1228 BLAKE2B f18640804c946225fed7324203c928062b37001053ac87a8f78c500b1bb6c65f3263650484f51ccf20b09bb8d1ce95f871b2ad53f8752154e0134b5e26b2e01a SHA512 a994d9d0dfd633fd9f091c77a0ca96b0b73dc9a7373631feece29fef3f3daeb38dddf7fc6fc829c64cb8eb3809d7e25d22f3c18d2202188df9d94ca237601815
 DIST tcptraceroute-1.5_beta7.tar.gz 119059 BLAKE2B e2d627c7fa96439e77be7d2fb5d57e0b92451367c95022876895fcbebdc0adf8c78b262e41ecb8a2696e8377e9862b45f2139cb8ca9d92a696d9a0dc319d4a64 SHA512 ad5588e62a56f1b5fa851b68280a88e66a900777fe4fd67587262245cd9da17b536b7dc972abe540fc124a93ac76abcabbc55bc32f9f8ee872d5df57b08f7222
-EBUILD tcptraceroute-1.5_beta7-r3.ebuild 880 BLAKE2B 36134fa45277ae34998f7dc9c8670e306d1a1ffd71ec036682aa2f7b2117b9225c1369a33108fef63392dcbffb64c4460fbe606e17fb192583fc60ea80016b70 SHA512 29153fadcec39febd3976118d2aec6f052babf67eaae7e44747b2e8574bfa72e8ba82f0243fbb0622a8afcb8404a11cbe87a8fd98ae83ee84e6e8c80aca4a7ac
+EBUILD tcptraceroute-1.5_beta7-r3.ebuild 887 BLAKE2B 3bbcb548f2a1e76e9a95d00e6aa20bc0780ba90d30ab1501307eeab57f2cc42b270b550d5ad62b902c6ae7a0b39b1ac830963164f403fc94d196fff529c66863 SHA512 9fd970e74a7f39bd735319488b206df65527296c2eecd4d5a1d95a5b34b24c66dc011f40339963da4e5c2b364456f76dce6679379e771212032f3c61e11dde7e
 MISC metadata.xml 362 BLAKE2B 7e5066833673e1881f77a10c92f8ff281c050140a6a77154fedb4f469b99d6c53abbdb0a35702d5325e294f7acfe8b050254be7ffac4c3832455777c65a98cd5 SHA512 783a1867b40907e8704e19ec6d423f4db8a97ba683f64efc72ea7bf4e4157e9bf630470fcf8a0410d6fa9bc5cf63f810f1f577828bdfe1203f2f56e55458c7cf
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
index bfb827e2b245..eb1c9f51819d 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mct/${PN}/archive/${P/_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest
index e94860afc806..c892c4dee44e 100644
--- a/net-analyzer/traceroute-nanog/Manifest
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -1,4 +1,4 @@
 DIST traceroute-nanog_6.4.2-1.diff.gz 18417 BLAKE2B eec999aae1e728e9c255715042ee7be66bc32c19eff3ab32b85fecd281032d24eea27fa19d27793d9820b61539791ed82b0a0a7845636970a8d2433d0e3ba40a SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e
 DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 BLAKE2B 427a7af1f65271b1b4f46522d76da00628e1c6b877b576ff571dc09d7c1bd0232abd626296b46a16785cccaf091b086ea61b5081035572b846e04fff97d0dafb SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304
-EBUILD traceroute-nanog-6.4.2_p1.ebuild 960 BLAKE2B cee2985f53c2dc93dbd4502ee2a7ddaabff4765ce18dbb2ef64648466dc9d231ecf7b46029cdfd3019b21b8afaecacbaf265a2afcfdd36a160ddf01c85aebe5c SHA512 71a07b76da6ffd54424e4705590c201aef0abc041614ec60e3200f5ecf25722b7349a8eaa18230ba34f7aed06f77109d29fa80d1b3118d62b6cc87dda5e54e05
+EBUILD traceroute-nanog-6.4.2_p1.ebuild 967 BLAKE2B 1e7e46eb3e693abfd58787468ff7c6ae3e7b77896c27f7022fbaaa9589bd962c3f9f99121c517151be2707dc967771d8296271ef246bca4b7d8eb2408a612bf6 SHA512 40cfcfc62e8b66c3b0c8d7dab4b9fa591653817f4a135efde647cdaeb7ed1074e89d73bdf346c41d9e160110aab72432df51606a2a5af1a63e0c438749f49d54
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
index e2c94b97847c..d40f8a60a493 100644
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
 
 S=${WORKDIR}/${P/_p*}.orig
 
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index 1dfa1c9ebd06..f3339d31c67c 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,3 +1,3 @@
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
-EBUILD traceroute-2.1.0.ebuild 873 BLAKE2B 7c263a7bc0158c287d4f0669ddeca20ddace934eb80617fcbe3aa45fd6a5ab13774cbc537796a1dfe5e9e8c7b5f360cae04c525a4fe9815a76d43f2e21cf9f8c SHA512 6b22f08031b842653d6da87d875894da775908495eae5b0146f4ba836d47c11b8ebcf5c9aedabb640a421202d6cfaeb03be572401b970d80ea73d5ff948a8fd8
+EBUILD traceroute-2.1.0.ebuild 880 BLAKE2B 0ac79e4e9d577a8b4b03e1a2ceb3fe49e4ade295fd2ef6ce4ea09ca65e45861ddead151f7d175f80fa13251c2fd848696a5d5260440d268a7daa81db6e7b7605 SHA512 6a62cfdcedaca43fe6d0b29bd43da46e8da87bf06b1195c99a4efb6e9dc4709f9f5f78abfbf7f3bdec4251d3ec38aeaf2d3c14c1ed3f1be8f0d1e9dc4938519e
 MISC metadata.xml 360 BLAKE2B ddaa20a837ed3daa2311c49dc988b9bd60e6a1dcb8a0a45d007ad78854d4e105a7303e816d5b13e12071ce264ab6b1f4df79f552d4920b9406117b0ca51e1384 SHA512 2114a7680804da45f09166e88f811d0b9088bbdedb0d3b587737bc3f4d723dfafe78e6ccf6c5f2b2c4c69838c9412dba3d9af682376b05bf1f4065f2a7c51bf5
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index 08c8de8deef6..5f737abdef45 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3f183980811d..2cef3cd98047 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,6 +2,8 @@ AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
 AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8 SHA512 eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d
-EBUILD wireshark-3.4.6.ebuild 7206 BLAKE2B 79a328e8d05370dcf7685a955ffde5d4edf073738ff643598ff7afd7000df5aca7ae4ac49639eb9c42b9d7c9d1714e257544b930ef8911e876d2146f724a7589 SHA512 58e84bb0ba2f577a76e4d92cff014d2a48f1cd661a3dba75f4613095a1a9ac1daa580157bbf54d834568001a752cdf0c2f362ea3b604362fc40520a06bb13873
-EBUILD wireshark-9999.ebuild 7211 BLAKE2B 1777dc913003253d12da947db992439d02897edc59de2a1fcc05d0504d6c72ff8d4a7db8912e8d6cf02498b0f7dc9525cf111d837252a14c0c55c0be96a35af2 SHA512 a7e50a1464efa1160e9927798b059796529f8b32e6da6762f20f3e582f1a0bf43746f1f5af3bd95bcc33b9f77e52b2557d32ed99f7784c59d04ed2035e0598bb
+DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
+EBUILD wireshark-3.4.6.ebuild 7206 BLAKE2B 4808491b469daf8b3185292bcfbbe215a9f32abd4ab0d0f4f78163633524b7b2457b17dc109a653a2ff2aa3f296aa7d9284bbf90c379e593e4bb33e1a6e81675 SHA512 5308aaf15324c020d1fa5bb68ba366f1dc686e0f40b1ea203cd1950cbcaa6e678380c0bc8bf24ec644649a07e364d8318b131cc234db94be2add86046c4626c7
+EBUILD wireshark-3.4.7.ebuild 7211 BLAKE2B 2b907655ef70a51ea09d2e597b84e625b9bf75ea3a23c44768176402dc17a6ed3732bcd6c5bec2dd53e4054920402b2412d2dc28aa0a9666dec990cce66624d3 SHA512 20443697c5a2ed143a16d4327bc1af599414beaac337aef6bd77bc6236a39a2d7f862aeeb42007df91a844a1a70d83403b0a82ae2678653bf4c65f4254c82948
+EBUILD wireshark-9999.ebuild 7211 BLAKE2B 2b907655ef70a51ea09d2e597b84e625b9bf75ea3a23c44768176402dc17a6ed3732bcd6c5bec2dd53e4054920402b2412d2dc28aa0a9666dec990cce66624d3 SHA512 20443697c5a2ed143a16d4327bc1af599414beaac337aef6bd77bc6236a39a2d7f862aeeb42007df91a844a1a70d83403b0a82ae2678653bf4c65f4254c82948
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
index 5e3828b57219..234f78724444 100644
--- a/net-analyzer/wireshark/wireshark-3.4.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
 
diff --git a/net-analyzer/wireshark/wireshark-3.4.7.ebuild b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
new file mode 100644
index 000000000000..7fd9e324e1a4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.7.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
+	inherit git-r3
+else
+	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+	S="${WORKDIR}/${P/_/}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+
+CDEPEND="
+	acct-group/pcap
+	>=dev-libs/glib-2.32:2
+	>=net-dns/c-ares-1.5
+	dev-libs/libgcrypt:0
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
+	ilbc? ( media-libs/libilbc )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( ${LUA_DEPS} )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	myctestargs=(
+		--disable-capture
+		--skip-missing-programs=all
+		--verbose
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+
+	for dir in "${dirs[@]}" ; do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${ED}"/usr/share/appdata ]]; then
+		rm -r "${ED}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 32f8fdef83b9..7fd9e324e1a4 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-17 19:04:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-17 19:04:28 +0100
commit	514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch)
tree	555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /net-analyzer
parent	4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff)