2021-03-15 21:38:16 UTC

13 files changed, 34 insertions, 47 deletions

diff --git a/metadata/md5-cache/net-analyzer/amap-5.4-r1 b/metadata/md5-cache/net-analyzer/amap-5.4-r1
index 338074e013d4..28852895a7db 100644
--- a/metadata/md5-cache/net-analyzer/amap-5.4-r1
+++ b/metadata/md5-cache/net-analyzer/amap-5.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A network scanning tool for pentesters
 EAPI=7
 HOMEPAGE=https://www.thc.org/thc-amap/
 IUSE=libressl ssl
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !sci-biology/amap
 SLOT=0
 SRC_URI=https://www.thc.org/releases/amap-5.4.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2d8ee0874ed2e14cc310ba0160dfec6f
+_md5_=a2840557c4a418c2b0295e135550ebb3
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1 b/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1
index 78bf0b43fbef..69466d945fc5 100644
--- a/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1
+++ b/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=network Audit Record Generation and Utilization System
 EAPI=7
 HOMEPAGE=https://openargus.org/
 IUSE=debug sasl tcpd
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap net-libs/libtirpc sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.3.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4c1d14bd7c0e1e1d35945eee509ad56d
+_md5_=9eb47322446c6d7cef073c20103a6c53
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3
index a912ce22c49f..4e499a874d35 100644
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3
@@ -5,10 +5,10 @@ DESCRIPTION=Clients for net-analyzer/argus
 EAPI=7
 HOMEPAGE=https://openargus.org/
 IUSE=debug ft geoip mysql sasl tcpd
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.3.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=420ac97e4e09023951bb7443a2447f0d
+_md5_=aa6649abf3c3d219852a6c6e97424811
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r1 b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r1
index ce508be325e0..0509b9c9c032 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r1
+++ b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address
 EAPI=7
 HOMEPAGE=https://ee.lbl.gov/
 IUSE=selinux
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=BSD GPL-2
 RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch ) virtual/mta
 SLOT=0
 SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jer/ethercodes.dat-20200628.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=14fbf7e0b5e299e65581d29c3a741e60
+_md5_=3a42043b2b407ba7390a30a34be6ddf5
diff --git a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2 b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2
index cb7208a385e2..ff94b4d63d1e 100644
--- a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2
+++ b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2
@@ -5,10 +5,10 @@ DESCRIPTION=Bandwidth Monitor NG is a small and simple console-based bandwidth m
 EAPI=7
 HOMEPAGE=http://www.gropp.org/
 IUSE=+csv +html
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/net-tools-1.60-r1 sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/vgropp/bwm-ng/archive/v0.6.2.tar.gz -> bwm-ng-0.6.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9e04340d0e5fd33cb3f13ad2eed35ee4
+_md5_=5592c3015795cb561a1dbbabcc34503d
diff --git a/metadata/md5-cache/net-analyzer/cutter-1.04 b/metadata/md5-cache/net-analyzer/cutter-1.04
index 85a373ac1c8a..82bfa837dbe0 100644
--- a/metadata/md5-cache/net-analyzer/cutter-1.04
+++ b/metadata/md5-cache/net-analyzer/cutter-1.04
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=TCP/IP Connection cutting on Linux Firewalls and Routers
 EAPI=7
 HOMEPAGE=http://www.digitage.co.uk/digitage/software/linux-security/cutter
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.digitage.co.uk/digitage/files/cutter/cutter-1.04.tgz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6f987173b449f5d6cf3c0ded3231c68b
+_md5_=b35d59389dc15b3d874b6bd3ba0b4dd7
diff --git a/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3 b/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3
index aaec0b661fb6..8fb0de6cc5f7 100644
--- a/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3
+++ b/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3
@@ -4,10 +4,10 @@ DEPEND=acct-user/darkstat dev-libs/libbsd net-libs/libpcap sys-libs/zlib
 DESCRIPTION=Network traffic analyzer with cute web interface
 EAPI=7
 HOMEPAGE=https://unix4lyfe.org/darkstat/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc ~x86
 LICENSE=GPL-2
 RDEPEND=acct-user/darkstat dev-libs/libbsd net-libs/libpcap sys-libs/zlib
 SLOT=0
 SRC_URI=https://unix4lyfe.org/darkstat/darkstat-3.0.719.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5a9896f8828ae3caa1d815fceb9424f5
