gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /net-analyzer
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
135 files changed, 745 insertions, 1121 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6bd0c2aa0b51..a2dd736272cd 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 479671899ff6..1bc805f57c4b 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,5 +1,5 @@
 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 1640 BLAKE2B dcc409946b45589039d5ec7c9fb730d1e516f58334e200229056ed9c42e9cbe52a1566a1731ecb15c9983773bb6f6772f488bd850afe90d7b085922b6b6e069c SHA512 4b231ecac2b0e06d9bab6fc0786e48f516a7a0fc5489b199fe1c1978731c3d8dadaee9b66bab580ead7a221066a658976b41713b2269232c4177cacfdeb9d455
-EBUILD amap-5.4.ebuild 1578 BLAKE2B 78a7022cd11c3f80a8c963eab4be8de04422bdb67274c23b7dfc146aef65b84b65b8f8bffb4af6c8e472d46fdee6b025b0fafb1537ec4e57c2bcebf40b445a4f SHA512 fa9614124ba7947ecdc46b3e31950e32dd40e2b699d6bd6f03d940a149f17468c92a5571be13061ac602a25192bda1d4da5bae14f408c35dc3fa50647902514c
+EBUILD amap-5.4-r1.ebuild 1630 BLAKE2B 5449df4394abc60542a06ad5d7b010befb0599eeba37565f9886c50111cb3b66e58c1412423e7984310c04acb2cf6bf6f011d98aef18665cebf8202f79185dab SHA512 e60ffc4d76af9219c5efd2b1da76d0487b48c45a0504d13be3a5fbf543325b0e1be9f92025fe5f3ead83f4d02f81c1ee21971a9508ff7c25a8b0f986bef46dff
+EBUILD amap-5.4.ebuild 1568 BLAKE2B 8f2e5d3fbc3dd8cf87539984198212a56ff8a68549bee6ce9f659b85b026f9d4c8803dd026d001d46513c07e239c68313cec366b17606051cb5fa7c1314d8ebf SHA512 d4a516be2e3826a6b8aba3ee0a13cd5ee3ae61b16fb4b33c1d2457fb1c5b4417802b24fd26463c9ee6020b3a8681145bdb6aa1c45cad021bbdb3af185ab1d54d
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index e29b58609849..9848a4c18f2d 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="libressl ssl"
 
 DEPEND="
diff --git a/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild
index 2181149109b0..ef97cd2aec15 100644
--- a/net-analyzer/amap/amap-5.4.ebuild
+++ b/net-analyzer/amap/amap-5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="ssl"
 
 DEPEND="
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
index c021832180fa..93901e44b00e 100644
--- a/net-analyzer/arp-scan/Manifest
+++ b/net-analyzer/arp-scan/Manifest
@@ -2,4 +2,5 @@ DIST arp-scan-1.9.5.tar.gz 414114 BLAKE2B 8a38f74bc2660a43905a6db1411dbea4a29b03
 DIST arp-scan-1.9.tar.gz 488442 BLAKE2B f4170736c07ff69e044ca0c17150fafb5aee9de67463ce828a856d21e264c43e9354ba1663f630fa6c40628b97e97884588ca6c4b0f372263af087a78c45730b SHA512 5061ac82d1acad3dd5dab998e4e2d2d9d2dbf436a2839ee1f68dd2997278df7e77f5dda7e54bdb13c9200d7a714b8d82737c041cec8438571d1d14c9d7f936ac
 EBUILD arp-scan-1.9.5.ebuild 441 BLAKE2B fd6f503bdb34b089583091cfb5d98542a453a2f8fa0c99fea08323b1563c8dfa1ede37e4d336be0241c1b0f601c2f4a11eadb493e5141df332a305f6508ee67f SHA512 ee28aeb1ed841f9bdab894759ae5b8eab86ef992f5e515fe7d9cc4be27e1ec89d8f602e0171d96b2878410e2242a87a5ae118ba52d8edda0f00dcd2c2a99a216
 EBUILD arp-scan-1.9.ebuild 459 BLAKE2B fbdf821002462a8c4c2f9d1fc34429b57947a40353d071401d5b04347e30c0702b531f8083e5d1b942b940f64d50f40f3de05b6b82965a470f1b338b5b15cc3b SHA512 942f0976f6516572819ae3676e6cd0bebed767b991c577652c805b6f472a49a93da206f69955d83d354639deff18188c65c8a5f51d92029a22a20fc97930abe2
+EBUILD arp-scan-99999.ebuild 412 BLAKE2B 7f4bb83706ee8ea67722e2aa5a37e481ed738d96b84038dcc2a34f221aa6249c72c8fb8e961336496f7cc13224ec01c7ee74528dee23916eb491ccabd610ef40 SHA512 495867de23e70d5491d07c63afc4c7804df7ac1a61bb93a16fce80e2b048e7be4c25e79bc6f2c647a60c58134454ae51bacabaadf401187c842b85d55373002f
 MISC metadata.xml 362 BLAKE2B 2f3d110218aa8df05bd9e10d31a23b40ad51f5ee3134133baf9dea867989b8c2f4c1a6424ffb97829f69b2309bc4262d4821844c7a699c2245629dbc31d29a71 SHA512 513df53208e314f55d1f2a2b14fbbfe7f28ab654f4b38be1adeb24490279a8f6cf276cd29941d4453702d208425380f926c43d9aac1e045b52bf67d118438ea8
diff --git a/net-analyzer/arp-scan/arp-scan-99999.ebuild b/net-analyzer/arp-scan/arp-scan-99999.ebuild
new file mode 100644
index 000000000000..3b3dd50a2be4
--- /dev/null
+++ b/net-analyzer/arp-scan/arp-scan-99999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3
+
+DESCRIPTION="ARP scanning and fingerprinting tool"
+HOMEPAGE="https://github.com/royhills/arp-scan"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index b72eb72431f8..86eed3a396ec 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -1,8 +1,8 @@
 DIST arping-2.17.tar.gz 174346 BLAKE2B b0a095ff4e39e8f08b25a10db828e4ab9f60299043fbefc353b9df14e5bae839a93be20724ab9758b5bfc830c211e5f9bdfd606e321db508dbce9886b5903b09 SHA512 062026f522ab3d3b96c05c97aa3133995bce808a25a470207359a1236886da0300368ddac7d76568201510c0bcc2ac4ef6b34b2284c8d367c1be41972f0ee1c2
 DIST arping-2.19.tar.gz 177178 BLAKE2B ed8936b5526c02526d3cf0f208be0cbb91034fec861a26ae9f3fa7a865597ae8ba9d9b15418b07e930b7b5d1e766e4a4be4b4b61e5ba313dcca0f1e038373a00 SHA512 7ad242202432d91adc34b049c5511529789cf381ef02e803f8fc61394a5540427b719981946a36f692df9b1b3186e3f39b0f867f583aa42e237ae7f7549822a2
 DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ffd9615964677db33f214b856300de0dd2619430ce934b19f260cd38c8fa892636787ae4de82022301274a06 SHA512 c5fac3b43a9be8c63ee7707a7df1cef2d75c6f7944cc6e580450a6558fb7e72b0d97d09b5c9b4a3aa86a59f49faba94b39bd634c93917c11ae20ac59e8635282
-EBUILD arping-2.17.ebuild 706 BLAKE2B e7c8265c088471fb2a158db710986fe67c2603c3b5fc19bb0d355f024baff962c31722ad255e3e747b106151d19ac77c0c0b2b994652d9cab72a5581467b5384 SHA512 8537da18d1a79d669899c82dc6344f27467824257ed327a070168060e745d23996d85692034cedf85b3a1e0073fb06f91f1b7615a134832a5d8139be0b8b127d
-EBUILD arping-2.19.ebuild 715 BLAKE2B 57e6e6704f67e72bd1a3a6b8ce393fb2e7ead1e05d15a534756914bc43d5f1eb845e8abdf4c027d64689a7b474d94b849d60b5eb2c38d7d55d2da799c75a9bab SHA512 72eb38608ba78934fd605170084642724f5ca05c020ec4a8b95f88e2652969225a8376af4cceda3f7ec9a5b91c18b50a01c4badc1d92e9aea47e5024a8940472
-EBUILD arping-2.20.ebuild 794 BLAKE2B 732883ce8dc887afd35c4d411190d885c125405cefbf1b25d18f61a240949b8d654cf914969989092c68b99ee068172bff36d4fd794f642eacb1f1a18ed872a4 SHA512 eab36d027018099d16bd4fa8e71895a3bee76aa3298f2769ebf58b2387ad31e02bec27a0f2e6fc191b8b47d20b8a7be43697bd2352d5d29708f794740c52e255
+EBUILD arping-2.17.ebuild 696 BLAKE2B a7c597992d93e0d3ff39916042f978c99ad43ad99339edb54d8f3f694b7bc651a9d827f8a77534ee29775e7eb7bec5066dc8e1fef3135700d2b53c11e17feb5d SHA512 a61be5c3bd84ff0b76d2f9b5fbfe3c2fb033cdfcdf755a96e04637faf9a61410f597770f7ff2d344d4bd52dd9c688e7f0121f6ea21ba74462730c61cd30c7acc
+EBUILD arping-2.19.ebuild 705 BLAKE2B c524cdcac8848de0ff2675ce69870a2f10c97e44dce6317c83c2bfb8c3c22a2d86d82148b0929c4a2a5d54a7350cde1777a3d6cce24545b4b12f61eba04078dc SHA512 016060a189a6a85ae825c9578ee63efa2f463af60b2f9e8ea5b19a873b7a89f9dcd20abb185768698e92eb8951251d8b9f1e15a92daadba4af4003315ff4edef
+EBUILD arping-2.20.ebuild 784 BLAKE2B a884e1a4797b0bc4c7bb872f8686826b69440d53fd3cb7694d4b1287fb9ee7bf7af0c0c16f363959b72a5bf3c9800b2c854fcae792b385a72a558a61c6ac8656 SHA512 a131e5b00fe3289c89895c553c708482810f368fdba2b35518ac743f3ec1ec242ca9395d5d533c4efd2626bc3b821ae16c6de69171c6c5f728f5078fa0389ef7
 EBUILD arping-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild
index daee9ee7286b..afd95c1681ba 100644
--- a/net-analyzer/arping/arping-2.17.ebuild
+++ b/net-analyzer/arping/arping-2.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
 
 CDEPEND="
diff --git a/net-analyzer/arping/arping-2.19.ebuild b/net-analyzer/arping/arping-2.19.ebuild
index 1552c81188ae..c31fa81c7b4f 100644
--- a/net-analyzer/arping/arping-2.19.ebuild
+++ b/net-analyzer/arping/arping-2.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
 
 CDEPEND="
diff --git a/net-analyzer/arping/arping-2.20.ebuild b/net-analyzer/arping/arping-2.20.ebuild
index 9f3f308a61fe..bfa7e8bc3a8d 100644
--- a/net-analyzer/arping/arping-2.20.ebuild
+++ b/net-analyzer/arping/arping-2.20.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
 
 CDEPEND="
diff --git a/net-analyzer/arpoison/Manifest b/net-analyzer/arpoison/Manifest
index 49beac77b39d..e1e8b8975de5 100644
--- a/net-analyzer/arpoison/Manifest
+++ b/net-analyzer/arpoison/Manifest
@@ -1,3 +1,5 @@
 DIST arpoison-0.6.tar.gz 8646 BLAKE2B 7e9a7aaf9fb184ffed4e69d1d709f3ec242423dd699014e89ce7eaf99cb225299110b3a6fed4059db89c3bbd05b30262d56dec4bf60bed367f01700f40fde883 SHA512 7c14a15b9b85f777e5151fae82dfbdb44dbfc85ce8f632b7d76727bce79ed7f958f725f39348489bc4659cb5e3b7ab5370e88e33c03277e16ab2f9ff00bb4038
+DIST arpoison-0.7.tar.gz 8458 BLAKE2B b0050aa6f3246fec9fb4db8bbb3f9f5f1d52b5b6c37851f0c6bec8b6c89fabd7f1811ae40a4c81af6eae16761f38fb749d0f2a58311645ef360d798b6ccbbb50 SHA512 d5af078c8e2c64eb721da75b5d6659ca017267f146d0dca7e0f1ba77bfd93a0f56363428c198e9c46537768d3568d813c150bfbc091430fc355a269f9327108f
 EBUILD arpoison-0.6-r2.ebuild 777 BLAKE2B c94d7ac7a0ae6afc7472f4e5152d65adadb9868af82e722b7744be7ef674ac4586297d8245dc46ef5fd1b3d33ecd52334f633d8ffa74465cff96962a539d63c2 SHA512 91565961d5cf3148236dd4522ac5343e46eb3bc76dda80d8fc5b35b0d9d5a21cfa1c3716207b580a7fde7127b596295cceb7f14a9b52bbbf67afa0d170b988bc
+EBUILD arpoison-0.7.ebuild 685 BLAKE2B 463d1b2114786f82ef451fa97d62513e8a85e9eb7127e39187d2841fd8c2ab1243740a37614fdb950318dd6f3a8c19fdf42e446193f0ca6dc754730253558d85 SHA512 19c323c2d36dc7797b437ca8304d0181f2aa51f87bee7e04ae95b772c2d999fc1d024d530ca63eea5bb42a3a399825499c6f94d63fb20510683fe01d665ad30c
 MISC metadata.xml 358 BLAKE2B 8ef81a7500bfd11eb443af7fdbe30ce89f91875ddd9434367e7eafb73604d13e6702fd34c88bb863bceeeb95822cff1354313d2146117c1ef32166527bd82716 SHA512 9a11704d5314e9ab1a061a179e757146b29c52334511578fe958455d417652c0ab523a58a17580ea6892e528d44b06aa8510293664d78ed01f35e32ef1d7bc18
diff --git a/net-analyzer/arpoison/arpoison-0.7.ebuild b/net-analyzer/arpoison/arpoison-0.7.ebuild
new file mode 100644
index 000000000000..49817cdd9dc7
--- /dev/null
+++ b/net-analyzer/arpoison/arpoison-0.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A utility to poison ARP caches"
+HOMEPAGE="http://arpoison.sourceforge.net/ http://www.arpoison.net/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	net-libs/libnet:1.1
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+src_compile() {
+	local compile="$(tc-getCC) ${PN}.c -o ${PN} ${CFLAGS} ${LDFLAGS} $("${BROOT}/usr/bin/libnet-config" --cflags --libs)"
+	echo "${compile}"
+	${compile} || die
+}
+
+src_install() {
+	dosbin arpoison
+	doman arpoison.8
+	dodoc README
+}
diff --git a/net-analyzer/arptools/Manifest b/net-analyzer/arptools/Manifest
index 388d6de8847f..2d3a5bbaf657 100644
--- a/net-analyzer/arptools/Manifest
+++ b/net-analyzer/arptools/Manifest
@@ -1,3 +1,3 @@
 DIST arptools-1.0.2.tar.gz 87475 BLAKE2B 1bbfa8082db28abaa78a3f9f363ed255909e6c6dc2a9fabc1668f66228977b9ecc5b70d4cf3514affb324daf31b906b40b1ec7d88ecc9568504362789ece42fb SHA512 c976a5a7778a9330ebda6ed69ef045ede3747b98d27a7e575f985646a52bf57e4a6584da280a0a13520a43b5d765b2ddbec2239d7c3ac865ffdf1ae23f5ff347
-EBUILD arptools-1.0.2.ebuild 465 BLAKE2B 0bdbbcd7209a6c21818e5697c12c614b96e876c401c9f23ee0bc33ba0354f59057c7b19c3be61565230acc09c1716a2a7db78b67a9802b142e27ea49c0a7b3f7 SHA512 369aead6e23542e8a30fdb23349b38981a9c39819383fcfaf9ae7edb0ba1afb3076913c6ab6b8a0d24559e7547918644ff77bea7e8d287c6c718820b2d53fc0f
+EBUILD arptools-1.0.2.ebuild 453 BLAKE2B 773d31baa61523dde742c83e4953a6109cf6596b48d25858b888429bb833d8090bfdf64759dc6d2131ebd62d36424eab2f6e5eb8e27c96caccdc226921d4f74c SHA512 86332d662a4cd15b1b297ccce0c82a32866c291e77253ce78046c8f660bb83c159c766700e41ee74abce583f0eaaf5e390defe959006a87aef24a40cb07a9b4c
 MISC metadata.xml 355 BLAKE2B 6a7a59a25152c35d3e60e6bf42556371caffd13ce3d559a8f5d9117dd9cb45c7b25bca6dbe527f6ad63cccc9bc0eb10e096a5a3bd0dbfefdf94fdd73958e1ef9 SHA512 bc5735d7a66320f39e87c77951652a28e4100b4236cf37ebeed12e62966b1a211f8af0cc78774c537e485488108ee5fb2bada682d4e5da91cfba36483986d1ca
diff --git a/net-analyzer/arptools/arptools-1.0.2.ebuild b/net-analyzer/arptools/arptools-1.0.2.ebuild
index 803627388131..44c7fa89a834 100644
--- a/net-analyzer/arptools/arptools-1.0.2.ebuild
+++ b/net-analyzer/arptools/arptools-1.0.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="a collection of libnet and libpcap based ARP utilities"
-HOMEPAGE="http://www.burghardt.pl/wiki/software/arptools"
+HOMEPAGE="https://github.com/burghardt/arptools"
 SRC_URI="http://www.burghardt.pl/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 1da570f3dd1d..00c92bd3ae18 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -5,7 +5,7 @@ AUX arpwatch.initd-r1 752 BLAKE2B ba0adcdc9c02ff0b60c46f9bd98c100171b365ca4d50f9
 DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90
 DIST arpwatch-patchset-0.7.tar.xz 132868 BLAKE2B 502d1493930ad905cd42bc76ec9b92a37811dce9829d69e8703d23039c5ab32a61da3cc1a399464b3edc71a2e020756ce2b9c5a069d10f809c21870add9a7f73 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00
 DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0
-EBUILD arpwatch-2.1.15-r11.ebuild 2228 BLAKE2B ae5ba44dd2e028950b6963614998a5ec0044ab6e62023e5d875e81f5df840b829319f051e1313395518828ed11b8b7781d2f1f750bd9b9d59fed56fb14617121 SHA512 b1f21536f6aa593cba85d03c4e89f6221f94988ec472cc19f22bed5fd5c08b44de9979c09fce91e103b9524bd148635c17fd6cc9ccef1344fb4be0445aa17dd3
-EBUILD arpwatch-2.1.15-r8.ebuild 1386 BLAKE2B f81172e5843b570164fddee72e1cddc4af60cf8e549dd61de2ed8ad0dc7fa3896e43ab0b5303cf8128bf37e468931559a38a111475b1f12058d2747068fb0e83 SHA512 a5b0462e7ca196b1e415f7911f3f76885540a87290a7219f8673e71fb8ab8ad5fbd6a2539b029ee94e4b990cf400900a26a8052469facc4a9e7e68f82ab44b87
-EBUILD arpwatch-2.1.15-r9.ebuild 1368 BLAKE2B be430b10486f7133eb691f7ec1ba2e141fe22244fe6fdd35f2542a647ac27e871c8c3c46eab9f62a1b26df42ffaa9989d51ca3932701fe547b9e43b7a25fcf2c SHA512 b6b9cc2c5cd85b2b77cb7342f5ff56f2239283065c4af51a8e62a31d5a592191fccb275e63bba3436f98feb9ae1d421ce8792a503c396e63ac8a1bf0d4541d3f
+EBUILD arpwatch-2.1.15-r11.ebuild 2218 BLAKE2B 7b6734bf7b6bff877416eed579e7856a6c2e09309adca029b29b0788b7eb4fc297ef73ac5883f4bf0eac5c716460077232db11dda290a15769fe937fdf675881 SHA512 014f820a79f7c62ffbc0aa3c85e59af8496b6bca09b3438c532a765c2c6a006e9429bd916c3cff395bed9a3b4e254a5f3d46549ff995279f8a8a32641f2f8947
+EBUILD arpwatch-2.1.15-r8.ebuild 1376 BLAKE2B 0924d01b3126961c45bd7f0db106f051ea8d235d361176b83d35281f29e10cd5557a26c05fca148bb104bacb13af2f92e534e509bc1b5a6e8339b6efb6f26a1f SHA512 90214a7dce649be52522c66a64746879b607d5269b6f57b08448db6347998b01ea35e58a336ff729cb7519ac6b2ec05941290715d5178f73578a382fad382e3b
+EBUILD arpwatch-2.1.15-r9.ebuild 1358 BLAKE2B dee35cc7a102f17601627a6eabc537fa54627085e2e87ce1375153679b0d3fbbceb877d31e6fc4d2b6a0a3c20c640055974dce976f5c49f59661ede1f8d977ac SHA512 940b9ddd4d17e217586ec344acf7b40aaa04d060adb7af2572408eac4e828d16a9d578ae526e862a700abac8465f3b06c2fda0215993e66eb517348e31252f2b
 MISC metadata.xml 741 BLAKE2B 63f289064fdfc3164a8c2651f783e851c42c062996e4e916e69ece25c5a0892030a07aaaead7b2fc14e6708128bc48e4321d30fedca97d09efad66a2340e3897 SHA512 0db051d36fb16c5a50239a243ca46f686e71b13387330bf98df46c9af3389d16e9842b89c15d2e6fb3fba867e5a0b36a2fd745480588ba621e117ee86aadbd00
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
index 48113d00e72f..fa78f4e10fa9 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
index f49c08367342..e8a073a8aae2 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ppc sparc x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild
index dcbace9cf4e6..c592f5b50ab4 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-analyzer/bsnmp/Manifest b/net-analyzer/bsnmp/Manifest
index 6394d5587694..926a18d307fc 100644
--- a/net-analyzer/bsnmp/Manifest
+++ b/net-analyzer/bsnmp/Manifest
@@ -5,7 +5,7 @@ AUX snmpd.config 2426 BLAKE2B e6031d307de5c70ff992cdb38586f328dfc76582ef93b9dfb4
 AUX werror.patch 532 BLAKE2B 46bd51ccd573d385745b568945e1e42ff8887af89d4aaaa3dafd15079e9ad269eea358f0651fb6f17011d2156d37694e9245d15be9df85f43971d2da95178df3 SHA512 2de595316841e7602b0950bcbe53c85af049c9474b12518119704df56663734616b64a16a8d1ccb34fbd240b0cd19afa6dc70289673ede9c8062f2becd0c98a3
 DIST bsnmp-1.11a.tar.gz 408165 BLAKE2B 11240fddb1b449927749baddc0c6a6e0d03c85a51fe6f3901e0b915f6060743875224de319c652f5aa70ed5f0a6d2a4ecea059a5d4d4441dff409bfa9be9a1bd SHA512 8b3695a147b5a3c012509f73c0627c8f7b66d99c54c53636d2add2d3427acf331bc4168ee88b8cad2536c1a15901fc38c4acd51e7630c48f4972504d94e8dc08
 DIST bsnmp-1.12.tar.gz 418653 BLAKE2B 87ec6325b2daade01ed46e6c1b5bdccaef310065e00a82b947c33d7451ec5485faa34d88b7371cb114fd4e70eee4746cb13ffaed2586bd35ed581883e1f748c3 SHA512 c2c292e21632ea475d30aafaf7f66566389bccabfd20886a27bc4af98dba24139568c0eaddd36710655abac9ca6a38525136e06f2cf7be8b9db8ca656b2021c9
