5 files changed, 29 insertions, 44 deletions
diff --git a/metadata/md5-cache/net-analyzer/ike-scan-99999 b/metadata/md5-cache/net-analyzer/ike-scan-1.9.5
index 60dd6f915c04..69cfe8675719 100644
--- a/metadata/md5-cache/net-analyzer/ike-scan-99999
+++ b/metadata/md5-cache/net-analyzer/ike-scan-1.9.5
@@ -1,14 +1,15 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=ssl? ( dev-libs/openssl:0= )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=ssl? ( dev-libs/openssl:= )
 DESCRIPTION=A utility for finding, fingerprinting and testing IKE VPN servers
-EAPI=7
-HOMEPAGE=https://github.com/royhills/ike-scan/
-INHERIT=autotools git-r3
+EAPI=8
+HOMEPAGE=https://github.com/royhills/ike-scan
+INHERIT=autotools
 IUSE=ssl
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=ssl? ( dev-libs/openssl:0= )
+RDEPEND=ssl? ( dev-libs/openssl:= )
 SLOT=0
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
-_md5_=ddbb5d958e42fd3f8e6eff4009c96d11
+SRC_URI=https://github.com/royhills/ike-scan/archive/1.9.5.tar.gz -> ike-scan-1.9.5.tar.gz
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3
+_md5_=4054e5ceb19d032cbda6b2e892b5e943
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.23 b/metadata/md5-cache/net-analyzer/nfdump-1.6.23
deleted file mode 100644
index 3f0d889cbe68..000000000000
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=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
-INHERIT=autotools
-IUSE=debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow
-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.23
-SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.23.tar.gz -> nfdump-1.6.23.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3
-_md5_=db25d56a21d02f93454819b578ad6bfc
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.23-r1 b/metadata/md5-cache/net-analyzer/nfdump-1.6.23-r1
deleted file mode 100644
index 87e5977ab04b..000000000000
--- a/metadata/md5-cache/net-analyzer/nfdump-1.6.23-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=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=8
-HOMEPAGE=https://github.com/phaag/nfdump
-INHERIT=autotools toolchain-funcs
-IUSE=debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow
-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.23
-SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.23.tar.gz -> nfdump-1.6.23.tar.gz
-_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3
-_md5_=1ea0241aea29dcd2b2b48f2a7326913c
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.7.0.1 b/metadata/md5-cache/net-analyzer/nfdump-1.7.0.1
new file mode 100644
index 000000000000..fe2616efc79e
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.7.0.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=app-arch/bzip2 sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) 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=8
+HOMEPAGE=https://github.com/phaag/nfdump
+INHERIT=autotools flag-o-matic toolchain-funcs
+IUSE=debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) 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.7.0.1
+SRC_URI=https://github.com/phaag/nfdump/archive/v1.7.0.1.tar.gz -> nfdump-1.7.0.1.tar.gz
+_eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153
+_md5_=54f7e22b4c182f5ce3bef63c86cd0377
diff --git a/metadata/md5-cache/net-analyzer/sniffit-0.5 b/metadata/md5-cache/net-analyzer/sniffit-0.5-r1
index 547ec195ad57..d3e5fe6a4725 100644
--- a/metadata/md5-cache/net-analyzer/sniffit-0.5
+++ b/metadata/md5-cache/net-analyzer/sniffit-0.5-r1
@@ -2,7 +2,7 @@ BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/
 DEFINED_PHASES=prepare
 DEPEND=net-libs/libpcap >=sys-libs/ncurses-5.2
 DESCRIPTION=Interactive Packet Sniffer
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/sniffit
 INHERIT=autotools
 KEYWORDS=amd64 ppc sparc x86
@@ -11,4 +11,4 @@ RDEPEND=net-libs/libpcap >=sys-libs/ncurses-5.2
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/sniffit/archive/sniffit-0.5.tar.gz
 _eclasses_=gnuconfig	b6b3e92f8b8c996400074b5f61a59256	toolchain-funcs	1542e649be915f43f6908a9e93909961	multilib	5ca4e49abed8e3a2f7b56920eadee157	libtool	241a8f577b9781a42a7421e53448a44e	autotools	9e6965bfaa00f52cc61e0d4bc44c87b3
-_md5_=d41d9c782430cc45e1a9e3b78aec9d3e
+_md5_=75c62f042180ac23736e1abf06f8f34e