gentoo resync 31.01.2019

19 files changed, 52 insertions, 327 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2b32979ad3f1..1e4fd71fc4ba 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 222354e2460b..857d2466dd5b 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -3,5 +3,5 @@ DIST nagios-plugins-2.0.3.tar.gz 2659772 BLAKE2B d4deccf04458daccde5fbe7e6c65928
 DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
 EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 BLAKE2B 2581655bd322f74c6253811b6a10de420c5f1c90677d87d5f344f4939d45b00d394fe8b026b44ed9bf76024d18ef67d4f7ab222e6fa75e72d88e7c4f44eae94a SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91
 EBUILD nagios-plugins-2.2.1-r2.ebuild 3109 BLAKE2B fb9958b01df2993cf3f2f95c50996f94b30e9238a39e116dd857255c60bb4d516781171041d8070a50ffc7526766d24b0331c4f93302d875e17775043b4f84ab SHA512 a7080b7c27013958a97a9125ba11bfa93be6402dbe8a8667b80f236bf3364e994b44815bb6ace6e24e08a0f9c0f90f96f47ca2d71403152c444b4b5afd064249
-EBUILD nagios-plugins-2.2.1-r3.ebuild 3118 BLAKE2B e8559ab89bf0391a3b49ccccb5289053cec7aaa212ae4efe9215bac0a1ba3aee75cbf387de50826500511696fb4a47112cadaa7764aeea57a23702f014835324 SHA512 1a831d6868998d0a065e4a91e180116655b52db08ea21a04c5b443fe45f5ab7f1b7f23a6f6eeed22cea3ceeffc8be3fde32282733ce991a485f05a7ca7289576
+EBUILD nagios-plugins-2.2.1-r3.ebuild 3117 BLAKE2B 02b59f5f96bac525180b90d714becad1427a989cb2b62d105ba896cca0e174b0216032bd96f406ada9bb592ff171a617a7493e0b02f9d27f339255d964549006 SHA512 0a05a987bca4ba9f5e2f22f911eefab193453bb93605527780983b9e424fd13515405bdcac2b2a8757b0da7e596c2eed9c9b63fbb17225116437356c3fe69aea
 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
index b67ad27f6923..df82bfc3f848 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/netsniff-ng/Manifest b/net-analyzer/netsniff-ng/Manifest
index 49326111c644..5bfbf6881b53 100644
--- a/net-analyzer/netsniff-ng/Manifest
+++ b/net-analyzer/netsniff-ng/Manifest
@@ -1,6 +1,4 @@
-DIST netsniff-ng-0.6.0.tar.xz 554612 BLAKE2B f677c0988f9b8c59c536a278abf996bec9d30ac20b252aeccb577cf9a3ceb09855023285d98a5255864f17df746f67bffdc1dc7d5f51ae7a7ab678a6f64a06a0 SHA512 a77d548cc16ef175b120945428e07e8ff2aaabba6add239b7f42429811bbb6e024ace92a15944551c45025b185f1df5aa3dee4500ff9ecb30536ec9a8deded74
 DIST netsniff-ng-0.6.1.tar.xz 565956 BLAKE2B ed965ee91c3d4bb6f339f983ee67052633f1fb90da114e1086672342adeec06ca2fa1b70a210b6a7cd43baacf59ff2c2b7fa72c2ea3e9477ba12055d0f34f50e SHA512 a07f3d5f85c517e220db53ac3a93e6337e49cbc8d69b730261697e765e449fa25024782b2b4fac089288f8753471e2fca3162b55c3bb2a9fcbbb10b96391efc1
