gentoo resync : 05.03.2021

24 files changed, 44 insertions, 638 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3f17d0a8aa3b..b8a844160a08 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest
index c56c66009953..7d81613d26e6 100644
--- a/net-analyzer/arpon/Manifest
+++ b/net-analyzer/arpon/Manifest
@@ -10,5 +10,5 @@ DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd6015
 DIST ArpON-3.0-ng.tar.gz 8795979 BLAKE2B 81b1fe9a426b5b0960911cbbac984482aeea15a957fac72a10e7dd9a45a609da90ca14163957cc008541be4cfaf426f07fa9c64ac4dff933f568b20284c5211d SHA512 e6338018d65f3f8300958e168a9eb6f6be85cba21ae0aee4b03e9838a29a06afbf2448c2f104367aa18389cc549e4489bcf8dad384ad46eadf2884a0908238af
 EBUILD arpon-2.7.2-r1.ebuild 727 BLAKE2B e401df619a1da645dad882e67b69451a01d2837475d39a755b453575698f90cf021bb7165016aff0805f4fa7d6fd2852ac6ecfeddb43deb7cd86b68d0aa94965 SHA512 a81ed2f8a530ffb3a9781ca5785c58d0adc01867f650eedda0511fc94376b3f077ef8fb99e221ce1e82b04c796a466c0c2c579203820f5ee8a400867f236b8b6
 EBUILD arpon-2.7.2.ebuild 884 BLAKE2B e83db5a744d62b0a7f7f3e7441a300345f81799617c93f220f320cb61f653c209aaa631fb0525d159c95337d83d339ca19e979a8cd3f4a35580e487c8085101d SHA512 4427110fc2ac7557d57d2bf9b453bb2b121ac5121e287d4273f1aea4bdc503ab38f64092c1776ca64d2ad66fddbeae4a25c82b53b98d6734b3a3347b070adbbe
-EBUILD arpon-3.0.ebuild 836 BLAKE2B 8a6da8f0a5a6b82d0908dbeacf5309f5ec657e8e0c61966aaad40595da2a324102015cba0160b5b7d20bfc1541d19795c3a6cc8d35ec842316820daddd54c590 SHA512 bc05ddc3562710bbe8cb5a94b03fd74cd880dd62c8a0a5182e51d15fc231bee00248db728273d81ae6bb624d3f38deb7dea05ad7b658789c97524a7d8b1c19ca
+EBUILD arpon-3.0.ebuild 834 BLAKE2B 7ceebb9368abdd8a5fdcb1acd0bb6db73c0eba5ff88e83f2d2cc787ea3462b27f45a3473d3c92aa7b3ab12dc745093c2f7b36a28fa81274dbc28203b92dc5bf9 SHA512 1d259119942237615a5a51286a73d4b90d37fe2c0ba4c8f11294e6f215b922f74a48bbae86b3a3e5909078a816ffbcb511cce7d4146a286ef35913a1cd291859
 MISC metadata.xml 285 BLAKE2B d232c837f5b78009aedc859ac2aa78da0775cb937b3742bec976767463c738db4054feb51e08725449432ef4c74add9697e2781938819d6e35cdccdfaaa2b590 SHA512 16762a0e8ae17a8f288d969f0f8d9dc15ce522c2c0e007007830dd3efe1ae96dc53f0d034f591fb6b6f7eb039fbde52f37f596bf9a34805900952391540bee4a
diff --git a/net-analyzer/arpon/arpon-3.0.ebuild b/net-analyzer/arpon/arpon-3.0.ebuild
index 6d1866670e89..f84ce3dfbc6d 100644
--- a/net-analyzer/arpon/arpon-3.0.ebuild
+++ b/net-analyzer/arpon/arpon-3.0.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-ng.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-libs/libdnet
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d0e4e04c5efd..685d639e9a67 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -12,9 +12,7 @@ AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39
 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
