gentoo resync : 16.04.2022

20 files changed, 574 insertions, 75 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8a0a7ff45e91..0aab3b62a3b5 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest
index 2e22497a7d72..f4a334425570 100644
--- a/net-analyzer/alive/Manifest
+++ b/net-analyzer/alive/Manifest
@@ -1,8 +1,4 @@
 AUX alive-2.0.2-ping-test.patch 378 BLAKE2B 1adb452bce76cd0dee69c52fc0432148ce7f3267d2ecb96f1f4199543fb61a11a20f9738175a8edd47c5aea75f925e12e5e38bf564e8915b978928c66bcaed25 SHA512 6479364f35345aad12fcabf4f11f84a601740771e0e602afc757a39f45eaabdd0d5d6b3d3d95a5307edaef2e84250e4ba784a9757fa75bad21363735c14cfd78
-DIST alive-2.0.3.tar.xz 187396 BLAKE2B 0614ae8d0707abf59dd1500d986ce21221092d118a40ae92e838bd11b81a2b5fd261a531843f99992746a86a31bbb494a9f35f9fa0ad5c0ea896d68edec17205 SHA512 3b2f14d84682466e02fc6678ba26eb4c0b9378f1c938a7463cc5736501cbf144baaeb7dea2c8343a916891ce4e2d580bac946c913c01d7c25e12bfa611c89422
-DIST alive-2.0.4.tar.lz 185849 BLAKE2B 34d2a29ea084b4bed960169fbf3d20377e79b56c183f1a3c1a05b6eb0a45a388267354d1740b7a9d63ff87281213e424362acb0f74b6d9351dbfad209b427edc SHA512 64842286fbe1ccd4d44d20610443fc5f5a2aef2acaef4d79e56ed9b6064f87ddd8af4dfb96b4a425a6cc28f8c741dbcda6ae86adbc5be86cb5c5925d7897e3c6
 DIST alive-2.0.5.tar.lz 186304 BLAKE2B 8528d7b86030ff0b54cd391a7cd7b42be974d5f605c66c6340468855959d2adf31940312d6693580839e9180813a3e96c2fe86a3842f3abd00af0e08b7f301ee SHA512 f760f9386019ddeac8690eec9119d557d4e288cc8698ce69adc8d9915eb0bc27fcf4015e9c4710411321d21c11731e61be754e9b827dceceab6463e531ed4240
-EBUILD alive-2.0.3.ebuild 529 BLAKE2B be00d4d145ae70804beef6c60ec39df973f1f9daa298faa29e5cef2aa02bfc05484639fe0e247dd5bba244a38af29c9d1514fff0f61107c0cba0a2b092382ea2 SHA512 34cdc3589a0bd34761770f047bb33e8fa69213c5c61113dedfcd4ca309b531c1099f68c4eda3a5b08fac274e73cf48fe64b9b3391c14511afa195be039351f01
-EBUILD alive-2.0.4.ebuild 543 BLAKE2B c298be79bcb87b5c0d69405f3ba16703c23ffe92a672da74be2171a1eea8795456ff539d1861babb4406af6ef2a66e7a055e2984aeb0db93fb70168c073faeda SHA512 f277993f32a201382c23da6ed6946ecc42acdc61488af622bb6fcfd0292de8f4617afad63fe78768c1ffbaa696d2b835c31bc21681e09b1b2064495cf53bdb90
 EBUILD alive-2.0.5.ebuild 543 BLAKE2B c298be79bcb87b5c0d69405f3ba16703c23ffe92a672da74be2171a1eea8795456ff539d1861babb4406af6ef2a66e7a055e2984aeb0db93fb70168c073faeda SHA512 f277993f32a201382c23da6ed6946ecc42acdc61488af622bb6fcfd0292de8f4617afad63fe78768c1ffbaa696d2b835c31bc21681e09b1b2064495cf53bdb90
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/alive/alive-2.0.3.ebuild b/net-analyzer/alive/alive-2.0.3.ebuild
deleted file mode 100644
index 34cb398fe14c..000000000000
--- a/net-analyzer/alive/alive-2.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A periodic ping program"
-HOMEPAGE="https://www.gnu.org/software/alive/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-BDEPEND="app-arch/xz-utils"
-DEPEND="
-	dev-scheme/guile
-"
-RDEPEND="
-	${DEPEND}
-	dev-scheme/xdgdirs
-	net-misc/iputils
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.2-ping-test.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-analyzer/alive/alive-2.0.4.ebuild b/net-analyzer/alive/alive-2.0.4.ebuild
deleted file mode 100644
index 567f090930f3..000000000000
--- a/net-analyzer/alive/alive-2.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools unpacker
-
-DESCRIPTION="A periodic ping program"
-HOMEPAGE="https://www.gnu.org/software/alive/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-DEPEND="dev-scheme/guile"
-RDEPEND="${DEPEND}
-	dev-scheme/xdgdirs
-	net-misc/iputils"
-BDEPEND="$(unpacker_src_uri_depends)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.2-ping-test.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index 235f6e5940df..0f26372a8171 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -1,3 +1,6 @@
+AUX 42.0-meson-drop-unused-positional-arguments.patch 1307 BLAKE2B 59c086c1dbec1853be1272ec20542516f4a3c730db2ee70aa392377b9506d1a0936923dc41cf7eb282d0d3454a60da9974b9f3aa9c51c604d6161213b0403f18 SHA512 8ead1d57f68415eb323896fc5a9bb3e0f67f7a976c12f8ceaafd81cbc45cd259df7cd835e3ae9b2311a42ebd9c0c3b66982b7398a99711b71e308fab662a9ba7
 DIST gnome-nettool-3.8.1.tar.xz 589024 BLAKE2B f12c43b713ae81a2460b12c150e2c52baf98900b14ce0ff188b3fb1a55aa636391fb62d9c20b40d3a60ff322d4af9744d072c2727a77bced056ef0df042e21cf SHA512 c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed
