gentoo resync : 11.05.2021

14 files changed, 171 insertions, 12 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index bc4ed076b715..e090d0eecf8a 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index cb9f46c07dd3..9858a489be4f 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-nettool-3.8.1.tar.xz 589024 BLAKE2B f12c43b713ae81a2460b12c150e2c52baf98900b14ce0ff188b3fb1a55aa636391fb62d9c20b40d3a60ff322d4af9744d072c2727a77bced056ef0df042e21cf SHA512 c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed
-EBUILD gnome-nettool-3.8.1.ebuild 940 BLAKE2B 1037c242a494b93139fbc02882afbbbec4be72114e1161d12b4c671ffeb5f20a6b7361debc6433355c4cc908a45e4d8283a231760c359be47daa473128409800 SHA512 2e5f353adc80f7476957498846faae8db5c36732d5f2039a8ba453b0072d70e67699feeb9909255096f93a3cf2f1d32e5a27b23c878c8efa87be0971fe452f27
+EBUILD gnome-nettool-3.8.1.ebuild 941 BLAKE2B 5759da6bf4697e61c9828d13122eb074299d13329936416d2abc54324a6a5bdc574479b68f22ecbe5f0aaec1ef550f20ad7d86c82044bde7f5dd64c73b588f3f SHA512 42f57eb7e0b9dd4fbd1f019ac7fe0f3521e15a399eb349cb282e4e923a33c1d5ab338e8f29a1b049cb237747194e0fd4a4f0e21f176c6ca1386c8eba40a2ca24
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
index 2505084a7f4d..078504133f7c 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="yes"
 inherit gnome2
 
 DESCRIPTION="Graphical front-ends to various networking command-line"
-HOMEPAGE="https://git.gnome.org/browse/gnome-nettool/"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-nettool"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index ba5f8ea26c8f..1c765993d242 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -2,6 +2,6 @@ AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
 DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
 EBUILD hydra-9.1.ebuild 3565 BLAKE2B 0194fe7972904f7cb3941db204847863739c933ff6fe1340664e3d467b77ab47df699e3197856182792dc49b0ef888b4283486151395e83cb2490776da20047d SHA512 9415468c35018864d296d2ff73d74f682c22145cb6bc4862a4f75c5d53484361a9023e2d91e0ddc9a08a34e01bbb8bd5a4f0e6dea82d328ca760a37d0c3e18b2
-EBUILD hydra-9.2.ebuild 3601 BLAKE2B 1f9db899a324ea8ae2b1acea1b9cc2f3c47fbafc554a4b8f58735acd76f5c2ae1d92d7a0e339e8eebf9a144a97622cc880d180de7e49a77b93658cef77bc3bf8 SHA512 79daf2557cc872cf7e401c389cde1e059c46c2cb52eea81d40d9679450894b10c359f0bd6808ad2e703262aa07b481782ebdf808cf6998c8d359740a6ccea001
+EBUILD hydra-9.2.ebuild 3600 BLAKE2B 5e330a0145a4896cac130e4aa18b442d06fdc431b910da5488253e633588b85c877b51b1138385118b1c1127cebb9d3a7ccda9d24c8774d3e24f4cfbd84431da SHA512 35dd11e14736c1e8d322196b095c7930e828243bcf2a207256b7df8fdc8b870178fa0e676971adbd1e5ad0ab847a727874e9791c9bc8bf7dfd31162b2e06b151
 EBUILD hydra-9999999.ebuild 3526 BLAKE2B 62437e07d91e5424234b7adb9c86c6d9cb00b89e9133d37cdbcc861fa2d793737073e4c5243e612480d3333b2a514d7da690659d022a878a6ba0016e3e385d75 SHA512 9179b9f969452208c3be9720cb5529c01ebe44f1e5d58870365bf2b0b13138ba8d7fdf1a5b540ce2a8044aaf2448fc1614ff0e036a3c9b5aeaa53ae45ca47311
 MISC metadata.xml 583 BLAKE2B 4471d2ece7889ace03be32f2d7227bfe9a0b7795a0d6292b97cb46fb9944cdac8b248deafcef087bbbc885c885cc60d2d58c4ccac391dc6f90bcdd975bdff3df SHA512 ab05494b6f96f007c06d7f86b696d148a8b2bf12ab23e193751785023733d9472623a873167f3b580d9167021d794466304732958ffbc0e67027a06076fd2ec5
