gentoo resync : 16.01.2021

author: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
commit: 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree: 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /net-analyzer
parent: c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)
40 files changed, 195 insertions, 424 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index bce4bda83ba6..e75e825e7f4c 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
deleted file mode 100644
index 34f1ab046a6e..000000000000
--- a/net-analyzer/amap/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 4.8-system-pcre.patch 1232 BLAKE2B b659a49c80f5902718160f41f70a595607e70b80ad5c332952365bca9d09e5fd63bd7b6f4f737c5803cd49189e0030aef835cfc5cc7c2615a2705ca286443cff SHA512 d22cb148748ec58920c0a66f67adb4df23dd081ab9c4e2e05881ce7029679e2ccf14e3cf6d199c63e5c0974ee6528fa8b0e85044cfdbba32833457e88a856934
-DIST amap-5.4.tar.gz 263331 BLAKE2B 683bcdd1ebb22dcd74c2ac20147ec5e5fe2bafb2452abda22a9a95c4d8fe1955394067b9a3765344674b48979cd56a99251d6359cd0247ac623da756a017a220 SHA512 e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d
-EBUILD amap-5.4-r1.ebuild 1573 BLAKE2B 6d5055a385060a97e68262fa634b8866d787770d2adfe8476cc5e0a71459488d6b6db8ee35d98149b7a0186e26975ecf78615f3d7467516981adaea139302b6f SHA512 4be74f03e373725fcd00243708df4e55313488bd8c22a5d614de4bb77576d19c7dd5f3f12ced3454a0ce3b405e1de35d3d869eb212ad4443111a460bfd837db2
-MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
deleted file mode 100644
index 17fd129b9fa7..000000000000
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A network scanning tool for pentesters"
-HOMEPAGE="https://www.thc.org/thc-amap/"
-SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ssl"
-
-DEPEND="
-	dev-libs/libpcre
-	ssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="
-	${DEPEND}
-	!sci-biology/amap
-"
-
-PATCHES=(
-	"${FILESDIR}"/4.8-system-pcre.patch
-)
-
-src_prepare() {
-	rm -r pcre-3.9 || die
-
-	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
-
-	# Above change requires below change. See sources...
-	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
-	sed -i 's:/usr/local:/usr:' amap.h || die
-
-	# Files to be updated are at different location, bug 207839.
-	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
-
-	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
-
-	default
-}
-
-src_configure() {
-	# non-autotools configure script
-	./configure || die
-
-	sed -i \
-		-e '/^XDEFINES=/s:=.*:=:' \
-		-e '/^XLIBS=/s:=.*:=:' \
-		-e '/^XLIBPATHS/s:=.*:=:' \
-		-e '/^XIPATHS=/s:=.*:=:' \
-		-e "/^CC=/d" \
-		Makefile || die
-
-	if use ssl ; then
-		sed -i \
-			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
-			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
-			Makefile || die
-	fi
-
-	sed -i Makefile \
-		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
-		|| die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) OPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin amap amapcrap
-	insinto /usr/share/amap
-	doins appdefs.*
-
-	doman ${PN}.1
-	dodoc README TODO CHANGES
-}
diff --git a/net-analyzer/amap/files/4.8-system-pcre.patch b/net-analyzer/amap/files/4.8-system-pcre.patch
deleted file mode 100644
index 097bfbf45eb5..000000000000
--- a/net-analyzer/amap/files/4.8-system-pcre.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --exclude='*~' -urN amap-4.8.orig/amap-inc.h amap-4.8/amap-inc.h
---- amap-4.8.orig/amap-inc.h	2005-02-21 21:47:47.251638320 -0500
-+++ amap-4.8/amap-inc.h	2005-02-21 21:48:27.774477912 -0500
-@@ -20,7 +20,7 @@
- #include <errno.h>
- #include <sys/resource.h>
- #include <sys/wait.h>
--#include "pcre-3.9/pcre.h"
-+#include <pcre.h>
- #ifdef OPENSSL
-  #include <openssl/ssl.h>
-  #include <openssl/err.h>
-diff --exclude='*~' -urN amap-4.8.orig/configure amap-4.8/configure
---- amap-4.8.orig/configure	2005-02-21 21:47:47.240639992 -0500
-+++ amap-4.8/configure	2005-02-21 21:48:41.379409648 -0500
-@@ -13,10 +13,6 @@
-   exit 0
- fi
- 
--cd pcre-3.9 || exit 1
--./configure || exit 1
--cd ..
--
- echo
- echo
- echo "Starting amap auto configuration ..."
-diff --exclude='*~' -urN amap-4.8.orig/Makefile.am amap-4.8/Makefile.am
---- amap-4.8.orig/Makefile.am	2005-02-21 21:47:47.242639688 -0500
-+++ amap-4.8/Makefile.am	2005-02-21 21:49:16.070135856 -0500
-@@ -1,5 +1,5 @@
- CC=gcc
--LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
-+LIB=-lpcre
- OPT=-O2
- OPT_DEBUG=-ggdb -Wall -lefence
- BINDIR=/bin
-@@ -7,7 +7,7 @@
- MANDIR=/man/man1
- SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
- MANPAGE=amap.1
--all:	pcre strip
-+all:	amap amapcrap
- 
- pcre:
- 	cd pcre-3.9 && make
diff --git a/net-analyzer/amap/metadata.xml b/net-analyzer/amap/metadata.xml
deleted file mode 100644
index dce3f3be66c0..000000000000
--- a/net-analyzer/amap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index a617e36e0139..d6b564e0053c 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,3 +1,5 @@
 DIST bwping-2.3.tar.gz 119043 BLAKE2B 2780f22a2cb541821aae3ddf0eaa5f2cb662ec8f190c44f7e28a092f4e07f9b19d1388b9ddaec0133cedef894c6ff64a9e53035fd73e44a8f0aae518c8b9dc7c SHA512 e8afed0d4ff0ae668f1700e3c93e4b6298e4861568d4786630826bf0f3519089602b9562c92b2c3bb97904faea0da6a084fb60cc69bc3a0a931bd0f55af3ee49
+DIST bwping-2.4.tar.gz 112687 BLAKE2B cbf2854ab5cf6e926db4e959e3e228b8dda6d5624898710de6bf0be4f7813ff85e088acba4b72e3f7d02ffec9f6feaf02720e915850e50daca2c7c3c5c775883 SHA512 e57bf644196a31acc845d4864d189595b1bca22b03ce7330581143ca369668f0dbccc23c936d985f334e03f9e5462a4298d714ceb56815a377ce1adec15364e6
 EBUILD bwping-2.3.ebuild 462 BLAKE2B 955a9e0f9fa4922fb63fa3bb385365d9995994d7a391f5e80618d4bcce6d609e8c2eefadddd259d38906e2b2b4c336404c964ab87fe1db84b802f3f90c7a3412 SHA512 198d9369469cbe54ac3a1b5e307f5d6f75be57de0fcc53ecc3be56e4b2f77855b33a86c5400be429e399734d9a2609e4a1f15f5c7cfd78aa4d0417ab9b2e0203
+EBUILD bwping-2.4.ebuild 429 BLAKE2B 7935122c7368253217729aca06572362a4f1d6b34632b4ca0fa90ed11d6bb59298edf87d8b3ce06f62818862292a1808d76cbb2264f97d50f8bcd3376cb42681 SHA512 a3ed74d37447fafa1acfed29fb319e4e793353b98cf70f4a0e58acd83fb377eef6d168f29ee15d7be80b457843cef1a6090a8f2efc421f18db5252abd7a7ae48
 MISC metadata.xml 714 BLAKE2B 685d375a27c754c7702bdd706e1918dcf944e9d91b654fe7cbe3d216cc3c0d9600275e109b48d50daf427839d78c06b5522201de84237d112c195e92fd3ce2db SHA512 0784e9c845a507468d69477620fc880ba9dc18ba2173cf16cbd3a52259b835168b31b46c1afcd22ea530317733cb64759900c2d3137722324d1e7b37f5a3f3bc