-EBUILD bsnmp-1.11a.ebuild 845 BLAKE2B fae80961c9d5f63af618ee450bffacdab6f5a0bc9e14fc813419647f779039d43f35dd052bc775f2457ee5033802276ac2c132e81ade1b55108fcfb96d0eae4d SHA512 8e0f22934c01b61d3683e0721390bd07733e94b0e19ba5e83f7c4457eac6ce0e3ea78d84497a24783d03364bc5ed18764e41319cef722f81d009c420d3304f33
-EBUILD bsnmp-1.12-r1.ebuild 1055 BLAKE2B 5b454c44f6198bcaff2dd0e9d450b1cb23c53cc737d8ce5c92c2859e88d4a33afa6913d37e4b7ca0408dcea8108778230ae25b1fad336ad016c2b3e76bf2bbf7 SHA512 983989a0aa8d5cc56d7e623b435e7cbc2e6ca47773d8dcb80f1906048e3bc2a9cce3209a4b6a7ba9556dad3347012401e2f2d81f9b3044c6e43c45680d23ab93
-EBUILD bsnmp-1.12.ebuild 892 BLAKE2B 73a305eba73acf18f9ca3eeff01b6c96287576d58d5aa589d463fa83c722516445fd0533e0ca53a5e03001e85549453df7a2ca89b35310300b89b9fbbddfe481 SHA512 e82caf72dd5b0805f6abc350e908ec582ab59bc71ab0158b288d072ec90e899a4d97881bdecfda6fc79d18de82acd4420b75a9e92ba7d1066c04a5214ec0b3ba
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
+EBUILD bsnmp-1.11a.ebuild 836 BLAKE2B 1a3c27bc8c31f2bc3c62a949e92601c2f2ce399cfbc87d4d114d510087c11d0cd210881ab83f64d10b382cfb901e31f960b32be1bc0ac8e73251645f2a908d1d SHA512 e441784d65460217e765779d6101b19f1e87cae073545af05f2084a6088d1e4234af2e972fae24da274b383ac313980dd4dc125b5a01ad3dcd9742cdce367425
+EBUILD bsnmp-1.12-r1.ebuild 1031 BLAKE2B 9239e81c30721efc4e263ac124856c198d79061ff82dff7b7be85558c3a710edb086a4ce13984a04dfff1654c43fe92a0a9d24a089573d6f883abf65785d4c99 SHA512 3ee8f319ebbf173829aa53e7a4841997986393768f38e1337d8a6ecd95802f896306ac6dfd4b4f09ee819768b4e2011f585d25d9331d49c9fae177475e583034
+EBUILD bsnmp-1.12.ebuild 868 BLAKE2B 635988bc56ce9d251ae7863ed8c2bd41fc8e15d7ecde628919d1dbe7fb417a154a120e192514dc15e38cdb817b999a7ac0946778d461e832e289aa879f730474 SHA512 0c4ebbcd485155bbf80d6635ff8c62e85c9799ec6068769d9f4edcc3eb3cdc024a4e5e6ade1d439bf4b1c2c7e449bf46a495c6c40f91abbd721634d7796ba94a
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/bsnmp/bsnmp-1.11a.ebuild b/net-analyzer/bsnmp/bsnmp-1.11a.ebuild
index f2e4f3a932ab..f19dc60cea7a 100644
--- a/net-analyzer/bsnmp/bsnmp-1.11a.ebuild
+++ b/net-analyzer/bsnmp/bsnmp-1.11a.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86-fbsd"
+KEYWORDS=""
 IUSE="tcpd"
 
 DEPEND="dev-libs/libbegemot
diff --git a/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild b/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
index 50910447c69f..fdd92f44ff94 100644
--- a/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
+++ b/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -11,7 +11,7 @@ SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 init script
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
+KEYWORDS=""
 IUSE="tcpd"
 
 DEPEND="dev-libs/libbegemot
diff --git a/net-analyzer/bsnmp/bsnmp-1.12.ebuild b/net-analyzer/bsnmp/bsnmp-1.12.ebuild
index bdc43032431b..57b8a2e3afd5 100644
--- a/net-analyzer/bsnmp/bsnmp-1.12.ebuild
+++ b/net-analyzer/bsnmp/bsnmp-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -11,7 +11,7 @@ SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
+KEYWORDS=""
 IUSE="tcpd"
 
 DEPEND="dev-libs/libbegemot
diff --git a/net-analyzer/bsnmp/metadata.xml b/net-analyzer/bsnmp/metadata.xml
index a00f3aeb1f81..6f49eba8f496 100644
--- a/net-analyzer/bsnmp/metadata.xml
+++ b/net-analyzer/bsnmp/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/bwbar/Manifest b/net-analyzer/bwbar/Manifest
index b29a186e3307..2ca301da6b3e 100644
--- a/net-analyzer/bwbar/Manifest
+++ b/net-analyzer/bwbar/Manifest
@@ -1,4 +1,4 @@
 AUX bwbar-1.2.3-libpng15.patch 345 BLAKE2B 1c2e3733ee08d4203021f647072b7cce88a7526dd717f9cecf8912a0717e0531aa25c7eef304efab097a094020ff901c8ceca9db02cfd853a4f91bb5ebc4e916 SHA512 14c07dc56320a748b864c8c3ad8b3c9408838db8630930409f2f16f6bcfbf6fab14e6eb1ae803e4f6b33127220c53a51d01a4b981f3ddd8bc8fb1be2952192f8
 DIST bwbar-1.2.3.tar.bz2 30202 BLAKE2B b7c0ed980e5af14e5e2fa2a3fafb8b7f75d96a0bac8b3effed2a7a54098bb00741b07f2ba32e6cb81dc4accd42a0f370c6bd95a5eec1301b1090e96d2e2ce80f SHA512 cb534f50007db6e39aa134d0d9a08ec6935c8a393f8dd5ab80f3c6ef94048821e065cd6c1be80657a2d6338fd16a73dcc0f89f5b15aba9e3bd38f0737a6d43c4
-EBUILD bwbar-1.2.3.ebuild 523 BLAKE2B 9817e51ddb2fa0ba4efa15a7fe2d3bab58b65213697be20603278b232be06a5715f073e75872df14bce8781a7d22ea216b476c4d9ba1fac04120e2e56c4bbea6 SHA512 91de227764e7b854414649fb3616b355840c7601f29243a055621e4fdf9fbe37e6caf6e4b347c9d6f91a55bdb7bcda2bd86486375925ce6aa5caf12df056900c
+EBUILD bwbar-1.2.3.ebuild 534 BLAKE2B 38286119521a53160eb87b701e6b3ffe9af5b8eca532a933c297b65a849de6b654f550d212192580ffa58369a90ce82fe6e055af6aca41d91cedb296cc6b814c SHA512 d61e518d3d604d4d41154dc223d78a2f9fb722ff3ad8e3de2410627004f3246bf9ff97227d52337c05298b6284173c0819e1c25f5be62f8d3fafe9a44ea1148d
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/bwbar/bwbar-1.2.3.ebuild b/net-analyzer/bwbar/bwbar-1.2.3.ebuild
index add43e56929f..67fb9f200db9 100644
--- a/net-analyzer/bwbar/bwbar-1.2.3.ebuild
+++ b/net-analyzer/bwbar/bwbar-1.2.3.ebuild
@@ -6,7 +6,7 @@ inherit eutils
 
 DESCRIPTION="The kernel.org \"Current bandwidth utilization\" bar"
 HOMEPAGE="https://www.kernel.org/pub/software/web/bwbar/"
-SRC_URI="mirror://kernel/software/web/bwbar/${P}.tar.bz2"
+SRC_URI="https://www.kernel.org/pub/software/web/bwbar/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 2aca57458256..62bbf5d27c93 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,3 +1,3 @@
 DIST bwping-1.15.tar.gz 104234 BLAKE2B f0bc4b050760c775b5186667c2c15ce431832761d0bf00bf451d37514f93bafc1b6379ba96c30b1132f6dcb22fd4626304e4037c47794f9bf6fe28d10d5df6fb SHA512 76578571e3b3ca0f5ee61c28380d784fdcfbcee632e92b28a42c446ded9fb0fd0b682f360a51fca2df599353d5da9227762b186b5339ccfe7b9a7fa876399f8a
-EBUILD bwping-1.15.ebuild 396 BLAKE2B 6b59bc7fb84ee9eb758cd25fa20366083edbaae1fd1848afd03f472f69ee8ea73d12549fbbcc8ecf480a047e3470e3651f28f72ec9224f34d0216fd7aed572ce SHA512 31dbec63d264033f3bbc526eb6c34687898f18e77ca98ae9850255174d59640294ba7c9d5debae76d2e73aae969ac7182aa26f00a5aa6a26ecb23bf38446cc7c
+EBUILD bwping-1.15.ebuild 386 BLAKE2B 9dc4c68a191c42d7c0de0b62ed51b92c2eb2ed7cd70f287134ebd84e43535819c35cab83921b17ec68bbe7a7a75e6935edb7ab924d92b444b914195d88733c9e SHA512 5dcf64cf3df28ba31e1225ea8cf558e4df7f95923211388a2b8198ba3476edf01d30497935cf00c3cfc8e1e7f8d400a7dd00b8fff5200d49f7f0a7f14322fb04
 MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/bwping-1.15.ebuild b/net-analyzer/bwping/bwping-1.15.ebuild