-EBUILD nmap-7.80-r1.ebuild 3270 BLAKE2B d3e505d33d6c14069bacdaaf7a5197ab03fac726f4728dc807ccd864da4fea89958e4cc199cb6e63d5c1de7c7f159e65ae3a620715d6b7d64a1469963e3bedaf SHA512 ee325f3747bdac7f8233adbc7e884090ceda7069d9b5f9ddd7ff2db7edacc80c8eaa3dc99727a3a2785e0504d6d4e4ef90f028c7baee35adfa0b93b886225dc7
 EBUILD nmap-7.80-r2.ebuild 3386 BLAKE2B fd3b88003aaab420a29745a407f07ec1a295eb47def0843a16acd3e6202068a4b3d32cb6129ee4c969c4c5c0791213e8b220e8f21332efab6425c68ae2a35e2e SHA512 df22d7061dec12102a3e3b42aac686144dc43d1a5208e5712af03e247b50d91a71c24caffe951d6ab8ff8d309443dd3f2a143d3007ecab3155a352df494a011b
 EBUILD nmap-7.91-r1.ebuild 2787 BLAKE2B 09a5c9e50b10688a700c4721a92dd501a1314e8a2b5d7655ce9eee614a9de8b260e420a46fd7e2a4674417f3caae7b87e3bcd58ab0aa0475b0f4b08f8a8c061b SHA512 a49f565239fe7d4e749ae3bdab9df84d29099ca8311626266eaa572fbebd5e579d5151cb06c836ef92ac81d4fdc2cd48d35210d5c8c61d9d71f7cd20f180b8eb
-EBUILD nmap-7.91.ebuild 2671 BLAKE2B 3247aac2abd7f3166a84afebf6cb316287ab4392f77b177ee476a3eead52eea41a1ac7365423720e9bcd78cb109d08721dcb5b2157fd12b357cd4ff9e95384a2 SHA512 4ecdb4a0e024b38ae382c9d6c677ab9c9295dbeea43f4f32431f8360969685b446d11ba752dca06cfb5da1bda78db0595a7af795a9b20d26cab68ab3d445f8a6
 EBUILD nmap-9999.ebuild 2716 BLAKE2B 6be7210726dc27a44345a78cd182fdd9ac6ead652bc0e0f0408d52ee267c1698588fac9e987da1c1d1a4965d0d41dd3ce03dcc2912c53e1d19ee4687df7fcff4 SHA512 807f71d9fe04ab3a535eea8d7f9e160ba4cae2d580ffad680fb36ba0f1e82697da76aaaf228813de610ce0fcf294f1caa9793ea88ce9142529e08deb660ac824
 MISC metadata.xml 979 BLAKE2B d77a475cc6bb5be93382dd712d5cee9b4a358a0cab70a0b13b40dd78cd6c5ccdc1802eaa58814ef3868281b2129c907cd22d480b4667ba9c162c0c0ac1ef2aa4 SHA512 c97db5c77b309a940b3307ef35edd202feb0cc5778d4d4ef9a624458012b473fb0a96c6d9460c3d42cc1fe3c5c9009c29aabff058c1dff818b6901d068f47e48
diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
deleted file mode 100644
index 41fbe9aca700..000000000000
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? (
-		net-libs/libssh2[zlib]
-		sys-libs/zlib
-	)
-	nmap-update? (
-		dev-libs/apr
-		dev-vcs/subversion
-	)
-	nse? ( sys-libs/zlib )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-)
-
-src_prepare() {
-	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_with libssh2) \
-		$(use_with ncat) \
-		--without-ndiff \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--without-zenmap \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	Commented out because configure does weird things
-	#	--with-liblinear=/usr \
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-}
diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
deleted file mode 100644
index 006cbe5ee03c..000000000000
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-
-LICENSE="NPSL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? (
-		net-libs/libssh2[zlib]
-		sys-libs/zlib
-	)
-	nse? ( sys-libs/zlib )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-)
-
-src_prepare() {
-	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_with libssh2) \
-		$(use_with ncat) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(usex nse --with-zlib) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr \
-		--without-ndiff \
-		--without-zenmap
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 85a797e1ed0b..081ad7953afe 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,4 +1,5 @@
+AUX scapy-2.4.4-libc.patch 406 BLAKE2B deec0a79cc1edf60fb5cae49945e0b3384d3671fbc8bbe5850134a7538d83bbcd41041c14820a678e8859e4bc32618a862a32ba4f8457bacaeef9519d5f9036a SHA512 ec5608d2cf3cdcba3dd5450087ca872da5a68ed97a2bcb51006657a634ed4679b9c013fea8b4005896afa27d668cf9a536c515994bbfa575e2b250811caa5bdf
 DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389
