2021-03-15 22:08:12 UTC

19 files changed, 50 insertions, 118 deletions

diff --git a/metadata/md5-cache/net-analyzer/amap-5.4-r1 b/metadata/md5-cache/net-analyzer/amap-5.4-r1
index 28852895a7db..8ec703d7bfbe 100644
--- a/metadata/md5-cache/net-analyzer/amap-5.4-r1
+++ b/metadata/md5-cache/net-analyzer/amap-5.4-r1
@@ -3,11 +3,12 @@ DEPEND=dev-libs/libpcre ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( de
 DESCRIPTION=A network scanning tool for pentesters
 EAPI=7
 HOMEPAGE=https://www.thc.org/thc-amap/
+INHERIT=toolchain-funcs
 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_=a2840557c4a418c2b0295e135550ebb3
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=d174741e1775cc29ebb107b3ac16019e
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r3 b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r3
deleted file mode 100644
index c7cedc3522d3..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=network Audit Record Generation and Utilization System
-EAPI=5
-HOMEPAGE=https://www.qosient.com/argus/
-IUSE=debug +libtirpc sasl tcpd
-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 sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) 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.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9856d7ea6f17c1a49f89cceaa8b77b0f
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r4 b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r4
deleted file mode 100644
index 47eae4c23a25..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 >=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=compile configure install postinst prepare
-DEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-DESCRIPTION=network Audit Record Generation and Utilization System
-EAPI=7
-HOMEPAGE=https://openargus.org/
-IUSE=debug +libtirpc sasl tcpd
-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 sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) 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.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0146d8b8cd1fd1f6edeca546291d92a3
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8
deleted file mode 100644
index 47b37be8eea1..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Clients for net-analyzer/argus
-EAPI=5
-HOMEPAGE=https://www.qosient.com/argus/
-IUSE=debug ft geoip mysql sasl tcpd
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl )
-SLOT=0
-SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ccbd05be2c3319934f643312278554ec
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2
deleted file mode 100644
index c7be15bfe6dc..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Clients for net-analyzer/argus
-EAPI=5
-HOMEPAGE=https://www.qosient.com/argus/
-IUSE=debug ft geoip mysql sasl tcpd
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl )
-SLOT=0
-SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=287c5c2f6cdf810dcdd5ea6a5b8bac13
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2
deleted file mode 100644
index 823e4f650be9..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=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 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Clients for net-analyzer/argus
-EAPI=6
-HOMEPAGE=https://www.qosient.com/argus/
-IUSE=debug ft geoip mysql sasl tcpd
-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.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fc1c5699722632a34790abdaf61a4651
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3
deleted file mode 100644
index 283e8bf65c30..000000000000
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3
+++ /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=compile configure install prepare
-DEPEND=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 ) sys-devel/bison sys-devel/flex virtual/pkgconfig
-DESCRIPTION=Clients for net-analyzer/argus
-EAPI=7
-HOMEPAGE=https://www.qosient.com/argus/
-IUSE=debug ft geoip mysql sasl tcpd
-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.2.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=44430f6a55aaa79025639bafb8920e5b
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r1 b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r1
index 0509b9c9c032..755df19e61ea 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r1
+++ b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r1
@@ -4,11 +4,12 @@ DEPEND=net-libs/libpcap sys-libs/ncurses:*
 DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address pairings
 EAPI=7
 HOMEPAGE=https://ee.lbl.gov/
+INHERIT=systemd user
 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_=3a42043b2b407ba7390a30a34be6ddf5
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8
+_md5_=cd25ae2a0f7434a19a3f93696184d6f2
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 ff94b4d63d1e..2b94fa3c1023 100644
--- a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2
+++ b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2
@@ -4,11 +4,12 @@ DEPEND=>=sys-apps/net-tools-1.60-r1 sys-libs/ncurses:0=
 DESCRIPTION=Bandwidth Monitor NG is a small and simple console-based bandwidth monitor
 EAPI=7
 HOMEPAGE=http://www.gropp.org/
+INHERIT=autotools
 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_=5592c3015795cb561a1dbbabcc34503d
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710
+_md5_=42edc87bcec219e10a6e2ed9be2667be
diff --git a/metadata/md5-cache/net-analyzer/cutter-1.04 b/metadata/md5-cache/net-analyzer/cutter-1.04
index 82bfa837dbe0..eb7419b2dced 100644
--- a/metadata/md5-cache/net-analyzer/cutter-1.04
+++ b/metadata/md5-cache/net-analyzer/cutter-1.04
@@ -2,9 +2,10 @@ 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
+INHERIT=toolchain-funcs
+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_=b35d59389dc15b3d874b6bd3ba0b4dd7
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=dce0f7ee171a26428a8e6abc9147e121
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 8fb0de6cc5f7..0d8b22bcaf0f 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,11 @@ 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
+INHERIT=autotools
+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_=c15ddd1eecd17635dad506a6b9c5564f
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710
+_md5_=df05e5b0b844a1c947842d9909643fb8
diff --git a/metadata/md5-cache/net-analyzer/dnstracer-1.10 b/metadata/md5-cache/net-analyzer/dnstracer-1.10
index fb36af50ca84..a63ac195b576 100644
--- a/metadata/md5-cache/net-analyzer/dnstracer-1.10
+++ b/metadata/md5-cache/net-analyzer/dnstracer-1.10
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Determines where a given nameserver gets its information from
 EAPI=7
 HOMEPAGE=https://www.mavetju.org/unix/general.php
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
+INHERIT=toolchain-funcs
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://www.mavetju.org/download/dnstracer-1.10.tar.bz2 -> dnstracer-1.10.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a448b321a12e73c2650ffa3ceb1fa694
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=942b870e07a1b321ef30e1550e5c3640
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 39bef6d05cb7..c561dc811ee6 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
@@ -4,11 +4,12 @@ DEPEND=acct-group/flows acct-user/flows sys-apps/tcp-wrappers sys-libs/zlib mysq
 DESCRIPTION=library and programs to process reports from NetFlow data
 EAPI=7
 HOMEPAGE=https://github.com/5u623l20/flow-tools/