index 9495e75977ee..95d107fb4f3c 100644
--- a/net-analyzer/bwping/bwping-1.15.ebuild
+++ b/net-analyzer/bwping/bwping-1.15.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~sparc x86"
 
 src_test() {
 	[[ ${UID} = 0 ]] && default
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 2491c8a0c56c..d19b074cdfdb 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -2,10 +2,10 @@ AUX cacti-spine-0.8.8d-ping.patch 235 BLAKE2B ab0390faaa8cd7b473ae2341a0f80d4eb8
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
 AUX cacti-spine-1.2.5-my_bool.patch 208 BLAKE2B 001bedf38a4cf481aa451670f9e8712b11dcae4192b8517db6c44b060560afeb094d66410f7e42fcd3229f96490782f0bcf23c359010762d25a7879def3c3668 SHA512 c0e873444ae4f259786a3e2705a0e07485fd6676bf5024cc503a8b30285b3920322c57184105a75148d696a4e762d63ff29c260b855f9a0c3040afc8bd7ab548
 DIST cacti-spine-1.1.38.tar.gz 805437 BLAKE2B 32d934f54e00d83e9807dd194a7cacf8d5526c8e5b84c44ffad201c07edcb117f862266843552299fe04cc780575b9b2dc7129a106a20bd709cb82844ade7812 SHA512 5409a690e89fcc74e1e87e34e1918cab27d1243825955eb8256a92f8e9658f312345c66b338a4a07a0e38c94e3275131cb4e58fb70e7b59837c0e6c47746e45e
-DIST cacti-spine-1.2.5.tar.gz 105494 BLAKE2B 1bd2f33cee841fb7b05a1a32d3d0d2824c36ccdc69fbf52c48cfe2d7bdbface4c1925261c8643c19addde90346c5ecdee547d8014705dc34800f59eab6ac248c SHA512 5bbf5f68e0d3477d43afee57bc86bfeb61a3ddaa18f7c0e5e0c2413bde6646bcd662d93e4c124daa6eaef5bca5843fb359b733c5189d9f43a34a14fba7f03682
 DIST cacti-spine-1.2.6.tar.gz 106592 BLAKE2B 4c7f92e1c1e6061689a5a18cc73326e38b1ed275d443069bf5bb6ad0edb9429b4946096db650d9af73b11ec51f1bc8728420a5084847b4d468b1e13341655ea3 SHA512 6659a3694c38704e266efda40893ed8e1bc1c52f3ae93a66ad219043408dd77bfdbde55191982ed3cebdffce1f49faf3e487fb926c680ea9b1c6dd379e1b53fc
-EBUILD cacti-spine-1.1.38-r2.ebuild 865 BLAKE2B d3ee48575e06d3936d7b05417549a6bbd0655f8b04f8e62b44f220615020016e373c9854b7b830efeda4fea76b0a133574a9e97f150ae6c62e029be6ec812147 SHA512 93a55f613d7f0be9301ab7d36e4bcbd9f518aa514bb43a70eec540848274b98574af5c8fb26ba8b21849c9c698005a7b7e404dfd29b2b04378308ca87cdda740
-EBUILD cacti-spine-1.2.5-r1.ebuild 977 BLAKE2B b95d683505702a0e4bb0e627c9d581e6668e5c97f6479d5e212ab60c0a079800f1c3cf77a15a24dec8076f0b65584ce4c14be4656717b2ec929f1b1f9c4da4dc SHA512 85dd5d7d273fab5cb939e95dc0eedd1f7e3ebf78faa4508f8211629e2f6ddd754fb138fefbe75f06a784f8f40172d70b6d1f4997e6eb97ecab91bfb397fa6b91
+DIST cacti-spine-1.2.7.tar.gz 106764 BLAKE2B 3c880c5e7e736d6d3acf3dbd5aeba13ed457d92541616ff8ddd2e88182a93c6c46ecc7c4c2d5f16784c91cdef823febf8fffac4a7ff92cf7ee11f1fda129956f SHA512 9877d4bb4d17728c714add8d5b6e974a2d92115753bfc1b2737e2d435072138169d9e2486eddc9e25048a4a72767baeb64a5479f738c4d3e57d8f362c8e3f48e
+EBUILD cacti-spine-1.1.38-r2.ebuild 866 BLAKE2B 16f5f9870d68ef5893d7bb9c6a31bb56916b935b2c665c13306cb6f57fe9d8ffc7c169d3744dd602648dc4db9f46b57d4633e537cce75107dd8aaced9d68ae24 SHA512 82fa09570d0e5d5a1226e82078dadfc384d75ee34f64744e2e70936d2376f9037035ab3abbe62a2d1c38e80cad4162c872ab89d857cb66c2c9ff32ac4d61bab4
 EBUILD cacti-spine-1.2.6.ebuild 936 BLAKE2B 16f005831e06f8b73cc07b945ed11a8a29b3e95a7b92714012088f90e5a66c33d831229b8fbe743c3a25c36df4133824e0c16561e56efe2b950804e3ff475297 SHA512 d8e4f9e7ca39d17cbdaabe81a7d973aa22863703c1105b0bdbdcb8bf20c557a7252999eafba2ef9f563d6910805afd74b31eb62b2b8524951d5c6ca1ae33683d
+EBUILD cacti-spine-1.2.7.ebuild 936 BLAKE2B 16f005831e06f8b73cc07b945ed11a8a29b3e95a7b92714012088f90e5a66c33d831229b8fbe743c3a25c36df4133824e0c16561e56efe2b950804e3ff475297 SHA512 d8e4f9e7ca39d17cbdaabe81a7d973aa22863703c1105b0bdbdcb8bf20c557a7252999eafba2ef9f563d6910805afd74b31eb62b2b8524951d5c6ca1ae33683d
 EBUILD cacti-spine-99999.ebuild 884 BLAKE2B 5df3c6c34e5b6d1fdf833d49a5a4cd1e9c6137199bd54879f47f632059b8cfa1d836d68f3f0abf126f66a0f78e6c3166a322b86df6f1b8f2acd709691f1e22b1 SHA512 7d2dface1745bc2847de70b2b8067822438b4d51d0039e1e9a9e4599d2ff64cbdc2d2e431a7e6d81694c1c23158a2f1f99cada8f374eff60a31ef9da6e6c0566
 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.38-r2.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.38-r2.ebuild
index 23a8cb6b9a4a..3a835f786dd6 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.38-r2.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.38-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 sparc x86"
 
 CDEPEND="
 	dev-libs/openssl:0=
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.7.ebuild
index 752dc560a7cd..8ca6122419f9 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.7.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
 	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-	"${FILESDIR}"/${PN}-1.2.5-my_bool.patch
 )
 
 src_prepare() {
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 086212d65156..e6bf646dee11 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,8 +1,8 @@
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
 DIST cacti-1.1.38.tar.gz 9081347 BLAKE2B 9f64bc7cd33187c4c744e1473409ea8998cd953c6fd047c66af6ff07d288678cbd944d2e70d0fc3838a42c7f7a9dbf7b094963391791a46bc50c3ed65ed4251f SHA512 1f91156416a9988fa149f9b8fc9fc7df904e4cf6d9a19a62d06c7de1ded99ddaec2f5b5f1a21b0effc4dee7b9c1d1911ca5aaa6113b57edc7e2f42b7969343b5
-DIST cacti-1.2.5.tar.gz 24677665 BLAKE2B 098a855c9eda7c6eca255a96be0d6abe016be00ffd985ce356773e8af4114ecdca4753e1b288a697c8defbbe481a9244eecf553f228518e1c223b582e0974eb7 SHA512 991847ded6045c8c6111c58c5f8687f2497183a545158924bba92ee5d0b7de3e658ddbfce6f59c651fa29118aedb271a438c5668a3db4b93f97f82fe721f0a32
 DIST cacti-1.2.6.tar.gz 24707849 BLAKE2B eaeee3953d170d7df9eb14be85d700af2221f8f940f19ef59dc57b5f9d86e048811a04c31c8390d5722ae15dd9ad911a602ce0c95b2b999baf2104570cb4fb3b SHA512 69cccb6f87c0b7128c878528898395965b0223dc6edafa52905febd596d7b58ed240c7d0ffc211a3ef69d131c77a0f2dd5047914fb879d026c052b6c889cf21e
-EBUILD cacti-1.1.38-r1.ebuild 1031 BLAKE2B 3e1d8d36763dd27d5823b458e80312ee7569fc906f13448bfd5af32d42a57abba4f336dbf9e6679573074b395f47e43e25453c29498835e96acd3bc594104445 SHA512 cebe81f683c4fc0c2cea917a9c29cb02933a34a11bc2e971baa2a12724f8dcd16bbdb9fab9dc50fffd5de8b551d995fc650dec0c69586cc46d055dcdedba9338
-EBUILD cacti-1.2.5.ebuild 1014 BLAKE2B d70d882dc895750ce208924f471075cede60644877edc87eace012a370b4cc5d34b4b3e4ef87924ab81381da0480d63ca5f85ece715463822261d951bd1b7497 SHA512 0c5a87b7c75a5f464e6a68308e678a05f5dc3385892e939bde653786a0ea7789fd0720f09509fcbc645b2ab52d63f8db569437a46205eb3552052a1407822c0a
+DIST cacti-1.2.7.tar.gz 24819135 BLAKE2B 75dfc9eb054acf5a1344ebbbda30f35777db876e67891e8c793901882b3ba27f5bf250be4e4527ea64b5ea9af575e58fccccb47233c2a3d27ef57657312c6c5a SHA512 2fc31342aa23b4fa98e6f3cf6b7e42f8cf98f272232a1bceb1b256b2104ea26445c1be1c1ff83bf20d293a3c1e7a21eb3a871623f78069aea9b21151ac57a243
+EBUILD cacti-1.1.38-r1.ebuild 1032 BLAKE2B 030e73b3e11a9de423b821c918eb95d018dfbbef262d49c96e52fca3e6ac9ed7e5ea0d4e0e822a2c75b83f96b6569858f249ea5dc5252708fd333fe3db5671fe SHA512 287e2caeaf1c0551ce6f1fc68a3103d8dcf9c140c4b81bd65280c58696d9300ffd8dda0e43f3084830921b32a1ecece9b8c3fc3af06180cd7a23fb1ac62561f8
 EBUILD cacti-1.2.6.ebuild 1014 BLAKE2B d70d882dc895750ce208924f471075cede60644877edc87eace012a370b4cc5d34b4b3e4ef87924ab81381da0480d63ca5f85ece715463822261d951bd1b7497 SHA512 0c5a87b7c75a5f464e6a68308e678a05f5dc3385892e939bde653786a0ea7789fd0720f09509fcbc645b2ab52d63f8db569437a46205eb3552052a1407822c0a
+EBUILD cacti-1.2.7.ebuild 1014 BLAKE2B d70d882dc895750ce208924f471075cede60644877edc87eace012a370b4cc5d34b4b3e4ef87924ab81381da0480d63ca5f85ece715463822261d951bd1b7497 SHA512 0c5a87b7c75a5f464e6a68308e678a05f5dc3385892e939bde653786a0ea7789fd0720f09509fcbc645b2ab52d63f8db569437a46205eb3552052a1407822c0a
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.1.38-r1.ebuild b/net-analyzer/cacti/cacti-1.1.38-r1.ebuild
index 12b17d1783ad..e50638085e2b 100644
--- a/net-analyzer/cacti/cacti-1.1.38-r1.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.38-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/cacti/cacti-1.2.5.ebuild b/net-analyzer/cacti/cacti-1.2.7.ebuild
index c44b77bddbdf..c44b77bddbdf 100644
--- a/net-analyzer/cacti/cacti-1.2.5.ebuild
+++ b/net-analyzer/cacti/cacti-1.2.7.ebuild
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index cfa1bda6c02c..68662fe2dadf 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -2,7 +2,7 @@ AUX cve-2017-6430.patch 2437 BLAKE2B 4267c1028467734e45f0a2b730498b6b1de86d9aca9
 AUX ettercap-0.8.2-openssl-1.1.patch 8769 BLAKE2B 6c9d7e8c60264b6ac0724891f9cbc9b2436bb943680d3e8612aee152bd360ea9f38a778175906787039041e654b49f91353f4cdc678f36753e289270c4b148b3 SHA512 0ba60719cde9648aae37499c1caa6f3e0630e31f1e819945648d778aa6359f0b3771d7673f16a81c4e7ea8efdcf84bf3fb55979d952cb767cb5334f5d154ca9d
 DIST ettercap-0.8.2.tar.gz 8082561 BLAKE2B 851df0a8700de45ce0e3427f7fdbdcd13feb2f75c0d1136563449db634b1f02276bade0d82a1a51bf8de726d6faddf05ff537e397c2e56cfc3e3181d25566fe9 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415
 DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
-EBUILD ettercap-0.8.2-r2.ebuild 1789 BLAKE2B a23ee25a8d7c4b95a072183c1cbc6f1465b013ba5cb9cd894481b9063af043f7802ffd2b4311b030973b9acc04bf956e49922b2ed6105c67073f50b62b798946 SHA512 29bb82ce78874bf7b0b512b4a6033a80d1eafa125e4bbae14d6df3d89d92e55158ed6dea064fee50d04d82472b07082e177ffde512274c9e037f7a62299eb7ba
-EBUILD ettercap-0.8.3.ebuild 1752 BLAKE2B 62ac3dc2e06f95db8d919181ee0ba2965e244dfab81bc79b7c12a162c78f9801f8b9db9834a80b511845d02984983be4ed0bcfaceaa9712683bddc92eb4465c2 SHA512 0a436c5e9d229ade9562b1d81de9249690ce1ff2d608dc86643785cb9da4a7c52c6611776bf2ecc5975a19af265649a3f836e0173023f3cf559361b4fb0f306c
-EBUILD ettercap-9999.ebuild 1711 BLAKE2B 0ed80f63f24c4c595f2b1caf410259fbe974d0833bf8bdaa14f964009a9bd5c75540fcd6beff17622a355bce45408ea2ca52d2378196c7b37a515c6222d96441 SHA512 9d4fd99f08e11126ba68519404490c7000997aa349805a8d4a6d271e52fcda764dc3c8164a3f5ddfe63e819343d24c7f792d229da9d44ec56f039c87854e37ec
+EBUILD ettercap-0.8.2-r2.ebuild 1779 BLAKE2B 502382e406d3c0611b6ba9387ff389ca73852f521e72b09a1ad1753413f873107ccaf2ad81dfa65d5ed56cc47d45e904d84112be03246ffd6680a509cf171946 SHA512 ed30bc84ec63f0019453195457c1ec99e196330f3d5ed57920b5cee0d1285ea681aa1742e2ca7a90d9113c048309444e756f604ca4f0f48a18816ef6cbb375e1
+EBUILD ettercap-0.8.3.ebuild 1742 BLAKE2B cc0211f64fd7b19a5dca22b14dd56f0fb39467451887b04bc2b3f33177187776fad9bd904be4101293be96968ece4924a4a0bfb7a6ba93d9f4dd7d8299b85606 SHA512 94ebd442f5f6ed0bd7daf7fdf1e1faecef5e80a6b1111ee83c00af5ba2c8c03ceb55c1e5db5d580644f0dfd0f84cc4ac9a6a9f5c0c384e5ce68624d0f0873ac9
+EBUILD ettercap-9999.ebuild 1701 BLAKE2B b1cea3586da1d8193878fd793a8bce5ec6674d9ce2d257b2f2d6d58d58133316cf7100392a6efa71c885ed598b92e46f658bcb933982c34c4c319e8c450ec9ed SHA512 4054f3a885f9c4916a1124d62e7cdf99e9e51ab367892ddc1da337e8e2b1e49eddc64f6ff01c7aa8491768be99fbda203e032e0404dc2f5cf0514c04b8c27d39
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
index e8904593dbd3..40b3700c376d 100644
--- a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
 else
 	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
-	KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
 fi
 
 IUSE="doc gtk ipv6 libressl ncurses +plugins test"
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
index 46454702f6d1..0efc31c95f97 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
 else
 	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 fi
 
 IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild
index b83933eda5d6..504fab9ea4be 100644
--- a/net-analyzer/ettercap/ettercap-9999.ebuild
+++ b/net-analyzer/ettercap/ettercap-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
 else
 	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 IUSE="doc gtk ipv6 libressl ncurses +plugins test"
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index c71c01656f1c..2ca958418cce 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,5 +1,5 @@
 DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4fb8c700142480ba0212072d8820126bfabf5dd417835bdac5f5b65d599c6dde859d8c57267e90cfb569dc4a2073 SHA512 ee53f2e8dc3cda4f588c60da5227d3d71550496ddfdf5bdbffced25bafd442b8e2352a9ad9f27bf76489903b5b779cdb9614963342de907c1036ae9268b8f35f
-EBUILD fail2ban-0.10.4-r2.ebuild 3326 BLAKE2B 8e1b3e1df71dc9179e10c0f6494be5a80e7545b5e504d909fcdb7d9ceb3fc6666712fec2c5a51d73c34d6663d0409f51a789086c0a8e93dd0993c495c3da1e1a SHA512 bc576caced2b5da19f5cf4af112881920f12593e19d0471770611d5603ef717b21a60b7cefcaf7dbca6dd6e91fe366c96877b80fa61415e9a65a145214d322ed
-EBUILD fail2ban-0.10.4.ebuild 3282 BLAKE2B ed096c484b45759d1b1f164b25651094b46b84aebe9027997d37d2bec4dd61f8abae5f2cf222eaea2930b3560e5de50ece3826e26c6e801af544fb630d05fa28 SHA512 a26c2cf6e1e83dc3c53e5d46d0d8ff739f6843ad0d019c41e524aca30d49cde29c6f59296f446e04fbf6cdbf0946f625897180644181839179c916a1d14df299
+EBUILD fail2ban-0.10.4-r2.ebuild 3316 BLAKE2B 822c4206e75626af5e6b8010a0148f95e1139c7c4d3e27941d8d6ad90ca5407bee0eb8238f77873a8f167cd236169735db4611f2c30e6dd6192967a294bacd88 SHA512 5d306daff6ed10bdaf6e81b70aea83acd8d5e310e2d40466eb40f5a52e9c7eb6ac4cd363a53ac685f600dfe17eadba8ae7a9b6e09f192c4261bc943bfffdcfff
+EBUILD fail2ban-0.10.4.ebuild 3272 BLAKE2B 717b33037ae160dbff07f6b13cefd50563ea0893b342a141401f64e8db6a02f152766e55025472859fe00afedd61c792a707c9b4a95290a83ec756234c551631 SHA512 f506a466ededa0fc5a4c01a45c8addd5364a0ca0385f6fbab6a264583563468c245befd7d1f3846131cf564e8049a538fa5bac58499487b44bde9df3bbd6ea31
 EBUILD fail2ban-99999999.ebuild 3087 BLAKE2B 6e6ab336757845e7d7e4da03c705f9b6b6877b19f007d5aa6f4a3faac0b9d6b10cfb51101334bd376e51f8280797245757696c623a7463873cd90cf456fde79a SHA512 d2441165011a25ac3616b5cf7e10ef53cdea1993a020c4af6ec5466ec86d48bd4065d86d184a9d56d5eab7ac5b952e2db1df2aa6e170209cae09d7acff5a53e4
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
index 9f2e26d12f29..ac3d06186227 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="selinux systemd"
 
 RDEPEND="
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
index 3b63990008e6..613c33272c07 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="selinux systemd"
 
 # TODO support ipfw and ipfilter
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index e9a9d4573e61..f8c3eee6eb4b 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -6,5 +6,4 @@ AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511d
 AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359
 DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
 EBUILD flow-tools-0.68.5.1-r10.ebuild 1637 BLAKE2B 29bae346e3b76f36438d2c242a69ff82c4586cc603c626f9d3a24df64fd841d35d7668177e565d319a64ff3d2343240b7ae62860bd1a8a59171fad0de1130644 SHA512 4ab063f2495e3f362613e2877afa9e3e6df8e8e5058762d115aca7cc98732eda06b5fd88c2e15cd3291b7434d34f6c45d73a4266a5c021127bb842af9ad2b45b
-EBUILD flow-tools-0.68.5.1-r9.ebuild 1615 BLAKE2B f041ee019a4d4d70f4612f25c5904112a2c08e4868d727dcea9c370bb9461acc5d1eadbe2f452fec3d5f319e38ebcf0910a8217eef8ebcbc4b7ed9f7af2dc36d SHA512 c7d85fc7c617008977f8e9d151eb1765a416d8ad7edc011b870b9b1f6727dbc80b26f1a3ce527b661d5f4da68047c4910e007e467d006796523a6135689003d8
 MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild
deleted file mode 100644
index 2245db8cff37..000000000000
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="library and programs to process reports from NetFlow data"
-HOMEPAGE="https://code.google.com/p/flow-tools/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug libressl mysql postgres ssl static-libs"
-
-RDEPEND="sys-apps/tcp-wrappers
-	sys-libs/zlib
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS=( ChangeLog README SECURITY TODO )
-
-pkg_setup() {
-	enewgroup flows
-	enewuser flows -1 -1 /var/lib/flows flows
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-run.patch
-	epatch "${FILESDIR}"/${P}-syslog.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(usex mysql --with-mysql '') \
-		$(usex postgres --with-postgresql=yes --with-postgresql=no) \
-		$(usex ssl --with-openssl '') \
-		--sysconfdir=/etc/flow-tools
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	exeinto /var/lib/flows/bin
-	doexe "${FILESDIR}"/linkme
-
-	keepdir /var/lib/flows/ft
-
-	newinitd "${FILESDIR}/flowcapture.initd" flowcapture
-	newconfd "${FILESDIR}/flowcapture.confd" flowcapture
-
-	fowners flows:flows /var/lib/flows
-	fowners flows:flows /var/lib/flows/bin
-	fowners flows:flows /var/lib/flows/ft
-
-	fperms 0755 /var/lib/flows
-	fperms 0755 /var/lib/flows/bin
-}
-
-pkg_preinst() {
-	enewgroup flows
-	enewuser flows -1 -1 /var/lib/flows flows
-}
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index fbf987895c09..bc58ce496b28 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -7,9 +7,9 @@ DIST fping-4.1.tar.gz 170851 BLAKE2B 4cad16f05afff5d1755f58be454059d1959cce1c9f5
 DIST fping-4.2.tar.gz 171409 BLAKE2B 7f61d7bb06e486c327539443bfd441e494d44cdf0f949c73272e51e0867f1b39b2c3ea7df62856b493e05d9964220e03e632df839a84a15ee92168389cc55668 SHA512 2bab34dae539d942eb5e436802e6f74d57c04aa4b782f9adbd6c27830209fdb47707131f20ed966012bcec3d253c9bb3df9033a60b55bfe560af6bb1f572ee8a
 DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 BLAKE2B fe229b5042445665403f40c5a7740e024c836176a375c77440a827463adb3ed219a9c6da73375482baa81c1134764d3cfafebc44aef7596dd380e0964ff130e0 SHA512 6af25324d159df4ddd7dd909e2e1a0d85e08c2f51c31469960c2dbc7a9eb4967fd114eb87361f8c6b1691de60e7f753d371e6c902bec706f3fed3d205fbe49f0
 DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 BLAKE2B b3495c304d1108732cf5aedbf3665ce2ce50be5ca051b724e92583197f9aa7f84e41655b9c3438e0715eb8210ec79fb17a020904fa0d1cfef43f7178f622ea87 SHA512 3d1a76680d3a7cd361481d6e6de49797fbaf01422a73c784c8b667131afd56de2bfbbeb17014047cd2dea903f87d9f19e38ed7b0a5c2e8f2faf82759bf064ff9
-EBUILD fping-2.4_beta2_p161-r2.ebuild 1201 BLAKE2B bafd4326be5bfadff8be1f7b88c2f7bdf792972775ef9a9db92e683c52968ec1d67ec238b89b2fec96bcd8566b075fc974077e4e1b734a0001b9964c114baca8 SHA512 75275a41e6f5963fec3345a979a4a810e44e3fd21e2a49c23008211107fd0170a255107da3354819e1f20ba274f6cc9a9f74e613191a353ba201da920726921f
-EBUILD fping-3.13.ebuild 561 BLAKE2B 68493cf433016b772efd1b1f3a65ce634071a38c2866ca4ebe313a304a36bb449ccc5000532011786a03fe91cc137772220a3f2198f96eafcd5eecd8c5551014 SHA512 62d2b19a07b5aca14a813d3a8d1c131080c6526ee21cca3b3b398da0d2f96f04e4a791aa729fc993b31e0ca4e6ce8e97d5cb820b2f637b987a6b3c768ba2ac19
-EBUILD fping-4.0.ebuild 534 BLAKE2B 8c45250989fb5e073b14bb0d3d3797a38bc5387826c6258bd75244dc2d901bd8b40b94bcfac8684bb78437eb525e11362603d6a49a66a5aaae4f8148c28a8bd2 SHA512 86b6820adeadbf780e787e7be66ed13b5c23ed7b35265ba49610bad17710aabce0be693847cebb04ad008b847fb71a2a10c2edfc4b21abe3b59d52c92ade3910
-EBUILD fping-4.1.ebuild 583 BLAKE2B 6b4119056de85dbd9ac0c0d4284b60b4a95f6f364f967eb51f867a0ebfe241b330d711e799975dc87cfe42f287acf62fc91bc6e9dddba1873b1085cc3a76e673 SHA512 a038ee6b861f906e16d8807092de6799f753d5dd121bcdf4a9afb8d209ee821632799ae9e5e99af1c56cec9066026e86eeb88f5a8610c21367644a76268cdf4c
-EBUILD fping-4.2.ebuild 533 BLAKE2B 784ca2771351ddf98f7eba36466292107c7df0cab5dad5bb384caf358efe3293209292ae00d3f4a8ae9da1e668766fafac25681f99b17ca44e8b5ef20ea9bd7e SHA512 a63eb45c7766f4bf32852b8e05f58bd01f2d322f72db8bce302301ccda8187e8f2482158d8817a5dea9104ca049dd1c74a8cb799d2c7a550b0df5156a9a1232c
+EBUILD fping-2.4_beta2_p161-r2.ebuild 1191 BLAKE2B ef4b1cdc6f9d323f13aa0336d9f4278d806050c472611170a3b908a751ac76478fe18d6b6ef8756f1e635d27c0789f72db9302f557eae4506593b13a01c77c5c SHA512 b8d2c5dadd676ac4ad58095689f7c98ea9b8f88774fdc44cf47b2cc75e57adf363f39a0ef50645bdc843ecaa429868b2fcde02a9041df6e4f855a232040667db
+EBUILD fping-3.13.ebuild 551 BLAKE2B c876528450868e8f9daff6b630bb0d45d25c2a7721010c8e68a8a7800ad65ba1cca964154b02598f614aaa1153ef7289b132dd58a7e856fde8f9c610bf197303 SHA512 bae1d752b7344690a5f8c4398fd174d8631980276306deeaa279633acf19f1cc05a44780750a7e72fe09996ada85f0e799758ba31ba8c08376ce6ac29268b9a5
+EBUILD fping-4.0.ebuild 524 BLAKE2B 37afe8c889ff6a04e9a452686a22bc06378b20f09bb7eca6e4c9087dddcf3eda4c2db965f2125ad9c584cb13624f54a02fc8225fcc9810b0ec6200dcfe0d35ac SHA512 e561eb0d9a1090dfdaae4d9fbc5d3207ff27969a26d659e9c3d5a35b6488755d00be8064f578e97ef54a7d40d2521e6d761c8a0e1e0ff2dd7443591deb3579b2
+EBUILD fping-4.1.ebuild 573 BLAKE2B cacfc3f9367c046a70e96ed2980a8ac416a383d63cc915f1cf9a42093f9e40eaa8405a46cc8dbee6111d92fbe440921efe26546cb8eca7552a90e1cbc1fe98a4 SHA512 466941d669576fe07cd4e34b75e8b7e648a8e9997776fad2a2fcb419da54f3810844ac1125d0ddbcdb827d0b1794d7c31363c37d6505b19fdbfe2bc3add3e58f
+EBUILD fping-4.2.ebuild 523 BLAKE2B 2101cba13f09dd408d5985d212f6042b0721872d37eea8f3271b8319c67df22707a10e2ae1c27a70746582d9ce37afcd2c9ac09d5a723e2f988e90d3515471a3 SHA512 9615242021bb6d0e2256f9e6db87b7860cae610dbdafd683431f4c593a74a08579c224363de61e91f65a658511ebca8cd6da978747e3126ac38254e9a7800953
 MISC metadata.xml 432 BLAKE2B 26cf2b8675d43f68216b366862c04fd46072965de423ad87a6ed12feded8e978ebc2378ce582917534699586a69b7690533385c6420c0187cfe0acc089dff5fa SHA512 16121fbc4071e437cac8d026dd418f9e6efd1110424de9e08c32dd27c55d204c566faf3a790f7e301795d19ceb427c565752583ef20e8a1828d3cb3474fb218f
diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
index 8181eccc2c64..fda799ceef6f 100644
--- a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
+++ b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://fping.sourceforge.net/ https://packages.qa.debian.org/f/fping.h
 
 SLOT="0"
 LICENSE="fping"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6"
 
 S="${WORKDIR}/fping-2.4b2_to-ipv6"
diff --git a/net-analyzer/fping/fping-3.13.ebuild b/net-analyzer/fping/fping-3.13.ebuild
index ec38bab42ded..7a7584960a7b 100644
--- a/net-analyzer/fping/fping-3.13.ebuild
+++ b/net-analyzer/fping/fping-3.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://fping.org/dist/${P}.tar.gz"
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 suid"
 
 src_configure() {
diff --git a/net-analyzer/fping/fping-4.0.ebuild b/net-analyzer/fping/fping-4.0.ebuild
index da1204b92028..82fc433b4cc2 100644
--- a/net-analyzer/fping/fping-4.0.ebuild
+++ b/net-analyzer/fping/fping-4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://fping.org/dist/${P}.tar.gz"
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 suid"
 
 src_configure() {
diff --git a/net-analyzer/fping/fping-4.1.ebuild b/net-analyzer/fping/fping-4.1.ebuild
index 13dec2b8e680..0c25ab5c1df4 100644
--- a/net-analyzer/fping/fping-4.1.ebuild
+++ b/net-analyzer/fping/fping-4.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://fping.org/dist/${P}.tar.gz"
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 suid"
 
 PATCHES=(
diff --git a/net-analyzer/fping/fping-4.2.ebuild b/net-analyzer/fping/fping-4.2.ebuild
index 6439049516db..b181b90c670f 100644
--- a/net-analyzer/fping/fping-4.2.ebuild
+++ b/net-analyzer/fping/fping-4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fping.org/dist/${P}.tar.gz"
 
 LICENSE="fping"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 suid"
 
 src_configure() {
diff --git a/net-analyzer/fprobe/Manifest b/net-analyzer/fprobe/Manifest
index b96a667a2774..6ff2b6246e1a 100644
--- a/net-analyzer/fprobe/Manifest
+++ b/net-analyzer/fprobe/Manifest
@@ -3,6 +3,5 @@ AUX fprobe-1.1-pidfile-sanity.patch 1319 BLAKE2B 911a4ec1f48f602c750a659c478380a
 AUX fprobe-1.1-setgroups.patch 454 BLAKE2B cec2168dbe296dea2e38d87398fd9d44543f1a0e679f8f02e0161363b4e436e07eb2c4ffc1242aeebb7db26f00d01c5360b2dc5dde60676d8f07ca609ccf8ba8 SHA512 a5248f5962f2ccb9e9235ae772d72b74db40504894e2ce40644af740849a98cfdaaa74beb151ca0e852f2df1419ee2366ed5850a15a23a54ebd3aab7569060fc
 AUX init.d-fprobe 1099 BLAKE2B 0c20d0b476298b05fd88841f40acd241897210edbbf35041f87e86f9a512e1f8da7e0b4e59425dbb364555690608ca8f950a63fd4c9b96c67301eecdfac98338 SHA512 60823b35f809ada8de94f6427e2371681f646545b227974c4d5c94ae5153d48ad3815c848702606dc2ee18622787f1d04c499a241d60475c00303c6b652b9e51
 DIST fprobe-1.1.tar.bz2 104358 BLAKE2B 960fd8941ec2a7656b9eb02a0b6ae091b6ab564b4f97aa8147ce1bc3785964008168a1ac43a3fbe2e342987ee68fff711648edb910a059222017fe1282205e8e SHA512 35fa4bedf2c615093b6637630322115e12f005bc43186b86c55c6bdc76ae5308dd31e1d05632e26e07a30fba88d76b9acc98632bee4f372edcf9df5da3e32210
-EBUILD fprobe-1.1-r3.ebuild 805 BLAKE2B 875105b66b27a36de952fd0abf6617c1ebd72c57778bcd31c70c667ada5b2950630f93ea519980ac131ed21f85ff59667a320564f21464c801b07859465752a3 SHA512 0e04cd9b9d0691c1a5c3bf36c6e66cf48ffcf0ee7f798f569f6ad090db2fdf7a56af3dd9d1a5d81007677dc343cc45f04c956160817f0ab39e2f3310fa246ee3
-EBUILD fprobe-1.1.ebuild 710 BLAKE2B 31fb2cc98cf7e134bd5388a94d7f2e3b389010ff1d5a7c75ed7365ba96e2426781f7041f3d2a8f6fda5d24540d5f2d33243e0dbb6c72af0fecdcf5398b74643b SHA512 727c45c7d4667dc532c46bf21b4655fb841303bbedab0a0c293716f5553b43426e3196d083fd05018c253c11a82e59cbd83fcd5d56bb186b804d8c5420490884
+EBUILD fprobe-1.1-r3.ebuild 801 BLAKE2B db254f316f6e3dc634b5e145322ebcc515c8baeec598fa91419a7522d0efb39e0162ad285a22c3f18583e72427b721e2ffbfebaa352d0becce9c68cd477e3ee0 SHA512 6af18b0521b9c8fcdfc0abf0c3a9163adf65869c3181b16a2574b0c3a9c42442ef911dc8fe7420fbc3d3668e32b5076987f25502153b4ee80c6be331f05f496b
 MISC metadata.xml 426 BLAKE2B 3ed8a67ede1c9d27d291645589c3eed9fb13ec009974dd9a113bdc3f5548deea784ccfef968501f282e9161f319bca59b835e5e822852537df93e8b75406fa5b SHA512 2b9247d129021a3e25d3d4196a48ec2d204d2e91307231d372cc1bde255553785c9e413ba3dcd6a62ad28e54ba46e732212aeff4bcb03e796f2ba87325dd80bc
diff --git a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
index c9f12cb15c7d..d86d043a9c3f 100644
--- a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
+++ b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ LICENSE="GPL-2"
 
 SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE="debug messages"
 
diff --git a/net-analyzer/fprobe/fprobe-1.1.ebuild b/net-analyzer/fprobe/fprobe-1.1.ebuild
deleted file mode 100644
index b187de05373b..000000000000
--- a/net-analyzer/fprobe/fprobe-1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
-HOMEPAGE="http://fprobe.sourceforge.net"
-LICENSE="GPL-2"
-
-SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-IUSE="debug messages"
-
-DEPEND="net-libs/libpcap"
-
-src_compile() {
-	local myconf
-	myconf="`use_enable debug`
-		`use_enable messages`"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS NEWS README TODO
-	docinto contrib ; dodoc contrib/tg.sh
-}
diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index 43493cf9c986..8f66ded8c997 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 988 BLAKE2B ec24e54ad5a77c6bfd6f36acaaf02ddcb788fc1cb7c57a664426d497ae30bfcd362a2e6d7b4eb404111a441f1bbd723c9b11c753c4615b759e2b6d9a9004918e SHA512 ba21742382c329f7a01669f644244df569b2d52ebc2ac75b7d893b119b0bc1828405e6b49078c5e985e2711d917f1be899038c66964290a98aa1495609918eda
+EBUILD gnome-nettool-3.8.1.ebuild 978 BLAKE2B 2a93f9d3a9bd1b9757652211933bfcf310d2f4b153d6c697daf5374e458a5b03940881e16d8a78e9a3bb3d9cc8fb11dfd8dbc19bd7eae4b70cd953d8086d3c65 SHA512 1c0e1547d9ad06eb45d39c296a8771b195d1a38b2efee157036fdcc4122d68e88f6d787e06e25874ac3841480a38fa0bd15f73c5c62e482956d1056d33acbebf
 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 a7f4719ea2d9..c168c33de958 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-nettool/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.25.10:2
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 874f6e48a7e3..d5ba51c43836 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,14 +1,10 @@
 AUX hydra-8.0-configure.patch 1089 BLAKE2B 7aa67a47f3fa8174b0a72b86e4bdf743750450559327ec8da31506b817d59a0f3e6b96f32acc4a8658f98845053f50ff089c57f16b9251bc0daa38795a93e2ac SHA512 d7fbc56b9d0fd6cc89ca689a07c0dcf618827bfaafb332217b695b38cc6382c32aedfec4c046575dc34c0946c9b0212a22d82554a296697d1b922ad45084a0bd
 AUX hydra-8.4-configure.patch 1217 BLAKE2B 005cd700dd32e56405afa7a37d630aa8b2fe66f94b16b1fe09e6a5172aa5ef1c5e6896b697717e6b0524b5fd8b41443a8c5a734b1273843e54a6aebaed563c62 SHA512 18d76ac35660955a07ba435bf00ceebcd62423fd08c97237f7aa3be4187532f454997008be5395b2d8ae9d66e10204f76905481034c3e5cb1761aec2b02e32c3
 DIST hydra-8.1.tar.gz 559031 BLAKE2B a3d2b52508a1d03a2f3d6cecf7100543487b5a0f6210dd6128d3ab48ad16ca3a8fad49709163830049ed8b9bb6891861f9c3f5fd5a6179b0a87a072877e829af SHA512 7608dd365865e5976bea446faedaad9f0334e7572fd0ee47a601c471471fc7c8a922c7114f4df08705b34b29144d3a6552e66148adf6b0f92c67301119c94959
-DIST hydra-8.5.tar.gz 1193694 BLAKE2B bf202ccf58f64e2b57a15b5aaf8d4357b8d37d0a634179d2b4fe0c7d63da1e363b02e8578de7d984c75f1e764fc95477aecac9643954c05acbcc63865e066b0a SHA512 67fd92bd5983a94314334471c526b71ca77dec6e359e55f4fb2fc78160e2065957b6c9af1ff694bcc5334893a8b5e0fe1b39d984248bde4e55dc2a9f9a8b1271
-DIST hydra-8.6.tar.gz 1200238 BLAKE2B d9470be5280ec51dfcb701cc3dd87ffaef7076c990a30e833c3fe7bc0f2b951f40eae26dab28ebbb1116f3d5e884a3c0819a5913c68e714a3b8597af75140829 SHA512 d5d70b5df54fbc556c6db9e9e44b869f29e54aca03dc3cc9e1777d310fcf604b9602ba08250c5bb0d009963dc0ca5c169e61d3f64d7ec2383760fc819d6b6c61
 DIST hydra-8.9.1.tar.gz 1186320 BLAKE2B 97c29cda5e26197ed66aa29555b0e4de3ef5b08bf65aa09fd0d564ee5f63825af71d6a41c4552a06a4c86a98dab5a69913c0b0200fe4e5068284ec7fc1f1061b SHA512 68b07dcb22bc55937e79035954417d820691e3a1eea169c959886ce6a741f545efe7879f31f41a1751779c923410dcc67fe8914bb9b5cf567edfc6fad3997d72
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 EBUILD hydra-8.1.ebuild 2231 BLAKE2B 95092e808318ddde9e4dfdffde525efba03a9327fcee14ea7e3b02c21b823d9d2b546a4a60e69d045fc2866ad30660ab796406a09c520aa4d09d1933a8fe1df2 SHA512 77b003b5e8c5118dc81c318974ae2af2b0e973a272eccf3666ada23ed2712762792c725c1d2f5b3bb1df37277d3a6951ea92dd3995ea79ec97bb053ab339cac5
-EBUILD hydra-8.5-r1.ebuild 2385 BLAKE2B 21d08357ab57670feb857ec4151df73eb760957c195514c890b5906698347d607211323c9905be22ea94fce87b270b9ae07cdf170d16041ecdb052ef9684d835 SHA512 7f9d38cf69559f85cc90a77d455c23ab08eff9cc4f32d2d93d12128ad903ec901462433b7870b10d4d221982eb496d4f72eadf060eff8d0dcd0ff600e19c1180
-EBUILD hydra-8.6-r1.ebuild 2384 BLAKE2B cb3e96abad9e6cf477042c583516373e774efaee1088218a092adeabbf2120e6807f5d29f92c338ab58f4a740041e5f0c993880c04d6fb3edba021d1ecbc99b6 SHA512 c6c98e5b9a379c058fc7bb041136bfc05d15f68e0af5873582af93826662a5e90d91aab32238efefc5f66fdc81f3f2a5626769d9ca85d41d0ab2bf145e17cb9e
 EBUILD hydra-8.9.1.ebuild 2366 BLAKE2B ba12d4eca5289fcb1142dafd6114a037097ebcf61e3cdf08c0befacdcbd799358b8db0df251201bcb3a9e690063c3a6b7bafe2917b3bb2fdfff4acbdfeae761c SHA512 1888c365da61c5e2e873dc4c7d76cc0f0e30d6638d9416df8857deb84bc844e7ae0ce3f71c897c1eedd1b9e1efdcbdef9b1cd9eac23b89df4b4a5147a6f68bdc
 EBUILD hydra-9.0.ebuild 3633 BLAKE2B fef1fb1edc77744dcd5e24321e4e67bd4f215c9439396455809b35a6f37409b379049356ea3f4fcb066b4ee772bff328023fe5fcc9528441b4e5a8767845331d SHA512 e9b1be609ea4c7ba487fab8865943a7f319e2040f6cdb42db78dd6dba9288f7c2307f76fb30d26db738f96d3564503f31db1b69d2c3c3e3b363f8417c9e26452
 EBUILD hydra-9999999.ebuild 3571 BLAKE2B 1bdb57bf900c1a3a3ae3e63858cef8dec1408d544f101d90485f11cb7705bafce7e708ee2006bed412e0cdb31238e8bd9719014ec416540d6f7ab88f1b7e8656 SHA512 dfd6138ea0fdcdd1c839eb1a2e094749e23cc6603c61e9975db6e5d94d792492c87fb918977307dde72fde2042690375b306c440280aad44c8d5ba622c2dcb77
-MISC metadata.xml 571 BLAKE2B 15177ec654ebb1b0a8afe4fcf48578579765545b0a8c1477900b7bfb24718f2645ae1b4fbdeb7110e3a2958be58869bf57181d6d9518a26f0e6f7d751fec2d3e SHA512 41e64b2953d3512bebf56e82ba27690ef3cfa87ae6b6508838e0678229c06f7bea6b9cf50046c41c76f519fdf23b08971fbe3cd5176b2b4f3875ee66e78d7e5f
+MISC metadata.xml 570 BLAKE2B fba8cf56f3f091fdf16a86ee3a1b964e9dfc0cae8a32e6fb81b8ccec3f1efe47dfac838c86fadd80e736d4a82233e8f84695c0a0987d4f426ab88fe0841df70f SHA512 45d0573055b0fe5f820e92cd43627e5c48dee8a1151ef06c7f65dddb8078ff62197bd5c8bbd1e1b12a42df61e399f2e3bff337201fa37df085339de24c8b50ba
diff --git a/net-analyzer/hydra/hydra-8.5-r1.ebuild b/net-analyzer/hydra/hydra-8.5-r1.ebuild
deleted file mode 100644
index 78edf98bb463..000000000000
--- a/net-analyzer/hydra/hydra-8.5-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Parallelized network login hacker"
-HOMEPAGE="https://www.thc.org/thc-hydra/"
-SRC_URI="
-	https://github.com/vanhauser-thc/thc-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="firebird gtk idn libressl mysql ncp oracle pcre postgres ssl subversion"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/ncurses:=
-	firebird? ( dev-db/firebird )
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	idn? ( net-dns/libidn:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:* )
-	ssl? ( >=net-libs/libssh-0.4.0 )
-	subversion? ( dev-vcs/subversion )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.4-configure.patch
-)
-S=${WORKDIR}/thc-${P}
-
-src_prepare() {
-	default
-
-	# None of the settings in Makefile.unix are useful to us
-	: > Makefile.unix
-
-	sed -i \
-		-e 's:|| echo.*$::' \
-		-e '/\t-$(CC)/s:-::' \
-		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
-		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
-		Makefile.am || die
-}
-
-src_configure() {
-	export OPTS="${CFLAGS}"
-
-	if ! use subversion; then
-		sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die
-	fi
-
-	if ! use mysql; then
-		sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die
-	fi
-
-	# Linking against libtinfo might be enough here but pkg-config --libs tinfo
-	# would require a USE=tinfo flag and recent linkers should drop libcurses
-	# as needed
-	sed -i \
-		-e 's|-lcurses|'"$( $(tc-getPKG_CONFIG) --libs ncurses)"'|g' \
-		configure || die
-
-	# Note: despite the naming convention, the top level script is not an
-	# autoconf-based script.
-	export NCP_PATH=$(usex ncp /usr/$(get_libdir) '')
-	export NCP_IPATH=$(usex ncp /usr/include '')
-	sh configure \
-		--prefix=/usr \
-		--nostrip \
-		$(use gtk && echo --disable-xhydra) \
-			|| die
-
-	if use gtk ; then
-		cd hydra-gtk && \
-		econf
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake XLIBPATHS=''
-	use gtk && emake -C hydra-gtk
-}
-
-src_install() {
-	dobin hydra pw-inspector
-	use gtk && dobin hydra-gtk/src/xhydra
-	dodoc CHANGES README
-}
diff --git a/net-analyzer/hydra/hydra-8.6-r1.ebuild b/net-analyzer/hydra/hydra-8.6-r1.ebuild
deleted file mode 100644
index c1e0721b8577..000000000000
--- a/net-analyzer/hydra/hydra-8.6-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Parallelized network login hacker"
-HOMEPAGE="https://www.thc.org/thc-hydra/"
-SRC_URI="
-	https://github.com/vanhauser-thc/thc-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="firebird gtk idn libressl mysql ncp oracle pcre postgres ssl subversion"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/ncurses:=
-	firebird? ( dev-db/firebird )
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	idn? ( net-dns/libidn:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:* )
-	ssl? ( >=net-libs/libssh-0.4.0 )
-	subversion? ( dev-vcs/subversion )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.4-configure.patch
-)
-S=${WORKDIR}/thc-${P}
-
-src_prepare() {
-	default
-
-	# None of the settings in Makefile.unix are useful to us
-	: > Makefile.unix
-
-	sed -i \
-		-e 's:|| echo.*$::' \
-		-e '/\t-$(CC)/s:-::' \
-		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
-		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
-		Makefile.am || die
-}
-
-src_configure() {
-	export OPTS="${CFLAGS}"
-
-	if ! use subversion; then
-		sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die
-	fi
-
-	if ! use mysql; then
-		sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die
-	fi
-
-	# Linking against libtinfo might be enough here but pkg-config --libs tinfo
-	# would require a USE=tinfo flag and recent linkers should drop libcurses
-	# as needed
-	sed -i \
-		-e 's|-lcurses|'"$( $(tc-getPKG_CONFIG) --libs ncurses)"'|g' \
-		configure || die
-
-	# Note: despite the naming convention, the top level script is not an
-	# autoconf-based script.
-	export NCP_PATH=$(usex ncp /usr/$(get_libdir) '')
-	export NCP_IPATH=$(usex ncp /usr/include '')
-	sh configure \
-		--prefix=/usr \
-		--nostrip \
-		$(use gtk && echo --disable-xhydra) \
-			|| die
-
-	if use gtk ; then
-		cd hydra-gtk && \
-		econf
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake XLIBPATHS=''
-	use gtk && emake -C hydra-gtk
-}
-
-src_install() {
-	dobin hydra pw-inspector
-	use gtk && dobin hydra-gtk/src/xhydra
-	dodoc CHANGES README
-}
diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml
index 3a5ee322a93f..27f48a7d774b 100644
--- a/net-analyzer/hydra/metadata.xml
+++ b/net-analyzer/hydra/metadata.xml
@@ -7,7 +7,7 @@
 <use>
 <flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag>
 <flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag>
-<flag name="mongodb">MongoDB support through <pkg>dev-libs/libmongo-client</pkg></flag>
+<flag name="mongodb">MongoDB support through <pkg>dev-libs/mongo-c-driver</pkg></flag>
 <flag name="ncp">NCP protocol (NetWare) support through <pkg>net-fs/ncpfs</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index ad8ebb7fdef6..37e911b72f00 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -6,8 +6,8 @@ AUX iftop-1.0_pre4-ip6.arpa.patch 1857 BLAKE2B 920b5393366d0fe1ccf7619a862fb6a91
 AUX iftop-1.0_pre4-tsent-set-but-not-used.patch 229 BLAKE2B 42318fa63e40a2a0b3f50d33c6ca3fef69c837290272f132d63dde276a4302254378f8ab31ab49dbb0b50e821594a2979c713f9119eb4ec852971b585648b344 SHA512 06d26d9497c6afc6b7eb5db508def08c8945408e89127f3938667973f8a8b7884dc0e7b005c115a7acd66d62107de5d47d49a869b89f25f24dd999161b0fb0bf
 AUX iftoprc 1391 BLAKE2B b2558509d0f8e9dfade1bcb1a1b50569510cada2629fb3b0cb772d2fa0642455ed6e4c18024a19b656bb9d42eefd4e2db2ea066dae28528ad51f12b439307f0a SHA512 01373add0177399e7cf4ae0ecba893fdd9c73bad5243478b4ac9ac5e936647738a22906ee1e8b22b51d541cc4150d0e0619f134666a1e3d0cb78a59a5c04b95b
 DIST iftop-1.0pre4.tar.gz 204665 BLAKE2B 181385c3fbf43abd4ead975aac11b5ff196de94d9a8d6f195b3f0068aba6ae953067995d19f0175b49ab15c447c99d531542ae786603ee390e080e79bdcd7ae3 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22
-EBUILD iftop-1.0_pre4-r2.ebuild 942 BLAKE2B 15e691dc44693bba16bf4a326419f69bb0fef3698262f017e4becb3828e3fec88f5818997da86dd39fd021d316087a4b32fe0c8c6120ab0902f665b43312a8de SHA512 99a36fad0f615711d836ee6e8aa8c4c370c609944cd8fd0d66e40cb3b0b4f8bd0605a5c193a33f1a557ec13a74d63288c4e93a76669f45398183f02bbdfe7898
-EBUILD iftop-1.0_pre4-r3.ebuild 977 BLAKE2B 942285e9896f3cd1b4431a41ce75ac55131dfe2ae7b0978596327a9df4d238d9088e2952f958a5eca725e99f4f0c8b7a06533020c7531b6e5ef3393cbd74084e SHA512 9d3e84519fcd745d055dc8c1fea5525f25d08ddf30bb8894cef7d2af3631d2d5fa5aa5368026c5092f5bce2a60f663db7245de2d82ede451eb57ff06d4f78ac1
-EBUILD iftop-1.0_pre4-r4.ebuild 1069 BLAKE2B 76fd9b231a91031734ad64877865fb8a59375bdab56c6b017828ae45e57fc8d8771334ceca236e4183f899c5bd8b1961359e23e49047dcc33739bf5bf776f4ae SHA512 71bb82ed24362c82baecc2a060324f22d2c98ed3ce03f78393d903f494aab0ded51f7db207cbe40d989a12bc167567347079da11175894b6d5abdc1c24e67616
+EBUILD iftop-1.0_pre4-r2.ebuild 932 BLAKE2B 8366d108b7c183a5dbda391f4ca3e134b6e794840faed54609b63ff8eca3e34a6344f369ba8787f6dc16302bb857daf73a243a7688cf3c45a4405ec684c009a9 SHA512 49523a3f3ac3e61e0e93b2cbcecc058dcd32aab67691e62c18e37b9d432539340dd22a0a174d778aac5d164773f1ba816b9ee681c3861b7a49340d3091e2dccb
+EBUILD iftop-1.0_pre4-r3.ebuild 967 BLAKE2B 3c772cb506cb89668fec11e768e7fd3a8867883c553a91d12c718391afc7c6f66236a5a298f8181a5e9b497e347e3e56ffb2abf6800730325bf02a728b6da0af SHA512 99150916518329e9af9b0c005f728f9280405ed5c6aab1caa01b035481d11c97e68d898bcaa5a742224c081bc1b9b4b3cd100ba12ccbcef0cb9c074d5e848af6
+EBUILD iftop-1.0_pre4-r4.ebuild 1059 BLAKE2B 6f1da490a679870a64d3a6e7a332142c0b1b3e5db264f51b008298d22a85161cbe5d24be17a7f428394cda43dae3e273dbb0aef09468675223f305b32bc89156 SHA512 e6230f7bfc694be260f7f842cc1c436ee6d54be1a37eef53310e5437ae0667d1401c0123c322b2a7929758f022c6c706bc6beb2fc40330dcb048a6ed3e4eccfa
 EBUILD iftop-9999999.ebuild 832 BLAKE2B feb1cc2f49365a06098ec2d90cbe02edb4edd0a598f390431473b829edc88ddcd415fbc902ab3f392481bda43085641e4fdd7ed875219209285b4d2abd64b199 SHA512 ce61354496ce1eb4e5e6073b61ac5eccd39b836c981a44f81e63b455d0206e0b4096642627554b01a0b6c5cb758f5a12e1a2859d3d66b078423d8b6a21ff3337
 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
index 3162199d22bf..66d4ef612643 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild
index 037c80722a7e..aede14d946f8 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
index 94b1fb3743b2..8221ce61ddb3 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/ipaudit/Manifest b/net-analyzer/ipaudit/Manifest
index f10a8bd10923..5a270090aa2e 100644
--- a/net-analyzer/ipaudit/Manifest
+++ b/net-analyzer/ipaudit/Manifest
@@ -1,4 +1,3 @@
 DIST ipaudit-1.0BETA2.tar.gz 135680 BLAKE2B 2a8e7754251c743758d6e0d7008d904a3a237c26a660f5c07661c632dd75ecda6cf3b04253eb76f64c72ed278da00030cf64231bdc4760a6b04df1497f628ec2 SHA512 3a8890821c515aea95762eeb2cc7a649533ff739984c944bcb26acb72434e1f2b453a98365719fce9e062d6262b9d76ac389f149ad2a19361422783bc0b55e09
-EBUILD ipaudit-1.0_beta2-r1.ebuild 573 BLAKE2B e75ebc9f1e3fd00a9bf3f4d7f84507cad55d5a513505c0ac0287a14f8921eaa64834784165677eac79123ea3742409728d92288a13071cda567f2afb29aa734e SHA512 7a2dc0294158302386fe49c2d54c95051d5aee8fdcfb22a467cf737691352a1d1c07e9dbf2eac34980c7370cb18ee4e307f451ab61838f0361326bb7ec983742
-EBUILD ipaudit-1.0_beta2.ebuild 650 BLAKE2B decd9daad1c7fa41d1a1dbbfb40fb55a85b7568ab0aea1ee80303628f4014330bcb92ed5f62c0f4d7c3a4fcdfe5dd4eb1ec84051b9819de3ceb9c8f08d14d6d3 SHA512 49e97ca5e9c70de10032632ac136dfd6bff516a86ef5d8321c132a5d02cd8633bbd3b25c0c22c2eac830bc863da255fd5ce3772f2af66d7e82027f21325ed07b
+EBUILD ipaudit-1.0_beta2-r1.ebuild 571 BLAKE2B a63f91c105d539e8858e86a6c808fc9a08018d649567e1d23549740bf4b06e5527e4b34381c3f6c0d3bdd1b1a0c471ca76bfbe7fcb2bbec03927299325afc29f SHA512 d10451f20c62d82cefee6530879cbf588aad4c8c756d003e35a311bebda9fef3cb73fc108e019819e9d738fd864817279772bd37b91c6f4f86dc1feda7e985ae
 MISC metadata.xml 337 BLAKE2B f6f2a1c579130f2d97b5d9885623824110a7ab7faf876fe8cdd3cea7202628d7176dd74ee8263174bfdb89125b5f58424c23af50f472806f89b3c398598e0900 SHA512 58c8b84ff4dc9e733926d97333c6bee74a769c4e08e6505ff72c317bd55099536e8cba81361d173d501f9b53efdb8d9f3c8c5e60ab79f5b03a63c4cc2ab9ca34
diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
index 0fc67f6ca6a3..fba409faf3e3 100644
--- a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
+++ b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
@@ -9,7 +9,7 @@ MY_P="${PN}-${PV/_beta/BETA}"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="mysql"
 DEPEND="net-libs/libpcap
 		mysql? ( dev-db/mysql-connector-c:0= )"
diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild
deleted file mode 100644
index 2a6a3016c57c..000000000000
--- a/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port"
-HOMEPAGE="http://ipaudit.sourceforge.net/"
-MY_P="${PN}-${PV/_beta/BETA}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="mysql"
-DEPEND="net-libs/libpcap
-		mysql? ( virtual/mysql )"
-#RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf `use_with mysql` || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS README
-}
diff --git a/net-analyzer/mdns-scan/Manifest b/net-analyzer/mdns-scan/Manifest
new file mode 100644
index 000000000000..845da21bd99e
--- /dev/null
+++ b/net-analyzer/mdns-scan/Manifest
@@ -0,0 +1,3 @@
+DIST mdns-scan-0.5.tar.gz 15181 BLAKE2B 318ee5560f9973c663d4a319182715c1452adf593c281df404dab9c87e4b0ea872e0cae1cd801a4e9b9f03019222b8969f4f70eeee7e1c3e2fa941ff7f3324a8 SHA512 732ecb5cd3830056dc61f3a688d72cbf18ef49c9efd7fc082e4d6fbf1a826fc50ddd372185e53cdcae0d819b6aa5e2834328d3799e0f0b37e0f493d162e7775d
+EBUILD mdns-scan-0.5.ebuild 587 BLAKE2B 1460e737a0e61f53b123990dc2dc2e820a9cfe321877539201aa40cbd055834c353048ecd6da25ec84e87741d2cc4c1a1553d652ffe814c0be69f0789fe89205 SHA512 13dc17f46c1bb61a4e01737f80c3173aeb32bd68c45a785e3ab0bbb299c677e864d7493406a02ae30890910c37c78538690ee55d1953199d86c0206e341ff2f8
+MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild b/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild
new file mode 100644
index 000000000000..7bfcea86d3db
--- /dev/null
+++ b/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="a tool for scanning for mDNS/DNS-SD published services"
+HOMEPAGE="http://0pointer.de/lennart/projects/mdns-scan/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -i "s#-Wall -W -g -O0 -pipe#${CFLAGS} ${LDFLAGS}#" Makefile
+	sed -i "s#-o #${CFLAGS} ${LDFLAGS} -o #" Makefile
+	default
+}
+
+src_install() {
+	dodir /usr/bin
+	default
+}
diff --git a/net-analyzer/mdns-scan/metadata.xml b/net-analyzer/mdns-scan/metadata.xml
new file mode 100644
index 000000000000..f4c696b2c619
--- /dev/null
+++ b/net-analyzer/mdns-scan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Rick Farina</name>
+		<email>zerochaos@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index f94440947402..2bb45374cf7d 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -6,8 +6,8 @@ DIST gtk-2.0-for-mtr.m4.bz2 2508 BLAKE2B 86d1eb64e21084d1455783765b0be088893c260
 DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea3629b2668631f25e9181cf4236ba0e2cfc0517e7c70683bbb6347d9c26a2b09701d89e225c27aa2faae4 SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9
 DIST mtr-0.92.tar.gz 296430 BLAKE2B 0f7dfcbd77d6f9cd0a9ba4c7e6829ce8f3fa0e1de4009632d10c3a1c2acc280db5830296695c27d89317d38d507af8f7e9bdd12b1c0e0d198872dc39f13032e7 SHA512 d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f
 DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d1ed257a2c238ab78ac16e1a1e152ef1359ca530b0eced14c9333df2b691c27cbc29173c843ebc64eaaa9 SHA512 046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021
-EBUILD mtr-0.87.ebuild 1160 BLAKE2B b2387d41479707319b51be3877f58aa6cf13e832780a75ebf4a9f0ffd013f83cb5e129e0c254f2fba7d7aa7a3d7a0bc73aaffd0769adfaaa5421d99ef2b347e2 SHA512 93f02f5f2f477f5aeef30fcdf9d589870af55b7076989be6cfd00513796acef1657a0f92558d97807fdfc70764da7b61a8c8f3dd67cdf73e7f9d417ee5fe5e82
-EBUILD mtr-0.92-r1.ebuild 1428 BLAKE2B 6adaa9e1d16e8b8969d5f3fcefb078cc3aa9ec6cd26e476ee3b3f3d13f6d1426f00d51c026fa44af03bb2713d0e60544b3a5b269e79bed03450108f2cbc02caa SHA512 b7dd855dfe63c4d069150cc2c78faad630dfc11e02afa5f9d1262df8ad35cc9d43602f7ca3721ce421285fb40ca362df35a196560726d0f1ca78262388b16ea4
-EBUILD mtr-0.93-r1.ebuild 1517 BLAKE2B 64ecaf414af0a278a8c3a75e065a8d0e0a333b203254e56f050352a867e21faefe0e699b6225e5ad25439410f784c161cff64d47b69c5b25c9444ff90d547a85 SHA512 a6c755d5d559227c09527ae024b0aa83954a511cd550e471a0c9de1aafe97d87df8fe3e75968d970987473bedc2710cfe1d2efe5b8606221756baf4d3a1ce554
+EBUILD mtr-0.87.ebuild 1150 BLAKE2B f7157b21c48d9fb942cf90db72ab8a3969abe8f295bcc4345ccddb12b50a7797f46fec44ab40f30c556040d6f72c1d3236898bb230bc742513e5e1c44f8c4e7a SHA512 baf2f11237b50b16037f9983869f1cb890bb4e37fb8d7604ecf5bc0a28397ecc2644a960c47b01bfb9a00deb06d2ea41915315ad53b8bb92f11b83f42152331f
+EBUILD mtr-0.92-r1.ebuild 1418 BLAKE2B 7617cf78513e3987491fe9f8c735160eda5fd524274f23e57cc41a40bf6cadc2fa86ac039f71622832ac25b67632a031bd6b70c4ed080d3a90723a8ac039414c SHA512 2864b1f8722b8206bfb1a9191251dc8e07fd1537344d802056b66b33aec3c9c830c9b09c6f310124c94a914fc3194a6b4c550d8de7542d2690d95a8a12a53cf8
+EBUILD mtr-0.93-r1.ebuild 1507 BLAKE2B 25bb941cf95898609dfe5e432535c49cacceacdf5c15d04f0ef3bd6257b18babcdb8502ea315c33bad2536bfa242c71aeb093fe8e6bd8acf124592a73e50d40c SHA512 8a15dec7446bd7642bb59113ad6ae6451856abb5f337875563233e8350705d8d0d0ab6000192074cf14bc7f28267a70e837ccfa37fde29865e22e980270751cf
 EBUILD mtr-9999.ebuild 1581 BLAKE2B e52533acb767ab356958eeb91e19deada75245671b24e201283a0db85493f2850db3c66351ee25c7471133eaed9fc1a1b1db715b78c496b6af002eda1cc31da0 SHA512 7a43bba45d9a2b17bbfa92dcdd9ede2ed9c1c7a5a6ed8a95e4ad6d1dc0be3783bd7cfe148674a1469e196da9a6c8b19d13d2abf6ae88464ed2e0b181dd61ca7e
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild
index e81c2db77623..575256d8fca3 100644
--- a/net-analyzer/mtr/mtr-0.87.ebuild
+++ b/net-analyzer/mtr/mtr-0.87.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="gtk ipv6"
 
 RDEPEND="
diff --git a/net-analyzer/mtr/mtr-0.92-r1.ebuild b/net-analyzer/mtr/mtr-0.92-r1.ebuild
index ea48af37e69d..c0124945b425 100644
--- a/net-analyzer/mtr/mtr-0.92-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.92-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="gtk ipv6 ncurses"
 
 RDEPEND="
diff --git a/net-analyzer/mtr/mtr-0.93-r1.ebuild b/net-analyzer/mtr/mtr-0.93-r1.ebuild
index a18dbb143fe6..dc7f90ebcff8 100644
--- a/net-analyzer/mtr/mtr-0.93-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.93-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="gtk ipv6 ncurses"
 
 RDEPEND="
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 0e82b21577b4..ef95adcdc143 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,8 +1,4 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-7.4.0-es7.x86_64.rpm 15719960 BLAKE2B 3ea992c54d7a5acf09bc0097b6780993daab68ef2ac4816b247dba8deb949f5fd3202f9244d8ca6d9b53414163deb942b4e2739e14b42396a9a64b2265dea18e SHA512 35d948807a5110a3b1e32abf8a427aebbf082555ffd7f11abff037909119eed8f866f09121d2523107a6b2c374a45f0ff42933b1148d7679436540956d227c4b
-DIST NessusAgent-7.4.1-es7.x86_64.rpm 15719896 BLAKE2B 16e0c578c01edeb54156e6228569ad3c179ac421887dc5f844aa957ef0c12f69d72a22efd8f0fecec9d3d23dcd8a9fdc017561f05f1aaf1cc3a426f83b9b914d SHA512 ff3704706d740e70cac083eb748e9e0e410709b8718c7fd77851ee7591fd5cb0c162bc7308662f864cd1d527ae33171c089d0b32e88c278399aaf8d95d013c22
 DIST NessusAgent-7.4.2-es7.x86_64.rpm 15989044 BLAKE2B 7fdc998acc4a5ee38519a3cf4d41d1de29cb8ddacb05bd6f734a458c63d7ce22c547b4d080320631d489dc381c4553d99a81786dcb48231833a77561ffa6928f SHA512 4aacc51d360c41963ad46c0976322cd29012d52e054337d4e0a303257796923bd35059324a041827ce0c54ef5c5dd6738311fcc4f0bcba19b6d4ea1e3730a146
-EBUILD nessus-agent-bin-7.4.0.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
-EBUILD nessus-agent-bin-7.4.1.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
 EBUILD nessus-agent-bin-7.4.2.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
 MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.0.ebuild
deleted file mode 100644
index 20d896ea6290..000000000000
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm pax-utils systemd
-
-MY_P="NessusAgent-${PV}-es7"
-
-DESCRIPTION="A remote security scanner for Linux - agent component"
-HOMEPAGE="https://www.tenable.com/"
-SRC_URI="${MY_P}.x86_64.rpm"
-
-LICENSE="GPL-2 Nessus-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-QA_PREBUILT="opt/nessus_agent/bin/nasl
-	opt/nessus_agent/bin/nessus-mkrand
-	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
-	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
-	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
-	opt/nessus_agent/sbin/nessus-check-signature
-	opt/nessus_agent/sbin/nessus-service
-	opt/nessus_agent/sbin/nessuscli
-	opt/nessus_agent/sbin/nessusd"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents"
-	einfo "The archive should then be placed into your DISTDIR directory."
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
-
-	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
-
-	# Make sure these originally empty directories do not vanish,
-	# Nessus will not run properly without them
-	keepdir /opt/nessus_agent/com/nessus/CA
-	keepdir /opt/nessus_agent/etc/nessus
-	keepdir /opt/nessus_agent/var/nessus/logs
-	keepdir /opt/nessus_agent/var/nessus/tmp
-	keepdir /opt/nessus_agent/var/nessus/users
-
-	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
-	systemd_dounit usr/lib/systemd/system/nessusagent.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
-		elog "obtain an appropriate linking key and run"
-		elog ""
-		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
-		elog ""
-		elog "This can be done before the agent is started."
-	fi
-}
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.1.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.1.ebuild
deleted file mode 100644
index 20d896ea6290..000000000000
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm pax-utils systemd
-
-MY_P="NessusAgent-${PV}-es7"
-
-DESCRIPTION="A remote security scanner for Linux - agent component"
-HOMEPAGE="https://www.tenable.com/"
-SRC_URI="${MY_P}.x86_64.rpm"
-
-LICENSE="GPL-2 Nessus-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-QA_PREBUILT="opt/nessus_agent/bin/nasl
-	opt/nessus_agent/bin/nessus-mkrand
-	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
-	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
-	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
-	opt/nessus_agent/sbin/nessus-check-signature
-	opt/nessus_agent/sbin/nessus-service
-	opt/nessus_agent/sbin/nessuscli
-	opt/nessus_agent/sbin/nessusd"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents"
-	einfo "The archive should then be placed into your DISTDIR directory."
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
-
-	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
-
-	# Make sure these originally empty directories do not vanish,
-	# Nessus will not run properly without them
-	keepdir /opt/nessus_agent/com/nessus/CA
-	keepdir /opt/nessus_agent/etc/nessus
-	keepdir /opt/nessus_agent/var/nessus/logs
-	keepdir /opt/nessus_agent/var/nessus/tmp
-	keepdir /opt/nessus_agent/var/nessus/users
-
-	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
-	systemd_dounit usr/lib/systemd/system/nessusagent.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
-		elog "obtain an appropriate linking key and run"
-		elog ""
-		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
-		elog ""
-		elog "This can be done before the agent is started."
-	fi
-}
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 104b5e4b396f..fb42f05b1726 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,6 +1,4 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-8.4.0-es7.x86_64.rpm 69321556 BLAKE2B 678a93b51a57688c45512e91f940fa372070484b67b5d716faada48b1d6a1d95126dc1a482c6e43b8ff37b9c1e99fa538c0cf01dfca05e22edb83d1156c4fd4d SHA512 cdbd1e94c283104c47ea29950339962b4aa541c783f849cd92b6ce83f04632d9ed7eb88a3791d1054a98b256ef787d84c70bb3b56af3fb1801e16d8412d4b763
 DIST Nessus-8.5.2-es7.x86_64.rpm 72892020 BLAKE2B c5ae05c02da4fe3265ae1b31da0d8dc025c7275ef466d7f889ebefe6a6006e500e2df029ab90ab37cd0c5089078a22b4f0474a4cfa830a378aead68337154f91 SHA512 ef96ee30b693c72a33981757a8e9616ce7813837de90065c8d140e9702552798e09c0941c282d1a54817f036f606a9934bc9020e86dce12baf50a1a57dbcec08