-EBUILD scapy-2.4.4.ebuild 1091 BLAKE2B cfacba22672232b8062ae8875eb0647e2fbf06ea57e849eae69fcc26ad3a1b9e375276b747a85b00bfa40c63c728aae91974f514eb64b21e8dc0c318a89adbc8 SHA512 111dc8aa7edf2529cca7a51ef6aa8b3d50e0e8dd99ad2c26ce5c16c71b9f1e6223960e7401a33c7d16ad6128ba53355a13d9e177e370f576ee413a7290176a75
+EBUILD scapy-2.4.4-r1.ebuild 1132 BLAKE2B 9e443884839312921260be7323baae52abf5a85799f6cab9d499cc02ac982b75746f097e48050bbd6ede928d35b5f4c37fb2eebf8baed4b2b6fd4c81af7c7e1d SHA512 9f8d9da8c924689ae39adfa19f5dd30b53e3808aea70e11df8b4a8927eac3d3a4c7401dc194b2df875e67825b25851ce304be4213ac31b1fa48e878a2190ab32
 EBUILD scapy-9999.ebuild 1018 BLAKE2B c892db076650ed6ebdc294a1d3c8edad12b981a910ce0b961d7c5b5bc84b9a2cc7523c2aed1cafdf739b1bc1ab97064d8a2683bb97c18667541fe15cf5946773 SHA512 912e7e95e42842c5c7cda3ac93d7ab7147c9924017d91906e333f896174c08036b97e1ab1500cbe2de54171b13fd0f3d1116902109c929e08675b323c82e4b86
 MISC metadata.xml 584 BLAKE2B a5b6c42179b511881bdc9c7946bb059f38a67e7e56edb76a81d021674badb4fca4a0ef51302d71adf64b6ce06b165d05d9cf43c3fefdd6127469736e6e37efee SHA512 a3193634b17020af3d35454f160ac6fc5289d5cadcc7a50c95e44d9ee98d26f102489334a750bb806f98e2e978dafe25718ef7468bf7159499ff33f5064da89d
diff --git a/net-analyzer/scapy/files/scapy-2.4.4-libc.patch b/net-analyzer/scapy/files/scapy-2.4.4-libc.patch
new file mode 100644
index 000000000000..dd27896b5658
--- /dev/null
+++ b/net-analyzer/scapy/files/scapy-2.4.4-libc.patch
@@ -0,0 +1,13 @@
+diff --git a/scapy/arch/bpf/core.py b/scapy/arch/bpf/core.py
+index 0ebdb53..c74902a 100644
+--- a/scapy/arch/bpf/core.py
++++ b/scapy/arch/bpf/core.py
+@@ -27,7 +27,7 @@ from scapy.modules.six.moves import range
+ 
+ # ctypes definitions
+ 
+-LIBC = cdll.LoadLibrary(find_library("libc"))
++LIBC = cdll.LoadLibrary(find_library("c"))
+ LIBC.ioctl.argtypes = [c_int, c_ulong, c_char_p]
+ LIBC.ioctl.restype = c_int
+ 
diff --git a/net-analyzer/scapy/scapy-2.4.4.ebuild b/net-analyzer/scapy/scapy-2.4.4-r1.ebuild
index efc71e5bac27..ebda6205e3bf 100644
--- a/net-analyzer/scapy/scapy-2.4.4.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.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
@@ -29,6 +29,8 @@ Scapy has optional support for the following packages:
 	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
 "
 