diff --git a/net-analyzer/bwping/bwping-2.4.ebuild b/net-analyzer/bwping/bwping-2.4.ebuild
new file mode 100644
index 000000000000..1f3911414ca9
--- /dev/null
+++ b/net-analyzer/bwping/bwping-2.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
+HOMEPAGE="https://bwping.sourceforge.io/"
+SRC_URI="https://github.com/oleg-derevenetz/bwping/releases/download/RELEASE_${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+src_test() {
+	[[ ${UID} = 0 ]] && default
+}
diff --git a/net-analyzer/gvm/Manifest b/net-analyzer/gvm/Manifest
index 57f262e77e56..5a9e1f923927 100644
--- a/net-analyzer/gvm/Manifest
+++ b/net-analyzer/gvm/Manifest
@@ -1,4 +1,4 @@
-EBUILD gvm-10.0.1.ebuild 1156 BLAKE2B 9179e6920cb3512dd5366a08e0d0e7f24732f1d9187640bcc17b9cc8d030fdb2fda318b763cad98bff5b3d6c5fda919b93d7fa207bcf389c38482c3ed886fd15 SHA512 90201123905ab3893582998d3c3124f2448bbfd84e82f7f398d9144ce2f8e39b4d24a7d4942cd71edf9c9206e31248c71eaf7fad114f46c58065839b0a2911b0
-EBUILD gvm-11.0.0.ebuild 1156 BLAKE2B 1355b40d167cce89e872467872564decb9f38b680fcfaf530f4979d55918df0b5c1d0a149ca72e87fae2dccb3cbc42781077efba78679879a46ccad4bc94a196 SHA512 101bd5d7e01a371de0b8406094203f92a627b0c02c2d047a83fd4be3c9af0ed402de9304801890fcea555c0cb1f0ca95f21ce46082b8c778af57cf1dc6e7aad4
+EBUILD gvm-10.0.1.ebuild 1088 BLAKE2B 1c4bb9db1ac9572e2141cd3fb0bdfca7e4601c3c084d61a93d97ed3a2d5ea5f879a12c66f2cdbead74358b47e5ec35466bb8675910b0f304206a239f6f4fc3aa SHA512 055bdd4bf8184a602971b4600abf33736c6ac6edea840925ed544ff8f3afefd8f2477cac014cec42437bcf2d0e82a700a2601ce26eb4da21ec2d276dad753f4c
+EBUILD gvm-11.0.0.ebuild 1088 BLAKE2B dbba29d6420643d00abd9ac10722e043bbea554c8f8ae3e9a5a1bb47dc6c56b058ffaa864aa255b61faed75b6391794c587b87ec05e076c6b6ee3ac13482acbb SHA512 c8a020bf7a47cf08f39d097b0a6552092b025bb1eb3fe36e58a6953f567140867184b4c52812d48d6cffecb0e505b4546d523874c72986cd5e4ec0c11170512d
 EBUILD gvm-20.8.0.ebuild 1094 BLAKE2B 02d3d065343df60a838497de5bd68dc57a5a0e9c4e22ae189169e2eedc3f7e38f0122d30948619a34a2792f3431987ebc34fc7a249eac7532f7aeb42251ad463 SHA512 be8b7c12f3f29fabf98ea36fab3086111ebc7ff03e13d23c908c647a521a0fb6b8d71b42417cf501a75ad59c7d2c6a320c573c7cf1231a8f0e9f0926f54bd787
 MISC metadata.xml 1201 BLAKE2B 2e3ba8bec61dd3bd045e69e906a27cbe2cbfeaa4b8f6ae659c35925879b815bca887b59b9c7754b17814c0e3cb801d7a41518c98fdfbed57b02b8e21900d50db SHA512 b3a41b9f9c90d99784fbbc0d240b695a373b00994b250c608da0a96aef221c61479301433ecc4e484a2f8ab6dc0ca4eb6c73009e33d5b992e9669a0c60841ee8
diff --git a/net-analyzer/gvm/gvm-10.0.1.ebuild b/net-analyzer/gvm/gvm-10.0.1.ebuild
index 4587ac214cf7..25b7338d62e4 100644
--- a/net-analyzer/gvm/gvm-10.0.1.ebuild
+++ b/net-analyzer/gvm/gvm-10.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,6 @@ pkg_postinst() {
 	optfeature "web server scanning and testing tool" net-analyzer/nikto
 	optfeature "port scanner" net-analyzer/nmap
 	optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "application protocol detection tool" net-analyzer/amap
 	optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi
 	optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny
 	optfeature "web application attack and audit framework" net-analyzer/w3af
diff --git a/net-analyzer/gvm/gvm-11.0.0.ebuild b/net-analyzer/gvm/gvm-11.0.0.ebuild
index d8f63107e62a..7eefd05a5af8 100644
--- a/net-analyzer/gvm/gvm-11.0.0.ebuild
+++ b/net-analyzer/gvm/gvm-11.0.0.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
@@ -25,7 +25,6 @@ pkg_postinst() {
 	optfeature "web server scanning and testing tool" net-analyzer/nikto
 	optfeature "port scanner" net-analyzer/nmap
 	optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "application protocol detection tool" net-analyzer/amap
 	optfeature "OVALdi — an OVAL Interpreter" app-forensics/ovaldi
 	optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny
 	optfeature "web application attack and audit framework" net-analyzer/w3af
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index a3dd3cc2510e..2ba91d184c62 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -2,7 +2,7 @@ AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1
 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
-EBUILD hydra-9.1.ebuild 3565 BLAKE2B 0194fe7972904f7cb3941db204847863739c933ff6fe1340664e3d467b77ab47df699e3197856182792dc49b0ef888b4283486151395e83cb2490776da20047d SHA512 9415468c35018864d296d2ff73d74f682c22145cb6bc4862a4f75c5d53484361a9023e2d91e0ddc9a08a34e01bbb8bd5a4f0e6dea82d328ca760a37d0c3e18b2
-EBUILD hydra-9.2.ebuild 3600 BLAKE2B 5e330a0145a4896cac130e4aa18b442d06fdc431b910da5488253e633588b85c877b51b1138385118b1c1127cebb9d3a7ccda9d24c8774d3e24f4cfbd84431da SHA512 35dd11e14736c1e8d322196b095c7930e828243bcf2a207256b7df8fdc8b870178fa0e676971adbd1e5ad0ab847a727874e9791c9bc8bf7dfd31162b2e06b151
-EBUILD hydra-9999999.ebuild 3527 BLAKE2B 94d7b1ea6060c9fe2b365a96f75056a14036b3dd06edf5e5829c27efe83d27e5ce671a07793e144081fcf289f0131e88b46e5e155cec00c2a59e2e3b20fc983f SHA512 97d2ff803fae962de0efa28c94287973888cf64d729cd26ed2da38eff0a97bdf733789a27bbcdbe421fa82956263efa35083a8285c32b8e5d04ed576fe0e3132
+EBUILD hydra-9.1-r1.ebuild 3564 BLAKE2B 181579f91649555a378c6ada4f88ecb177378c2c77c9bcc7f59410b93c7113aa9b93f0e9d3204bad420db9cbffe144bb74b0d62664f9c9a7db2bd1e3b8abc1dd SHA512 e8b588bdb0e290a082eb26749239fefc988aa003151dd7d8cfde04b8d4952a6667e3d133fd23bd1cb6a1e6bc5575272078e35f553e4b482228d415c51f303379
+EBUILD hydra-9.2-r1.ebuild 3599 BLAKE2B 58ff03bfb0214373529ba1b6bbd9cc6b0f304f01b267d22e6d92a39a77553c49f8c6674528f0db6fc20fecbbcf32875154ec61bb164094568cf3f40dddd71460 SHA512 de54e80aad0c54891c0049503c2319ca9a6e81b35d8fdef6559e5eee14fa49bd28c538ff183a62fa275e4e50ac8247491ee6a77bfbcfb2f585ce23ec5c8005f9
+EBUILD hydra-9999999.ebuild 3526 BLAKE2B 4ffc7aae9d712ca4fb31332fca52734a932e4e14d8050b15374039801c410f2739fe1b8ddd406abc62548662b5c655822007b83bf25d7bfefd88e1e3cac589f0 SHA512 ef96a56c78a0941354c8aa2fa130c0041267f5bfb0b928a7624e3752535430a2a1116cc277ce35eb9a5633750d69298f9b9445390836001d501f9ac9f4addc16
 MISC metadata.xml 584 BLAKE2B c408a4a825d860594a10c6ba9a562a5fb96344f2a02a5d7ff12622c986ebb2ba05eeff5a7a3c79c09a437c14fc7024df33196ccd7f6566325f2f7920afe2d545 SHA512 e548b8600a0b3d9a548b963c1b3dc6c917606942f165f7c0859ad7e877c21dbe677c964d54f9548e38452170c4a3b4872ec81436100ec7b55123628bf4383da8
diff --git a/net-analyzer/hydra/hydra-9.1.ebuild b/net-analyzer/hydra/hydra-9.1-r1.ebuild
index 09104ab74d27..4998a4103fe1 100644
--- a/net-analyzer/hydra/hydra-9.1.ebuild
+++ b/net-analyzer/hydra/hydra-9.1-r1.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
@@ -31,7 +31,7 @@ RDEPEND="
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	ncurses? ( sys-libs/ncurses:= )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:* )
 	rdp? ( net-misc/freerdp )
diff --git a/net-analyzer/hydra/hydra-9.2.ebuild b/net-analyzer/hydra/hydra-9.2-r1.ebuild
index 04538cf60a2f..f5072411a36a 100644
--- a/net-analyzer/hydra/hydra-9.2.ebuild
+++ b/net-analyzer/hydra/hydra-9.2-r1.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
@@ -33,7 +33,7 @@ RDEPEND="
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	ncurses? ( sys-libs/ncurses:= )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:* )
 	rdp? ( net-misc/freerdp )
diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild
index 4597ee4cb589..1e7e5e715482 100644
--- a/net-analyzer/hydra/hydra-9999999.ebuild
+++ b/net-analyzer/hydra/hydra-9999999.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
@@ -31,7 +31,7 @@ RDEPEND="
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	ncurses? ( sys-libs/ncurses:= )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[sdk] )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:* )
 	rdp? ( net-misc/freerdp )
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index eddd8e56d382..27b040c1f5bb 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,9 +1,7 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
-DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003 SHA512 450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7
 DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d SHA512 1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
 DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e SHA512 39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906
-EBUILD icinga2-2.13.1.ebuild 3953 BLAKE2B 3c77b7daa7343916baeec5a8a7bd4562e4e6de07b3edbb457f04f8e5c414d7bbf0f422957a8c11b3363d90185d4eedb1245af05128e109294b3d16c1079ef0dc SHA512 216c9c67fddd1b81e22b87e98bb8ba1972f99d6b75a052669ad7e89d69e15db898405901b147be74a389f27c2b122f7cfe30a9c834594c4bd84afc23d2e76054
 EBUILD icinga2-2.13.2-r3.ebuild 4216 BLAKE2B ec5403e9a11550f681cb7009d83ef9d0e2b51ee05144b34b838f60961335d3cadef2ec4b007b8df640dba5ed5d7e843faae71d980d529539ee1d2d53a368c348 SHA512 ccf8629da48e4b499051206ba349a3d641dafc8c5d403f53349241a04db2d5621d65791362356f604790884303ab2eff884c554305a7db753944270c67bf2422
 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.1.ebuild b/net-analyzer/icinga2/icinga2-2.13.1.ebuild
deleted file mode 100644
index 3e79963a2e64..000000000000
--- a/net-analyzer/icinga2/icinga2-2.13.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 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 ) )"
-
-PATCHES=(
-	# https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-)
-
-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 root:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	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/jnettop/Manifest b/net-analyzer/jnettop/Manifest
index 777d3b52dc56..862c4d9dacba 100644
--- a/net-analyzer/jnettop/Manifest
+++ b/net-analyzer/jnettop/Manifest
@@ -1,5 +1,5 @@
 AUX jnettop-0.13.0-asneeded.patch 253 BLAKE2B 2d6275aaabcf5a305a4647025e462ca13d1ef022c826f450f0922c668b08dd278980ab5053b80c4ce12234e0f908c0381ebc497f33280168a41f23662bedc1de SHA512 68084c207c6154a86bb65913c523264ceb83e349d21de9ed7184aafaa21f63d9739154b69fd3f55023d89947ae70727dbdecd6dc8483854f1f2e5bc5565b52e7
 AUX jnettop-0.13.0-tinfo.patch 375 BLAKE2B 9145af5175ce963f7ecb9a95b70ad315d0694de99e15694f68b6a594540c8bfbdaa5c055c3b9a76e8942374ffa2b053cc972a3aba999075affeb331d15cda55c SHA512 07f6ad5cf44648925d64277f2e74d4a70c1770d192a7b6e6f39c1fc3e28748de1e959cb95d841a9a3b0afee337bb1a8a6c342a698115c44ad76969cf6c095189
 DIST jnettop-0.13.0.tar.gz 131009 BLAKE2B b787d6876199c56af5daeeda55cdd5145ed64268db9066dd2c64c96511ef7bd1c08eb826407d1e488cbd72172fdfc5a2aaaebf81203fb27d2b14c60c3cd3b2ca SHA512 304293cd011ce8556aabf69e91b2e831ac61aa43016bb5b616d24b45805315a815dfba37dfe9f7cd3c637931043d4123b2f46a7637ba1a0b9d30267fe6dcb051
-EBUILD jnettop-0.13.0-r1.ebuild 905 BLAKE2B 5b906f6d3a7a3acbb46635f25d4566d10f5af2893b58857d3df1ba069f15043b3d6a7697caf63fd1c43419a60c2b58b9274959f5f7edaf6db87246cb3508c58b SHA512 e79b29d96db89b40e5c8c6f9be7205c19cb19b0a75b4f99846e2e1dceb8ca3e63578afa472a691e5ef07d23f1ccc95f40c199f67602a507dbf36dcb352b9c9fa
+EBUILD jnettop-0.13.0-r2.ebuild 890 BLAKE2B cfd9f935100569f32404166e09769031619589fac18f075b00c0baa8d9af7ab056c258923107aab88c569c307008d5eecc96e5271f7f2d4e794bddeda539a4ff SHA512 56c7eda3526608aee9a68db04d68fd5d45d0c73080ffa804e407f95275e6025cbc5e0c1e411d9516077dea8278903b3e4e6774a565c8b4dbe4ff0ee5bf7fcd83
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild
index 546fa03600b3..f94cbf95ae1c 100644
--- a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild
+++ b/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools epatch
+inherit autotools
 
 DESCRIPTION="A top like console network traffic visualiser"
-HOMEPAGE="http://jnettop.kubs.info/"
+HOMEPAGE="https://sourceforge.net/projects/jnettop"
 SRC_URI="http://jnettop.kubs.info/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -21,15 +21,16 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses )
 	syslog? ( virtual/logger )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS ChangeLog NEWS README )