-EBUILD nessus-bin-8.4.0.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
 EBUILD nessus-bin-8.5.2.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.4.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.4.0.ebuild
deleted file mode 100644
index 45aa75d3c45a..000000000000
--- a/net-analyzer/nessus-bin/nessus-bin-8.4.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm pax-utils systemd
-
-MY_P="Nessus-${PV}-es7"
-
-DESCRIPTION="A remote security scanner for Linux"
-HOMEPAGE="https://www.tenable.com/"
-SRC_URI="${MY_P}.x86_64.rpm"
-
-LICENSE="GPL-2 Nessus-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-QA_PREBUILT="opt/nessus/bin/nasl
-	opt/nessus/bin/ndbg
-	opt/nessus/bin/nessus-mkrand
-	opt/nessus/lib/nessus/libjemalloc.so.2
-	opt/nessus/lib/nessus/libnessus-glibc-fix.so
-	opt/nessus/sbin/nessus-service
-	opt/nessus/sbin/nessuscli
-	opt/nessus/sbin/nessusd"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus"
-	einfo "The archive should then be placed into your DISTDIR directory."
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
-
-	pax-mark m "${D}"/opt/nessus/sbin/nessusd
-
-	# Make sure these originally empty directories do not vanish,
-	# Nessus will not run properly without them
-	keepdir /opt/nessus/com/nessus/CA
-	keepdir /opt/nessus/etc/nessus
-	keepdir /opt/nessus/var/nessus/logs
-	keepdir /opt/nessus/var/nessus/tmp
-
-	newinitd "${FILESDIR}"/nessusd-initd nessusd-bin
-	systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To get started launch the nessusd-bin service, then point your Web browser to"
-		elog "  https://<yourhost>:8834/"
-	else
-		elog "You may want to restart the nessusd-bin service to use"
-		elog "the new version of Nessus."
-	fi
-}
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index d82e6b1c44da..1ecd69611b9f 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -2,6 +2,6 @@ DIST nc-v6-20000918.patch.gz 8740 BLAKE2B 56274ee32a77f335c31b5593ae92afdb1758ee
 DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c5721829a19c46f1ec91a792d9d6309930b3bba5df1180989025f7a04ec8c85cf4832ac6f4199d13f15764f000420 SHA512 4413849c07c6ec5aae07c6e2baa1ba9a99721fa6ac08cf9e7d15379937a207246eb4f4299dd8c049445a72eac9cfe0a3633a87e4e01e21036db1217ea7a1e330
 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812
 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46