-EBUILD netsniff-ng-0.6.0.ebuild 1320 BLAKE2B 68cee00362c24a31186394df316e552d44c0786782fb8ba045d73b1f82b8cdb6fc0fbfb706bef130dc48d2bd4abf1f243b9d4bb084812f13860cac148a2f84aa SHA512 5dde5693a54ccf3a4aeb39dda5ff03eb3e966388e1e157c910c8bfabb9a7f0f75cb1e934361962ea8ece8101a39fe58ed9a5418069977c307c4caf85ab575f12
 EBUILD netsniff-ng-0.6.1.ebuild 1324 BLAKE2B 43e5ab2c4dd9b2b6b2241b11c423330c03d2055649fa6c363ffe53b91dc56bbfabc54b8bc394442cac48150fe97ebcc94a7f5821bef1eba371f654fd69e297e6 SHA512 6d297cfc26ea6f5f6a1cbb577cb9c593a68022cd4448112e40f93a56ab250820fed3071245459c9d5b1fa60372feb0bfe8e473ea33a9eb8285c190c67b2036ae
 EBUILD netsniff-ng-9999.ebuild 1321 BLAKE2B 6972fb2c40d19b2d4257ec0641ca6777e8ee236b0da9cf159da18279b6b9b3aa204148d4e4c75046bdec64c51089ebfba06d2b2f0e615ae9331c912c55c97284 SHA512 39e58aaa796dc1056a54b8f00bf6ffca0a2bc21b66d0b1c75d6b84251a44250d5e6858d84b5fd3c8dcabce5baf55896744c2a8f269328659aa68d650a3ff1fb5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
deleted file mode 100644
index a62b4469379c..000000000000
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="high performance network sniffer for packet inspection"
-HOMEPAGE="http://netsniff-ng.org/"
-SRC_URI="http://pub.${PN}.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/geoip
-	dev-libs/libcli
-	dev-libs/libnl:3
-	dev-libs/userspace-rcu:=
-	net-libs/libnet:1.1
-	net-libs/libnetfilter_conntrack
-	net-libs/libpcap
-	sys-libs/ncurses:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	=net-libs/nacl-0_p20110221*
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -e '/CFLAGS/s:?=:+=:' \
-		-e '/CPPFLAGS/s:?=:+=:' \
-		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
-		-i Makefile || die
-
-	if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
-		die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
-	fi
-
-	export NACL_INC_DIR="${EROOT}usr/include/nacl"
-	export NACL_LIB_DIR="${EROOT}usr/$(get_libdir)/nacl"
-
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
-		LEX=lex YAAC=bison STRIP=true \
-		Q= HARDENING=1
-}
-
-src_install() {
-	emake PREFIX="${ED}usr" ETCDIR="${ED}etc" install
-
-	dodoc AUTHORS README REPORTING-BUGS
-}
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 0acda6804fdd..d865c2df60f8 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,5 +1,3 @@
-DIST nikto-1.36.tar.gz 206921 BLAKE2B ed6cc343ddccd8d35a7df566c5facb91b31fa9ec1697bb962fb7a0fdf3bc396a95c60997267fdca929b6af2e599f1535a223bf04ccb53da485ce409f8bc4391f SHA512 e340eebc8323a689b1fe8358626f90d822f4eea4aaeba44c64f68c758fccdec7c3d5896b93739128b1b53429967d4e66ccb08b880066e0c63bed4e2748f94a45
 DIST nikto-2.1.6_p20180122.tar.gz 511615 BLAKE2B 0937a5a52ae79e00da5bc53b089166cb2fc5cdf8311c4db55e421ddb44c22e31a9a964b02d75995c74b144d8fe05046895c4e54cfa7500aecd5d36787105a417 SHA512 4b9cae08146cefcfe4e929385631062f27cd13f5e516ec50fa9f9804a677a4a8846bc0f5de99bc1a25ec58ea8e2889bfa5953f8ca9cd7152e7b95b05861cac91