+PATCHES=(
+	"${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-tinfo.patch"
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-asneeded.patch" \
-		"${FILESDIR}/${P}-tinfo.patch"
+	default
 	eautoreconf
 }
 
diff --git a/net-analyzer/mrtg-ping-probe/Manifest b/net-analyzer/mrtg-ping-probe/Manifest
index e031dc01b89f..eebe1494db3f 100644
--- a/net-analyzer/mrtg-ping-probe/Manifest
+++ b/net-analyzer/mrtg-ping-probe/Manifest
@@ -1,4 +1,4 @@
 AUX mrtg-ping-cfg 2077 BLAKE2B 78f267bc07d301c0b8b37b5ea6398fc2390ed1f0103e0f05c58f483693676f907df0d47d3a41fd44363aad97ab1ffd04f6998372a645fc97e375f00c8132b416 SHA512 d4c9f651fff32b7bb417ae07700cc179c4db596270a9f2dba5ccef45992239b0f964ac7cf63478c3c12a02e02adf088b692a66740872ebc8da2edba376f7029c
 DIST mrtg-ping-probe-2.2.0.tar.gz 36923 BLAKE2B b4556a46d0d644dc5215b686767370542a0b382287aabe4a9c3c7ed8a165005b7602a83135166b9539f3ac479a397ac6e782ef51eda107140ddb426de0f1397c SHA512 efc86ed732547359d8b2d94da367946d8b573e2b4d1b3d240b8eb7c5bfff17971848ad62c1448cdc0305393193d969361328448d9c9b25ae54866f71614b7cea
-EBUILD mrtg-ping-probe-2.2.0.ebuild 722 BLAKE2B f3d6fd3c1d10b6f3a217dac686c9f2ce4205355e0d0b818277100bc7ed8d1f66413d964a7979459b224ed8635a5fc22a61537ed044688a328d6b90077bf7c011 SHA512 1270bf8ef7eb36d874fc808b0e6083de5ff61f7046da54d866e7336b65710d955fb8254e383963c32ed39b5cc46064e242bca34e16a3b5288b28c7da41d60033
+EBUILD mrtg-ping-probe-2.2.0-r1.ebuild 712 BLAKE2B 843ee40b38b032680da003cf6550d53ec48d3d243d3eb99b0ba38bdea3a4087e1ac9f5983bf5ca13adf9292deda23d25fc95c48979ab7fac996199c31f8d2950 SHA512 1c07cc1e96ae81c8cd37a191c2926d8b8c1b06ed48a07fa53edec6e2a3a14dade6bde0c29add17ce52754d45f7faa7f62a946073d644f23cad42a8c926cba8a2
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild
index 98d1db01c9ce..c435fe21a0b3 100644
--- a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild
+++ b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Addon mrtg contrib for stats ping/loss packets"
-SRC_URI="ftp://ftp.pwo.de/pub/pwo/mrtg/${PN}/${P}.tar.gz"
 HOMEPAGE="http://pwo.de/projects/mrtg/"
+SRC_URI="ftp://ftp.pwo.de/pub/pwo/mrtg/${PN}/${P}.tar.gz"
 
-KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~x86"
 
-DEPEND="dev-lang/perl"
+BDEPEND="dev-lang/perl"
 RDEPEND="
-	${DEPEND}
 	net-analyzer/mrtg
 "
 
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 6ea1504bebe4..10ccacde0bf5 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,5 +1,7 @@
-AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f384258339495abcd937271ad29b429bebe5922f5288113683e5910c5ea513d2a131aa50b230ab51bfaf332e31379 SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa
+AUX mtr-0.88-tinfo.patch 494 BLAKE2B 5eba829ab106aa74799780da890b39a37f69a0cb2cf644a739d1a4e6484507bc42427995069d03ddcad811a99baae9211db907b82a3efb328edec075eee92b57 SHA512 165bcdd1aa04e7786e2e8eeab4e85d5c592198b7b9a39f2c13a229870fba47d36fc92b136277d7d4e0a241ef96c714954a78f9e1091ab71255cd5b8d88bf2fd8
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
+DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690
 EBUILD mtr-0.94-r1.ebuild 1435 BLAKE2B 1d4a682c1a98d639deccbba5af331fa1a56894c46a701767bc63f19f54cb97dae0c1d42c5ef70719782ad5210be41fbc702e3ef55e1286b98d37cc322cf8d0db SHA512 bcdcfac855318bee2063247d1413f20306fe9b0687242820fab39bff1825aa3b5e3e4bc336745dc90e9920beaafeb3e87654b94401224244d82eb433bd1d9769
-EBUILD mtr-9999.ebuild 1284 BLAKE2B 08bdc5af886f337ac86070a00a804d22903090226bfd97ca233550404d05e5f933081fb66067fb828d9adca904c196badbc95c6a09af5af4f249dde145e8729f SHA512 88d134303408562729358a4022b4c77392e62d58a0f3e9dd54a1c0cc56a3ceba147763f4b1d53628cdb77ae0c65bee34991d463c62309fef2b8c278d70b8f5cf
+EBUILD mtr-0.95.ebuild 1559 BLAKE2B 17528e9063c3a7c0bc73520d4f6af606e516f471eebaa7a95bff27f9cc63db154e9b4d16e4270233b704273965e0b5f8a87182ac2e45c42f0de3f40f93685831 SHA512 db4d54dc01bfb2f9390303ee9bd2e1ba1b1db82c3e30f71749e0dfa59a4574178cda85a2248b905f1e1bb85b335d83da6f997bfccd3bfb848eb99046cd98b544
+EBUILD mtr-9999.ebuild 1559 BLAKE2B 17528e9063c3a7c0bc73520d4f6af606e516f471eebaa7a95bff27f9cc63db154e9b4d16e4270233b704273965e0b5f8a87182ac2e45c42f0de3f40f93685831 SHA512 db4d54dc01bfb2f9390303ee9bd2e1ba1b1db82c3e30f71749e0dfa59a4574178cda85a2248b905f1e1bb85b335d83da6f997bfccd3bfb848eb99046cd98b544
 MISC metadata.xml 637 BLAKE2B c3b654a66fc6d6c7cea1169d0432a7753e81de0071ae3e1515ed6e52055e578881cbc71f3e995dc364ce7ce983bf65d9d2d6784c18b93cf34743007f7cf94b3f SHA512 89e58ee410dc0e5aa7729c03f2fde6ad3ff4d34170a8fa0217757a7c834b5fee1f948a2042afc2e47043fcc198136e9353ef914c3924e5d3d4f0e2d52e4398e2
diff --git a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
index c7252b74435e..fb50c7e9a0b3 100644
--- a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
+++ b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch
@@ -1,3 +1,4 @@
+https://github.com/traviscross/mtr/pull/368
 --- a/configure.ac
 +++ b/configure.ac
 @@ -101,7 +101,10 @@