-EBUILD netcat-110-r9.ebuild 1647 BLAKE2B 1a79623b55b08d09c18a60000821479e5b8f08328be2f0b35b69664fa16d7344c4ab9dd022f70f9844ef636eb6883c08ac91177f248416d15b24e0a23b8c4eb6 SHA512 c6f41fc3890d7c7da89fab4597c99260de1160e5982732ddd57c090e04aef788e51dcac724ce78d1cc660c7d0a3459844ccf92dcd6c80c117a40dd842dab42d5
-EBUILD netcat-110.20180111.ebuild 1301 BLAKE2B 7219c5111c4647100d0e9d8b2800c985f9cb36be4faaa1294564ca5209a1a86768626c54878bd263e386bed443a5c3dcfb22a4f1fad22c883e4255ba99fe08af SHA512 e61641fd5b18a3c283c3db0b8087eb6373f0b9e7380bd73235fdca4288f8e690bdd9bb42a94a0056d1ef9d56266a96627630c3f03f27290c167073e6519e90cf
+EBUILD netcat-110-r9.ebuild 1625 BLAKE2B 7bcb48d35af7e8dae00fbf0a1933cdf2ffe777315ca5df9f80090b1fc3314d0681c317acafdd5d281f6332c0a90e324ffe0c0c1d6a904b7cc91b79a62bca2319 SHA512 e865ffeebe9ee492535e30179d325e893b3af4caa4466a7e17d66bf82ae31a6d85b24d2ddd96ccd0c2c5dc5dbb759d1e557514ab91f7a4a31fce72ff3ed0cf38
+EBUILD netcat-110.20180111.ebuild 1279 BLAKE2B 32b1fc5499ed4959ac9cbfec93ed55cbf3d2f28e1711f9ebecd7b554c5572eac2c15350084237d3ec600bde72edd2032d39c3b3f1b5a3475b6cce156dcfd16cc SHA512 bc38cfc75e3ccb33f818f5392bfb814d41b2e7a37f3b883168cea3a28a5239adf3433d6d1491227dde6cdb70d137b761b5743904db0483eac78ed66ee1a95f8b
 MISC metadata.xml 420 BLAKE2B 2ecb5d0734634fa00dbe4aecc8353dcad2a6d76bfb6ff22522b52ca2e67298a0923e46fd2d32c31f48262b06c6f46b02e4e065853c56efc793186132b2e92570 SHA512 f6d0b317880cf10065aa552d4653f3338c89fc36b2175d64b6b17bcdafbea03e0c02608904ffca7a934f2bdcc794758f4132b7cd279fc91530ab077eb2115ccf
diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
index be5f42d1157c..12914d4ca99a 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz
 
 LICENSE="netcat"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 IUSE="crypt ipv6 static"
 
 LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111.ebuild
index 760fe86cdf9d..df0524891b05 100644
--- a/net-analyzer/netcat/netcat-110.20180111.ebuild
+++ b/net-analyzer/netcat/netcat-110.20180111.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz"
 
 LICENSE="netcat"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ipv6 static"
 
 S=${WORKDIR}/nc110
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index b895f8b664c3..f60e7171b1dd 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -5,6 +5,7 @@ DIST netdata-1.16.0.tar.gz 3233403 BLAKE2B 5e51722f9f11171a38231afd918a319c18fb7
 DIST netdata-1.16.1.tar.gz 3286225 BLAKE2B 4411baa2da9282173abef872dce02bc0a3f1b1e46a449648a0e09f35db27f2864bc63caf155f84e550ea8cff60c0c0d887a9e7043ac138a45a8170805059fed5 SHA512 f16dad4395b3cd2c437e03f98a2e0945fabd1cabd8b0f294d83e2fbd429955fe1cbe92668f9d3160d1c56ea744acc3908c8df91d0b3bb0623854361878317520
 DIST netdata-1.17.0.tar.gz 3313545 BLAKE2B 4225ed7e53d9d79d4e0e5e6c4c5408a78bcb1ce05a5d20925c231d55131e13ef3426586962c85f814073fad389495ac010b6843288865a44d8a0f22e55eab065 SHA512 fb1a2295868df3a161cc777dddece3bd8c6a2338a75ba72d6eaa7ca6914a1661cb056680229ad67d3059081309130f60eeff98d8e60ab3a03622f5c1947d1b08
 DIST netdata-1.17.1.tar.gz 3332115 BLAKE2B 4811d36beade1d990ddafdef2843f2740656c1127f192c89863639a0c44753b78743cae3eab49a5a4e4c65aa36a3e52479624ea7c45248b3a55a841753b834ec SHA512 795610ef3e7153982665edd90ece1f06fef264a3eaf28f49ef59505aa83983822f9dd88035a30885db1d462e72b6ce2416ef6365abb94229d6155b896d12a8aa
+DIST netdata-1.18.0.tar.gz 3401415 BLAKE2B 2491f6d180a30e0fbc5a6af8dab9fe920188934eccd9891df11f36c8e4e9d386f5d5b5639d91f232e7cc3505fd8842844cf8c6b3120a9281701a1013609f16d6 SHA512 012400c555ea24f7f2bcc32f59bd37594811602c1e4d3428c19e1091ca21bd52f5fb2db7469de276a5461e38bd3323a2fba5aa496769e31df92a272c5300a923
 EBUILD netdata-1.13.0.ebuild 2633 BLAKE2B 917373166cefb26f30a9f62fedec407be3e7332774b419cb36db4a8ec6978d774f527a21d8b09e9bc4ed920144d7dc0378c9ecd30eaf51e855c6557b4e950556 SHA512 b964e4a3949b0ccf268cc8caa6ede03a45c3fbf5ec9b2d98e2c8ca9efec2643d8bbcf4233a087ac259c9a62c19f54ecaa15183a51fae0642c93c80d27c95cda8
 EBUILD netdata-1.14.0-r1.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
 EBUILD netdata-1.14.0.ebuild 2623 BLAKE2B 8552936e3884d9b62a6b2ee94ce4d14fb80feff59412e35b5f6174f5de2abc0506fc22311386b3337c3ee250fe0952acda36ae1524e924bf39673aa5f74a7eac SHA512 82d51a4bcd131b4dca9090ec6c6b344e37efabb5521f06315324bc006fdf5cd9930f4b68c4aa4a90f1ca7a1135803872726521f3d4ac21504a60047f8abaab96
@@ -14,6 +15,8 @@ EBUILD netdata-1.15.0.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885d
 EBUILD netdata-1.16.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
 EBUILD netdata-1.16.1.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
 EBUILD netdata-1.17.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
+EBUILD netdata-1.17.1-r1.ebuild 2905 BLAKE2B 170822976de7051309a9493de81456c05b729af237c083bd52e80eded0a264e605617a584c68d7791ca72c3a4d24583a90134297b16d5dc2daac89d158204b33 SHA512 dc5ac15f1cfb056b5d2946050c4b406c13e6a9f0c91d215e9fb7401976dbcae51317c2b8282adedb234f766db9578caf5e9fcd5a1345011c95514bebbbe55d98
 EBUILD netdata-1.17.1.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
-EBUILD netdata-9999.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
+EBUILD netdata-1.18.0.ebuild 2905 BLAKE2B 170822976de7051309a9493de81456c05b729af237c083bd52e80eded0a264e605617a584c68d7791ca72c3a4d24583a90134297b16d5dc2daac89d158204b33 SHA512 dc5ac15f1cfb056b5d2946050c4b406c13e6a9f0c91d215e9fb7401976dbcae51317c2b8282adedb234f766db9578caf5e9fcd5a1345011c95514bebbbe55d98
+EBUILD netdata-9999.ebuild 2905 BLAKE2B 170822976de7051309a9493de81456c05b729af237c083bd52e80eded0a264e605617a584c68d7791ca72c3a4d24583a90134297b16d5dc2daac89d158204b33 SHA512 dc5ac15f1cfb056b5d2946050c4b406c13e6a9f0c91d215e9fb7401976dbcae51317c2b8282adedb234f766db9578caf5e9fcd5a1345011c95514bebbbe55d98
 MISC metadata.xml 939 BLAKE2B fa9652dfc67eb1f088383a62d435349665f81dc9db3e1dd9c8412110f27297cc15681cbd2307c8a09cd490bd195e830311bf9a2612abfe14ecec18fb99a17eed SHA512 c9e7794f190c22d0b5a14d2431d7f15d7b048fcbcf8cf48499e6a71fb21f7fc0292bd944db6767e1f70413c484a338ffeccbf7a70c63d7c128e4bc72c7d24fe3