+INHERIT=autotools
 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_=1a76afbc59dce15dbb837782228b9094
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710
+_md5_=65e7718dc1a0da0b2371b64653025620
diff --git a/metadata/md5-cache/net-analyzer/fwlogwatch-1.5 b/metadata/md5-cache/net-analyzer/fwlogwatch-1.5
index 4c6599853bea..829c8c63f65c 100644
--- a/metadata/md5-cache/net-analyzer/fwlogwatch-1.5
+++ b/metadata/md5-cache/net-analyzer/fwlogwatch-1.5
@@ -4,11 +4,12 @@ DEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib )
 DESCRIPTION=A packet filter and firewall log analyzer
 EAPI=7
 HOMEPAGE=http://fwlogwatch.inside-security.de/
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=geoip nls zlib
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-1
 RDEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://fwlogwatch.inside-security.de/sw/fwlogwatch-1.5.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3633bdf2ee78a71c9e3561a7e635daec
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=f6f2875699683f3b44c473d0e24e6baf
diff --git a/metadata/md5-cache/net-analyzer/ifstatus-2.0.0 b/metadata/md5-cache/net-analyzer/ifstatus-2.0.0
index 110aefb61fcf..5cc4132993b3 100644
--- a/metadata/md5-cache/net-analyzer/ifstatus-2.0.0
+++ b/metadata/md5-cache/net-analyzer/ifstatus-2.0.0
@@ -3,10 +3,11 @@ DEPEND=>=sys-libs/ncurses-4.2:0= virtual/pkgconfig
 DESCRIPTION=A simple CLI program for displaying network statistics in real time
 EAPI=7
 HOMEPAGE=http://ifstatus.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+INHERIT=toolchain-funcs
+KEYWORDS=amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-4.2:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/ifstatus/ifstatus-v2.0.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9efd4f0708896c124269fa85e05cb6eb
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=c37ef93831431be5d040d51c62940b8b
diff --git a/metadata/md5-cache/net-analyzer/lft-3.91-r1 b/metadata/md5-cache/net-analyzer/lft-3.91-r1
index 91ef93334df2..1f6c38e1d51c 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_=df4afb65cc885ea3eccf86d5b141b209
+_md5_=9f44e66b3412d0219e388376ef1b62eb
diff --git a/metadata/md5-cache/net-analyzer/packit-1.7 b/metadata/md5-cache/net-analyzer/packit-1.7
index 39a0d740aec6..32e6992372ad 100644
--- a/metadata/md5-cache/net-analyzer/packit-1.7
+++ b/metadata/md5-cache/net-analyzer/packit-1.7
@@ -4,10 +4,11 @@ DEPEND=net-libs/libnet:1.1 net-libs/libpcap
 DESCRIPTION=network packet generator and capture tool
 EAPI=7
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/packit
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+INHERIT=autotools
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/packit/archive/1.7.tar.gz -> packit-1.7.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f75e49dfb999ae52e42ae52c70be951b
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710
+_md5_=466deaa7da4de63a8642734436e55df1
diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8 b/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
index 4125c9ccd311..12f881ef67ed 100644
--- a/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
+++ b/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
@@ -4,11 +4,12 @@ DEPEND=net-libs/libpcap sys-libs/db:*
 DESCRIPTION=Reports network interface statistics
 EAPI=7
 HOMEPAGE=https://www.frenchfries.net/paul/tcpstat/
+INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=ipv6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=net-libs/libpcap sys-libs/db:*
 SLOT=0
 SRC_URI=https://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz mirror://debian/pool/main/t/tcpstat/tcpstat_1.5-8.debian.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=10ff4908f181b54d46ef30dce69e783a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741
+_md5_=69d783c747253656b3bc1114c6757fb0
diff --git a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6 b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
index a53d8347695d..e38e42fd5d18 100644
--- a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
+++ b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
@@ -4,10 +4,11 @@ DEPEND=net-libs/libpcap
 DESCRIPTION=A Tool for analyzing network packet dumps
 EAPI=7
 HOMEPAGE=http://www.tcptrace.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+INHERIT=autotools
+KEYWORDS=amd64 ~ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz http://www.tcptrace.org/download/old/6.6/tcptrace-6.6.7.tar.gz mirror://debian/pool/main/t/tcptrace/tcptrace_6.6.7-6.debian.tar.xz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5dd7f0f50843e2b95b919b7af6efb13a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9988ecbe04129214297a7bbf3d253710
+_md5_=73758a05f69031496a3408bf62981c2a