diff --git a/net-analyzer/mtr/mtr-0.95.ebuild b/net-analyzer/mtr/mtr-0.95.ebuild
new file mode 100644
index 000000000000..42b6aeb30b04
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.95.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 fcaps
+
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/traviscross/mtr"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gtk +ipinfo +ipv6 jansson ncurses"
+# TODO: This is an inherited RESTRICT - figure out why!
+RESTRICT="test"
+
+RDEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	jansson? ( dev-libs/jansson:= )
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_with gtk) \
+		$(use_with ipinfo) \
+		$(use_with jansson) \
+		$(use_with ncurses) \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "mtr needs root privileges to run.  To grant them:"
+		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
+		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
+	fi
+}
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index f6a3911e9d43..42b6aeb30b04 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -1,13 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools bash-completion-r1 fcaps git-r3
+inherit autotools bash-completion-r1 fcaps
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="https://www.bitwizard.nl/mtr/"
-EGIT_REPO_URI="https://github.com/traviscross/mtr"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/traviscross/mtr"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/sqlninja/Manifest b/net-analyzer/sqlninja/Manifest
index fcf7a889aecf..3050d6aa4b4e 100644
--- a/net-analyzer/sqlninja/Manifest
+++ b/net-analyzer/sqlninja/Manifest
@@ -1,4 +1,4 @@
 AUX sqlninja 47 BLAKE2B ea2fe2997cee59de681528f2a87e0b40c73061ee02893f1e46e4a21bd1f51c936473c9987735481ab6ff1ec7e665538f5af8afca3c72ba82441e25c975e69a24 SHA512 5ad7443ca0691e5e9a309d698d3503e683cf38d9ac980c7aaff562e008fc5120736a826ee87a44ea6c65da15fa868d9fcdf3291f97ad2f747ad3ceddb66065c4
 DIST sqlninja-0.2.6-r1.tgz 454841 BLAKE2B c8fc4932c4bffe03e873126801c75dbf9961b97979ff1fd1530aca5f0d132513f62de2516e1649f57955c0ef5ca723b52cd4f9c6e89b27df63b978b0aaf42745 SHA512 18f6c8f0f1eca59d9ce6df80267f1f6bf45d151dfcd395b32d349119e1480389ba28f057778349b4276d480f60c41ca03578a1ca9c4e246f3fcb63653bc6ccf9
-EBUILD sqlninja-0.2.6_p1-r1.ebuild 1081 BLAKE2B 1d9b6aad062c4820c3c78d07cc402918ca681a6c91d7d2837f308a8a4ae12a974d64f37ff3060e865fe2979fc87aba3581680e870581d81ec8ddcf50e4feed9f SHA512 65a03bb791872072133a9431baa07fc796817863c44e9b27432e4aa76dd1a1405044692d3ab40f7b8451bfe61ae1eb4c642d7e80c2395538b68648a763a60ee0
+EBUILD sqlninja-0.2.6_p1-r1.ebuild 1002 BLAKE2B cb81b7ae5bcf07817e24161a369ec218d84df08d898175e4436bcc1e47f903f44467fff1947bcef29ca9e3a156f776f9afbd5636b6e6e09a81ee48c88fdf05b1 SHA512 ec2a1c283a1d9c8d8b2243b66b2fbc6b2fa127c58ceb11ef344a009e7d58f58e4907a355dcbc76746e958ef6b84914e86fa84d7de03f4ef6a0143b061665be42
 MISC metadata.xml 359 BLAKE2B 3d9555d0d7fc21bd462936e45b1442ef0543617f84d4d17f6b88646d2b62860138cdf6e8aba864865d2d3dc785f406ee39c06448b9d4f8b48d40c5b147ed64f6 SHA512 c6cc2dac7bcc75b289bd38439373b63d960cf1b30a9c4fc056fa99ad785cc24bb86384532cc68680caef8ed9e8df9e84cf908e760b70e0f84079370c9ff80447
diff --git a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
index a4283bd9f1ac..c6a7a32beb57 100644
--- a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
+++ b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit versionator
+EAPI=8
 
-MY_PV="$(replace_version_separator 3 '-')"
+MY_PV="${PV//_/-}"
 MY_PV="${MY_PV/p/r}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="A SQL Server injection & takeover tool"
 HOMEPAGE="http://sqlninja.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
-
 RESTRICT="mirror"
 
 RDEPEND="
@@ -28,28 +28,25 @@ RDEPEND="
 	dev-perl/NetPacket
 "
 
-S="${WORKDIR}/${MY_P}"
-
 src_install() {
 	dodoc sqlninja-howto.html ChangeLog README
 
 	if use doc; then
 		dodoc -r sources
-		docompress -x /usr/share/doc/"${P}"/sources
+		docompress -x /usr/share/doc/${P}/sources
 	fi
 
-	insinto /etc/"${PN}"
+	insinto /etc/${PN}
 	doins sqlninja.conf.example
 
 	rm -r sources sqlninja-howto.html ChangeLog README LICENSE || die
 	rm -r apps || die
 	rm sqlninja.conf.example || die
 
-	dodir /usr/lib/"${PN}"
-	insinto /usr/lib/"${PN}"
-	exeinto /usr/lib/"${PN}"
+	insinto /usr/lib/${PN}
+	exeinto /usr/lib/${PN}
 	doins -r *
 
 	doexe sqlninja
-	dosbin "${FILESDIR}"/"${PN}"
+	dosbin "${FILESDIR}"/${PN}
 }
diff --git a/net-analyzer/syweb/Manifest b/net-analyzer/syweb/Manifest
index 04068c026384..9e73cf08c3ec 100644
--- a/net-analyzer/syweb/Manifest
+++ b/net-analyzer/syweb/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 353 BLAKE2B 1f5210b60821297b376c0c0872fecb5c200d0922586f9a2040b8ed3448d61b66e787c39959c8eeb588890cb3a17c260c63e119b6bfe5c6a5da676911fa3c88c0 SHA512 fb14e7b4acb86a0acc261e1690a03fc963be1e20df808c5a1f324692b0a2b0494fe79fe2e9b97d0be088cccd7c4c03ad3a4feafb126d17d0896e5c931670b0a1
 AUX reconfig 374 BLAKE2B 908c8cc6be06e1a9d548088dfdce76ffc6aa053eb9259e10ecf5aeeb2cca1a7e1a014123a99d0ab3eb66a7394e1450291116e6e34630a330a172b0a7d0f5a915 SHA512 4305a6931b07c8e06a4841a3b5094419f8201407a060c8a766424b31049d30e432921d53d6204cbc7a2c0d52f03119932ec99df915985050b7798f3f2653aaf6
 DIST syweb-0.65.tar.gz 37052 BLAKE2B 502bee5e78bdfd309780dd7414616eec99982b3c203039aff645842fc6538396180dabcc9953a70f4bc7c7326fb28c11dc5bd4fd17b8e5c409a8424203b61a88 SHA512 ca4a4ad6f48dc4ff32c11979d6f34ae6f87462fd295780cdef6609ca425d21698ff43e2c5ffbf43a1f1ecccef4718891992160d1fbc1325726c474d113f824b2
-EBUILD syweb-0.65.ebuild 921 BLAKE2B ab019a058124f436876d858f504d5b041cf27dfc4d9a4e981557e0ed34946798fd3bc1f064d0d7568b4859bff0dbb99a0fc17ccfab5b5df91dd343e32fadfe13 SHA512 86d24e2d6350c99c909e61c51d27f976afd8de1e65c12e6208618cb7fab449c90ef8ae32557cb9c0ab2ed6f22df797c3d1893a9cede812683347f72f98e249fb
+EBUILD syweb-0.65-r1.ebuild 922 BLAKE2B 0d0b60f6f39f9e44b7f76275cd380ccf2a978eb75c867960ec08978d1297a9469cdae1c1f4ff1a21e6c5a5529f823dfea238088f43b2f7217c8eff208fc84ce4 SHA512 47fa8815d65d2b767cfcd93c4329873a8dcfacc1a9ac5b73ccc38717df06f0512402ddca522c7d0e41322359f22e51ddb68cbe4421f9cbad5c36eef99e9adbe8
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/syweb/syweb-0.65.ebuild b/net-analyzer/syweb/syweb-0.65-r1.ebuild
index da3bdcae2f6d..1f6494bd2c77 100644
--- a/net-analyzer/syweb/syweb-0.65.ebuild
+++ b/net-analyzer/syweb/syweb-0.65-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 WEBAPP_MANUAL_SLOT="yes"
 inherit webapp