diff --git a/net-analyzer/netdata/netdata-1.17.1-r1.ebuild b/net-analyzer/netdata/netdata-1.17.1-r1.ebuild
new file mode 100644
index 000000000000..a9120717c5d0
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.17.1-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		dev-libs/libuv
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--disable-jsonc \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
+	doenvd 99netdata
+}
diff --git a/net-analyzer/netdata/netdata-1.18.0.ebuild b/net-analyzer/netdata/netdata-1.18.0.ebuild
new file mode 100644
index 000000000000..a9120717c5d0
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.18.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		dev-libs/libuv
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--disable-jsonc \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
+	doenvd 99netdata
+}
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index b12cc034edfb..a9120717c5d0 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
-inherit autotools fcaps linux-info python-r1 systemd user
+inherit autotools fcaps linux-info python-r1 systemd
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
@@ -27,6 +27,8 @@ REQUIRED_USE="
 
 # most unconditional dependencies are for plugins.d/charts.d.plugin:
 RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
 	app-misc/jq
 	>=app-shells/bash-4:0
 	|| (
@@ -73,18 +75,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
 FILECAPS=(
 	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
 )
 
 pkg_setup() {
 	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
 }
 
 src_prepare() {
@@ -95,7 +91,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
+		--with-user=netdata \
 		--disable-jsonc \
 		$(use_enable cups plugin-cups) \
 		$(use_enable dbengine) \
@@ -114,13 +110,13 @@ src_install() {
 	# Remove unneeded .keep files
 	find "${ED}" -name ".keep" -delete || die
 
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
 	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	fowners -Rc netdata:netdata /var/lib/netdata
 	keepdir /var/lib/netdata
 	keepdir /var/lib/netdata/registry
 
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+	fowners -Rc root:netdata /usr/share/${PN}
 
 	newinitd system/netdata-openrc ${PN}
 	systemd_dounit system/netdata.service
diff --git a/net-analyzer/neti/Manifest b/net-analyzer/neti/Manifest
index f8b10f5e9c8f..7cbca19a6eab 100644
--- a/net-analyzer/neti/Manifest
+++ b/net-analyzer/neti/Manifest
@@ -1,5 +1,4 @@
 AUX neti-init2 375 BLAKE2B 2524fb79e8c30ab3e6f694ae2b5e81b2e8b7d9e66dccee6b7d0c6f27fc5e00cd903a2ab124b45374e22bb38d9f27a265a17183f22cddc30a03785c9d236a8b34 SHA512 37019c01645c720e425354783b6f98a18ad7ec7ee335c393621f4fbb5f04bca8079d47c24f8961abcbcddca8588725e85c6656a4c92ec9749cdbff4ddfe59707
 DIST neti-2.0.tar.gz 383442 BLAKE2B a76977f6eb16b729e67cf4c98c2b1497d76572374b825bd7200b9d8f3b24634b3bcdae5e611dc3fa145f1cc4d5130d5e8501b017c529a72212a865c845cd01c6 SHA512 5a1156195106e8dcb738c5d2efdd88b77803fa16145db182f2d782a21316fac18af6812b264ece3bc49a5d6713b2aa86aca13129edd01753bf5cf0dd33b1aeb5
-EBUILD neti-2.0-r1.ebuild 1021 BLAKE2B 35b9a42add7be43e9a1e28ab8fa4595272a72798c23c272c97239b91abcb709b01c6fcabe7b840d76d6f53ca0fdbfb51d36a047c50de842f712dda9177bd13ea SHA512 5cf91367c8b51b6e4a58382917dd20623aa31b3e4e9e09e4bbd2c9907b4abcb03e4b6502f2fb8a8e20b01b3ec6032706759a90df0dcde22d5f0c9950620f7ff3
-EBUILD neti-2.0.ebuild 1180 BLAKE2B 49726cd535ed4f7ee50239620a53a7d9fbf823eb313d82b4fa13fd59087a51aad69df18c98d69857ad7e6ebe9029886dd37ffa77b8eb97887b1f980abd782e6c SHA512 ff20a87de5aff235cd2f55d26b20771415ffbdc1a0b429e7c57eba2ad79d9f799817be81df6bcef8acceb71ffc6256ee7353d3058f26e55183e79cc621acc871
+EBUILD neti-2.0-r1.ebuild 1017 BLAKE2B 351aeb1f6670a44287f864487e179b7deab406d7340236474fb69869a2026f5f8b94bb61cd903bb853cf9039fcde482de6e329ab40e30c14d9a705797b66e40d SHA512 8233e86256799a76b7d149cedd8c09c300ccbc6c77ad4b1f43c6a38b2a794eb284229f13bbb5e51c3e2712f23205a81590a01f7589cd2d66eefeb9f4c3097b67
 MISC metadata.xml 354 BLAKE2B 1664fee911f821fe0ad2a51680cf0eed3607fb23e3f725bb942db1e17595e4705dd0fdd7627f0ce8d9a1da8b56ec3b0ca15193ec51706a5e1395a54adaa082ed SHA512 3108cabc42dbe541365c68cd0052ed08d163a100531509c1cacbe20c48f1e2926c32cefdbc393e0d2fd2bc6ac3bce933edffa0e049f4bc012ea69f76b7eb6bde
diff --git a/net-analyzer/neti/neti-2.0-r1.ebuild b/net-analyzer/neti/neti-2.0-r1.ebuild
index 453c5877d209..bea83118f9b6 100644
--- a/net-analyzer/neti/neti-2.0-r1.ebuild
+++ b/net-analyzer/neti/neti-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ DESCRIPTION="NETI@Home research project from GATech"
 HOMEPAGE="http://www.neti.gatech.edu"
 SRC_URI="mirror://sourceforge/neti/${P}.tar.gz"
 
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="zlib java"
diff --git a/net-analyzer/neti/neti-2.0.ebuild b/net-analyzer/neti/neti-2.0.ebuild
deleted file mode 100644
index ccbec34abed2..000000000000
--- a/net-analyzer/neti/neti-2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="NETI@Home research project from GATech"
-HOMEPAGE="http://www.neti.gatech.edu"
-SRC_URI="mirror://sourceforge/neti/${P}.tar.gz"
-
-KEYWORDS="~ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="zlib java"
-
-DEPEND="java? ( || ( >=virtual/jdk-1.2 >=virtual/jre-1.2 ) )
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-src_compile() {
-	econf \
-		$(use_with zlib) \
-		 || die "econf failed"
-
-	emake NETILogParse neti \
-		|| die "emake NETILogParse neti failed"
-
-	if use java;
-	then
-		emake javadir=/usr/share/${PN} classjava.stamp || die "emake classjava.stamp failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-sbinPROGRAMS \
-		install-sysconfDATA install-man install-info || die "emake install failed"
-
-	if use java;
-	then
-		emake javadir=/usr/share/${PN} \
-			 DESTDIR="${D}" install-javaJAVA install-javaDATA || die "emake java install failed"
-		dobin /usr/bin
-		echo cd /usr/share/${PN}\;java -cp /usr/share/${PN} NETIMap > "${D}"/usr/bin/NETIMap
-		fperms ugo+x /usr/bin/NETIMap
-	fi
-
-	dodoc README AUTHORS
-	newinitd "${FILESDIR}"/neti-init2 neti
-}
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index 9df358df028f..cf204c83b5da 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -5,7 +5,7 @@ AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2
 DIST netselect-0.3.tar.gz 22047 BLAKE2B b0039ee21382f541446c49b3a536e400e70120513217969ffb7168c906c5938d099e5e072f05f68a95829410fd013da386527ee1280938714c00a006ae6a248d SHA512 04a4b79c357a0110dcf377ad04ac729ed7854bec4b064ad16da632367ce1870379546fffc8396ea770bfa580618d7c0495c16b0ba30f736419511b890ce5dca5
 DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
-EBUILD netselect-0.3-r3.ebuild 976 BLAKE2B 53e56c268d75225b7566279f7fe604a6fd915d40e31160947c8a2ed10e47c06ec815e27371357a8b2641fdd488b1f3f998a68afc3f32fe3fc17e13df3d7cf5c1 SHA512 c3a42dec4c8830765d1b5122465708c9c8f47d67c80a57a69ce91741f7c135de52963ac9ef2ed0a5306a32b9ba7f86e7383ed7faf5d3227434fcdf1c24ecfaef
-EBUILD netselect-0.3-r4.ebuild 994 BLAKE2B af8c22627e8ab2e495a2d4653543c69bd30d7a406551a07d87570782dd00d98e7d386eeb4de2e0dd16a0f6e41754aa0f903e78da93f19f16f23cf4f1bfe862d7 SHA512 af56e7e5c74d79f4079d2721021f9c9b00183db5e92eec44e722a47c98701250910afc7057d7fae1a7d5bccd39104620625a46dd02ef8948caf734b80abbae6f
-EBUILD netselect-0.4.ebuild 947 BLAKE2B dcc1c3f14d962b309906ef195192e662b911899c7fdfaff6e2e47365526ba7e919e8aed1ca60d48fade4a000dd4a013d54013f938446ec01b5515c13033df7bb SHA512 4c7c982412e35e7cf90b49cd8a06545d5a5fd429fb7e6894fd250750d6a1ebdeaaee288fbe6434d54b4e9942074ad89642bd9e9b128ac085e4d5c3379ad34658
+EBUILD netselect-0.3-r3.ebuild 954 BLAKE2B 6bc146a9198f60858c154539e33f78edf9dbafde99971cf4485d4ad35fdd37ce9755bfe942f32e555a3882abfd260808f293bc56f82b5d31dafc9ddf8668369b SHA512 b9ce39804bce1901285325e2224f1fdd96e00d9ad8663cfd1968505652745925204f7411c744ce0def8e53ccaa261de4be1b9aa1b3fccf914f5d4a4e40286de5
+EBUILD netselect-0.3-r4.ebuild 972 BLAKE2B 9b7516f2fa8fc90591202d47361fa6020eb2deb2ec8c4d2ebd0a5785b62f3bb005545e1e97ab70df17a2d1ff7a9d337d26f5d4db218dbd0284b1b8108a129aee SHA512 acdde16df8966c55842fb71a17078ade15df6b3e93900d0970835e0482bb1d4a5935832329ff1e909834d5e19e0d96f88f7a524ca32f4d89a237286c9b644c46
+EBUILD netselect-0.4.ebuild 925 BLAKE2B 3a629fb5bb2b8cbf83758b696d29b1c3d8942fb0c0e82f4977f95c06eb4cb7104703d7ab08b5046e3c8be484358e7745cd94fc19f91ddd403241a83d64e7ab08 SHA512 47f89b2f4bd41569ab23ad76fc8d42abd4f60cc40f22841b95abe5cd1b46984da0e2f6b0bb1ac8f5ffb0feeba6b952b54e8bc0f0e6494aa3e382bd74b8963625
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netselect/netselect-0.3-r3.ebuild b/net-analyzer/netselect/netselect-0.3-r3.ebuild
index d987e3985719..5709db974bbc 100644
--- a/net-analyzer/netselect/netselect-0.3-r3.ebuild
+++ b/net-analyzer/netselect/netselect-0.3-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S=${WORKDIR}/${PN}
 
diff --git a/net-analyzer/netselect/netselect-0.3-r4.ebuild b/net-analyzer/netselect/netselect-0.3-r4.ebuild
index f5909a4d75c3..59c62667dfa8 100644
--- a/net-analyzer/netselect/netselect-0.3-r4.ebuild
+++ b/net-analyzer/netselect/netselect-0.3-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S=${WORKDIR}/${PN}
 
diff --git a/net-analyzer/netselect/netselect-0.4.ebuild b/net-analyzer/netselect/netselect-0.4.ebuild
index 05f5cc209795..18559af3f1e5 100644
--- a/net-analyzer/netselect/netselect-0.4.ebuild
+++ b/net-analyzer/netselect/netselect-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6"
 
 PATCHES=(
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index 28e6f44b5901..aa84c2d558f5 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -4,6 +4,6 @@ AUX ngrep-1.45-setlocale.patch 495 BLAKE2B 10d70be3c787344f120ed2faf527425af68ab
 AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de
 DIST ngrep-1.45.tar.bz2 463361 BLAKE2B 31f7828fb28197f06a583cd6d250b5d70bfbd2bc5dae657daaed3f7ea286aec4dff9cca449c72a3c27d8e8b30d861304872eaaaa11abc9eb71f2acc94d9fc9f2 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7
 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
-EBUILD ngrep-1.45-r3.ebuild 1064 BLAKE2B 2aaa8fbcf88736d9a0158234cb814ddae81fbf42620d5e5d441db9944b100f338752c75038b13b8ae22d6f1a52aa6506673d4a71ead769193028c55f66ebd404 SHA512 df65d35cd87e740eb28892572a897f90705d0db40669eda2422b82e77af2da3280433ec5386c4e2d82ba014eb263777e3bcd797f7f7b44a57a613e7add93077c
-EBUILD ngrep-1.47.ebuild 980 BLAKE2B 9a7c50222fe1a25d1142c13fbe902ae96487d6101508a675f8e7b919aee2bf1169bbf8ad47ae96048e79d5452f978fe404f84d92b005e473a26966a16341896d SHA512 55ba01f51dec30c33ceffc6de85d119c310b0ae0aae5fcc2f58d2aa5ff35e418d0f1244389fa35747559017b4263ccde16adfe3a1d8f857613cea7e566fbfb43
+EBUILD ngrep-1.45-r3.ebuild 1054 BLAKE2B bfd9bdbaeee4b01ebf2ecb3da4a86799bf4d4731c043b2710d27c51ff957fd5ffca8b909c2818bce8412deceebddd740a93e78798ef7be60ad6ce9be8a7f5e55 SHA512 4cfbb8c069c4b758bb29e87a179c790f2b8c3ed4a8f057944cbf5d7b119b2812cfabb572180027ca4260dec247a7aa1adcad3e02dd6933823d154bc4f8834680
+EBUILD ngrep-1.47.ebuild 970 BLAKE2B 05f6b80a67ba50256456dbca1e14d2a492e30a2472a2c2cd9e645cf0b6dd236240cc0364b970de8872aaec19f79d532a54df3822b5601b2d4eeedc46cfc8e022 SHA512 1542eff1e1a20d00e4844b80421d8d541eaa5655190a5ed147cfe3a635333c627108df77b61158381d804d1b73e113badc5ded484fa2e699a390526a02ad51b1
 MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
diff --git a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
index 070bfb219184..6afb5aa76ca9 100644
--- a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2"
 
 LICENSE="ngrep"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6"
 
 DEPEND="
diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
index 1816037305bb..32d16ec82dd3 100644
--- a/net-analyzer/ngrep/ngrep-1.47.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ngrep"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6"
 
 DEPEND="
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index b0be4e6f1483..fc676140a74b 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -12,7 +12,7 @@ AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
-EBUILD nmap-7.70.ebuild 4521 BLAKE2B 76117fe9d3a56e733ebc0da0099a39b98480ee1c1c473b58798358650359799763dc314e4f7d42d67c02338c6bb3f799601a043f8e272c342051bb8b42a445f9 SHA512 5a4fa0b6eca3cadcf7b5bd72f0f564e59d64d96c3a123d6ba8bdc750ad1b1ab0d54b22f1fe7546f0b373cdbef36cb2109b86a56fa9ffcd6ad7f784a33eab243d
-EBUILD nmap-7.80.ebuild 4414 BLAKE2B 7c8f6cfc1d5834b2ecd78580bc45910d8fc6f3e51dc21d17e5b9140b6107b1133bcddc34b96ec6ea698fd0e7d7273918fe16ca330220f8cfb7e3ca554e1be30f SHA512 41aec93faea4cb96116386529fd3a694e6d75b803985bc475e55dd7583489ef3ab26224813500e62562c930fdbe980a4b2b5cb3b4dc5a1f9690111af8c94306a
+EBUILD nmap-7.70.ebuild 4511 BLAKE2B 1a5599df259671c105270d6be62aef9d0da5c707da9ec952eea374cfeddb7674dc49d742a7ef1e895f0a13aead05ddf5c310f258f83fe1305a16d7912a95822d SHA512 03f87c2848fc01424b036006ad4628637c4fe57711b79a8dffa4047c65ab4dd8f19f4612e56334cb0aeb711c2eebe9607f14165abce431c72dec96985b92de81
+EBUILD nmap-7.80.ebuild 4404 BLAKE2B 5b14582a9f8ba7fb1872b18bc7e4f3a12f91cb46ec71a872947f004fc4b1cb018f65d0839cf06d5f153ccd0ab84c36b9ec549d2955cf5e90f5ef02a468f01c13 SHA512 0eadaa7891d91fe15355d0a24694eae1ef31c72899c841a436eb11e34a4200f61144e0916a05891e765fcee6120420b48378fff6e65407c94e00c5f33786baed
 EBUILD nmap-9999.ebuild 4269 BLAKE2B bb6b027fa1ec70811bee19603285f470b58efa83f93bd7d6ff3470363b12731b54b15709b95738a000935cfab04d5866cefafc2ffd0788a3dbeb09f0bb695e9f SHA512 ee859d47d92d21cfe8c0e0bcc24063229eb52ebce081aa6e3b3df420f7ce41e310ba1b21e50573801f728858b449eef0f882ddbc54dc085660f57093d4a62f0e
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 2158e6bff708..7eaa1c0767d7 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
diff --git a/net-analyzer/nmap/nmap-7.80.ebuild b/net-analyzer/nmap/nmap-7.80.ebuild
index 0c3f096077e8..3d1303bd82a8 100644
--- a/net-analyzer/nmap/nmap-7.80.ebuild
+++ b/net-analyzer/nmap/nmap-7.80.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 6c7e420895a9..c0cd26a33e24 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -12,7 +12,7 @@ AUX rrdtool-1.7.1-rrdcached.socket.patch 733 BLAKE2B a9ca7691e1589061e65ed4acd3d
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-1.6.0-r1.ebuild 4248 BLAKE2B 2e072f4503032b3f103ffb8ba21e60d9376608e763142b450b66a8dc6418cb130623f8d3eb8eaab68d884c9d80c561d318c9b2bae6fa17f0e9621815bdc710c7 SHA512 7ebb70f03615b612174bc9a66262c5eb2e658b8d7b6ddfce41bcff7e0ed589f31af4fd101dfedbd2b7578bdd88d060adba5f78028894a2d9a428c4b04a040e8e
-EBUILD rrdtool-1.7.1.ebuild 4255 BLAKE2B 03afebd8aec6e29074c4def30106dd9b0c46383d3e1e62ca5c3b71cd938aecc53a9fdb6844ef20168e9e35b4ab17d1f201c20f7fce3a9c2f8080572693f97838 SHA512 92e9bdcbbaaa93b7e8c19caa111a1c7b8657ff03882bfef34165805dbaae8c4cd4753d0793fac1f96c7f0b560c0ba618d26177e6bd82ab2c59f85353815db216
-EBUILD rrdtool-1.7.2.ebuild 4203 BLAKE2B fcb474aef1bb6fe12b7c23515116f7e4cc214fc5ee2801aa1e3165e7d4cf5234fc48d01ca8ff156861f0c442800fbdfe06cb3011715de84ced266408f423ebfd SHA512 ee4702bc851fbdc723e1bcffb0c00c7f79c0337360f7558b07b5075c87729e0f618ecd80aecc077fec00bbf1dbc6f237698cfcebbe1d5779d867b382e98b52df
+EBUILD rrdtool-1.6.0-r1.ebuild 4238 BLAKE2B d4f47ed88190e565c9b78d781ea7af7aa44a5d50f5d5c3b8e4b6dd089415f44f23ad3bc99920e0484cd316557f5950d42a85c1bfd035e3ddf0fb9d92a48bcea1 SHA512 c50b37aed115f3b8acdaf5b46c880e48b206705e598594e1c15999c4e2b2885cb52a6a98c7ce695981e3410c46813e7e9d07295bebeab9006130b8c5b2eea65d
+EBUILD rrdtool-1.7.1.ebuild 4245 BLAKE2B 3908c6f33b0f229cdc31fa5960f216ceccbb97138f5affefc98c2a5c578b2e4453dba37d7a0c97801ca2e81dc4f2d49140deffc5a6e2d1f67fba35c3aa14545d SHA512 f562122b7d42d804acd869882eb06289b5943fe3daf6f85eeeb84027292659b4ac1bbe527f8e2df3850a94503375f632a33dce88c1f3f128d5b47ea353d58b90
+EBUILD rrdtool-1.7.2.ebuild 4193 BLAKE2B f4884f5057fa865abf852dc1022b05d3bbc8678d441458a97417481c7c699289b2dae618c3653962e777ba273a359f712e6f425b6a2e6f99c46162befbf8ffd2 SHA512 d3745480835b470ac3956649eae82c3eda1131ef81fb007696522bf92110f8e124536305ed95765a667d85fe6056df35f553725623e8e652c16099dbda287cc1
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index 2967a716b0c0..c781e4a95684 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
index ea2cc5c49734..b1ac8232ccf9 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
index e907820c5be6..c0583310fe34 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/sflowtool/Manifest b/net-analyzer/sflowtool/Manifest
index 5d04c8773a07..001e96a72afa 100644
--- a/net-analyzer/sflowtool/Manifest
+++ b/net-analyzer/sflowtool/Manifest
@@ -1,7 +1,9 @@
 DIST sflowtool-3.34.tar.gz 171613 BLAKE2B 70e55777253af2055f7de57da53bde8f63b6ee79fcd0db7545bbaabf024ea3baf933beb0a62c9a29b073b34f3471faf47ceaca6664d873fe5d91a3fe73b76f54 SHA512 4fd551fc1e03f68c886bf3effaab466c4470f1e3878ed5b94fd5152e81c076b56a6901df878edc95850522cf70458c6c9c4130c12ff071739b1da4725ae1e777
 DIST sflowtool-3.41.tar.gz 187119 BLAKE2B 3ba9d1baf8da4be14361ce82f7a783d7d1dde10264f123688703c4a41eb316d8d917f98150bb64562c3398f49a4a083e35b56402e8e8ea0a140406923bfe0519 SHA512 8758bb7f2ad17db1c8d8c943093edde72efbd4411f8acbba2b97717e447df0b9e771a33307b9fa090da6ca12ba2dac69fd72787795aa878ad3c5d4148100c57d
 DIST sflowtool-5.02.tar.gz 192907 BLAKE2B 100745fb7f4eb4e40edf93e66a0f3fb26e2cdc26d2d3808d6bf5fa4a92d2b973e6fd8947f39a1695898abf647f4012cbb1577af281f8b51fc6d008ed4643986e SHA512 9b2369c8d30b9cdcd1cdfca29e2f8405ac8ea3bba22243ce62d708f943b726865fbf6ba2eee2f0e00e5df1d1b6fd4977f636bbdbe9676424183e1f973bd64dde
+DIST sflowtool-5.04.tar.gz 187733 BLAKE2B 8298bbbf23d2ce30b5954a73fc8fed9e9e3510e77d80e02cff9fdab2330260cd3960db76ed7c1e9266b47f964e5724eb2fef9dd89514d9abbbf050df28e1e133 SHA512 611c3c23ed7a586997b1622b4d1c48eb0e0784a0667e5f7d17f2862c071ff5a34a55c6e537eba99e1c281d9ab870c95c805b764122b623520c81870d730b1688
 EBUILD sflowtool-3.34.ebuild 478 BLAKE2B a1e8ad0768cb72a2093dd937ee6a7bd36d6a0fc70a1bbc0b5f663fe4cbef8062c4e6d6e72100670a02c11c9035d572c95efebd4e38d703681f8b20c57bc5d760 SHA512 4089eb7326499d15d3bf2703f3764d35e1db32f5eda2a18b0455685f844f85a599f3ce9c5bc37bf61df08fdd1fb6aedce0e1f509142d870dca89cb1ac6c7ed3a
 EBUILD sflowtool-3.41.ebuild 562 BLAKE2B c525f5cae45cc62891d9647f71c0f1a9afcbe8eb24925244c01ba5c359090c506108658ad0ecba566f02772c9adbacf8d219906036d6466344f4585560c31553 SHA512 93c748e0bc9a40de73df9b4eea7e2bced91f06aa17fadda708e6cb8c8860e65ab54e5b0a22c10e402911e01b5b18ddefc646decbdfd06826786ddd55662cb47e
 EBUILD sflowtool-5.02.ebuild 557 BLAKE2B 0f6e476f19e4345720099fb3a8fff93645e4c1110541230a99f06df978bb871a48570b2a65e9e90eb8147e322c590d1a85da9c9ccb3424cf44cc4fc0110ddc7b SHA512 a465c43c462480e90dd379d3eedeb8625df606725489519b0ec67251de998573b5063cfc96db520a4cb29c918cff324d7b00415064ed181fb9de012fd756e184
+EBUILD sflowtool-5.04.ebuild 557 BLAKE2B 0f6e476f19e4345720099fb3a8fff93645e4c1110541230a99f06df978bb871a48570b2a65e9e90eb8147e322c590d1a85da9c9ccb3424cf44cc4fc0110ddc7b SHA512 a465c43c462480e90dd379d3eedeb8625df606725489519b0ec67251de998573b5063cfc96db520a4cb29c918cff324d7b00415064ed181fb9de012fd756e184
 MISC metadata.xml 370 BLAKE2B 54ac4c209077f5fa6d73a231013370ac06ce05d5f1ce8704291c0b7631fe8eafe6212065876287850e5ffcf56b532bf2fc7c678fb30dda1c8f6dd969bbb63c99 SHA512 7e6c6628a82ae6cb1cc52c362df66bda90edcfeff7af2a52b2aeb6eaf7703aa092ddb1a9b9ecbca5aa34ba9b07ff27ca69dd47832b67e90505c932bdc27c811d
diff --git a/net-analyzer/sflowtool/sflowtool-5.04.ebuild b/net-analyzer/sflowtool/sflowtool-5.04.ebuild
new file mode 100644
index 000000000000..820030971af1
--- /dev/null
+++ b/net-analyzer/sflowtool/sflowtool-5.04.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
+HOMEPAGE="
+	https://inmon.com/technology/sflowTools.php
+	https://github.com/sflow/sflowtool
+"
+SRC_URI="https://github.com/sflow/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="inmon-sflow"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+src_configure() {
+	append-cppflags -DSPOOFSOURCE
+	use debug && append-cppflags -DDEBUG
+
+	default
+}
diff --git a/net-analyzer/snmptt/Manifest b/net-analyzer/snmptt/Manifest
index 45bfae918899..78680d7d665c 100644
--- a/net-analyzer/snmptt/Manifest
+++ b/net-analyzer/snmptt/Manifest
@@ -1,7 +1,4 @@
-AUX snmptt.initd 393 BLAKE2B 79f8f0cdbb5302d59af5d4ecbfe0ce43a489b13d414e814cf8231ac884400d3da52cce5c9c60ba84d04cfbce1deba7c2239a1c9b27623543b9eaf011cf96b387 SHA512 07dac48c0bd4f09d8fb1d705e933693b507ab06f908921e5033c863c65597832c509372c6270f56535176b0484f02be66383dd9efdf20303a36bec6e1f0065da
 AUX snmptt.initd-r1 374 BLAKE2B fa18e20e2fd206aacb782da948e6b2a6dcfa5f33f3f9f9f1e682a3ec1d6c058b94e0e9046f0a5a274fbf933fb47a80e00a4247a53368a18f3faa872dac2d6e04 SHA512 ccf4441135f4a8f3fb323efd68c75b099977c1855ac5ae41adf6ef2974e0c2c1fd57c132e9877da12c34683b2bf19d4774e7aad4527e530ce48ec3fb59c2b7aa
-DIST snmptt_1.2.tgz 135132 BLAKE2B adb58a04b8d0f4f0367c7ad789ac249b57e9acbbc7458cbea38c0ad9931a83ce991b8d4297a485bb5ccb0193286418980ab3bbe008d65dd1a4f849d177b30bf1 SHA512 6a6fc291a11ebc42b8c2e4bc040cd2833acc2e8e5dc9dbcd1aa48a073125b342a2333f7caba4fe789dba876e5a3879161707a23b52ba751007fcf9bcfa408a67
 DIST snmptt_1.4.tgz 148504 BLAKE2B b49e51d0ec207f1250536010e6475649eeca1a89f85bf31e1a7545cae2fa6ac66951916932863543336bb63a8519f35e9c54e7c67bcd14a43ed7ce6d8d63876b SHA512 200ebe565766c15f85b9b9cbc178baeef740663efc951af4c790c4b28d27398c14a95c4b38306ec3503cefe9b86634d5f24ec5f2482694f07789e9025ea39a80
-EBUILD snmptt-1.2.ebuild 1452 BLAKE2B 81c2a9a060d895f777102f498756af54d71a6a844d0d41e1629c561793adae3172f5eddfda5e44d5449510670b10000ea2bb4b722d865cdef5d7e0726104f526 SHA512 3de10e31c9c9fb46106137d4d49f0481cd05c54d77685813356bf2477f45a54e346cfb72045f757d9c77d2e6d5ac3dd6afe7775df70cb006b5f8af836b5bb135
-EBUILD snmptt-1.4.ebuild 1219 BLAKE2B fe0081357bdb6d9ea2adb0092eaeae7af38d1a562faa1a2bb5b2217fd21d9599409e72ed5aaf8c61ea57ebb2181c8daf7315c40f9ae4a0aea1dad930a82102b0 SHA512 1810d0882d35993f2280ff6800bfe3b8c3b3b6efcf50c463c57ea1355daa3747a2949cf1e677736e3aeeab493156a11146311e5c49e87cfe31ae9555144c1749
+EBUILD snmptt-1.4.ebuild 1215 BLAKE2B edf2cd62de24976f6d4391f0c5fde21d3627651c4fa1cce0361900c526512fc50b3e97023915184e575e636b8733db931725f0a026a315226fa74c110d3155ef SHA512 e1f60bccd817decdf4ce2aed6be0aa3ff06ec983f3c5bb6046636f70231054eaab0642b9194232a4da830bd2d3020d8e29a565ef3feba812b035494aa9b53190
 MISC metadata.xml 413 BLAKE2B c84c68487407401218116505b51d3e61edfbdfdd9008a83c51c2685b1ebd513fe94beedf8c02330bf465f979b5f7d88f1e3b896c8d0dea74c1a2db3795024b5a SHA512 facfbb9f61e391c7c80e3dc62300049a3fee43c2de84805474662e4c7fa7fce78ecbf86bbb691f13ddf39b0759ba5daec5feef91bedda39731d6fb389e4df1a3
diff --git a/net-analyzer/snmptt/files/snmptt.initd b/net-analyzer/snmptt/files/snmptt.initd
deleted file mode 100644
index 76b67a2b1304..000000000000
--- a/net-analyzer/snmptt/files/snmptt.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net snmptrapd
-}
-				
-start() {
-	ebegin "Starting snmptt"
-	start-stop-daemon --start --pidfile /var/run/snmptt.pid --exec /usr/sbin/snmptt
-	eend
-}
-
-stop() {
-	ebegin "Stopping snmptt"
-	start-stop-daemon  --stop --pidfile /var/run/snmptt.pid
-	eend
-}		
diff --git a/net-analyzer/snmptt/snmptt-1.2.ebuild b/net-analyzer/snmptt/snmptt-1.2.ebuild
deleted file mode 100644
index 207d3658b9d8..000000000000
--- a/net-analyzer/snmptt/snmptt-1.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${P/-/_}"
-
-DESCRIPTION="SNMP Trap Translator"
-SRC_URI="mirror://sourceforge/snmptt/${MY_P}.tgz"
-HOMEPAGE="http://www.snmptt.org/"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-IUSE="mysql postgres"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=dev-lang/perl-5.6.1
-	dev-perl/Config-IniFiles
-	>=net-analyzer/net-snmp-5.1
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug 105354, daemonize this thing
-	sed -i -e "s:mode = standalone:mode = daemon:g" snmptt.ini || die
-
-	echo "traphandle default /usr/sbin/snmptt" >examples/snmptrapd.conf.sample
-}
-
-src_install() {
-	into /usr
-	dosbin snmptt
-	dosbin snmptthandler
-	dosbin snmptt-net-snmp-test
-	dosbin snmpttconvert
-	dosbin snmpttconvertmib
-
-	insinto /etc/snmp
-	doins snmptt.ini
-	doins examples/snmptt.conf.generic
-	cp -pPR ${D}/etc/snmp/snmptt.conf.generic ${D}/etc/snmp/snmptt.conf
-	doins examples/snmptrapd.conf.sample
-
-	dodoc BUGS ChangeLog README sample-trap
-	dohtml docs/faqs.html docs/index.html docs/layout1.css docs/snmptt.html docs/snmpttconvert.html docs/snmpttconvertmib.html
-
-	newinitd "${FILESDIR}"/snmptt.initd snmptt
-}
-
-pkg_postinst() {
-	if ( use mysql || use postgres ); then
-		elog "Read the html documentation to configure your database."
-	fi
-	elog "Please configure /etc/snmp/snmptt.conf before running."
-}
diff --git a/net-analyzer/snmptt/snmptt-1.4.ebuild b/net-analyzer/snmptt/snmptt-1.4.ebuild
index bae24f294755..ed70054e6dc9 100644
--- a/net-analyzer/snmptt/snmptt-1.4.ebuild
+++ b/net-analyzer/snmptt/snmptt-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/snmptt/${MY_P}.tgz"
 HOMEPAGE="http://www.snmptt.org/"
 LICENSE="GPL-2"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 IUSE="mysql postgres"
 
diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
index ad8a3e6ed403..5dc3dd529ab3 100644
--- a/net-analyzer/snortsam/Manifest
+++ b/net-analyzer/snortsam/Manifest
@@ -1,7 +1,4 @@
 AUX snortsam-2.70-gentoo.patch 8979 BLAKE2B 7df4e769ed440b5bd595b6a62a414d9172ec283ab6f48bd00f5ede432c7430c1c936a9915ca40857216e926ccf7354cf45743e97fdbd945374efe01e403a928c SHA512 17f5b03820491ffbd8eda4b5cc99230ab358788194eb07221a303e98cc0ef5855d347804b30bd21f38d2a6f0e370f2433a691a33db0599c50887857bdadb53b6
-DIST snortsam-2.50-ciscoacl.diff.bz2 7295 BLAKE2B 174d84e06d9242c900f3c52cacd57c2a69114c120ee381038f566cf52346dac238a66f899804dc0b10f73e5275b45d862f62fda9f7602a55aa93c7df90382f5c SHA512 c8b19b19721f75fb00a269923e4191a26853749658ebbec9d4c74dcbaaacb8db30a6a0bd33068a364aa95375db958b6fd45ad498abdc97029e04b7e140cb2523
-DIST snortsam-src-2.50.tar.gz 1073391 BLAKE2B 544410d68316e733285e41feade98b2d09e9ac47fd7d5d7efaa6d70daad7bc5a2e4919c44b1f9abb02581e62681bba5ae6ef049ad4cf49edd0d2a13f56ebddf7 SHA512 cc4509c0d02666d6697a565e95013639a1f0c042ef948d8def92b749f249f647247ef7649ae23a2860ce58f08e310c08edeabc93301f812a98845f74ba5c266e
 DIST snortsam-src-2.70.tar.gz 1971624 BLAKE2B 10f26afb8addffb52db099e0c376a9adb884b625503233b72203070cadc79a688c7a6950014759d6fb58c8844899482057d9701e9eaa5e9d12066f10e88d6421 SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1
-EBUILD snortsam-2.50-r1.ebuild 1316 BLAKE2B ca7c4013a946f951e8b25f977a054be4b7c5b00541d43207a10c857c6dde4861fc3726ba739bb1fe1e89b799cbfecfde831554335f01eeea24aeae16d78974e9 SHA512 9f00049c8962276c8c10c5ddb90783f4301e1ae967bab0d87141b53b0efe8f5044b82b230f2cb184a1f4efa758d800c6b5d2c7a190126b74ce6c934f43c888d9
 EBUILD snortsam-2.70.ebuild 1003 BLAKE2B 2ab1efd8bf874af8990a8849d92f93a6798e16432068105f868feb4935987b87aaab7203ebe9fe02abbb5ede30d1a4232f4ba77facea13ecfeebb5c19a2f5e87 SHA512 3b0e94f42990aa06f6751fcee991d7bf5966b88a6c88b919e5ea29e37d734797afe30761ed6e6d01dbafe096a42d0cb86354c58c0ad09f0f7391adaab6ec7d41
 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760
diff --git a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
deleted file mode 100644
index 8ec9905d8de2..000000000000
--- a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
-HOMEPAGE="http://www.snortsam.net/"
-SRC_URI="http://www.snortsam.net/files/snortsam/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-2.50-ciscoacl.diff.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# bug 155955, ciscoacl segfaults with gcc-4.1.1
-	epatch "${DISTDIR}"/${PN}-2.50-ciscoacl.diff.bz2
-	sed -i -e "s:sbin/functions.sh:etc/init.d/functions.sh:" \
-			-e "s: -O2 : ${CFLAGS} :" \
-			-e "s:gcc :$(tc-getCC) :" \
-			-e "s:\( -o ../snortsam\): ${LDFLAGS}\1:" makesnortsam.sh || die "sed failed"
-		ecvs_clean
-}
-
-src_compile() {
-	sh makesnortsam.sh || die "makesnortsam.sh failed"
-}
-
-src_install() {
-	dobin snortsam || die "dobin failed"
-	find "${S}" -depth -type f -name "*.asc" -exec rm -f {} \;
-	dodoc docs/* conf/*
-}
-
-pkg_postinst() {
-	elog
-	elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
-	elog "Read the INSTALL file to configure snort for snortsam, and configure"
-	elog "snortsam for your particular firewall."
-	elog
-}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 3645f36d2949..2f2473757913 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -3,5 +3,6 @@ DIST sslscan-1.11.12-rbsec.tar.gz 56346 BLAKE2B 0079a4be50c037c02bc716341315e0a2
 DIST sslscan-1.11.13-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
 DIST sslscan-1.11.13-rbsec.tar.gz 57006 BLAKE2B ea5e2754f5a8218ee1f3aba26e7efe2394fa87b79137955705edc4600d67139f2641ac7b4e7a92f7273878f5b150e3e1b159114c833dc180049688563cf5095b SHA512 51477e5b29a2fc87e2d6c8d76430eeb2a6feb388d47392938b9e2c572acc5926534a19dc249080a066256a1a6cbfe08b162e9f3839386c86116352e5eb57c544
 EBUILD sslscan-1.11.12.ebuild 1158 BLAKE2B 8e6eaf2230adcbd177ac5b6b5755afd110c6ffd1d63abfecd2bd52139a6697935e855b793ddb03eef404642b66fa0fe6a3a24e2a142781c8d148b9d0ecae9e4f SHA512 0436371a9d645dd0396844dc5ffcd5bb8d7180892760024bcc57344962c05e1019eda986a6e116b51b319712d9876a86786a0d6e89fc13ece85a1d45790e5222
+EBUILD sslscan-1.11.13-r1.ebuild 1031 BLAKE2B cef5610d36cb942659f025b064d9029bcad7862f1394d894e5d1f8b5b33c6b2a9f8058a0bcc353b90c8e5991778ca1fd41f95dd97a1295b08d7735a9bab07152 SHA512 98c28b9ce6993659005d57f28883cba0eb5912999648d715f5ddffd73e4edfb4cd1be5cdc7eecb7519c75dbe089b2ddcac359ffc175c81bcba53d8db21a52004
 EBUILD sslscan-1.11.13.ebuild 1160 BLAKE2B 132efea34f015b54ecd5e6c4e47aaca1c3a2f34b3dad1d95caded11b9a2261427d7c0177521a5676b38f315147e452aac56f9c9d3a68dec85d69ab4bcf3f6328 SHA512 e5f66a9aa033596ef033c87d31328d6a62969b7164143c0fd0629e1c497c5f7a16cd68b2bf1853a5d34ecb769d9d6c74bcdfbb222d864de85f59ed58806f90a3
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild b/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild
new file mode 100644
index 000000000000..dfa4053fb25f
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Upstream now builds against the openssl 1.0.x fork by PeterMosmans
+MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+MY_FORK="rbsec"
+SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
+	https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} openssl || die
+	touch .openssl_is_fresh || die
+
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index fcf9c4c80896..8a2957c24618 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1,5 +1,7 @@
 AUX sslsplit-0.5.4-install.patch 1131 BLAKE2B 1f81f8fbc8861e4ccfc0b2068d19e1a5dbb1485cf72d7aa0799e7addf7c73e4836b427afd510de8b6c98037e473e5699c33920fb7931c99ccc989fd0cb956bb3 SHA512 0219d175cf9f8a6a89f9a807bb5981a83c1e62c6738f5fafd93970045fa56dd0595761f3915cc223f60541b39a8bff9222233f176a5a608cdcf7a6774b69f56c
 DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b SHA512 5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed
+DIST sslsplit-0.5.5.tar.gz 1846850 BLAKE2B b223491c480070dd9718804f0ceb8fec9fe519cf0d189fd9bf9cc4dce5ae00d93227dca42349b42d2b82c62d0d92c451442670f6eae2f8d2beedef437907299b SHA512 f236f1ccce8bdb4a09659551defd73b73fbf660ceedace6ffbbb687c1de4488f74a23274b53a67e7001dfcdbd0ede7270ba8261feab633a25ae9f57cce468f39
 EBUILD sslsplit-0.5.4.ebuild 1062 BLAKE2B 21b643d7ea3e2b6227c1f51d1113b708da07624357fef757361150ec8a2d29d8e5b4c1a9a217b23e9ce0b106e2d7c13568aa3c3c2fdbfd828b717170a20697a5 SHA512 7aff2062038061115f4e59d706585da52ffba89f2a12f9d0da2c7be19844c0a3530771f6ee28b2b91bf4a6abd648180ee92052e6815ee4ff911fd5977d33109f
+EBUILD sslsplit-0.5.5.ebuild 1029 BLAKE2B 84433424dce11eb473146ce9d4caa229f6f648d2ad627059992b9877140caf720f126b03b96655bec689ae5042e296573fe3ee77b9d938699133fd6a2666e57e SHA512 a44176eb89f13fa2f337116026d9ceb363c6d22ffcaf6c635b23ca8edffd8fd145ea6fa6129991a57b50187a083890215e7da069b11f045764f09bb6409ac820
 EBUILD sslsplit-9999.ebuild 1029 BLAKE2B 84433424dce11eb473146ce9d4caa229f6f648d2ad627059992b9877140caf720f126b03b96655bec689ae5042e296573fe3ee77b9d938699133fd6a2666e57e SHA512 a44176eb89f13fa2f337116026d9ceb363c6d22ffcaf6c635b23ca8edffd8fd145ea6fa6129991a57b50187a083890215e7da069b11f045764f09bb6409ac820
 MISC metadata.xml 873 BLAKE2B 2025dba83d4a6c2c48f8297da057360bc42269093af9292a8baa3096a5ec5cb3644da47effd8977ee9829e318bea5c11680c5eccab0407d5f14ed29a12e615b3 SHA512 d6d408cf00e3201acd6de22a0f10a2322398a889c84480da8eebd005da099f9306ac8d88d13c4186fa369915c39b4ad04d7aff558ad263896591374c9a4c78a1
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
new file mode 100644
index 000000000000..5ea7c49b62cf
--- /dev/null
+++ b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Transparent SSL/TLS interception"
+HOMEPAGE="https://www.roe.ch/SSLsplit"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_musl test"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/droe/${PN}"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	dev-libs/libevent[ssl,threads]
+	dev-libs/openssl:0=
+	net-libs/libnet:1.1
+	elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+BDEPEND=""
+
+src_prepare() {
+	default
+
+	use elibc_musl && append-libs "-lfts"
+
+	sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
+		-e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die
+	sed -i '/opts_suite/d' main.t.c || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" SYSCONFDIR="${EPREFIX}/etc" install
+	dodoc AUTHORS.md NEWS.md README.md
+}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 57033b3b46a7..e2186a80a2d8 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,6 +1,8 @@
 AUX tcpdump-4.9.2-includedir.patch 2027 BLAKE2B b9fc28ec180095f9b6e47e9a1ccd75d479029cfb19d6f1ff53595a25cab4c68d1ca55df0f702dfae86e264e4b7d3f645f3fac1b548bb6d62cec58306ae19e88a SHA512 054af892c4948926d23b6b7a4f93ac00ab8f258181784598a4097dd8f8b641ddeaedf3c9924b940b860929e086810037d3a672fabd03427b4bb41d3020013c27
 DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
-EBUILD tcpdump-4.9.2-r1.ebuild 2196 BLAKE2B 3fa9633aec8cbf4fade7622b445336fb79d90b361299ad18d0704e613e749d05204f44b0e75b489692dc5851dcc1d987719c7f6cc4d1e5f5b9265775c1ffcc88 SHA512 6573400c2c12725e5c791756de76854c38869cbabe35c208c479beda30893f0f029011f407bd56f0ae6dd8a63a5dddf45f57d49b51babf25a966a407e0cdbe6b
-EBUILD tcpdump-4.9.2.ebuild 2074 BLAKE2B 94a22e1acea10408c02fcca114547eba248491b0a99505ee369549c681e23e5a5ffa51f4dd43ba6ae2eaa79d0abc85f1f5c1f9a057a96c70189d47e9d98e0028 SHA512 48bd328212aae63dc3f0361352f93b29edb165cbbe12f7d92cc3588c9240e4584e5257bda6adc52872b271e72dfcd65cbd78d79b1faf86b76088fe4f3244376f
-EBUILD tcpdump-9999.ebuild 2199 BLAKE2B 4931c70244b037b100cbabad036f2cb14a675d6bb0cec61697bcb2b996d18ee18e38afe6d04cec9e07b78b222cf5ef1f2cf01205eef137f7df5eb7d931605744 SHA512 57e1a444b5a345b2acc2cc14e64fd2298b6d8b20fcf45a9352ddfb3a6a16220fb078b0e4382031eb1b3ed61b7b33ab30c2790c7f1adb15a68701fd57fbe97f9f
+DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
+EBUILD tcpdump-4.9.2-r1.ebuild 2188 BLAKE2B c0c4a55475be8412eec59fdc0f32c8008144d1e355b28d064c4ab379882b60e1d45f6463a6cdab600ac8476267dc363e1a85810a506f6c2101b5b90427a11dc7 SHA512 a4a54a5554afa51e1305a8de0fbd2559685070036cee416fb3bc02133123b4e438ec41f1c7ed8afb124fd12acd2df538113bdfd937777c12724e4b41737b00e1
+EBUILD tcpdump-4.9.2.ebuild 2063 BLAKE2B 724f8b73ac79e4d25ad27e8530f289edbabc0f9606c2d2f195b0084e0701d9d37ea039652f9c0f46099fe6b21f2dabe55f9a613be7ce08b8b0c6f5294226f930 SHA512 4f792631df6effa11a6e09a286e612bfbaca812530bbb05deb6b0b468b164d70974eb69d021f4ca4539bcd994cb8c00de09a95cee750563d6a1665875cfff3a2
+EBUILD tcpdump-4.9.3.ebuild 1947 BLAKE2B c773686b1362f6b6c4e6e988dab7e90eede28f039c8b785a27b7484b00534f15b3c25d994600f58ee5e37e780b2251e3c542554b7c2921853b081e8c61da1653 SHA512 227eca309c750e4bb3761d395b733e85163f9c4bdf13aea19034f2236ea3c44f300eaa1455b11958c42cc8bbe2bdcc4e32894a936f13a3cc01759322a765d0d5
+EBUILD tcpdump-9999.ebuild 2190 BLAKE2B 29650a330e482a82589b8472b62cba24bc3ddfc931465557ef7695938a8d208ceef862d09f9f4a5aaf9d917c58396451f071909c5ab3c808f5185b9b49ddb0f1 SHA512 974ff9bed610720376d46f54316e7aa25cba88255d40327f7325ae3101ddee62210d9eb70f32336eeb507bfd267258f072e299a149c16a4a1218ccea0262c13c
 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
index 7e89e1714aaf..193cb91dd2e7 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
@@ -6,16 +6,16 @@ inherit autotools flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/tcpdump
 "
 SRC_URI="
-	http://www.tcpdump.org/release/${P}.tar.gz
+	https://www.tcpdump.org/release/${P}.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
 
 RDEPEND="
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
index 250b25f46250..632d82283d9c 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,16 +6,16 @@ inherit flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/tcpdump
 "
 SRC_URI="
-	http://www.tcpdump.org/release/${P}.tar.gz
+	https://www.tcpdump.org/release/${P}.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
 
 RDEPEND="
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
new file mode 100644
index 000000000000..b299f9098c09
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs user
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="
+	https://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/tcpdump
+"
+SRC_URI="
+	https://www.tcpdump.org/release/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+drop-root libressl smi ssl samba suid test"
+
+RDEPEND="
+	drop-root? ( sys-libs/libcap-ng )
+	net-libs/libpcap
+	smi? ( net-libs/libsmi )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	drop-root? ( virtual/pkgconfig )
+	test? (
+		>=net-libs/libpcap-1.9.1
+		dev-lang/perl
+		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+	)
+"
+
+pkg_setup() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+src_configure() {
+	if use drop-root; then
+		append-cppflags -DHAVE_CAP_NG_H
+		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
+	fi
+
+	econf \
+		$(use_enable samba smb) \
+		$(use_with drop-root chroot '') \
+		$(use_with smi) \
+		$(use_with ssl crypto "${EPREFIX}/usr") \
+		$(usex drop-root "--with-user=tcpdump" "")
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+		emake check
+	else
+		ewarn "If you want to run the test suite, make sure you either"
+		ewarn "set FEATURES=userpriv or set USE=-drop-root"
+	fi
+}
+
+src_install() {
+	dosbin tcpdump
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc CHANGES CREDITS README.md
+
+	if use suid; then
+		fowners root:tcpdump /usr/sbin/tcpdump
+		fperms 4110 /usr/sbin/tcpdump
+	fi
+}
+
+pkg_preinst() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+pkg_postinst() {
+	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+}
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index c4fe962e8128..7fd150b21bd2 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs user
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	${EGIT_REPO_URI}
 "
 
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index ec551e18b181..7e74600accdf 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -3,10 +3,5 @@ AUX tcpflow-1.5.2-gentoo.patch 1344 BLAKE2B 2b795f920d9605f53f81b03dd125dc52c6cf
 DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4
 DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1
 DIST tcpflow-1.5.2.tar.gz 788545 BLAKE2B b3995cf0f4bedce207dcac19de3d57920231cab75df030da1cf93fb815999de602fd1e3f0955c82effff88f9a3945a891c3b3f0e08449cf366de4bb8269a6452 SHA512 e060779c78f79ba6efdf5f9d8ff490823ff06051a7089247b8155c03f487776fa1896e487e8dca1d5842b617fc5d9056e043f01ac3276edeec1d394ed24bc7e9
-DIST tcpflow_1.4.5+repack1-1.debian.tar.xz 11144 BLAKE2B 1188e259406b5bf4feaa95b6a6805217564f71f377b6ae5baa707453da4f0d9bf15c7fdfe1fea0a9c4586e5c24f9b4cea8fd5226a97d762d9f5969d3381d4bbb SHA512 ed2c491595a3d5382ca79fe945467639af3d99658d002353f90e07aa6b1a955e57ab0fbbc3fadf964e9d6d3dba4fd327a02c1b07d6a239efdf90b365928b2a1e
-DIST tcpflow_1.4.5+repack1-4.debian.tar.xz 12228 BLAKE2B a7c1725d2a82a6ef63800c3bf8fe4d99fd81566fe3b1dbd77238337784954e3161fae868b2a915a9fa2ce580a81d726b6359f905953a952e500f811e9e38c4b5 SHA512 27d8a7a735b06c35cc2985cb26a129a490fc2236eedeede21977afe4c3096a6fde3ea18de1aaa3a1c6a56bc36d332b1e8bd4c7be933d5b031509a69cae189b18
-DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 BLAKE2B 282849bded34acc79ece4b06c72d5ed05ada07bb2e1a5e6e15dd7c6c46f8f1e57b5bfb018b1a23bdd543d0664b3bd5a3f756342fd657930a77c1ab8307358421 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85
-EBUILD tcpflow-1.4.5_p1-r1.ebuild 1119 BLAKE2B 47a36a5f641e96a2a16afc41c02468ea83b93b425b7c6f1e7f3382321119d3459cbe7e1c9e4a42e02a73fe205d9da21f7afe596c543f6d5879bc5d0fa2b0bbbe SHA512 bbaaf72e7ab163093392d1c4c690281f84100209f4084f351c60823bbbf94e7787530dc75120123ff4a7f4439de06d1a1c815a97185f0735753444d374d8506b
-EBUILD tcpflow-1.4.5_p4-r1.ebuild 1132 BLAKE2B 431b20f5779a0cb828d321069300f12348f75f47d75dd9d2fd7411bebe956f0f40085ff1a0e33fd5036bc919881d07972506ae2dea4362c6f63713eb433d0c33 SHA512 e781ef6618cbd549828bf426c2fdd9511b037d149f45279d54da658b48b5e6302e62b278e9fe36782cf458e2a335263507efb3be8134d698900c4530455a1bfa
-EBUILD tcpflow-1.5.2-r1.ebuild 1571 BLAKE2B 7fef6a92a455d62a4e253a7e1c25b0b2c92b61c5be950f4c76079cdcec4a1d120e1ebc8726b9d2c608b781d701b0070d299fa866bafd71ca073ac800d023d7b1 SHA512 a3005f38a0998dddb0136dbba1b686afa019a93c1c44ea311eb78cc21583ee663f89b99a00f6b3278d6e689b754f043f5d0e7286cd4bfcd48fa716cad61a5a96
+EBUILD tcpflow-1.5.2-r1.ebuild 1568 BLAKE2B 30369bf01dd72a0b231152be69678a2fe5d55101bdee0cb7db6449f622354386dc8a194a205f113281563293b05c930e14fd401e650dceab0e04b1f4c0c28be7 SHA512 d240db703d05ba81626161868315dc11cd599aec886236c54bafbbd67cc45127df65239a13b50d7c7551d7aefff4935c95eeeea33a92ed9add566618691f534d
 MISC metadata.xml 360 BLAKE2B e69d4aa24b5949bff690f0dd8e735d85e975424fec366d7952232a9efd223c163b57684eadde0ddaee26cb0a763e09b64ef7b6361e97611e2369eb1b037d7341 SHA512 32d3c4b5fabd54d1c6c1db15d8af755a6c83725f1d52f5be2ffd7e9975113d200581da4e4a735d823bdf5d12408c8306cc08ef08721ce924f04e137a7da8fa08
diff --git a/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
deleted file mode 100644
index ce8b561465f6..000000000000
--- a/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
-HOMEPAGE="https://github.com/simsong/tcpflow https://packages.qa.debian.org/t/tcpflow.html"
-SRC_URI="
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1.orig.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE="cairo test"
-
-RDEPEND="
-	app-forensics/afflib
-	dev-libs/boost
-	dev-libs/openssl:=
-	net-libs/http-parser:=
-	net-libs/libpcap
-	sys-libs/zlib
-	cairo? (
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/coreutils )
-"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/*.patch
-
-	mv -f README{.md,} || die
-
-	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(usex cairo --enable-cairo=true --enable-cairo=false) \
-		--without-o3
-}
diff --git a/net-analyzer/tcpflow/tcpflow-1.4.5_p4-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.5_p4-r1.ebuild
deleted file mode 100644
index e29648afaeb5..000000000000
--- a/net-analyzer/tcpflow/tcpflow-1.4.5_p4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
-HOMEPAGE="https://github.com/simsong/tcpflow https://packages.qa.debian.org/t/tcpflow.html"
-SRC_URI="
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1.orig.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE="cairo test"
-
-RDEPEND="
-	app-forensics/afflib
-	dev-libs/boost
-	dev-libs/openssl:=
-	net-libs/http-parser:=
-	net-libs/libpcap
-	sys-libs/zlib
-	cairo? (
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/coreutils )
-"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-
-	eapply "${WORKDIR}"/debian/patches/*.patch
-
-	mv -f README{.md,} || die
-
-	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(usex cairo --enable-cairo=true --enable-cairo=false) \
-		--without-o3
-}
diff --git a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
index bf0aeffb4aab..1b29c9fe64b0 100644
--- a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 SLOT="0"
 IUSE="cairo test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest
index 6ce9163bdead..85886c991b06 100644
--- a/net-analyzer/tcpstat/Manifest
+++ b/net-analyzer/tcpstat/Manifest
@@ -1,8 +1,5 @@
 AUX tcpstat-1.5-_DEFAULT_SOURCE.patch 428 BLAKE2B ee4ac925f6baa2728cdc5ec2d31fe9ddfa555465f3386ff0413a851541c06d160270f56896c715c136849776b7233482a0de359c616e73ed4be0755ed05da199 SHA512 471309ad08b0a10f18b34a3d69a81ff19223787f375ea652fb12a96b3166432a55efb091d255aee4388262e44af0d4b3ea2a644ddc6cfaf8201b57194511a1d9
 AUX tcpstat-1.5-db.patch 4691 BLAKE2B 1c135688c7197144f6add6ccca007a70141033a16a6b3c24cf4d9769f43b651fc5cfc2bad875c010d7b888e5533af49aca7eab2c691bb716e2c389435136ab0d SHA512 03de51e86bd0aa1bf2d29097871fe8409498050100c4adefde7d8aae7bdd752455af6ce13b490f4e596ea90557b37c95b974705cbaece35d9b465571fdb31d6d
 DIST tcpstat-1.5.tar.gz 93102 BLAKE2B 39a570fe6176fda0e8a6539417ece268183a1ebed6fa956b8ec5556b8bbd2508829e7d0861ef39b551bd6070df70cfdaf3dbf694a42ad00be4ea0f3e5c757ce5 SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab
-EBUILD tcpstat-1.5-r1.ebuild 865 BLAKE2B b904e297122d5640de2f88c68124bf6a6945f41e0a60632c0813422ae0496da917093e2e47968d7e919110521f3ce5adc24de853b3cae2b29ee9b2f1e9e23af5 SHA512 f74ee7b2f110edbacf08085e95d8409ac35e85a656439156e4c98e09b5bac06dc5a91ea91eb13cd51f30f085bc6be6433da95a42fba67039bfa4d8c18e5896ed
-EBUILD tcpstat-1.5-r2.ebuild 725 BLAKE2B 111495835579d8b584959fb232be6bf813886dc26de21585b2f7b820da8cf390dde050a9c257d74633802236449943e801d65df5482473c5ed08964bf6230a01 SHA512 5379b0dc23729ff8c4a3148dccb0efa5ff2971eb39c0939ff795ad8923b95917191db1e3809bd9c05e5a4b2fa12db4e13a407e94976f28af580ad0595c46d672
-EBUILD tcpstat-1.5-r3.ebuild 859 BLAKE2B 5f32b003b52942bd8b1d74a20b99e64d25b37272d95550afd6ba11aca2ae875c6a75b83c106ecec76424455138f9be2ad1024de96d3abe6019a906a1e46645a3 SHA512 6a2613d431804324507e49a835612e5ed59db0850f038a23b64c63f6177e2b8bf85ed7bb061b991ef63b4e1e542b8b113bd2c6216e34b1c913cbd399d6e7fef3
-EBUILD tcpstat-1.5.ebuild 561 BLAKE2B aa14697eab225735f94826244653ec1c5cfd97799fc46adc6a17924f244c52841babaec0d20005f7599cefb79a9878a1eeb38fb9e2b65a8a5b148978ffe8048b SHA512 47cdb87e19a06b557e9ec1253790cb349929f04690d8f760b4e78e68ea5fa8ddb84e4edf87d8b22200c20d3cb3222867d538537debe22b6c934677d230995aa6
+EBUILD tcpstat-1.5-r3.ebuild 855 BLAKE2B 330c2133eabd9397e71e7cdc2bb81525c4021883597abca48344e66b70652d2988ade3ad476a856c11f7971ef443bf4732f0e89910dbbd7764ef55087e55569f SHA512 1d1564553cddcfd07aa05e11f15be0dc9b07a7754024626f5429330ee9ca2d812721e9d7b666bdba5567fa13dacee1cda1e4cebf491dc35340f8c9f4b0622634
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild
deleted file mode 100644
index e12e9962899f..000000000000
--- a/net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="Reports network interface statistics"
-SRC_URI="https://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
-HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/"
-
-DEPEND="net-libs/libpcap"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
-
-IUSE="ipv6"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-db.patch"
-	eautoreconf
-}
-
-src_compile() {
-	append-flags -Wall -Wextra
-	econf $(use_enable ipv6) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "emake install failed"
-	dobin src/{catpcap,packetdump} || die "dobin failed"
-	dodoc AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt
-	newdoc src/README README.src
-}
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r2.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r2.ebuild
deleted file mode 100644
index cc4cd5ac89ad..000000000000
--- a/net-analyzer/tcpstat/tcpstat-1.5-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="Reports network interface statistics"
-SRC_URI="https://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
-HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/"
-
-DEPEND="net-libs/libpcap"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-db.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -Wall -Wextra
-	econf $(use_enable ipv6)
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt )
-
-src_install() {
-	default
-	dobin src/{catpcap,packetdump}
-	newdoc src/README README.src
-}
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
index 64128ffed42c..422bd5d082da 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="ipv6"
 
 DEPEND="
diff --git a/net-analyzer/tcpstat/tcpstat-1.5.ebuild b/net-analyzer/tcpstat/tcpstat-1.5.ebuild
deleted file mode 100644
index 3be19c53a62a..000000000000
--- a/net-analyzer/tcpstat/tcpstat-1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE="berkdb"
-
-DESCRIPTION="Reports network interface statistics"
-SRC_URI="https://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
-HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/"
-
-DEPEND="net-libs/libpcap
-	berkdb? ( <sys-libs/db-2 )"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	use berkdb && dobin src/tcpprof
-
-	dodoc AUTHORS ChangeLog COPYING LICENSE NEWS README*
-
-}
diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
index 83bd348b631e..20376c8da4a7 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,4 +1,4 @@
 AUX tcptraceroute-1.5_beta7-cross-compile-checks.patch 1228 BLAKE2B f18640804c946225fed7324203c928062b37001053ac87a8f78c500b1bb6c65f3263650484f51ccf20b09bb8d1ce95f871b2ad53f8752154e0134b5e26b2e01a SHA512 a994d9d0dfd633fd9f091c77a0ca96b0b73dc9a7373631feece29fef3f3daeb38dddf7fc6fc829c64cb8eb3809d7e25d22f3c18d2202188df9d94ca237601815
 DIST tcptraceroute-1.5_beta7.tar.gz 119059 BLAKE2B e2d627c7fa96439e77be7d2fb5d57e0b92451367c95022876895fcbebdc0adf8c78b262e41ecb8a2696e8377e9862b45f2139cb8ca9d92a696d9a0dc319d4a64 SHA512 ad5588e62a56f1b5fa851b68280a88e66a900777fe4fd67587262245cd9da17b536b7dc972abe540fc124a93ac76abcabbc55bc32f9f8ee872d5df57b08f7222
-EBUILD tcptraceroute-1.5_beta7-r2.ebuild 942 BLAKE2B 54238e0e80eb89945dcb61701f7974f3b7294d035ee2ecc96b1f6c85e7eb3f14f04c3a3ed4a155f32f088dac6b240373351387ea053f5d4485ef78fcdc916d16 SHA512 42f277c577eb7161f5c62262536c5f50c2cd53cdddf55748924e67ac4b9e15d85c3ba04fa5446b88c207fe1dde12e0c5cba6107069dc2b5e4ea2ac943655df1b
+EBUILD tcptraceroute-1.5_beta7-r2.ebuild 932 BLAKE2B 27bdd1f9cdf1a458adaa96b26a4dac6cf005b6b2d0014bbd116afb59770dc129c7ce5705491a4ef06d10c4977a3e9e1be8f2f31775a2a4f1df8f961f3f82d340 SHA512 e71e63651dea0d1eb69ae3c3d0e5fc4b265c4b4cf0f57616541e443c34a517a2a9b3ea2b46cfcb67038c2a9e4bad91efed24b8f23266568828f3f2d0fe33697d
 MISC metadata.xml 362 BLAKE2B 7e5066833673e1881f77a10c92f8ff281c050140a6a77154fedb4f469b99d6c53abbdb0a35702d5325e294f7acfe8b050254be7ffac4c3832455777c65a98cd5 SHA512 783a1867b40907e8704e19ec6d423f4db8a97ba683f64efc72ea7bf4e4157e9bf630470fcf8a0410d6fa9bc5cf63f810f1f577828bdfe1203f2f56e55458c7cf
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
index c3d71529138d..f5b06925a972 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://codeload.github.com/mct/${PN}/tar.gz/${MY_P} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b07eb3b8a28f..c0ea0a5bca36 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,9 +8,9 @@ DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e
 DIST wireshark-3.0.4.tar.xz 30938336 BLAKE2B ab97cbfd9999a4e326787639debb67f0d0b8509572fb85297385a461dbaf081691d59fc2cb16b4a69baee8ca0ef873503f85f0238bf0fbedfcb3e0755749d3df SHA512 eb9ddc8ba3d78bc6c1f2e1d277e81c00939638793ed21b98999310231d13a0fc8a6149dc5e78f58026778b8137e954ad7f67069f8cb80465078ca2d9795b25d1
 DIST wireshark-3.0.5.tar.xz 30929864 BLAKE2B 0e3d8eb37e6d1d1976e8084176fc9c75dab43a74f65f8247c9b18b85cdd82d207791b839743a59c4ad299d63f5f41a94f931901e9245dbfb3d4a239046c874c4 SHA512 237ee66cfe0a7073f0e3623f327f7eb7204d1cd274e006dcc6890972d4135c2baa6c9d2426ea03ee64b7fc6dc45cb4cfe823e5cfc6f90e252d35b3ad7750884e
 DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9
-EBUILD wireshark-3.0.3.ebuild 6587 BLAKE2B b73890fced1e5959f8955bcd61b81f298c247c6075f03510870369882c8039107c396bc74f0577a23d5480461de3a991b9366146700fa646f2ee5bb8d1800fcc SHA512 95b42f065c4d678755a28dca5382f27df91a9ecaaa679b7c531a2006ab6aaab11838ce39a19370c5bb9cb7955a6d54feb6458d347999dd1cfd7f9ecf5ed7795c
-EBUILD wireshark-3.0.4.ebuild 6591 BLAKE2B 79d06a7c557799398bec0d257529a2d759ac9fd96d548f265ea3040e85a9de549e0bf504af65de0cf9ae8aa02e1422332285247c630e0d46af571f93370359ca SHA512 d2576cfb2dbb5cae17a9c83fcd4ce4575857c8fd250050c6561a8e969e5e6789bd4875c4a1195f4718323d0bf61c319c40e9d15b0c671ffa79be728a2e20d3e2
-EBUILD wireshark-3.0.5.ebuild 6594 BLAKE2B 9edf7d4f6b3cf5614adadb036f2319f8667fba725019c47b45c16c33fd9be41f6f0525e919b19a487c4b7173a235876096089f40a95bda90d516f82bc0071fcb SHA512 eae7ecc3f8a3599026c94b0f207cb7960175ebdaa9ab91d30414d7d10b0395632d5ca56cc699b07305e8aed65bbf067939081ec462fa1ce0a06100d37ea1da54
-EBUILD wireshark-3.1.0.ebuild 6796 BLAKE2B b8c8bf8ae8b08591ac11bfeefaddd953844ddb2b3c30c0bd5be3a3dea179ad6bb9896aa2dffe67e31f612e6b7cff6c7349981d8641b395041bc9b1999b59b3ff SHA512 5967b885881c10d5a6ae516eb5319ddffdb73a31856545e9bbb7676d0bf9b3b02c868bda2821f4c5e655cd0b0967fe7cd1e2f7d6d77607a492714c54cc7c07e5
-EBUILD wireshark-99999999.ebuild 6801 BLAKE2B d6fce252397acd89269ac1ba4e96377f8f9072045e378c97b4bdfb1452a14fd80e5b6014bf74616ce41639b1596c1de13dd10092a0f98e8bcdb7dd7201ed2c10 SHA512 bcb538192ffb47eb9c465ac7fcfce7b86c34a7657b6172750fa4965693d4a60a398664984ee4969fc4f884e79c4959ed544fd9d6d2e873deb5cd39366f20af11
-MISC metadata.xml 4965 BLAKE2B d50849435714c6a4c1e8b2d43e27a4d2fb97dd5711b5c80ffba97b3218c4b76459f79a06590ae188d024be6bff5e80731c73a8cfc72d1682c24f0719803a7d3c SHA512 dc4cdf407f86f85f4542f605497cff1cf97510ef065ede61f1cb1c1ec774393ac71689c36e5e5d06e34f272f42a48ce8000bcd8b51e4757e5d85db8703a06779
+EBUILD wireshark-3.0.3.ebuild 6581 BLAKE2B b9caaad314347dc3a02cd2994344f3113c604487b36c6b785018c0683a11dcf5e1714871431e1305ca9e1ba2eb3b542d91044f5b2c5afd0419a13b53c3f256c2 SHA512 154f303dc3c9c84088db981d00218cdf9dc7bb6dd5719d25201b9460b9dd9998093d179475c97cdc54aaf27da659acc5609ad333f0cccea3ba23f13cd837bf91
+EBUILD wireshark-3.0.4.ebuild 6585 BLAKE2B 06d39f7d056b73ea4d7180cd7373975831dbb1f1d5a4b28faa5d9ab37452d70f78247a4727cfd7acb15879917a7be703733fa42dc77ac4b61b26c5b46b383e06 SHA512 b627ce7283791654aeec6f7400b5d12e309ba98548f382256cb5732e171811637462af036c676b936217f00f24a3f0ad566a1ed9a95ca4eb8f9504a48a2d74dd
+EBUILD wireshark-3.0.5.ebuild 6588 BLAKE2B f76ebf3af16e8f11f97af85b599b7555b3c85db8cb7c37698252be645622623cc8549aa591bf627909ebd04b9008c1581f607376a6fdf849783e31cb57294d74 SHA512 348cf90f7c319ab19a4befc74ca261c286eb9b778a6c21d65a4b462d422e7d382741102260d2155d5e415b2348499d1dbd3ea7bedc91e4f81596331d337c5263
+EBUILD wireshark-3.1.0.ebuild 6790 BLAKE2B 7acc05ba1e54b2a9b68d775c639c60d19ad98e7f0d35caa70cf42400618cef1306de4514d21bc249e19ffda36ee6e96a8425a57bfb72de44ea439565eca2b98d SHA512 e1bcccdf1ca7fa2e97fb55591c6d067e3bb2d4a03188254b8decd6e277b8ff584f2c8590c578109fc3045b908d46a76892d952c1c264665c36cd02fa4b36ebfd
+EBUILD wireshark-99999999.ebuild 6795 BLAKE2B 615b65c6838e00c5b0c54a05508d0758f761387dd0a9488ad39608054c4940fc3d5b557a370bc1e14b9b70734ea9c0ac4df4cd8a06a84b1854c41cab12b96182 SHA512 0d5b143ad8f104f4ddb66195a000bc94fe26997ef5c9269f967e20c9832deafe31443ac53558046aa7f300bf036194c23fb6a9a5611237bf31d039ebfc567978
+MISC metadata.xml 4963 BLAKE2B b3c0a51c2ffc96313fe46be2f4b970c0a22d7b479a3701a717531f7b9c46ff5b00b1d3a29a54295abb90989226afb679f2d4842c2ade5f4f1c2d7923121591b8 SHA512 03cdfa1a78a23ae572eb0eacf787b1edba135541ab94d899dad77c6f0d482d9303fa0168033a3a60a8e12dd54506999ea5bd323dc0a90c58d87d8640bda139d2
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 3e0355cd9ccc..651879bc6f82 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -38,14 +38,14 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag>
 <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag>
 <flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag>
+<flag name="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
 <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag>
 <flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag>
 <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
 <flag name="minizip">Build with zip file compression support</flag>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
-<flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
-<flag name="plugin_ifdemo">Install plugin interface demo</flag>
+<flag name="plugin-ifdemo">Install plugin interface demo</flag>
 <flag name="plugins">Install plugins</flag>
 <flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag>
 <flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag>
diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
index 25bf89b8cfe8..0fcd75a867a0 100644
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
 	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
 	+udpdump zlib
 "
@@ -29,13 +29,13 @@ CDEPEND="
 	bcg729? ( media-libs/bcg729 )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
 	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -157,7 +157,7 @@ src_configure() {
 		-DENABLE_LUA=$(usex lua)
 		-DENABLE_LZ4=$(usex lz4)
 		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_NGHTTP2=$(usex http2)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
diff --git a/net-analyzer/wireshark/wireshark-3.0.4.ebuild b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
index a2a6a43079c7..61e8bd7a288c 100644
--- a/net-analyzer/wireshark/wireshark-3.0.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
 	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
 	+udpdump zlib
 "
@@ -29,13 +29,13 @@ CDEPEND="
 	bcg729? ( media-libs/bcg729 )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
 	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -157,7 +157,7 @@ src_configure() {
 		-DENABLE_LUA=$(usex lua)
 		-DENABLE_LZ4=$(usex lz4)
 		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_NGHTTP2=$(usex http2)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
diff --git a/net-analyzer/wireshark/wireshark-3.0.5.ebuild b/net-analyzer/wireshark/wireshark-3.0.5.ebuild
index e33cf0877e63..f4fbb9dc3bcd 100644
--- a/net-analyzer/wireshark/wireshark-3.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.5.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
 	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
 	+udpdump zlib
 "
@@ -29,13 +29,13 @@ CDEPEND="
 	bcg729? ( media-libs/bcg729 )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
 	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -157,7 +157,7 @@ src_configure() {
 		-DENABLE_LUA=$(usex lua)
 		-DENABLE_LZ4=$(usex lz4)
 		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_NGHTTP2=$(usex http2)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
index e489d3494c1a..4d9324a7a9b8 100644
--- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
 	adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
-	dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
-	+minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
+	dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb
+	+mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
 	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
 	sdjournal +text2pcap tfshark +tshark +udpdump zlib
 "
@@ -29,6 +29,7 @@ CDEPEND="
 	brotli? ( app-arch/brotli )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
@@ -36,7 +37,6 @@ CDEPEND="
 	maxminddb? ( dev-libs/libmaxminddb )
 	minizip? ( sys-libs/zlib[minizip] )
 	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -82,7 +82,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-wireshark )
 "
 REQUIRED_USE="
-	plugin_ifdemo? ( plugins )
+	plugin-ifdemo? ( plugins )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
@@ -160,10 +160,10 @@ src_configure() {
 		-DENABLE_LZ4=$(usex lz4)
 		-DENABLE_MINIZIP=$(usex minizip)
 		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_NGHTTP2=$(usex http2)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin_ifdemo)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
 		-DENABLE_SNAPPY=$(usex snappy)
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 97001a178907..7ecaa00c8eec 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -14,8 +14,8 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
 	adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
-	dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
-	+minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
+	dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb
+	+mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
 	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
 	sdjournal +text2pcap tfshark +tshark +udpdump zlib
 "
@@ -29,6 +29,7 @@ CDEPEND="
 	brotli? ( app-arch/brotli )
 	ciscodump? ( >=net-libs/libssh-0.6 )
 	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
 	lua? ( >=dev-lang/lua-5.1:* )
@@ -36,7 +37,6 @@ CDEPEND="
 	maxminddb? ( dev-libs/libmaxminddb )
 	minizip? ( sys-libs/zlib[minizip] )
 	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -82,7 +82,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-wireshark )
 "
 REQUIRED_USE="
-	plugin_ifdemo? ( plugins )
+	plugin-ifdemo? ( plugins )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
@@ -160,10 +160,10 @@ src_configure() {
 		-DENABLE_LZ4=$(usex lz4)
 		-DENABLE_MINIZIP=$(usex minizip)
 		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_NGHTTP2=$(usex http2)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin_ifdemo)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
 		-DENABLE_SBC=$(usex sbc)
 		-DENABLE_SMI=$(usex smi)
 		-DENABLE_SNAPPY=$(usex snappy)
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /net-analyzer
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)