+_md5_=c15ddd1eecd17635dad506a6b9c5564f
diff --git a/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1 b/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1
index 3120486d700b..39bef6d05cb7 100644
--- a/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1
+++ b/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=library and programs to process reports from NetFlow data
 EAPI=7
 HOMEPAGE=https://github.com/5u623l20/flow-tools/
 IUSE=debug libressl mysql postgres ssl static-libs
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=BSD GPL-3
 RDEPEND=acct-group/flows acct-user/flows sys-apps/tcp-wrappers sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/5u623l20/flow-tools/archive/v0.68.6.tar.gz -> flow-tools-0.68.6.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c0f417208f78ab6cb36832f3a41169ec
+_md5_=1a76afbc59dce15dbb837782228b9094
diff --git a/metadata/md5-cache/net-analyzer/lft-3.91-r1 b/metadata/md5-cache/net-analyzer/lft-3.91-r1
index 8d0ac7e44d53..91ef93334df2 100644
--- a/metadata/md5-cache/net-analyzer/lft-3.91-r1
+++ b/metadata/md5-cache/net-analyzer/lft-3.91-r1
@@ -3,9 +3,9 @@ DEPEND=net-libs/libpcap
 DESCRIPTION=Layer Four Traceroute (LFT) and WhoB
 EAPI=7
 HOMEPAGE=http://pwhois.org/lft/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=VOSTROM
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://pwhois.org/get/lft-3.91.tar.gz
-_md5_=bec576cec5e8d59c4f9a1236bbe9be19
+_md5_=df4afb65cc885ea3eccf86d5b141b209
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.20 b/metadata/md5-cache/net-analyzer/nfdump-1.6.20
deleted file mode 100644
index 5a244f28ec3a..000000000000
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.20
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) app-doc/doxygen sys-devel/flex virtual/yacc
-DESCRIPTION=A set of tools to collect and process netflow data
-EAPI=7
-HOMEPAGE=https://github.com/phaag/nfdump
-IUSE=debug ftconv nfprofile nftrack readpcap sflow static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) dev-lang/perl
-SLOT=0/1.6.15
-SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.20.tar.gz -> nfdump-1.6.20.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=57b01e6d924d7f70d3530d88990e7414
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.21 b/metadata/md5-cache/net-analyzer/nfdump-1.6.21-r1
index 5dacfac11251..2d640e2b7d3f 100644
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.21
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.21-r1
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-t
 SLOT=0/1.6.15
 SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.21.tar.gz -> nfdump-1.6.21.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ec61c709e09081edf5a2312fbca63488
+_md5_=16ba665049aca8713a99816dbde71728
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.22 b/metadata/md5-cache/net-analyzer/nfdump-1.6.22
deleted file mode 100644
index 4b0a5d6a4d45..000000000000
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.22
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
-DESCRIPTION=A set of tools to collect and process netflow data
-EAPI=7
-HOMEPAGE=https://github.com/phaag/nfdump
-IUSE=debug doc ftconv nfprofile nftrack readpcap sflow
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
-SLOT=0/1.6.22
-SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.22.tar.gz -> nfdump-1.6.22.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7997c09dc8738b39cf5e92b2a0191224
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1 b/metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1
new file mode 100644
index 000000000000..ff8396bf4b24
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen media-gfx/graphviz ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
+DESCRIPTION=A set of tools to collect and process netflow data
+EAPI=7
+HOMEPAGE=https://github.com/phaag/nfdump
+IUSE=debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
+REQUIRED_USE=?? ( jnat nsel )
+SLOT=0/1.6.22
+SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.22.tar.gz -> nfdump-1.6.22.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=205cc176146c042f62de7c9025538d8d