+PATCHES=("${FILESDIR}/${P}-libc.patch")
+
 src_prepare() {
 	if ! [[ -f ${PN}/VERSION ]]; then
 		echo ${PV} > ${PN}/VERSION || die
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index 52b1d60ee33e..2f96be642ca1 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -1,11 +1,7 @@
-AUX slurm-0.3.3-gentoo.patch 1999 BLAKE2B 68775e7b95bfa8c2a00672fea4186c96e2f481d6e27396c6b173202c1af2a2e314c25d4f3a9e722a1ba4079b3efaf1b108aa9c013afb2c0e0121a1c28b1899aa SHA512 cafc05ccdd2adeaab03007698662a2403031bcb1d0e825210a41473a76296674d8522206fc2ffe7dd82b772fd3dbec02d4d906427f94b40fa2eefa4f08235059
 AUX slurm-0.3.3-overflow.patch 596 BLAKE2B 4cd1544015da6c32373969b5d049644cd0ec1187e998327479841ed94237dab18a0487c9d3a01d019acfc7f43767011b549b1dd81e8f05390b303a89b9770b9f SHA512 6211306f2e6787cc8c4f4e02e4af840003db6b90f32b6a7191e019300a00e460c8a16b13e2ad24c0f51bd5af7de9f7d85ede44b6f4de3d1c8544f9deacb29890
-AUX slurm-0.3.3-theme.patch 492 BLAKE2B b1d51eda6e6efab80452bc85cc3997b35b92c353126f332a379f2ae33e335863804d3ea211301321b0a52ed5e7c5b7e007443fd82d9e3b3c32db4e4a82dcdee8 SHA512 c05919c8c7dfd8f79d6d87d22a79900aa4f284b30a2fd9b8099e575956d242443f2aff51e99ce9f48fe236f9b3d7596904d7bf4ec77a75c6442867a0a231a179
 AUX slurm-0.4.3-fix-includes.patch 556 BLAKE2B f2b9ad3a33fa87e6a66b460b72392bf4ad3d978eaa9ca4886dd09243b73fa4580c402fcd455fbfe8ca8ea31393c25351ddd6ce3a4caf8ee2c1e8942559540c95 SHA512 f6cf0d23c9b311b7b9b2384f00a751d091304f518caf8d4882bbf15c95ea5724e8e1c90b55f175d8781cd1edc917bf65ec09f8cf1c7665c2cb1412b0a5f8cba3
 AUX slurm-0.4.3-tinfo.patch 267 BLAKE2B 2cd7d9cb11504b1eaf9b940e82a8baca65bd067ba99a0ddba6908e4c1863b71688ce3669dd2bed9233a7413810e2e2f71c3a680de024f3f941e7a44b576e1801 SHA512 fc348f28590efebb86993d7187539e949d052d8959eb36765d6dc3a889fff22f7d6b72bc8337d6a93f22426bf590f2a2239ed4426b4a26949624bb1f9e48ac14
 AUX slurm-0.4.3-version.patch 170 BLAKE2B 21d810de2df77546c584d66c85d180054b3f569933771d2e265809308d51eb247a1fb74fad7bb6a3c6c8dc8c7386527b27f796bca31d22cdde5f4a8d277f64ae SHA512 40f2e3bc6c2136f7bc91a719a5e8ffcaef4112ff9cacc5a61ebecbf9d3272b1b3aac425b9e22cafb4fc0b630aec2338e1c2ada27d9d2828fbbc90af215cb936b
-DIST slurm-0.3.3.tar.gz 122839 BLAKE2B 2633ab72c6fa32c66a6573937241a3053644ea33ad43d6646a1f0b54e34367254f3185fea5ea7cd31fbd09d640bc56033e6b74ac74817ee4262511ee90a262f0 SHA512 67ffef9d0fc6239e2a742b2020a2a1fa913a6f0d681ffb7fd00611265e60b39f83b18cbd782ce841b6b39ed0db2c40cd6410d7f5d9408bf0eb0361b95949a8a3
 DIST slurm-0.4.3.tar.gz 36076 BLAKE2B 468dadfb7e338a7b11a2db8501763fa75e9f82af1c7411d132c6aec2e8426cbd1170fb9657a661dde35c77d6ad23497599affc9b36e583772950a2bf30715c20 SHA512 f55005e2e2acebf1b7be0f7106511f83123f4df30305d00495940220f99394ddd48193ee4985c91604f294487c181f6efebe9452137f7df5b9675d2c3388892f
-EBUILD slurm-0.3.3-r2.ebuild 771 BLAKE2B bc0919c9de9e4c97929cf51cbcd0e4a241262ab92bd4017ecaba0cf2884d57793a25b28bcc9761f6c8505559789f0d87774265c4dc1fbd7a8a31d76970a5e9c7 SHA512 2e528680ff2ddd6b31c4b8c2ad49a4b3a21e7da0d8f504100f6588cbe480fcfdd5f2e3a58a60c26360313c526cf9dddb4c77746e1e5938766e7ea1277b36accc
 EBUILD slurm-0.4.3.ebuild 703 BLAKE2B d8816f08f1be187c170a1f805d3cbe2e5a341cac4b19857f2a37d0a21ce3cc2e9de660f5bc1ce0b2f11dbdd0e462e101d8d4c31a6e003bfc859dc14d5c9f8004 SHA512 c66c994f8d152177499684255e3be582c096f61bda0cf5203bb4952e9bd64a3fe77c11d35f1c17160b72a3cfb1eddfb0f3b1dfeb620b2ae1752497e54797d0d7
 MISC metadata.xml 360 BLAKE2B a7b740796c57e64abb029e278f22e04a9af73827f35a2b1576b4f955d74c23cd1c16c9215b831f46030f55bfa0727bd50ccfa31ca7ad999bc574dd6cc4b575bf SHA512 bcef8916863832f9192e7df51f693b87836b74663da01a1b7f330569e10ffed23de36a6c5ffbde968ec4270bd2fcacec3f12f78b700cdbfc001c34862e497f12
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch b/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch
deleted file mode 100644
index bd97a10c1e81..000000000000
--- a/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -40,31 +40,6 @@
- fi
- AC_DEFINE(OSTYPE, ["${OSTYPE}"], [The operating system to build for])
- 
--for cursespath in /usr/include/ncurses.h /usr/local/include/ncurses.h /usr/local/include/ncurses/ncurses.h /opt/include/ncurses.h /opt/include/curses.h /usr/include/curses.h /usr/local/include/curses.h /dev/null
--do
--  test -f "${cursespath}" && break
--done
--case ${cursespath} in
--  /usr/include/*) 
--	CFLAGS="$CFLAGS -I/usr/include"
--	LDFLAGS=""
--	;;
--  /usr/local/include/ncurses/*)
--        CFLAGS="${CFLAGS} -I/usr/local/include/ncurses"
--        LDFLAGS="-L/usr/local/lib"
--        SOLLDFLAGS="-R/usr/local/lib"
--        ;;
--  /usr/local/include/*) 
--	CFLAGS="${CFLAGS} -I/usr/local/include"
--	LDFLAGS="-L/usr/local/lib"
--	SOLLDFLAGS="-R/usr/local/lib"
--	;;
--  /opt/include/*) 
--	CFLAGS="${CFLAGS} -I/opt/include"
--	LDFLAGS="-L/opt/lib"
--	SOLLDFLAGS="-R/opt/lib"
--	;;
--esac
- # add Slowlaris -R and libraries to LDFLAGS
- if test ${OSTYPE} = "solaris" ; then
- 	LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat"
-@@ -74,7 +49,12 @@
- ncurses_support="no"
- curses_support="no"
- color_support="no"
--AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes", AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; ncurses_support="yes"; echo "NO TRANSPARENCY SUPPORT in this ncurses lib", AC_CHECK_LIB(curses, initscr, LDFLAGS="$LDFLAGS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; curses_support="yes"; echo "NO TRANSPARENCY SUPPORT in curses lib"))) 
-+PKG_CHECK_MODULES(ncurses,ncurses,
-+	LIBS="$LIBS $ncurses_LIBS"
-+	AC_DEFINE(HAVE_NCURSES, 1, [Define if we have ncurses])
-+	AC_DEFINE(HAVE_NCURSES_COLOR, 1, [We want color])
-+	color_support="yes"; ncurses_support="yes"
-+	,AC_MSG_ERROR([ncurses not found]))
- 
- # disable color support on Solaris for now
- if test ${OSTYPE} = "solaris" ; then
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-theme.patch b/net-analyzer/slurm/files/slurm-0.3.3-theme.patch
deleted file mode 100644
index 131554ee57f7..000000000000
--- a/net-analyzer/slurm/files/slurm-0.3.3-theme.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/theme.c
-+++ b/theme.c
-@@ -70,13 +70,7 @@
- 		if ((f = fopen(filename, "r")) == NULL)
- 		{
- 			bzero(&filename, BUFSIZ);
--#ifdef __NetBSD__
--			snprintf(filename, BUFSIZ, "/usr/pkg/share/slurm/%s.theme", name);
--#elif __Debian__
- 			snprintf(filename, BUFSIZ, "/usr/share/slurm/%s.theme", name);
--#else
--			snprintf(filename, BUFSIZ, "/usr/local/share/slurm/%s.theme", name);
--#endif
- 			if ((f = fopen(filename, "r")) == NULL)
- 				error(ERR_FATAL, "cannot find theme '%s'", name);
- 		}
diff --git a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
deleted file mode 100644
index b8f2e06dde3e..000000000000
--- a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus"
-HOMEPAGE="http://www.wormulon.net/projects/slurm"
-SRC_URI="http://www.wormulon.net/files/code/slurm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-overflow.patch \
-		"${FILESDIR}"/${P}-theme.patch
-	eautoreconf
-}
-
-src_install() {
-	dobin slurm
-
-	insinto /usr/share/${PN}
-	doins themes/*.theme
-
-	doman slurm.1
-	dodoc AUTHORS ChangeLog FAQ KEYS README THANKS THEMES.txt TODO
-}
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 9922459526b8..8465491df76a 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -5,8 +5,8 @@ AUX suricata-5.0.1_default-config.patch 813 BLAKE2B 5758447f2dc6fa50bb6a388c2c83
 AUX suricata-6.0.0_default-config.patch 833 BLAKE2B a8a63f838452531feb9f1b69e9756c0385338f4a1b8f6c36b22052cc7f8a41cd07e31b882e2e89402c5eb43e599390cf6922f9dcfc869416d57aa3426516f8f9 SHA512 8edff1be84dbe29a140889040a7d9310ee8dc5ab82cf9ff64298ecfab07a75853caa7ac907cf191a62a1c2de9833311fd090eb2f82c9d3745b5f3fc01adf6efd
 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
-DIST suricata-5.0.5.tar.gz 29094537 BLAKE2B c2a5897836117abe9ca39b3a03de36c4d5667d3e64dc1befd77a7b777e4191439a497e3042e6d00b80ae31c8c4f18347cb2e6833e8db5f64b31c8ab1cf557ac5 SHA512 5f26731e0a0134fdecc8e76a68a69584bacb614ba4fd56b74f27abe62ab7d80135908eeaae38c9a03101f069d83597b3c7c69000bdd2a2e6bfe87f7a98de4e16
-DIST suricata-6.0.1.tar.gz 30460439 BLAKE2B 55a24fa2f653a0a80f51e1ab102bb7046bd1f67d60c64c139b485086f4d8e0f5db58906bc33a7b5bdb76ba37b8206ded99b08034c4c292cf16d595bcafc7acc0 SHA512 be57150afc238b6627731e4463297e67469b66241779f5af3d1bd93bfad4fde41a5371298b54a06c7c3ea324e5642753ca57900173989ac738d663a85e9c33f4
-EBUILD suricata-5.0.5-r1.ebuild 6312 BLAKE2B 40a8f0ef7b5078a1a39bb361d81ca9ec41f668f2354b6317b8dd096b7bf185b4b53cfcf5f7bc011e995d9c8aa98b0c0978a63288d3e9b15197538d43a8aa0b2f SHA512 1539b84cf8ba2a5ead188fdbbf6df5317363f099c97d87d8e1af897febb1d93cf57b3df39e426ed1177f28bc9352a8c6324d5c9218bfd876e8aaf3fd0e323e3a
-EBUILD suricata-6.0.1-r100.ebuild 6588 BLAKE2B 1645c459b24dde4fa93bec87bcf5f053223ccdef59ba92185e8dec2ea175f2e7c9efb068f41f3a55efd6a92e22aeff578227546023a0aa65baf0e00be32f52e7 SHA512 e4bf0aa17354349ac74a7c33878a1c30a9e3f96cb51d58644e4e7e27e1cfcaefd16ef30c8bc975d1f8d77a8256825270d1adeceb362d456db8496bb58845a065
+DIST suricata-5.0.6.tar.gz 29136659 BLAKE2B 97d95cadd54d44bd82424322c08ad04be2122cdae5763995f7aefe4a75872091dd7d289e89e47a5ad9fbce570964f11331d848db7fe7ec4c2be9a0f8b62fadff SHA512 73580721683f929a90b6b59673842c051fe44ee7b8d8d890106aad09952d5b8a8f3716f168c41b33feb5c32e0106f5926125313cc11b27bc5a9c65e90b21888f
+DIST suricata-6.0.2.tar.gz 30514801 BLAKE2B 20604fa3332a9d99a1a30db55a0ccd689af0e08e686cd6739d6c4390456acc28d34702704f7e25537463b0c23600d123de361a227f9ef2420ee5c2b11df2866a SHA512 230a74a5442cfa066c56528036b64c173702238c5075161119eaad08d320e528d3510c51095297f120030177fed9c84076d00f567f7a3a4cbdb23d382966cf00
+EBUILD suricata-5.0.6.ebuild 6314 BLAKE2B d9bf2ae7f52c4ca9aa85440f53868648f01ab916cbe3c3b649a26ecf1ae4d9b2dcfc59d17e3a19e19766630fc4400d1e724d8d67a3c4465432aae109eac2e311 SHA512 d2a99f7fb76a119dd45cade648e9694644afa60f71c9df99776bdfdf56f465513af9143b5cc1d630243008aea9af328c123ac0c2b3f608b98a3ea7d47c520655
+EBUILD suricata-6.0.2.ebuild 6590 BLAKE2B 7015f6872fe496c7858143f860d24c5e040eea8cc4bd152a2fb62e5a36548d594295e3e9d1e5662376af0955225a2a189d66dc2d8828c6a7d0387077a0d137bf SHA512 bd30baeba54834066bc7915797da6c8664f4077a9d06ff353a9ce374437997ee194246efb1d7559a8c2fb9bfe6ec0fd72295c29666ef9a7f6f494241db5d579f
 MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5
diff --git a/net-analyzer/suricata/suricata-5.0.5-r1.ebuild b/net-analyzer/suricata/suricata-5.0.6.ebuild
index a87e7c8fa165..ef4c372ec11e 100644
--- a/net-analyzer/suricata/suricata-5.0.5-r1.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://suricata-ids.org/"
 SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/5"
 KEYWORDS="~amd64 ~x86"
 IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test"
 
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	>=net-libs/libhtp-0.5.36
+	>=net-libs/libhtp-0.5.37
 	net-libs/libpcap
 	sys-apps/file
 	sys-libs/libcap-ng
diff --git a/net-analyzer/suricata/suricata-6.0.1-r100.ebuild b/net-analyzer/suricata/suricata-6.0.2.ebuild
index 64ce2211725f..028ea37b43e7 100644
--- a/net-analyzer/suricata/suricata-6.0.1-r100.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.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
@@ -13,7 +13,7 @@ HOMEPAGE="https://suricata-ids.org/"
 SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/6"
 KEYWORDS="~amd64 ~x86"
 IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test"
 
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	>=net-libs/libhtp-0.5.36
+	>=net-libs/libhtp-0.5.37
 	net-libs/libpcap
 	sys-apps/file
 	sys-libs/libcap-ng
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 9edc977aaece..f1daae51f068 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -3,6 +3,6 @@ AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
 DIST tcpdump-4.99.0.tar.gz 1876161 BLAKE2B 5ad7e7f888f56fac92ef3c01229ba03b45cfd706d7a904a10118b65c73aa6c5c1d39f54b7139c72116b67ed2971566596ae51d65de8528116b3a81bbcc7f52ab SHA512 921c27bdd803de9ecebe735a3efc82ac87c4efbd47949119241b8290ed1a015c25d252e428d5bf3b8e275e5b084d19bafb31020b1b3e241202cbc42f1f1d4801
 EBUILD tcpdump-4.9.3-r4.ebuild 1759 BLAKE2B 90dad95e765825652c9e7da84b69f863fc545d522aa14fb9c2994d3b5f1276c0b3d03d817daf57b54140a1d1058ea0c36203e7918851fe4af3f10e964c82ca2d SHA512 cc654bde41b19b3f52616c8c9fb3693307bc21aa4ed1568df7d7b68e28a453272344358a4c13f5258de96a045009875696d734fbde7b2ac73fcf2c89e84886f5
-EBUILD tcpdump-4.99.0.ebuild 1846 BLAKE2B e6506aaa002791fde7c00c9b7a1788858b1f9d93bc2988550712b79f28e2ecb4bb400f4d252d2fc8659a0808d1565ea904831222a771d92046d512bcddb97e72 SHA512 970e01743686f7bc827488bead7632a772b15dadf71912711fafd294bd7571256e0f8206ba2ffbc47e5e0e19087ac2df9abd3596eaf44d05c32f1962460584ad
-EBUILD tcpdump-9999.ebuild 1719 BLAKE2B 538b1b4f0519fcd589a9d9c20935c84c9fee5136337ce13f519f0a22cce6ac0331a37310574cc60d1db3f0eaff030f75ca756c729bc81989b3cfc1230ae27bfa SHA512 9fcbc567c7be186a19181a0daf3014e4df3acf16b7a578bb7a782802afa449a21f7174d6a5eb75f7ee313453e46a12488b18957000757b8e23110d6f72ebf4a4
+EBUILD tcpdump-4.99.0.ebuild 1866 BLAKE2B 1bbf588ed57d4a34d087c2c40b07e30edfc46653d890cca9e071e3898c35eed62f522f1136b7b7951ac451d1fdfad2576810b441c16bc3789e7881c4b3e095e2 SHA512 3d6a7da809de4a3dd69172cfe8b54327be7c3533fc7ffbb0106f033e263ffaf59b0780cfa7dbf8b4692c308d3ff42992c50c5cdb943a3758e7cdf6d8f7c5a514
+EBUILD tcpdump-9999.ebuild 1721 BLAKE2B c78759b703923b0b79a81cb79499dd8b1f3a90592eb926f14fa63caa68df2ea93b5a593fb1e4649aa5a492380a93bef800d30aeb5e1f4f90c6f16b1aad3a83b4 SHA512 35ddcf9bd232ed197e33e328cdffc41c2f8cedd5508c4f78abc55b05de3eff0dca43750fa76d7fb52a5455f6e41a5398928c1fba7b573dbac63dcab2f8b68350
 MISC metadata.xml 700 BLAKE2B 05ec78b920be862d58cb8ff1ec914ab7dd0be1a1b21cfacf106e127a51e0059afe61060ff6b647eb721a000b2b5433ee462f0463cba0004f344773fbcb3de7b9 SHA512 545888840227ad3a50cf4cc2a83a7f808ebeac4864ecae37efabf1723c9d5d7b7a59c62c9cdf7436f3fe5353c18f4b913eb6ea6f92ff7256312d7e0446cd09da
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index 3b3f98211ec8..ec7564d96dd4 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -12,9 +12,10 @@ S="${WORKDIR}/${PN}-${P/_}"
 
 LICENSE="BSD"
 SLOT="0"
-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"
 IUSE="+drop-root libressl +smi +ssl +samba suid test"
-RESTRICT="!test? ( test )"
+# Assorted failures: bug #768498
+RESTRICT="test"
 REQUIRED_USE="test? ( samba )"
 
 BDEPEND="drop-root? ( virtual/pkgconfig )"
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 6f074f38fb23..4765315651b1 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools git-r3
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
@@ -87,5 +88,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump add them to the pcap group."
+	use suid && elog "To let normal users run tcpdump, add them to the pcap group."
 }
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 28db2c120f41..567cf435f972 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,9 +1,7 @@
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
-AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
-DIST wireshark-3.4.2.tar.xz 32465900 BLAKE2B dab7e871c798a6e0f03f45eaa49ba5cbabc18afabd6a5675a3241e4f1e6d86ef21b56b4cee5d561da2f2ec2b274ac6c5a52ed7b8ad50cbf02949a3a7f68d4f09 SHA512 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a
+AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2 SHA512 6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
-EBUILD wireshark-3.4.2-r100.ebuild 7048 BLAKE2B cd9f0f0b03798fb023c2f5cf8f8fa0276f6d36a002097b57139bd52860f8d6c0718663268819898c12437723a855fca16d37668291ef3c5226a8c33ac845fc94 SHA512 39a85dd6b01e3de8978c1bde8de0693a6ce2e08f1ecb296994c6f8ab38d61c5919a7e1bc2c50386eaad3d6c6cbab26c7fd5b08aed315596aac749fe706a2bafa
-EBUILD wireshark-3.4.3.ebuild 7064 BLAKE2B 9ccd4ad0a7616800d9e807e3b29251f7fdb744ba38f52b7e32e8b1f96ac26196bdd7b428d329256aaa234f2fb783110c55d34e27c9eae2e208712ab4faca53c3 SHA512 87a396fe18db80ce249fd3e8aa36846c7843363aa2f51a7ebc266a02ca9ef9ff07e10b922bcfce300f792d4866e98db5040024f24ef516aa498f377e1721cba8
-EBUILD wireshark-99999999.ebuild 7000 BLAKE2B aa5d6f86cb7725b6006cd0444635e92f39aa9f9bdc52546ff7dd627aef8bbb2bdac810219ebb5e371fcec2c5acc03ae578f389838845f31445799464f3797b70 SHA512 07c3d58bfceb06f1896226329202d44696466fdb4c732306cfb923cb40a9241efe80c985a93ff82b302003cf9d03bd504bb71ec706452c1b5805ba2ccb603521
+EBUILD wireshark-3.4.3.ebuild 7060 BLAKE2B a1fbc00d217ce8ad232dfe2f3ca53dd78f5b12927af0bfa87d65cddc48a861fffe94d706e93d13e168ff89abc30593e215bc03663ec491dfadd321fc6ee517a0 SHA512 7e2944802986fffaabafd0f10eb9a504505c896ccc0b612d583eb2bca3bcca67560a31e4b23f6b765da975c2485b627f090bf0f82b3335e91e7884572af3fcd1
+EBUILD wireshark-9999.ebuild 6996 BLAKE2B c5e8c2938682bd4798bf4e89105abebe479efa1e2d6f10a992b8f7da3f0b81a5f790e3902eb1cdf54f7e59cddc1e489c3525c1d3efd839a6603926b43739e841 SHA512 07ba086d124909c54a5bbad139888e4dd0e0a19cd02d76c25d93b52db9c3e25fa0163d9ff72334d3dffb18af3cb660522787304063bf0010543a53ef5f309d13
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch b/net-analyzer/wireshark/files/wireshark-9999-ui-needs-wiretap.patch
index c0bfc3acd5a6..c0bfc3acd5a6 100644
--- a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch
+++ b/net-analyzer/wireshark/files/wireshark-9999-ui-needs-wiretap.patch
diff --git a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
deleted file mode 100644
index 803afe19339f..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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_{7..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/"
-SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-IUSE="
-	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
-	+mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt
-	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
-	sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
-"
-S=${WORKDIR}/${P/_/}
-
-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}-99999999-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 "${D}"/usr/share/appdata ]]; then
-		rm -r "${D}"/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-3.4.3.ebuild b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 311f89608fec..7ff5005db92b 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -100,7 +100,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
 )
 
 pkg_setup() {
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 80fb077c9a96..0854e2e82548 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.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
@@ -98,7 +98,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
 )
 
 pkg_setup() {