@@ -9,18 +9,19 @@ inherit webapp
 DESCRIPTION="Web frontend to symon"
 HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
 SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 
-RDEPEND="virtual/httpd-php
-	net-analyzer/rrdtool"
+RDEPEND="
+	net-analyzer/rrdtool
+	virtual/httpd-php
+"
 
 need_httpd_cgi
 
-S=${WORKDIR}/${PN}
-
 src_install() {
 	webapp_src_preinst
 
diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest
index 6fe3d19c2daa..156bc74d431c 100644
--- a/net-analyzer/tcpslice/Manifest
+++ b/net-analyzer/tcpslice/Manifest
@@ -1,5 +1,8 @@
 AUX tcpslice-1.2a_p3-exit.patch 148 BLAKE2B 630ab0a2f57eda36d148c9338bc1a6b95feb4867f27bef5bc0ba4144a7778ab3a080bc13dce964c56fed8fd723f6ba3247aafd1d878cbb276f3d17ed58ba724f SHA512 7506ce229cc1e0d44570c62a77e0e96adc3936d8464af6c79abbd9b1fd09559b627fa4f27f905cc5e7fd39f246e818a445406ac9439b6792223671f0f1f77864
+DIST tcpslice-1.5.tar.gz 136597 BLAKE2B 04512feb49d905458b06150846ea1ae5439db42567e652afb49ddfca179f60fef425db71c0a1ea0aa8c4863e170385bb0f57599ae50cc2417b2fd16e57bd02da SHA512 b9d8192c6aea60661898633a47679c8890813530c7ef7a331c1e3b711127028ccc90e6748cbf23666d74f1639ce8f71d4d7703aac707821d8abf9b9c73f2402e
+DIST tcpslice-1.5.tar.gz.sig 442 BLAKE2B c7fb1b09c9fe2c0dbfd9728ff95d2414a583ed95a21c1e0476e0ed2a7b32eff2c8cf848fdb52414162e7c7df480e722f28063905e9e03093814590a474da86bc SHA512 4b948ac72672066ba679aa58b6e7fdb672d5be36ae24a503fe4093b67185d0f9466c7fe820199fb1043e6c21e015be07cf9ed020414ebf0c801aac30e3b84afe
 DIST tcpslice_1.2a3-4.debian.tar.gz 5784 BLAKE2B c85beab03b494984d721ca64fb75ccb29746dee4184e4daecf2703e80f3b3d3e4330b911831960caa17d631a4760a21d17368cd7017e61c05766fd1f50c66e0e SHA512 43a0ad5811c84639be0c6d162ea92101e73240e9689e4b647ee060697382062ec0e22dcb951ca000e05bac829455b7aa37f8dd73c5b1dd87f55e6d61a8a9b59b
 DIST tcpslice_1.2a3.orig.tar.gz 76879 BLAKE2B 38b20ef09c2c0fc2c956c421d131ce27748bea684bb459da13f0d29b008a4561b7f61381cfbdb9c1dbdf53478c55b412efa9af689d5425f7fbfc9f0ee32016d5 SHA512 04e12d592807022c78eb4941580ed103995680c69af885bb8f13828a12ec570f7fe93c34c1b20a01d3d99f445d5da17a1fcfbe25b2e3b41abe28304c034654c5
 EBUILD tcpslice-1.2a_p3_p4.ebuild 882 BLAKE2B 6c4cb82b914f111c4fdeb5c28a33d40e52427817cdec12cab8c60a28b90d3ecebdef276db8f3af2203fd20a48a9cf7160898d6c7cc9a796c2663aacffa1f51bc SHA512 724644057f7c5e9f7970b5c8dbd4958182c9b9cf2e51cd1b7926f6483b95959f33b2c8b3cda16ae870ab3783c6bd1364d6e7a12c69e3d43568abb08e6cf23212
+EBUILD tcpslice-1.5.ebuild 625 BLAKE2B 0f5c8cb441f1931f401d1b2e086f286245586c13128d0e73ca5e1e353a2fb41eb61704e5ef29d7ccb147235ec983d2a1c35cd2275184eb4f88b5b676599bf9c1 SHA512 ebe38063bfea7b7391898c819a209b9811c1213797bb2d60645933abc22b71b36c26f129f938e3139c87f074501807a9370600272e850749b1a9d2181d51ec48
 MISC metadata.xml 372 BLAKE2B c2e297cfa3dfa8458ff52fee54990962c94e9a06e8e180302f735e84b49a68d1b252bd1bbd3ed8f7882d4dbc70706dcd55d50f7fa87a32ebc44fa1ae952a54fe SHA512 aeba6817feb7095adca5beb16df6d14aea57d773b6a82a6d99dda19b28de89fa8e64d75b018e7d346b59c7014df34c0a45c3725361227ff709617da733be76bc
diff --git a/net-analyzer/tcpslice/tcpslice-1.5.ebuild b/net-analyzer/tcpslice/tcpslice-1.5.ebuild
new file mode 100644
index 000000000000..3a527c4395da
--- /dev/null
+++ b/net-analyzer/tcpslice/tcpslice-1.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit verify-sig
+
+DESCRIPTION="Extract and concatenate portions of pcap files"
+HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice"
+SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz
+	verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tcpdump.asc"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index df78b60c2290..ab77410c26b7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,7 +7,7 @@ DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 3e08d01f2d89f5ddd74c4e2215e6852f30
 DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7 SHA512 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
 DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B 49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0 SHA512 8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
 EBUILD wireshark-3.4.10.ebuild 7361 BLAKE2B 65370daecce9dffe999ef0099dea5aedd5e7b4a28689c0cfb76847be380ac1d7b0ff09433bc446c3ea0a545bedce0d8ddb259d7d55c2f4492ed4e8dd4f48aa9f SHA512 03549a3ae6ec4e00c16c4d48f016801a848aa8d7d7913c0800c8376d74b31117deeacf442cc901f5c938b82673eec887b00ff695414d9d2873388b79d0995c12
-EBUILD wireshark-3.4.11.ebuild 7462 BLAKE2B 2a0243e7ad78fbdb2e218e9f380f38e9e9d36c59cf558ee5d9729f571df38d78488950457712f8f81aa867ff8ab70519be0f100d4dcdb6fbef091c51bd159e8d SHA512 aa782138e51359afbd2a694e26478895e671289f616481f4242a06e699edb11f7750a26cebb089d2ff5559d3a066968ec0a6f60b3e638d0e6df5daaefe584b05
+EBUILD wireshark-3.4.11.ebuild 7458 BLAKE2B 363ae8e38119cc1fab1da1e3d6048648d3d2292ac884872b83c9cce88394b4060abb3f2014799975c4b58ec8e8556c49ee97fb034c6757ccd76c7525c04d85cc SHA512 d434cf292543408131b06c360718efeeee4062eded238708561d613cc7f5043b863c6bf7d02b8db458f9cf21147d699b5d86870117aaeec51097b603bb784e61
 EBUILD wireshark-3.6.0-r1.ebuild 7239 BLAKE2B 71572576c94fdd09acd7eef362b055e3379544533d153a2076e05cec90dbaec98cd152969507723c49ea7fcd5bdc4f46743ef6d334d2393aa46d4a55ec4962ab SHA512 498b426faf4c297950e8aecf71b1409dfb0de1ed2a8f345d386d6c7b91860ea11107637ec55a54a76a8872eb7cc4dcb8c54c69f420078252953fffcc9f085830
 EBUILD wireshark-3.6.1.ebuild 7263 BLAKE2B 7a54fbd432604ec99bfafc9b5d55b471f1fd79b6747d220c2da5756b0757deb2b99916afed180b84eb74212c9d7e67d4cb03f6b8fd270101bfd20840fb9f6f28 SHA512 5765ffe3414b42e2ae3a55246d0d1e98aed8d6bf97de8e6c868e93f2bfd9c498a85f346a58739a4e2c5d0716f466b804f13bc8267f1b3dd99e5bd59e87464686
 EBUILD wireshark-9999.ebuild 7263 BLAKE2B 7a54fbd432604ec99bfafc9b5d55b471f1fd79b6747d220c2da5756b0757deb2b99916afed180b84eb74212c9d7e67d4cb03f6b8fd270101bfd20840fb9f6f28 SHA512 5765ffe3414b42e2ae3a55246d0d1e98aed8d6bf97de8e6c868e93f2bfd9c498a85f346a58739a4e2c5d0716f466b804f13bc8267f1b3dd99e5bd59e87464686
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
index 6ea541c8b477..509b6ba57993 100644
--- a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.11.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
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index fd3efdf50725..6af445720ce2 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -12,7 +12,6 @@ AUX zabbix-proxy.init 487 BLAKE2B b094521d1ec12ea27f1dec78a858ff3b78acde6a0473a2
 AUX zabbix-proxy.service 275 BLAKE2B 19b594aa010bea3320de1d90277881b0c42ae1ea7f787bd4a456d8960401b0dd0ea4bde21b683e27c84123fefd681fe4f64b81dd9771273b4b6199f4af17d045 SHA512 2522b68c725e80b98655b9ff8cfc97b51add9f095e77422a275b3a30cb34d58e107ee03fdcc293b4ef37c60bd5d9ca2271aef48b727c91da44d507a888578c18
 AUX zabbix-proxy.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 AUX zabbix-server-r1.init 598 BLAKE2B 53026be133378595e83de14f939eda655d871f8caa524bf3c6496da77dcf4582a287e4365737317d710e8488ad93164eaffc5e5eca4d78f05cde820cc519d8c7 SHA512 c18e454b8944572af737052156c5985ebfa35504be43aad0465b4fa48108e9e60cf3a1326480762b89263df0d495fc793a45faea24de62f337ad2bcf57eb75a4
-AUX zabbix-server.init 494 BLAKE2B e58063bfdb0bcb6ea70325d31bff4ffebab2686b7063916619aaabc5b39b1ff5d960b968e382615f84b18531465cf0ad0eab5ffa171c0b4b1797e70d58ed3450 SHA512 7dd55ffe8062bee9104218bf673aeeeea56a4a332ef6a5676b83e7f026a2b6ebc70446c63d6116b684ad16abd95de355cdbdf07c81a51daf1424b3fd8d627c74
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST github.com%2F!burnt!sushi%2Flocker%2F@v%2Fv0.0.0-20171006230638-a6e239ea1c69.mod 36 BLAKE2B c4bd514ce347b1cef3c84d6a9b0c50c30f627ec96a01b083c240770618fc6ec4a66d73aef4dd3f40426fcce60be02a6fb620c023c56f88930925e71a4b842a83 SHA512 1d855074be6ecc48804f3d70d54a92617864fbcdade80deee03fe29f046d05901628bfe11c37a30838177801aa2bdb8247b7a8ad18bdd4d1d3a2d85d3342b304
@@ -259,10 +258,10 @@ DIST zabbix-5.0.18.tar.gz 21377940 BLAKE2B 4143dd2b5c4b04795e2f1b43637e541e3108a
 DIST zabbix-5.0.19.tar.gz 21367685 BLAKE2B 4e6b52d4ace766f700894d1eb6c7adf8e13ac72fe2534a48625302ffa6aea02734f8e81ee781a1d1aa0e6e375428919609edfca6094f17912123a7ed96e22af0 SHA512 b7223c656f8830e302ccc6321ff19e580eed199355ca9070ac2b59375e0794d17de1dfa4e1600ef6ac5a72e8abd2b80191b2f58fa77f25096dee52e6e40940b9
 DIST zabbix-5.4.8.tar.gz 24431613 BLAKE2B 82279ba2a4515603d50083a391ea2c9d230dcc7459d62841cf003eaa092012cb2e5b5ba7c3a5eeabd4df27a8d5b6e97a90824fb119ee078864c6bf06cfec5cad SHA512 1812142cc949a2886cd1edd4d369934022aa5e89ae31b67641b7263dfbc5d3ee6f99a20a51e5b44e4af5719160f728766c5546e74c8bf9b0cf303867d20fba11
 DIST zabbix-5.4.9.tar.gz 24382685 BLAKE2B 3ec6fac5a7dbdf6b0527e7686a57d3d107be5ec4fb9f5a36254199f9e1ac656459b6582b2b8968e9d8c00a9d1167d03df9b5854584070b74ff5ef8518798a21e SHA512 e2e0dd01b4c2a571f554a60d2b88023ff209111a6e71f2f6dd04173ee2a1c4f31a2a0f19f10f73a43e40634351eeaab0c0e98b0b6a020f39af6cabe7f764409b
-EBUILD zabbix-4.0.36.ebuild 9584 BLAKE2B 22d81700eb7101bb8e069fb541b177dbb13d64786767c03c0d3ff06f07bddff49454f75cb33e0b6d93e85379676619a26116cae8ad9a10654baac893d4213c87 SHA512 3c7a383a1ee0ffd9de2730472b6f21a2a306cd91e1c0bcb29eb8a8642d816af941b10146d6db36f36f4098b64c5402e54fd2bb0684d3ff0e56ee213675cd4703
-EBUILD zabbix-4.0.37.ebuild 9586 BLAKE2B 5a436b25169837c1547831092d5cf507a9cd0d8a8d8a8ce0cefae2b7350ced40dd010bc65c1b2e0d5740558d9e97fa5cfa0c53d67c9437603b1a0d744928250b SHA512 c697696b251fe48d06ea0ef57f0297eb3c0567ae352544a701bfe4c26aa1e872188a4eef6d124cc9e58a24d305bd17684513de288b66cdecf0235b64bf0ef978
-EBUILD zabbix-5.0.18-r1.ebuild 31494 BLAKE2B 02b4265a37ef72a27cf3f45df5596d5c08b56dd2da4f3ae83c260c2c9879473474491129c075805a85463360c1f1b7896308bd94c10cda233f511e40cd46190f SHA512 8f6e72d750e00ee162e2c6079158464e6944234f002a0e1966b9d845d21c19ad6793b884df211cdccb59e6a4241138cd22da8bb52c8f109eaf4f4c2fc5057914
-EBUILD zabbix-5.0.19.ebuild 31496 BLAKE2B 982f5a6c2a7aa2a9b637d6b5acdf5bdfeb0cd57f27cdf1f13e8006ebcaf2f7a1ff934ce5768e9f5de32cfa0c989953792e213ae5f7e2f1f607a7094bb58117a1 SHA512 5c20fb89246596fcbc47165c09662673d266681554523832d563e552c7265939fed1466a8ebe0edc3249a4e1c0667842973ee0dde913f60a12709f86f564be7c
-EBUILD zabbix-5.4.8-r1.ebuild 33884 BLAKE2B 590c6b882dc1d80bfe6773f8f72ea05d3e50e1d52b4e72f44f88b75696e8401581cd9876e420f52144076c86d5a52c2d86fe1e1f6c38f6a0f89042d755309a6d SHA512 ab28518a6409688b39fa945b72dc6c9990e0c72b3a52afcaebe9d82314f98ca25a6b111468320539a78092e9ccd01a77b29facd95d6a73a85365445edbaea592
-EBUILD zabbix-5.4.9.ebuild 33886 BLAKE2B 12c76fe2e627d21c96b4a24532645e9e97b5c42ca2471b6c10aef6fbd5e605ee9077863319c3c74692b1be63adc77bd89ed14b7a5d152e2feb21c9ce81a2b6df SHA512 11dd76eefc71d47760a9e5dc03f76d3837bbc421e803aeff524401fa28ac2caa5d05d837f88783864c0cb066a67cd04740bdd0d97051bc30f3f565622988e2f7
+EBUILD zabbix-4.0.36-r1.ebuild 9376 BLAKE2B 89acf1beb09c5bc021ab3a52def9f57428f9eecfe01627f0833c8b5d63a6f89dd9a4753077e2d1515dcccde6b920344fb55f0dbad443647938458b8d250f7ca9 SHA512 08d7f16b29cc76a472d8629a1cc3cff34b310615c33f18ab95ee69065ac4fb1f004cd2be2135234010d9f76f33f38595eab78c7562aff85054843bcfa7f7fa8f
+EBUILD zabbix-4.0.37-r1.ebuild 9377 BLAKE2B ba9b49e4c921ea8b412ad4fe914c5487def605efd517b3a7fecf921c22e44fb4e84efea8aa397b0b56b793faf8dc48b028f14a999ee32fbd30766e7b74482593 SHA512 70d25ca38acbe96cbf7421a58ee3c2b66ef1c712335ff413a492818248c6a7c49897476d519f8ebbb7435d453d0ad0c3bb333f3af0594f7662b6de3ce02d34d3
+EBUILD zabbix-5.0.18-r2.ebuild 31286 BLAKE2B dd9e08873d39b8af81de65535d1109baae7b7bd5aea7252c84aa8cdae50bbb7950957faee21fd66ba93ef9bbcec0b31904509a3a405974f91a984f9c0bb65c48 SHA512 441ff45fe00f177aee0b07b758ecb4b0a4af698a404e8abc7741f124d6f269028c64c728c05e462f99815fb86516b1940008aaa235d6b0d62248b2cba2867765
+EBUILD zabbix-5.0.19-r1.ebuild 31287 BLAKE2B 4b7533425a47a46c878c05f0e001a32d624f519bdc2993f84ecdcf120bf7ebfea821c9108d319b84cf612452ec540e77b9db1522c4c31c6b57265fa4518a4b8e SHA512 e64c2bed1f3e7f8264b2d6a0eb984fe3cc6323efe98a31c93484bcbd7b3d39d52a3abb33a66212de52c1a59ce806377863e77e3801b738aef3b11deb90ca77f6
+EBUILD zabbix-5.4.8-r2.ebuild 33676 BLAKE2B 960c6110ee104fc86b18025286741731c5e8c09f35f92edfb863b7064ec6b490421d52984d4943b4082a46811f976cfec9d0b7c387d0489583dcc7479be71340 SHA512 6835393b32bc6d3b2d6ce6d3bac10cf0d33aac03d281d4297653d91b08dadef3dd0cc7d1de9ff1f2a41cf8955c137f8638023a0911de19744c880364cffdcb05
+EBUILD zabbix-5.4.9-r1.ebuild 33677 BLAKE2B 2bcc7017b2bc2fba99ba7b0f72273562821027f5ba5e8d12ab26893c988dd7535c8844cfdf83c3ade88b5dd079c360797200848407b20ef829519c9b25f73df3 SHA512 516a71a06c9c5a2ba140639623832912700e5b886dda05bd6e5a0a1bbd16663db890da0de32b82ef08e8814df888e2b5da8e263afbe411da969b77885f870c8d
 MISC metadata.xml 1633 BLAKE2B 04e5d43c20e34d9a85139d7ff31e446a4a12cd40730b364ac2cf9cf5d7f913d2bf13711782769670e94e8ac184943a3e58d6392565e2ea9726b0bc0dd179e356 SHA512 2524cf9b092f29e457b39b12a13ce21c9c2e1de912deb147563e5e936991940f26ed93cf0de7213c784196a71b3ea281d7b76e16983fe27c55862fd1d77bbb7d
diff --git a/net-analyzer/zabbix/files/zabbix-server.init b/net-analyzer/zabbix/files/zabbix-server.init
deleted file mode 100644
index b0bf752abaf7..000000000000
--- a/net-analyzer/zabbix/files/zabbix-server.init
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/zabbix_server"
-command_args="--foreground --config /etc/zabbix/zabbix_server.conf"
-command_background="true"
-command_user="zabbix:zabbix"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-depend() {
-    need net
-    use mysql postgresql
-}
-
-start_pre() {
-	checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix
-	checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf
-}
diff --git a/net-analyzer/zabbix/zabbix-4.0.36.ebuild b/net-analyzer/zabbix/zabbix-4.0.36-r1.ebuild
index ea768e73c470..2e40b615546d 100644
--- a/net-analyzer/zabbix/zabbix-4.0.36.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.36-r1.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -116,12 +116,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
diff --git a/net-analyzer/zabbix/zabbix-4.0.37.ebuild b/net-analyzer/zabbix/zabbix-4.0.37-r1.ebuild
index 8680114a3627..81ee2d775f2b 100644
--- a/net-analyzer/zabbix/zabbix-4.0.37.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.37-r1.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
@@ -15,7 +15,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
 REQUIRED_USE="|| ( agent frontend proxy server )
 	ssl? ( ^^ ( gnutls mbedtls openssl ) )
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -116,12 +116,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
diff --git a/net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.18-r2.ebuild
index 2f8473c0658e..4342e5657f57 100644
--- a/net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.18-r2.ebuild
@@ -255,7 +255,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -341,12 +341,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
diff --git a/net-analyzer/zabbix/zabbix-5.0.19.ebuild b/net-analyzer/zabbix/zabbix-5.0.19-r1.ebuild
index 91372fc22301..c943193d86ca 100644
--- a/net-analyzer/zabbix/zabbix-5.0.19.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.19-r1.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
@@ -235,7 +235,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
@@ -255,7 +255,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -341,12 +341,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
diff --git a/net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.8-r2.ebuild
index 4ce856f85891..d9e19c691037 100644
--- a/net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.8-r2.ebuild
@@ -280,7 +280,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -366,12 +366,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
diff --git a/net-analyzer/zabbix/zabbix-5.4.9.ebuild b/net-analyzer/zabbix/zabbix-5.4.9-r1.ebuild
index b6a5f0089663..b39cdf2cd65c 100644
--- a/net-analyzer/zabbix/zabbix-5.4.9.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.9-r1.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
@@ -260,7 +260,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
@@ -280,7 +280,7 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? ( dev-db/unixODBC )
 	openipmi? ( sys-libs/openipmi )
-	oracle? ( dev-db/oracle-instantclient-basic )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
 	postgres? ( dev-db/postgresql:* )
 	proxy?  ( sys-libs/zlib )
 	server? (
@@ -366,12 +366,6 @@ pkg_setup() {
 			eerror
 			die "Environment variable ORACLE_HOME is not set"
 		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
 	fi
 
 	if use frontend; then
author	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
commit	2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree	4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /net-analyzer
parent	c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)