+DIST gnome-nettool-42.0.tar.xz 422880 BLAKE2B 847f14781865eb936f0ded28a3f45ffa4ed02a20d335aea95a623795a2bb40bf57a49ecb28b26088c2818d028a401b3ef346806ea60305022bcafc9972094f4e SHA512 a640cd7f2008be870c4c457d3f793e6d31a10457b826641ef3cb9b831ea1d80756abc2a39aef7cb093905adafe41f27ee3c5648b1a6a3a01aa3d3ee7988330ce
 EBUILD gnome-nettool-3.8.1.ebuild 887 BLAKE2B 1d477c82c829ecb536140f52cd9f792dc39f50c62c95b66adc558bde9ffcfee17a3e1011006774787f89b23cc917b1fa00841a3643cef75f8e8ea80f497e6021 SHA512 3819612df6c5bfc0995f3968049dbc44b8233a5e7b152edf651f98f6168b97a76c92b93943042b06b2fb97378dc15d9ba5b8784081f9358b63106a3e28a80095
+EBUILD gnome-nettool-42.0.ebuild 967 BLAKE2B 2e23d5692ba153d9c6196e4c0b05b460527487bd1a3d0c1060929e900180bfae3c8256b6f7f902520c65504f900eb42eea8cb7e33b4c86368f44c08d62461eb6 SHA512 9c9b97bbd0930dbed8ad5596aacb661041d519ac22f7ad3c24b4a71edeced0c72712d8cc0fc852f4a5973b8b68528fe934804e45b66fe887998766613cef0618
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch b/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch
new file mode 100644
index 000000000000..e1da4288a742
--- /dev/null
+++ b/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gnome-nettool/-/merge_requests/3
+
+From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Wed, 6 Apr 2022 13:05:25 -0400
+Subject: [PATCH] meson: drop unused positional arguments
+
+This fixes a build error with newer meson
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 585e6d3..ed1e8bb 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,16 +20,14 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in',
+                             output: 'gnome-nettool.desktop.in',
+                             configuration: desktop_conf)
+ 
+-i18n.merge_file('desktop',
+-                type: 'desktop',
++i18n.merge_file(type: 'desktop',
+                 input: desktop_in,
+                 output: 'gnome-nettool.desktop',
+                 po_dir: po_dir,
+                 install: true,
+                 install_dir: join_paths(prefix, datadir, 'applications'))
+ 
+-i18n.merge_file('appdata',
+-                type: 'xml',
++i18n.merge_file(type: 'xml',
+                 input: 'gnome-nettool.appdata.xml.in',
+                 output: 'gnome-nettool.appdata.xml',
+                 po_dir: po_dir,
+-- 
+GitLab
+
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild
new file mode 100644
index 000000000000..0237bc3c236d
--- /dev/null
+++ b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Graphical front-ends to various networking command-line"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-nettool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	>=x11-libs/gtk+-3.0.0:3
+	>=dev-libs/glib-2.26:2
+	gnome-base/libgtop:2=
+"
+RDEPEND="${DEPEND}
+	|| (
+		net-misc/iputils
+		net-analyzer/tcptraceroute
+		net-analyzer/traceroute
+	)
+	net-analyzer/nmap
+	net-dns/bind-tools
+	net-misc/netkit-fingerd
+	net-misc/whois
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/yelp-tools
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-drop-unused-positional-arguments.patch
+)
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 2ba91d184c62..ed57ce159f28 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,8 +1,11 @@
 AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1a31f2775dceb6b2b305885a2a3e72a2329c5337221c895ab49129e920c36941d5b34101877ebf0d35f10f46d601de58981c21 SHA512 b00112c17f025b657111c93decdecc5ee4a10f388e259929ed2f55ca08888d24fb2fac1892df017d00602943ba93a72dcbbb4cf00fa808c2bc05ed1b95cb428a
+AUX hydra-9.3-pcre2.patch 3854 BLAKE2B 3338fcae138b913008857db9e1678977d5809380e5e916b6b9f022b5e3c88f3030d401702fd0e59297916915ab9869e62113464e2a36b91e66605ea15d9b6cba SHA512 7cd1af834d6ad7fc120d600996bf13a8d6feca571b44bbf6194c4a0205e243b489aa8f80be4a21a5dbe19930b933fdeb56e76075649c1827384a1aeb2d46a977
 AUX hydra-9999999-respect-cflags-more.patch 1241 BLAKE2B 6f0cab7a763d0eb1cee2e20ab5dc8889e45c3ada5ba1dd9be79a029f2d22ec8d027af18cb61ca22418f1662ba68d7bbf7dad2fcdffc05ce0471f06b7db14fa49 SHA512 b01bd45cecc90984bb1c97749d4c333973d72fea75719f9f1a7d848ce9fba1933a1cb8ff3b452699fad64b5ae716e6e1bc872b077fa2dcb36363de802c0b59b7
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
 DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
+DIST hydra-9.3.tar.gz 829856 BLAKE2B 5ae1ab77f64d2bc17bd8389acf8a47201d84455a82f5ae28ab740594571a13ab145f5981efdfb09ddab3d6cc443e171e4664bff08c1a6b2f08169dea4f87ba54 SHA512 06d2ed61492c76d16ff3b2fbbde3938f79d6038c979a2af949f9b4d116a1506943e0a3a246da4d1bc8848cf440097e6175962e3fdf3e7644dd36ad7c2f6b2ce4
 EBUILD hydra-9.1-r1.ebuild 3564 BLAKE2B 181579f91649555a378c6ada4f88ecb177378c2c77c9bcc7f59410b93c7113aa9b93f0e9d3204bad420db9cbffe144bb74b0d62664f9c9a7db2bd1e3b8abc1dd SHA512 e8b588bdb0e290a082eb26749239fefc988aa003151dd7d8cfde04b8d4952a6667e3d133fd23bd1cb6a1e6bc5575272078e35f553e4b482228d415c51f303379
 EBUILD hydra-9.2-r1.ebuild 3599 BLAKE2B 58ff03bfb0214373529ba1b6bbd9cc6b0f304f01b267d22e6d92a39a77553c49f8c6674528f0db6fc20fecbbcf32875154ec61bb164094568cf3f40dddd71460 SHA512 de54e80aad0c54891c0049503c2319ca9a6e81b35d8fdef6559e5eee14fa49bd28c538ff183a62fa275e4e50ac8247491ee6a77bfbcfb2f585ce23ec5c8005f9
+EBUILD hydra-9.3-r1.ebuild 3913 BLAKE2B 736e7175b81d282703fdbfe63f53aa9fa2b7dff62f40c17f804498fec139e40b787d8d5681dc5bde484946a94792408add0d724cda06461ea1f77c7a4f7ee460 SHA512 69cef15abea195f7fdefd518bfdc68647ed5022438dbb9ac05463ac945171ee802227e0ecbe22a40581bf894780311fcc748f18850923e1032e522fd6ed9e0fc
 EBUILD hydra-9999999.ebuild 3526 BLAKE2B 4ffc7aae9d712ca4fb31332fca52734a932e4e14d8050b15374039801c410f2739fe1b8ddd406abc62548662b5c655822007b83bf25d7bfefd88e1e3cac589f0 SHA512 ef96a56c78a0941354c8aa2fa130c0041267f5bfb0b928a7624e3752535430a2a1116cc277ce35eb9a5633750d69298f9b9445390836001d501f9ac9f4addc16
 MISC metadata.xml 584 BLAKE2B c408a4a825d860594a10c6ba9a562a5fb96344f2a02a5d7ff12622c986ebb2ba05eeff5a7a3c79c09a437c14fc7024df33196ccd7f6566325f2f7920afe2d545 SHA512 e548b8600a0b3d9a548b963c1b3dc6c917606942f165f7c0859ad7e877c21dbe677c964d54f9548e38452170c4a3b4872ec81436100ec7b55123628bf4383da8
diff --git a/net-analyzer/hydra/files/hydra-9.3-pcre2.patch b/net-analyzer/hydra/files/hydra-9.3-pcre2.patch
new file mode 100644
index 000000000000..bb12936254bb
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-9.3-pcre2.patch
@@ -0,0 +1,113 @@
+https://github.com/vanhauser-thc/thc-hydra/commit/c82e5d51c5595374e6b7801bfc84c26a497d8989.patch
+https://bugs.gentoo.org/838031
+
+From c82e5d51c5595374e6b7801bfc84c26a497d8989 Mon Sep 17 00:00:00 2001
+From: vanhauser-thc <vh@thc.org>
+Date: Tue, 1 Mar 2022 14:56:05 +0100
+Subject: [PATCH] switch to pcre2
+
+--- a/configure
++++ b/configure
+@@ -380,21 +380,21 @@ if [ "X" = "X$CURSES_PATH" -o "X" = "X$CURSES_IPATH" ]; then
+     CURSES_IPATH=""
+ fi
+ 
+-echo "Checking for pcre (libpcre/pcre.h) ..."
++echo "Checking for pcre2 (libpcre/pcre.h) ..."
+ for i in $LIBDIRS ; do
+     if [ "X" = "X$PCRE_PATH" ]; then
+-        if [ -f "$i/libpcre.so" -o -f "$i/libpcre.dylib" -o -f "$i/libpcre.a"   ]; then
++        if [ -f "$i/libpcre2-8.so" -o -f "$i/libpcre2-8.dylib" -o -f "$i/libpcre2-8.a"   ]; then
+             PCRE_PATH="$i"
+         fi
+     fi
+     if [ "X" = "X$PCRE_PATH" ]; then
+-        TMP_LIB=`/bin/ls $i/libpcre.so* 2> /dev/null | grep libpcre.`
++        TMP_LIB=`/bin/ls $i/libpcre2*.so* 2> /dev/null | grep libpcre.`
+         if [ -n "$TMP_LIB" ]; then
+           PCRE_PATH="$i"
+         fi
+     fi
+     if [ "X" = "X$PCRE_PATH" ]; then
+-        TMP_LIB=`/bin/ls $i/libpcre.dll* 2> /dev/null | grep libpcre.`
++        TMP_LIB=`/bin/ls $i/libpcre2*.dll* 2> /dev/null | grep libpcre.`
+         if [ -n "$TMP_LIB" ]; then
+           PCRE_PATH="$i"
+         fi
+@@ -402,20 +402,20 @@ for i in $LIBDIRS ; do
+ done
+ for i in $INCDIRS ; do
+     if [ "X" != "X$PCRE_PATH" ]; then
+-        if [ -f "$i/pcre.h" ]; then
++        if [ -f "$i/pcre2.h" ]; then
+             PCRE_IPATH="$i"
+         fi
+     fi
+ done
+ if [ "X" != "X$DEBUG" ]; then
+    echo DEBUG: PCRE_PATH=$PCRE_PATH/libpcre
+-   echo DEBUG: PCRE_IPATH=$PCRE_IPATH/pcre.h
++   echo DEBUG: PCRE_IPATH=$PCRE_IPATH/pcre2.h
+ fi
+ if [ -n "$PCRE_PATH" -a -n "$PCRE_IPATH" ]; then
+-    echo "                                   ... found"
++    echo "                                    ... found"
+ fi
+ if [ "X" = "X$PCRE_PATH" -o "X" = "X$PCRE_IPATH" ]; then
+-    echo "                                   ... NOT found, server response checks will be less reliable"
++    echo "                                    ... NOT found, server response checks will be less reliable"
+     PCRE_PATH=""
+     PCRE_IPATH=""
+ fi
+@@ -1649,7 +1649,7 @@ if [ -n "$IDN_PATH" ]; then
+     XLIBS="$XLIBS -lidn"
+ fi
+ if [ -n "$PCRE_PATH" ]; then
+-    XLIBS="$XLIBS -lpcre"
++    XLIBS="$XLIBS -lpcre2-8"
+ fi
+ if [ -n "$MYSQL_PATH" ]; then
+     XLIBS="$XLIBS -lmysqlclient"
+--- a/hydra-mod.c
++++ b/hydra-mod.c
+@@ -7,7 +7,8 @@
+ #include <openssl/ssl.h>
+ #endif
+ #ifdef HAVE_PCRE
+-#include <pcre.h>
++#define PCRE2_CODE_UNIT_WIDTH 8
++#include <pcre2.h>
+ #endif
+ 
+ #define MAX_CONNECT_RETRY 1
+@@ -1291,19 +1292,23 @@ void hydra_set_srcport(int32_t port) { src_port = port; }
+ 
+ #ifdef HAVE_PCRE
+ int32_t hydra_string_match(char *str, const char *regex) {
+-  pcre *re = NULL;
+-  int32_t offset_error = 0;
+-  const char *error = NULL;
++  pcre2_code *re = NULL;
++  int32_t error_code = 0;
++  PCRE2_SIZE error_offset;
+   int32_t rc = 0;
+ 
+-  re = pcre_compile(regex, PCRE_CASELESS | PCRE_DOTALL, &error, &offset_error, NULL);
++  re = pcre2_compile(regex, PCRE2_ZERO_TERMINATED, PCRE2_CASELESS | PCRE2_DOTALL, &error_code, &error_offset, NULL);
+   if (re == NULL) {
+-    fprintf(stderr, "[ERROR] PCRE compilation failed at offset %d: %s\n", offset_error, error);
++    fprintf(stderr, "[ERROR] PCRE compilation failed at offset %d: %d\n", error_offset, error_code);
+     return 0;
+   }
+ 
+-  rc = pcre_exec(re, NULL, str, strlen(str), 0, 0, NULL, 0);
+-  if (rc >= 0) {
++  pcre2_match_data *match_data = pcre2_match_data_create_from_pattern(re, NULL);
++  rc = pcre2_match(re, str, PCRE2_ZERO_TERMINATED, 0, 0, match_data, NULL);
++  pcre2_match_data_free(match_data);
++  pcre2_code_free(re);
++
++  if (rc >= 1) {
+     return 1;
+   }
+   return 0;
diff --git a/net-analyzer/hydra/hydra-9.3-r1.ebuild b/net-analyzer/hydra/hydra-9.3-r1.ebuild
new file mode 100644
index 000000000000..5ce501996e27
--- /dev/null
+++ b/net-analyzer/hydra/hydra-9.3-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Parallelized network login hacker"
+HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
+SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/thc-${P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug firebird gcrypt gtk idn memcached mongodb mysql ncurses oracle pcre postgres rdp libssh samba subversion zlib"
+
+RDEPEND="
+	dev-libs/openssl:=
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	firebird? ( dev-db/firebird )
+	gcrypt? ( dev-libs/libgcrypt )
+	idn? ( net-dns/libidn:0= )
+	memcached? ( dev-libs/libmemcached[sasl] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ncurses? ( sys-libs/ncurses:= )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
+	pcre? ( dev-libs/libpcre2 )
+	postgres? ( dev-db/postgresql:* )
+	rdp? ( net-misc/freerdp )
+	libssh? ( >=net-libs/libssh-0.4.0 )
+	samba? ( net-fs/samba )
+	subversion? ( dev-vcs/subversion )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pcre2.patch
+)
+
+src_prepare() {
+	default
+
+	# None of the settings in Makefile.unix are useful to us
+	mv Makefile.unix{,.gentoo_unused} || die
+	touch Makefile.unix || die
+
+	sed -i \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s:-::' \
+		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
+		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
+		Makefile.am || die
+
+	# Needed to get GTK+ 3 change in configure.in (.in got updated, but
+	# configure not regen'd.)
+	#cd hydra-gtk || die
+	#sed -i -e 's:AC_INIT(configure.in):AC_INIT(configure.ac):' configure.in || die
+	#eautoreconf
+}
+
+src_configure() {
+	# Note: the top level configure script is not autoconf-based
+	tc-export CC PKG_CONFIG
+
+	export OPTS="${CFLAGS}"
+
+	hydra_sed() {
+		if use ${1}; then
+			einfo "Enabling ${1}"
+			if [[ -n "${3}" ]]; then
+				sed -i 's#'"${2}"'#'"${3}"'#' configure || die
+			fi
+		else
+			einfo "Disabling ${1}"
+			sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die
+		fi
+	}
+
+	hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD'
+	hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT'
+	hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H'
+	hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH'
+	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
+	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
+	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
+	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
+	hydra_sed pcre '-lpcre2-8' '$( "${PKG_CONFIG}" --libs libpcre2-8 )' '-DHAVE_PCRE'
+	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
+	hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
+	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP'
+	# TODO: https://bugs.gentoo.org/686148
+	#hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN'
+	hydra_sed samba '-lsmbclient' '$( "${PKG_CONFIG}" --libs smbclient )' '-DLIBSMBCLIENT'
+	hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
+	hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB'
+
+	sh configure \
+		$(use gtk || echo --disable-xhydra) \
+		$(usex debug '--debug' '') \
+		--nostrip \
+		--prefix=/usr \
+		|| die
+
+	if use gtk ; then
+		pushd hydra-gtk || die
+		econf
+	fi
+}
+
+src_compile() {
+	emake XLIBPATHS=''
+	use gtk && emake -C hydra-gtk
+}
+
+src_install() {
+	dobin hydra pw-inspector
+	use gtk && dobin hydra-gtk/src/xhydra
+	dodoc CHANGES README
+}
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 27b040c1f5bb..89a0f1d4cece 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,6 +2,8 @@ AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd12
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d SHA512 1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
 DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e SHA512 39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906
+DIST icinga2-2.13.3.tar.gz 7529976 BLAKE2B f661919b0a7b420eba663d6cb01f2223c15b2be7f4ad649e1e09b7b4068d1122d63c6baac490ff3a0bd808066b759138748e70de364eea4d89f560168a448c72 SHA512 818eb565c6d46bfb538d70b9e33bb7424ab6fb98289da9eb947ec1f36b7e3b0e3869db789acd565b5e5b3d8b4819fe991000f4df362e28686dd9e3394cec3743
 EBUILD icinga2-2.13.2-r3.ebuild 4216 BLAKE2B ec5403e9a11550f681cb7009d83ef9d0e2b51ee05144b34b838f60961335d3cadef2ec4b007b8df640dba5ed5d7e843faae71d980d529539ee1d2d53a368c348 SHA512 ccf8629da48e4b499051206ba349a3d641dafc8c5d403f53349241a04db2d5621d65791362356f604790884303ab2eff884c554305a7db753944270c67bf2422
+EBUILD icinga2-2.13.3.ebuild 3994 BLAKE2B 1f6c3f53948145032d5f40342ddc0a48b39dcaf646f56b6d5ba38ff3b1ea8a1fc6f627a6e529ea2af5d157187491b0245ded84bc023463bc3f7866abbdf8c8e7 SHA512 d5f1bd8198b1ff7336a5ec23c77b5538e155769c4f901b1be333899090f869e51f7d3d451ed654cf78bb42790f300f07242241eec624d0173e24b26f30638655
 EBUILD icinga2-9999.ebuild 3994 BLAKE2B 1ab39f8060c4d052b299d79c4481edba30662e69754cc7595d267e3a68c743115341ca3ec0cfbc0e3f3d4122f27de9bf58b02ffc7942b5df2c6e18fde7f404ea SHA512 b0189c1ea6d4eaffdd0a9f749fb323f31810f51e5e7e71d951df7ef3b0aea9ec5e07f508177655692f853385c50c01a869a3608c590d15140edd82ac7d2364f2
 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7
diff --git a/net-analyzer/icinga2/icinga2-2.13.3.ebuild b/net-analyzer/icinga2/icinga2-2.13.3.ebuild
new file mode 100644
index 000000000000..d9cef157f92b
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.66.0:=[context]
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl:=
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd"
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DICINGA2_RUNDIR=/run
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+		-DUSE_SYSTEMD=$(usex systemd)
+		-DLOGROTATE_HAS_SU=ON
+		-DICINGA2_LTO_BUILD=$(usex lto)
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres)
+			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql || use mariadb; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/run" || die "failed to remove /run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners -R icinga:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests
+	fowners -R icinga:icingacmd /var/lib/icinga2/certs
+	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 9a16419ee6c4..0aa045e3d347 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -6,6 +6,8 @@ AUX nfdump-1.6.23-autotools.patch 6579 BLAKE2B ea194c79ad584007b5c2e19a4b7b5cb94
 AUX nfdump-1.6.23-m4-dir-automake.patch 579 BLAKE2B f77f624bfcd108e048ee215d85968fdde380720de90979cca81c45c64e022c872983f0d0d370bec8c16c1111948748d959662eab494a2c660fdb8d63377bd3ab SHA512 90df4adaba5deaf79d93eb05dcf3f364837bf7b60175a325ac08bad056bb356dd23f414132e23c068579a9fa9ad46ec74ccab7178022e8fe3bbead3f8f0be07f
 AUX nfdump-1.6.23-m4-dir.patch 477 BLAKE2B 1ef4634ad61efc372da5bb92657826ed45112121e98dbb8971e51df33d50ce312e841659cf01fe949f5ce9998b75bd1037be9ffe1a95a6dbb2aca73e5be6bfac SHA512 b50cb179373a6b37b4122a0b77e6d321b6e992430f4fbc5178cbf867bf4cc0740e2c7a4b01c075f3d8c4339b0690781f1df74f773993cedbe44ff041c9bb6091
 DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
+DIST nfdump-1.6.24.tar.gz 647945 BLAKE2B 6f054c7ccdbc6c5052d1c4655509414b9acc7de320152e932dd31d6cc9eb915b73efa29e42a212ea206c4619c9e025bfd751762808fd8136c38d4edb72f4fabf SHA512 b1e092663ce245247af721565139eb0a264918747e6c0695c59f0b70a99049e92d79674d75c248f60aa832949d7e13027887cc825e393fce7dc5571771bce1d7
 EBUILD nfdump-1.6.23-r1.ebuild 1719 BLAKE2B bd83dea93bc0d33639a92015249f15ccebda61c0870481c30fae667516a8dc279a69eea0008e1490d4d81b123b3c7edb8189c5460774f1e44d9d7c49d2d9b2a3 SHA512 ac32eaa741fe3482056fed7481b087806ad3b2fa8cbd94ad945e982871f35bfb8031d61a73b2e54ab08bda7e30d46ea1acc9eaafda9953a9a0bf0270a79b817c
 EBUILD nfdump-1.6.23.ebuild 1713 BLAKE2B b0a76ab56f3a696d1828cd8241de89238d824c13f7cdd3ab22b052732c76f9660d60ef6114e54ab7f2ccb30c0608fc33ae448df1a4fd191b9e7c74347c477804 SHA512 013079b47e1346c7b057572687cda6a1b39e5966da05674e2329cd55e14fa8ea36a894f18b18c7a4485841da54201ebe5e7d0832355e4e01447b524cc56d5f74
+EBUILD nfdump-1.6.24.ebuild 1641 BLAKE2B 830ebb3edae4bd700115dbaa5c66671044d4e014106a91d17f45c47bb71cedab6e045d9c70835f602005d05493af8a234a0ce09dc849314379c0b11b57579582 SHA512 3083bb63b599105a2608371779f99958a7470b47aa3aab1515b1fabddd3fdcf5772fc03aff253dea5f3ee82944364d36ea68326c7b059c367ffcc39118e258a9
 MISC metadata.xml 1278 BLAKE2B ad9d73532114eb0942a2b5262fe8e5f2b787993950fcd7c8bcb926f9e9e8d93ab94476265976b2e0cc41f3ea46fc6699a0bbb591d0c929208ec5e85d1b399617 SHA512 0bdbda9ccce4611ab88b746f4907dbb0c96d1e5f0dac909e2318c8bdf77de87321f65baadbb886f0c2e1b231cc30c50c70e5363cc9084285d1eaf5897c6f38cd
diff --git a/net-analyzer/nfdump/nfdump-1.6.24.ebuild b/net-analyzer/nfdump/nfdump-1.6.24.ebuild
new file mode 100644
index 000000000000..abe553c93b29
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.24.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow"
+
+REQUIRED_USE="?? ( jnat nsel )"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	ftconv? ( net-analyzer/flow-tools )
+	nfpcapd? ( net-libs/libpcap )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.19-libft.patch
+)
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use doc; then
+		doxygen -u doc/Doxyfile.in || die
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	# --without-ftconf is not handled well, bug #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfpcapd && echo --enable-nfpcapd) \
+		$(use nfprofile && echo --enable-nfprofile) \
+		$(use nftrack && echo --enable-nftrack) \
+		$(use_enable debug devel) \
+		$(use_enable jnat) \
+		$(use_enable nsel) \
+		$(use_enable readpcap) \
+		$(use_enable sflow)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/nfcapd.initd nfcapd
+	newconfd "${FILESDIR}"/nfcapd.confd nfcapd
+
+	if use doc; then
+		dodoc -r doc/html
+	fi
+}
diff --git a/net-analyzer/squidsites/Manifest b/net-analyzer/squidsites/Manifest
index 69eb72e00725..decee4c1345e 100644
--- a/net-analyzer/squidsites/Manifest
+++ b/net-analyzer/squidsites/Manifest
@@ -1,4 +1,4 @@
 AUX squidsites-1.01-format-security.patch 202 BLAKE2B 7c943932b2220599d15b3ceadff05c0cec2994dcd11511d0cf589aa8abbe316e3fd0058a1e1a99f7ef4adb047b2c54901007fe75196ce9aec0a0883ad3af000c SHA512 730bb76dff5ce69b9b5fe0671b09028adbff67fc6648a051c5f019d0157ecec8235b5c1111ffffd56c734fb2b8163c10da030bcdfb9a0d5fa149cf2ac9c38a98
 DIST squidsites-1.01.tar.gz 23646 BLAKE2B 89f236c83cbaffd6671c3d22b51c8325e8224259b2902a6b3d70f5bfd3bd4bd5391434ae4672d7c57165636ba4263da397ed187c3f2bdfe7f3d62512e0e5faff SHA512 ecd6caf4ffbb531de1de85b2d8548e4256603909b1d1bc8c368516b644298803bc0cf3036a370ad679a763b94494bd755043df8a806dcca16990024c515cfed9
-EBUILD squidsites-1.01-r2.ebuild 770 BLAKE2B c6861e2114738b6a3c72def952c137d949bf642310d2c0336aabddf75b8f8995e4e6d099ac34aa077e8207e21fa668c3a5ce1506c96b31c80cd0c95ffb42989a SHA512 2c070ec96c30eb849b26c1414e62a6b2137cc0855217a74d007b89f849e31af0955a20169e23273813121574fc168f5258980f4c018530934d06d8614800d6cb
+EBUILD squidsites-1.01-r2.ebuild 742 BLAKE2B d3e5098ae5d5e3a660d1ec88a019c435943d9753a7b906e22397e0346a3299b257b65afb6adf5de9d161accf14e4752a5c4c834fd4ae11ddc48dfed03985de59 SHA512 d829c561eabb148af799a10032de5704328cf6ee35c0299910fc3844c0d7cdcec748d13a2c32fbb6e77ab9b2028da81e902b01fd39d4bbd58230e9243eab5092
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
index c165a7e043dd..3c359aefe472 100644
--- a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
+++ b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites"
+DESCRIPTION="A tool to parse Squid access log file and to generate reports"
 HOMEPAGE="http://www.stefanopassiglia.com/misc.htm"
 SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz"
 S="${WORKDIR}/src"
diff --git a/net-analyzer/thrulay/Manifest b/net-analyzer/thrulay/Manifest
index 6dc28467059e..27be52667d33 100644
--- a/net-analyzer/thrulay/Manifest
+++ b/net-analyzer/thrulay/Manifest
@@ -1,5 +1,5 @@
 AUX thrulayd-conf.d 248 BLAKE2B 78679b56450e476181e51a77145d462b8824bc7c9d01bb16cece24f9f83c30923bcd0c36b10103b8fcac23e6b14bf56b04072c025da08e6114b6ccc2e6489d83 SHA512 d74cf8e47c48b762ab76ec74bf92227092706a4594a8b894a58eb0a8972ae99ad9fa565e1ea5520144e692429e35f67593c37ac79e2682a9cebd2044bc3b510a
 AUX thrulayd-init.d 557 BLAKE2B 203082d1e1005c6f5c5e313bedf78251c79a608063cd968c018d56aeb39f2ecd5ba4bee8c1beda97ca22ba19d5bedda88369ac89680abd563547812b994366fd SHA512 9573ca678b719b913f492b8f2303c8c25b1b49fe727aae5f89016c1d3a2d34595655b851ef26eb85a8f66379b9ea1868babb1e1e1a8e9bef9a61858aa467b9a2
 DIST thrulay-0.9.tar.gz 370312 BLAKE2B fdcbc0785ccc61bb85454d878f46bef97c346dd8c8a54591c993940615a8047b24fad00ffca5c3db6d7c1303b42c67f45b828e899564d7c920cc83924e3a18c2 SHA512 9655ef37f6ef3ba51a2fadacf08978fb1c284af6b571dbf76c44e5582bf705bec08170b3b2cc69512b8327485dfd3f758ed2addf510a075558aea70eb4779a6f
-EBUILD thrulay-0.9-r1.ebuild 831 BLAKE2B d0c522eb5f752d9b4d90cb329f974d663e319f4d9be995b42aa8dded8a097abf50436176e6f4bd08b95b83cd142e5eb38b10be805c613d880271783e6c23ef2f SHA512 d1e20e2d809df5bfccef7a0946f1d7118398e4ae44623a6f1b30d0e4af4f7423b547336984077002a9c47bba1abdbe1a7a45c7322830d106bac63a9f4124fa6b
+EBUILD thrulay-0.9-r1.ebuild 855 BLAKE2B c2cafc6c666fefd3f1510a9bcb9498480ea792d4c19c1839c7c2dbd0f415b2bd27cc5bea2379e2d80f5128bde862b166623fa385089ce3150682102d6369699e SHA512 bb42463bcd6b52906f7a376875b05b784a120f5af1993247943d8d5953f8e0ad596cac529a6c992e85a4cab1c5c0bc754080be1974b83a09556279504aef59cd
 MISC metadata.xml 304 BLAKE2B ef77f6f65b5ec5c17192d44e31d15895b761e10e65bdc05acd2b80b013c37a8e1aa308fc66a42a7509dc7298948f60a64643498ca38ea9140404fec0787b3ba4 SHA512 324b4a4a90e83792c63a1aa0887e1341dec1ce1f8817cf3de8923953d20cf89820def2fcd1487e183cf1bc17a707bf77808d2a2b5a1bfd288f9d76f7585ebc97
diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
index 388b9ba4e265..97d1f5c8c503 100644
--- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
+++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
@@ -11,7 +11,8 @@ SRC_URI="
 	http://www.internet2.edu/~shalunov/thrulay/${P}.tar.gz
 	mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="BSD"
+# init.d is GPL-2
+LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
diff --git a/net-analyzer/tleds/Manifest b/net-analyzer/tleds/Manifest
index 64094430d558..997ef2f7ce83 100644
--- a/net-analyzer/tleds/Manifest
+++ b/net-analyzer/tleds/Manifest
@@ -3,5 +3,5 @@ AUX tleds.conf.d 141 BLAKE2B 75b09687dba067ed9a85fa70bc278c818e0a9c61e445a57e2d7
 AUX tleds.init.d 341 BLAKE2B b14a1d22b5adfe2edc2b71ba3d94f6a521198fa57746059a5f89c4030e5fcf4f94a7c0071a1b30d6f2271a1985ac225c29c3ed9e64cfc3fd44f51bbf4ac9e03a SHA512 45e39bfc3e769f86432bb251e221f22a5e4640281713ed1e39ca372dd46343b56ab3ab257aca6b012be533daec2c559d987e9447e807c6df6406520d63ea60dd
 DIST tleds-1.05beta10.tgz 28640 BLAKE2B d51104cc4f6341e383582edbb65bd4e7057807fbca33fe9c6d6daca519f804c6e5170c547b6a42e629d000eb3243c0c64e6ab0517293f12b34744b7eca8b19b0 SHA512 661ac8749c85ce20ffc2851a62ee7691e6cddf3700f4a388465bbdf2faa117d8bd6e316541bc5e2fa81d18f74d47bdd78010b8490124f39b6a1c085c4d345d3a
 DIST tleds-1.05beta11.patch.bz2 5540 BLAKE2B 91da2fbcd339be7d313645f63b3daf9404a82a9678e1f562aae357ed16c6d3d47d8d38f021cf367b0038987e8a5d667cf650c4ca5e2184cdb1f4f1c1f67b1b45 SHA512 8c6e5b28e055fd546af97244230560cb22d7def65a8c16e0257d9f41b789394f744a056a95bf7d9f6fb9dcf8ab0bcacfc8fce7c91d0e8be798ae2af4817ce1a4
-EBUILD tleds-1.05_beta11-r2.ebuild 925 BLAKE2B cb2dd377d1c24c4951a4fcf4a4ed5025fd6fa6cedb61b9ee3f49268c3324304472ef889c86c99ce9b5039b536918aacffea86665d37e348fcb444d357691c58b SHA512 6472def4940dea2624b6cef278a6e136e439c6c44c56a46f89798947e383c4c768261b1d9e5ffaafb97def24a09d1bf6eecfb6fc356083d6af0529a9336d46c5
+EBUILD tleds-1.05_beta11-r2.ebuild 895 BLAKE2B 6ad12afff36071fcd10aa390a33c300b416b61c97f8122c3232bb20161e3743796debf687e88cab0767fae220aa5b690b97fe67535d4b04d71544c7bb7cb8f56 SHA512 ba2e835032954273489f3ed8e787fa611cca3b4a553b5a0c492c0f32482eae871ab1004738143eca1fe3a56950444d298ee0962fd25e670deacf9043d8998bbf
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
index bda787fe72f7..50d2d48db744 100644
--- a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
+++ b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 MY_P="${P/_/}"
-DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets on selected network interface"
+DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets"
 HOMEPAGE="http://www.hut.fi/~jlohikos/tleds_orig.html"
 SRC_URI="
 	http://www.hut.fi/~jlohikos/tleds/public/${MY_P/11/10}.tgz