diff --git a/net-analyzer/hydra/hydra-9.2.ebuild b/net-analyzer/hydra/hydra-9.2.ebuild
index c93420ba6a1d..04538cf60a2f 100644
--- a/net-analyzer/hydra/hydra-9.2.ebuild
+++ b/net-analyzer/hydra/hydra-9.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/thc-${P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="
 	debug firebird gcrypt gtk idn memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index f560a4e5c6f4..6f4a67f30a76 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,6 +1,8 @@
 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
 MISC metadata.xml 1434 BLAKE2B 0d6304a4cc6f3d5b9ea268d7c6613f4613ac68ee1ae9d40079796716eb845ea97a1d8d6418d5dbaccdb7686754913f06dee8255ea12d91d3d8dc94e12fb55970 SHA512 0a9e64da453edddc864fc8b1c0fb13c63976f99968060a9ef2dc1d5e36b84dda9a79ac7dbe795401ef0680b35e397b08920a9a5ea4f861575bc61a76e89cde42
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
new file mode 100644
index 000000000000..8beced678194
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1.ebuild
@@ -0,0 +1,106 @@
+# 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/scapy/Manifest b/net-analyzer/scapy/Manifest
index fba157765015..6530a5ba500a 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,5 +1,7 @@
 AUX scapy-2.4.4-libc.patch 406 BLAKE2B deec0a79cc1edf60fb5cae49945e0b3384d3671fbc8bbe5850134a7538d83bbcd41041c14820a678e8859e4bc32618a862a32ba4f8457bacaeef9519d5f9036a SHA512 ec5608d2cf3cdcba3dd5450087ca872da5a68ed97a2bcb51006657a634ed4679b9c013fea8b4005896afa27d668cf9a536c515994bbfa575e2b250811caa5bdf
 DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389
+DIST scapy-2.4.5.tar.gz 3323309 BLAKE2B af94b3ec6324c4544aca25f63bcca8aa60a3b1cbbf132d3ed07b5bc73b95e4298bf250e65157bdb7851226fd0ac039367892a9a14d844e5815832ad4ab556819 SHA512 b5ccd689f7bd4fbbb86921a35360b94ec7a738b494f16e4764828689835296016bc476825add798406e4d32761d8df90b41ce7e38049afdabf98397b1bf5982a
 EBUILD scapy-2.4.4-r1.ebuild 1132 BLAKE2B 9e443884839312921260be7323baae52abf5a85799f6cab9d499cc02ac982b75746f097e48050bbd6ede928d35b5f4c37fb2eebf8baed4b2b6fd4c81af7c7e1d SHA512 9f8d9da8c924689ae39adfa19f5dd30b53e3808aea70e11df8b4a8927eac3d3a4c7401dc194b2df875e67825b25851ce304be4213ac31b1fa48e878a2190ab32
-EBUILD scapy-9999.ebuild 1018 BLAKE2B c892db076650ed6ebdc294a1d3c8edad12b981a910ce0b961d7c5b5bc84b9a2cc7523c2aed1cafdf739b1bc1ab97064d8a2683bb97c18667541fe15cf5946773 SHA512 912e7e95e42842c5c7cda3ac93d7ab7147c9924017d91906e333f896174c08036b97e1ab1500cbe2de54171b13fd0f3d1116902109c929e08675b323c82e4b86
+EBUILD scapy-2.4.5.ebuild 1095 BLAKE2B b3b76ca95286acc819383eb0986789fa21ec7e9e31abece82a63661fda373fa90d996497e491f48621022aad201426b1360d6d56cc282e2e448095df4d6cbcd5 SHA512 ecdbc01f7ab4985cb9ccbc66c1090123de24df403821ce0d72a0bcf899e48fb53caaa25b56834dae53bdd863652150b15e1b4fef8db5f3c2ad48a22c2d2dd813
+EBUILD scapy-9999.ebuild 1010 BLAKE2B 5bd01cb4ddfda58610a8e32b4452379dcadc7b562f404cd23832ddfed5af4ce063ecaed1025b469db662db701d2ca7c3d5645fab9f2a0a9650f35282761738d1 SHA512 4be78df01f5f07c98f63d33570225b206630d070e8cb6cbbef501bbd7e70fcadd10d2197089d97afdcef7a2b422bd784b1358184bce3cc6cb6684a13bb95a08a
 MISC metadata.xml 584 BLAKE2B ea0689ea7a708e36148f15307cbabb2a32e018a4442cc58f5da1fc95ebfdb1a9e2a8468a68f3e5f441bd401b59b3d877d27fe651a94b25294c2881e7b5286f35 SHA512 1ce387a001b5bb8ce6acda68d43a9d02f50eda40da9d434ff1e544032a07c6e50f4b5e2d821383cdfd333ed15423f04889fce84f9bba2a19c03567860a7a9622
diff --git a/net-analyzer/scapy/scapy-2.4.5.ebuild b/net-analyzer/scapy/scapy-2.4.5.ebuild
new file mode 100644
index 000000000000..2c8170223ff8
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.4.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
+HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
+SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DOC_CONTENTS="
+Scapy has optional support for the following packages:
+
+	dev-python/cryptography
+	dev-python/ipython
+	dev-python/matplotlib
+	dev-python/pyx
+	media-gfx/graphviz
+	net-analyzer/tcpdump
+	net-analyzer/tcpreplay
+	net-libs/libpcap
+	virtual/imagemagick-tools
+
+	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
+"
+
+src_prepare() {
+	if ! [[ -f ${PN}/VERSION ]]; then
+		echo ${PV} > ${PN}/VERSION || die
+	else
+		die
+	fi
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc -r doc/${PN}/*
+	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
+}
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index ec171fbddec3..6b0b5ba376c3 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-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
+
 PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 git-r3 readme.gentoo-r1
@@ -9,11 +10,11 @@ inherit distutils-r1 git-r3 readme.gentoo-r1
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
 HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
 EGIT_REPO_URI="https://github.com/secdev/${PN}"
+S="${WORKDIR}"/${P/_/}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-S=${WORKDIR}/${P/_/}
+
 DOC_CONTENTS="
 Scapy has optional support for the following packages:
 
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index 2f11696b2b7e..a69a3c9c4368 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -1,5 +1,5 @@
 DIST ssldump-1.1.tar.gz 187436 BLAKE2B 3cafd7263762a7a326fb30722a918bcfaae5b43eedca37a0b5c341efc510e935671dc7ebf71eb807fcacbfce5f77896f310b634028713deb5516390fcfc21f65 SHA512 00ff449d3818a27fbcb46316733428f6a623488e758a67fcb7ee4390835e3279e7242aa0134ddc158740cb8323f5fd9869bd50efb35189dce977d4768d9636c2
 DIST ssldump-1.3.tar.gz 122819 BLAKE2B 8a96746939eb8d9ba33340ff112b1bc5b436a7eb5756fda494065c8f8fd7d6ec9c1c28d8f7f880d25856f24749fd8a8a98d4104753bb68772b2583dafef099b8 SHA512 6da4db890a30673278b17eb00201b6c2535ba476b769bed6ed4e31c06744f32e299d0f0dd6420aa7255e2c982a378cd721d7bf51dd0aeb23211ab678d1e5f26e
 EBUILD ssldump-1.1.ebuild 937 BLAKE2B cb9e7f84168680586b01f3d7392e92782476684a50f507be370ba5da0cc93fba4410dbb85d172cc2985560c8f4516c893b88a9aae0596ffd78590b481e78a7b7 SHA512 7e2d32d38e73c1768778d54f9357b5da7000ee7e794e74ea05304fef283ccf945643a336ed380cf3098d968649e6ee2f2599bb173a18cb0a7dc7f1af82813314
-EBUILD ssldump-1.3-r2.ebuild 662 BLAKE2B 87e6fd16bb47dd59cd39c398c268b9c02f375bee9e941bbab5a673859f38fac6c09fb7a405cf869e03f2436d2f1b892775a895d141b3aab68cf70cdc33e87d0a SHA512 d280b99903e604e3a34cc919d72f909d41ca7ab49e77db326b55525919a46745d5c2634b1bfaff7482bb8f30b9581799c5ad9ec3cf4190bffab442e3d3199ae6
+EBUILD ssldump-1.3-r2.ebuild 661 BLAKE2B c029ae3caf669efae13cebc005ac4de8cedaaedf6ed584cbd2b057a21c6b01e8ce7913f73007bd4223cd8b4dc9a5b84dffa04734fe2b0e7872ee30bc40fbee77 SHA512 cd906cc11d80bbf8ce11bedc09533f11f50f5fb6a7792861b89361635e04bff241c6353b14a3b13e03165b320004c0b4b6c15ceeaedd22514ba84292c7f4bafe
 MISC metadata.xml 359 BLAKE2B 6cfa34e7b48e628a649c1e0775e8fde048226ba01436a3c275844089fbbe14f0588be44a2fc9ee6a4e89cc16ad1e479a53c926a4c3ba9edabe910bfb7d19bccd SHA512 e3eadb3bc57cdd5909cd93907f9d12a6541d303070a860bed60b10f5e018b6571d89f5100be0ff3800b2da5c58c40e3095cdfa43105273c389714c182ff33fe1
diff --git a/net-analyzer/ssldump/ssldump-1.3-r2.ebuild b/net-analyzer/ssldump/ssldump-1.3-r2.ebuild
index f96a0e9da118..45809ea32b92 100644
--- a/net-analyzer/ssldump/ssldump-1.3-r2.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-libs/json-c:=
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 948de5aa26fe..357dc8bbad86 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -2,6 +2,6 @@ AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf84919
 DIST tcpreplay-4.3.3.tar.xz 748220 BLAKE2B 2de09f75e6bb6035fc25f34f41d9ce2ccbb961d7464a9a6dae16ec417d629e4819593fd781d95075293ffa3a3db7c4a50ae8667c4e7d07c0b425361027c8df06 SHA512 110d7768a176d2126766829466a209cdd983afcf0c988f7e128baa5057b3ac1dc918fcaeb168a2e6654429100a146afcbdafcda8c3d67adf6b17892a48689a02
 DIST tcpreplay-4.3.4.tar.xz 739280 BLAKE2B 8b680363ee182fc7581f99cc4587d50e36285446d07a5be370e2439b31582ad88c786c11d662e28dadc5b69aee376889b1c0f6a86d61c106426ab6ab2c085012 SHA512 6d19cf492114c68a9fafcf7790c08f31607d2c0112e02fa41eed8747255bbbef85f281f74348e1d51f1d476b88f07d64715224618ec15268688baefaf7cc7124
 EBUILD tcpreplay-4.3.3.ebuild 1924 BLAKE2B 0eec7595c24499e9d2dd603d097613f3b1ca59a28c096d7ec8a9231be16ddd1e5d2ce8a56cb41086c6baf3fb08ff56d890b8aec553082e0c7272b49f8dd32285 SHA512 521491bb8e182f93ffa83bc50448e45f178881889af50371f6a770a9815b572d48721ba6b480c64d81fad2f8d2f90e772ea055adc990b98fbd99cc681e86afd9
-EBUILD tcpreplay-4.3.4.ebuild 1927 BLAKE2B 4839c1ba1f6aef0b4f276682b1bcd2d06cb8e95ace072444bfdb4d9943bcc8f59ab7ffb823e99bf535a254f40cb6d0f7a48174c6c0a221840085e1bd5a0a68b6 SHA512 a7c791e86b9fe9a98b8c4496ed48b245a136faaaa2ce60441fae141dac3a5e5363111111c1acb237bebfc3f478cb066fcf22957d090dde9476032fac186978a8
+EBUILD tcpreplay-4.3.4.ebuild 1925 BLAKE2B 00949edc8ccb707a26dd93ace9d298eeb1cf9167870d130f3b335e12ec88ae7842f13b560ea1e6005cc3892b94e1d7a7aff6ea958b82efa43e25a63c19951dec SHA512 2c64a85b0e9c6b6da59264d235c8c4025e2ffa58e0efa5f4b8325937a94fd3874bea8920043f28faae7eb408bf84140f1744e8fad58ed19eb9c6478bc0f83b7c
 EBUILD tcpreplay-999999.ebuild 1875 BLAKE2B acf0bc3fb3e2d84f598d8ed6e13c42bfc642da1aedf8036362e52ab0bc7709beb81d9e57517d26b2b9507ec1cf89c577b0c40993f8faa63babcfaa2d11dbdc6e SHA512 be4c895b20ee5898dc182fdf8f45de64bb9c28fb4b581c07ad29a1f03d3ed953f6bc2e6b596fac66a6290a83dcdfdab17fb01de0042b82cdae86deefcf6be062
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.4.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.4.ebuild
index d15c8f13c99e..908816ad6f53 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.4.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/-}
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 IUSE="debug pcapnav +tcpdump"
 
 # libpcapnav for pcapnav-config