-EBUILD nikto-1.36.ebuild 1278 BLAKE2B 43c562d26e0c6bc9f5d1d70a7c3e16dc4f7e502eff73bf52f3519e3a6694c5b653d50a14cfcc677e0b9b6e33520304464680ad30b04d5609911d71b002fb6b08 SHA512 767bafd225f1f2628652939f703b930e4d4524686d580429d1fb51e8e564c816d84e23455e0f0e253d94d49a604fc29b99cd62a16405ae7d76a855d246c7f6a4
 EBUILD nikto-2.1.6_p20180122.ebuild 1219 BLAKE2B f8e7f956842f8025f3d778b1b1acb0a5e719a5bf8b835e987c50313eeb1d0701258607adfe0cfbf7dc6e843525094053026324c16387e3ad3f432fed29cb0fc2 SHA512 03a896addbd469b9d79a908b19d6f2ff7d51778b05f1b4940922accf0e1c36ee71d7c7ebda8d623844c3c2d8e4ebc3101d09f69337703b90ce493ffafe9d8d44
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/nikto/nikto-1.36.ebuild b/net-analyzer/nikto/nikto-1.36.ebuild
deleted file mode 100644
index 2656b333753a..000000000000
--- a/net-analyzer/nikto/nikto-1.36.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Web Server vulnerability scanner"
-HOMEPAGE="http://www.cirt.net/Nikto2"
-SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-RDEPEND="dev-lang/perl
-		>=net-analyzer/nmap-3.00
-		ssl? ( dev-libs/openssl )"
-IUSE="ssl"
-
-src_compile() {
-	sed	-i -e 's:config.txt:nikto.conf:' \
-		-i -e 's:\$CFG{configfile}="nikto.conf":\$CFG{configfile}="/etc/nikto/nikto.conf":' \
-		 nikto.pl
-
-	mv config.txt nikto.conf
-
-	sed -i -e 's:^#NMAP:NMAP:' \
-		-i -e 's:^PROXYHOST:#PROXYHOST:' \
-		-i -e 's:^PROXYPORT:#PROXYPORT:' \
-		-i -e 's:^PROXYUSER:#PROXYUSER:' \
-		-i -e 's:^PROXYPASS:#PROXYPASS:' \
-		-i -e 's:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=/usr/share/nikto/plugins:' \
-		 nikto.conf
-
-		 cp "${S}/docs/nikto-${PV}.man" "${WORKDIR}/${PN}.1"
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf
-
-	dodir /usr/bin
-	dobin nikto.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
-
-	dodir /usr/share/nikto/plugins
-	insinto /usr/share/nikto/plugins
-	doins plugins/*
-
-	cd docs
-	dodoc CHANGES.txt LICENSE.txt README_plugins.txt nikto_usage.txt
-	dohtml nikto_usage.html
-	doman "${WORKDIR}/${PN}.1"
-}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d36813ff47d7..d4e7dff9f8e8 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -7,8 +7,9 @@ AUX nmap-7.25-CXXFLAGS.patch 302 BLAKE2B 3a6689beb9750dbb2d35a779089c4f8dd772add
 AUX nmap-7.25-libpcre.patch 291 BLAKE2B f63a80d6e25309d4706f7f428cd70f5926df99f7dc7b98f6991c75f13f2cdc0ca14e2527bd55cc88e33837012d4b1b24433a9f63b614cffedbf3da40ab73d9b6 SHA512 75963ed6eb156475a8e928f6fd6ad18cdc61ed658a3e0a82a7719bbc4998b186981fa93c2b39b8bc92e10cc0ad19f5097224a9a68bc4b35e1b771d4a27532b1d
 AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8ca016f196bb59eaaa42ebe7ef31f473f9bf9db893c7b4330b1a2aa723b5268640b5edba4519b94ee094d63605600bffd9e6 SHA512 29b19e8cedc5e9edf66e728d89b71c4c0ada29fdbb9c167bec84b5aad2c9d52fe111a902c32b247106ace0154734f2a3b4eeae119887dc7203ad2271c8c240a3
 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8
+AUX nmap-7.70-time.patch 586 BLAKE2B 5354fffebb073c2e96ec744ac746b140ef1b528539faea0ba9423283b2bb535e4310423cbae9671b13ef3af4381182cb61a6662bf314f597cc2fbcaf16b9d11e SHA512 5b948f7393fae98bc0d94e3aef585308476728fe1530fd59bc67aa16ab8f8d790f06b9efa30c9c0a924e690c088453f213520b086ec233a80aa7de8205d79276
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
-EBUILD nmap-7.70.ebuild 4517 BLAKE2B f75af2eebce015967a3d99714eb1a743f91ac10382b3934996c14c55ba8cd6e95ab5d15075701f82d159dbfe364154ad098b9bab1c87870bab3be86edab9e06d SHA512 5ebcbf15de1f26b964f08564833946807b16bf1141d2cc733a86a440efecb58f0c10da563f2f0d20b353e9b96e10993f6ccc38d7af70ed977aa8d30c5bd9ca24
-EBUILD nmap-9999.ebuild 4315 BLAKE2B 7d83887400200359844f202b29e30cb358a6c35a35f23754c69455f1807fdb9e1e6739f856d5e575058a01b9f0a4686a83602e53f3d202d80fcd33e636264141 SHA512 c9b708642cf84cc3caa3555085779ae3f3d93a575f07b033f5e562ed2dd3bc4f94f17f27244a4baf5b15b98ebafa1432df292d11c991a357fed65d21af2def18
+EBUILD nmap-7.70.ebuild 4549 BLAKE2B 7923242126a368798da7c84e2f60fe719a27e452e0c067b15c704e70f6919fd62623cf4bfae1afd93714b0bf399b1c5dbfa6ee42fb8d94ca6b925febd853268b SHA512 33308a5492a447d3aa059a0f69cd339e20131f901b3fe19a668929a4a5840a5303361bf23002a32a67ed7699f70e82e19f430b89f5302776358b204286ba3519
+EBUILD nmap-9999.ebuild 4349 BLAKE2B 6b3b1ea837ac1e72e610aab1c22f83611a12793b05aec5ed6ce8d7558588ab39f4441be74f5498b2f45d177e5a8a3f7033d95ee1767a983ddf3a62b8c1113712 SHA512 1f7fcfd904567fb7d3ce1b75a3b871d7baa1b76c3b546b29953111468b51e433782825031a89fe1bdb0fce00b9beb1d7cde0ef307a678ac546325bb33ed147f9
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/files/nmap-7.70-time.patch b/net-analyzer/nmap/files/nmap-7.70-time.patch
new file mode 100644
index 000000000000..4b97bdf49049
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.70-time.patch
@@ -0,0 +1,40 @@
+--- a/nmap_error.cc
++++ b/nmap_error.cc
+@@ -135,6 +135,7 @@
+ #include "xml.h"
+ 
+ #include <errno.h>
++#include <time.h>
+ 
+ extern NmapOps o;
+ 
+--- a/nmap.cc
++++ b/nmap.cc
+@@ -161,6 +161,7 @@
+ #endif
+ 
+ #include <fcntl.h>
++#include <time.h>
+ 
+ #ifdef HAVE_PWD_H
+ #include <pwd.h>
+--- a/osscan2.cc
++++ b/osscan2.cc
+@@ -147,6 +147,7 @@
+ 
+ #include <list>
+ #include <math.h>
++#include <time.h>
+ 
+ extern NmapOps o;
+ #ifdef WIN32
+--- a/output.cc
++++ b/output.cc
+@@ -153,6 +153,7 @@
+ #include "libnetutil/netutil.h"
+ 
+ #include <math.h>
++#include <time.h>
+ 
+ #include <set>
+ #include <vector>
diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 692e3cb12908..e9bc260c7a9f 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.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
@@ -25,13 +25,11 @@ IUSE="
 	zenmap
 "
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-
 REQUIRED_USE="
 	system-lua? ( nse )
 	ndiff? ( ${PYTHON_REQUIRED_USE} )
 	zenmap? ( ${PYTHON_REQUIRED_USE} )
 "
-
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
@@ -66,6 +64,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.70-time.patch
 )
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index a54dd5819b11..c282246d4512 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.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
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.70-time.patch
 )
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-analyzer/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest
index 9c2973cbc415..c3b835a5b38c 100644
--- a/net-analyzer/ripe-atlas-tools/Manifest
+++ b/net-analyzer/ripe-atlas-tools/Manifest
@@ -1,8 +1,3 @@
-DIST ripe.atlas.tools-1.2.1.tar.gz 83916 BLAKE2B f48ba56deaa282a2c801e49abc712c3b4cdca20ee37d40b57c6d7d2602f68f5cdf54fc53820484672039bce349a68567ba1a1ebb2eb74665f716868c279de7d7 SHA512 4c91d14f15e80e7e0ce4d6973e497bb48561314434d1521437311fb813197da7ba0a3e27f14cebe5a71d75baba37d2e5045b94d9e39699ef4a4e57aafb063ea7
-DIST ripe.atlas.tools-1.2.2.tar.gz 84242 BLAKE2B 2d5bf29716d67404b9b6752dffe0642444bc1ab771029dd2b27b8a2d2cec31f805eb67b96adfe0bbb5aca33c17cc2c838387f3736163b8b96e99274d5152418b SHA512 f76efc0412e21ae50c27ddb33b00274f9be6f6f8d2106eac4e76d8dcdc14f114efc0cae5ee961b56f10b302cee0afa0ea6b84b0df588ddaf9ff5e132f8db4f2c
 DIST ripe.atlas.tools-1.2.3.tar.gz 86364 BLAKE2B de2aa0a57e135d463d1edb7e3277d21052353009d1dbcc2ead03d659c9736e61f36e95d102b5c3792448a1ea304e340f97856647f3c565fec9fcbbf0c414596a SHA512 f9e3b94ac9561faf0f6738099a0511b5aedb3b0d3230997a8033b8a1a804b885169891de8f408933ad90e3d4543375741657d9989fef09548d9cc8f0d9920e66
-EBUILD ripe-atlas-tools-1.2.1.ebuild 1271 BLAKE2B 4809fb479e42e30fba4bb025bc11453c1dc2134e1e1c2a71b267465cc0e2133beb4e63677ed81d332fe9663377e07cdebb223e2924c586b7cd7c66299fe292b6 SHA512 e30a9dabe7ec4947f310a97ac417fe81d0308f00906a4daa44df19d04c7bc084816df383f5b9a3a1c7c210b603514de27283f837d00c29e52c2acd66e9f82435
-EBUILD ripe-atlas-tools-1.2.2.ebuild 1269 BLAKE2B 19fe7a653a4c4af7b48fe51a9269ad7549104f8de882ace772657e0523ce16b78596fa7f5d1b0fd9da983350a71d2fca36d731786d2a92f1e7e5f649ccf2164a SHA512 248a50f7f8c599475e5da8db73c333952b646c41910ff0f2efba6289b955552f508ad9c888a3d3f17ac9ac2dbf3f9049febb488d89758f43b411da2031e06a48
 EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1303 BLAKE2B 4e4cead8479d1bafca52840400e0ef23e36e0ba205323f71c5fdb774c9e17a6c5bc498e486e57b45cd359f7c854afdef2183bbcf18ed29fd4471cc3a60a2dcdd SHA512 0fbb6e077ae0855fa070620a34b0c63f6a6a749b6e9cd871ecbd94a0ec4bd4d8ae3f6e28ccd4365b67c584c720fa33e1c9dfbdcdebaada5c1cbe74ec232e8c14
-EBUILD ripe-atlas-tools-1.2.3.ebuild 1301 BLAKE2B a8436a12f352d44d7d976dd82b0eb622500f2754c1f84fe175d1e98771c1fc427d13d3cbc5e2947771d9082bd38f62bb09d1b706d000c5b479f5069f5e357d7a SHA512 c7fd5df592c73ee30e4341fe4494f601a716c52538ab3d0f71294648a5e7668cd2261c5bc215d5a48ee2d26abe0018ae5b0bff92013aa4e6e6fed606d427d59a
 MISC metadata.xml 245 BLAKE2B b9eb390672e4258c0f413eba0dbed731d0f8b2b65275669505e6c5ccdb034944856c212e564f307bc5567203f4897164654f047a2355b9d6f493e0633dce8192 SHA512 d4e3e22b2dde06b42ba712b048c38c8809da125ad6eacb06823f2013d5c9c9b82a4a0b5ffc104f0b786ef048700980c72bed9cabb90a1003db929d2ead0db9d5
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild
deleted file mode 100644
index 283dfe597855..000000000000
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="The official command-line client for RIPE Atlas"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PVR}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	>=net-libs/ripe-atlas-sagan-1.1.8[${PYTHON_USEDEP}]
-	>=www-client/ripe-atlas-cousteau-1.0.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		"${RDEPEND}"
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
-		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
-}
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild
deleted file mode 100644
index 7bb832dcae2a..000000000000
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="The official command-line client for RIPE Atlas"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PVR}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	>=net-libs/ripe-atlas-sagan-1.1.8[${PYTHON_USEDEP}]
-	>=www-client/ripe-atlas-cousteau-1.0.7[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		"${RDEPEND}"
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
-		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
-}
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild
deleted file mode 100644
index c48c7717c1d8..000000000000
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="The official command-line client for RIPE Atlas"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-DOCS=( CHANGES.rst README.rst )
-
-RDEPEND="
-	>=net-libs/ripe-atlas-sagan-1.1.8[${PYTHON_USEDEP}]
-	>=www-client/ripe-atlas-cousteau-1.0.7[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/tzlocal[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \
-		${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent
-}
diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest
index 3ceb9f7a5b3e..fc19e1755a43 100644
--- a/net-analyzer/thc-ipv6/Manifest
+++ b/net-analyzer/thc-ipv6/Manifest
@@ -1,8 +1,6 @@
 AUX thc-ipv6-3.0-Makefile.patch 465 BLAKE2B 42194c35ace6760ed17c454bbf4ae01a70618297efed865d93ec645514ef34734668fde6df1139727ca317769bc2e221af88b8084811529c3372aab6db908c0b SHA512 2a0a0d21ad3147a772df5a52ea425edbf2681256240e3570976268b5d9cf19f315a014b304932161219813c65dff95a2644070383121595ec3f2adabbb116093
 AUX thc-ipv6-3.2-stdint.patch 208 BLAKE2B 639a1ceec32ab48b886d721b7ea197dd39efe4ab5f62f8f1fffe04e68560336269e9b3b021c90ef635948bfbbbc0c60e0cb2c56e60e7bca3dfdc7c0d823dfdd9 SHA512 635438ba4a64eb63d51130643afd73e87e83313532f351e1f124cd0f34d719a67d77e592595707e65c8fd5b69a00cf04942688668e5a9c921807934ca602fd8e
-DIST thc-ipv6-3.0.tar.gz 667859 BLAKE2B 6fa4f697bf316c3b9730b58e35c3d8ac6910c0e063751037a0900aa459c128c5de9a07e4912025dd6eebb92061a7cc48a6e2e2a0b5d7d53b339e4d5416e4fdf7 SHA512 969ebbf4da4514cb83e3abcff637f7ba301c4f072f1f983b3cd3cfd3b0643b55af6eacca3c76e39e11ea9ef6e465be03dfa7ce1d6c988cabbd42cdd95d1e2552
 DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e7a8c585c7c494f03e229fccbcd65677e382a65f0e650d79278f5ede89173db1cdf313ade7c48dff1566856afa SHA512 648db4618ebb83572e2e318cdbb284fe96a86adf335f7dd9b26fd010c76d12e9137ed7367207c66c93c1961c868d3917d706db9f597289ac47ea3f9b83c03441
-EBUILD thc-ipv6-3.0.ebuild 1172 BLAKE2B 24e8c7bc51f3abefdd752003f9bc32da61a83e2af7863afd2ee711a4a52ead7f27ecdf7855ccfa5d9803b763bd233d54bc2f5786f75cfd0ba2dfbd5b88c4f648 SHA512 f8d0288bbfc765ff2f838bb7a402e4c7d15384bc23b34d4a43bb20071b6e2f6f8410e8803d3006ae978235002ee536c6e1551e808d9e31cbce94c85e8970c616
 EBUILD thc-ipv6-3.2.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
 EBUILD thc-ipv6-9999.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
deleted file mode 100644
index d4aee56ff488..000000000000
--- a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
-EGIT_BRANCH=master
-
-inherit eutils toolchain-funcs ${SCM}
-
-DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
-HOMEPAGE="https://www.thc.org/thc-ipv6/"
-LICENSE="AGPL-3 openssl"
-SLOT="0"
-IUSE="ssl"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DEPEND="net-libs/libpcap
-	net-libs/libnetfilter_queue
-	ssl? ( dev-libs/openssl:* )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch"
-	"${FILESDIR}"/${PN}-3.0-Makefile.patch )
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default_src_unpack
-	else
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
-		-i Makefile || die
-	if ! use ssl ; then
-		sed -e '/^HAVE_SSL/s:^:#:' \
-			-i Makefile
-	fi
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
-	dodoc CHANGES HOWTO-INJECT README
-}
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index 3a90d1029f17..a48ec50e01af 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -3,5 +3,5 @@ DIST traceroute-2.0.22.tar.gz 69001 BLAKE2B 8678bf2636b3a0615e7282923ccfeae9c721
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
 EBUILD traceroute-2.0.20.ebuild 937 BLAKE2B c725daf3511d8d24b2e3a49942944595529245483bcb981457911be9c6216dd1baaa3a13ef2bbb78c9647d6e232d3829e31739880cdff65666ea00f935f3fddc SHA512 7bdeef7eedc93e792e57e8c09d256e55bc0b7f9216035d174da66523119e57ae71eb5f9b8805a4421b0910a0a658c2412053f67999ed34d140e2b9d3c2a9cb5f
 EBUILD traceroute-2.0.22.ebuild 888 BLAKE2B af947b2e99b1d4d6ea9996c40b3aded90699a04583ee9fc56714650df3762812e7c7628ca611ded9f2d694fa30240ae9b8a03a85bf4fe574396597c0351b2fad SHA512 0c299339fa16328123c82428f339cb7b1b1ffb528d76fbe0795f10035eb4520c507901c67c32a68e08cf2d221dad56b68cb239f9dbecb99611c28f90f77a094c
-EBUILD traceroute-2.1.0.ebuild 873 BLAKE2B f8b93f99eb075c220dbeb76eb62882908b7b590524c79875f5695fa74faaf44d3decb12b1b72501cb478078d10f812fa7dbbd9b2cc831cfc44e8ef7bd4deb57c SHA512 c68761f15837ade0255b549e789f66ae781e295fd095c44a46eb0785f65fac234ac35d80cd01ca265185c388946c278828531d99ecc05209dd3a54573de68479
+EBUILD traceroute-2.1.0.ebuild 872 BLAKE2B e606b1a54a6eb6b5d77ed524800c44853b6971951a02bd594f1ab17637b75a2fd2dfcf6e68ff8dfef157b5d46d352d1e04a594f45fc1617c2e41527017f35d32 SHA512 56b88be21f6bac9fe16e451a455da14635ba2797d9c94c7e5aa42207fc99ae3052fea4651177049d2149c9c62b8bf4a34bcfb6424abdefb3620586ca303dc47a
 MISC metadata.xml 437 BLAKE2B bbef3a65676e67e78b4f78846a46986a3ffc8b74bb73517795b4796b2865ee0ae4d6ecf99edb1a9b12dc97988cc51fb161dfb757e8ef449a3b46fa1eac5c8411 SHA512 928cbbbcefe88681f5f797616d8f8b4de75cf789157afa536a757e7e72f44b07c337105380816aa79713ec143c324ae16577351648357a77267b6625b962924d
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index 4378e4df6646..6500eda2ebfd 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1