gentoo resync : 18.11.2019

22 files changed, 91 insertions, 107 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b63dc3598850..b7062e4373aa 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest
index 7a6197e1a152..d2a4a37c53cc 100644
--- a/net-analyzer/alive/Manifest
+++ b/net-analyzer/alive/Manifest
@@ -1,6 +1,4 @@
 AUX alive-2.0.2-ping-test.patch 378 BLAKE2B 1adb452bce76cd0dee69c52fc0432148ce7f3267d2ecb96f1f4199543fb61a11a20f9738175a8edd47c5aea75f925e12e5e38bf564e8915b978928c66bcaed25 SHA512 6479364f35345aad12fcabf4f11f84a601740771e0e602afc757a39f45eaabdd0d5d6b3d3d95a5307edaef2e84250e4ba784a9757fa75bad21363735c14cfd78
-DIST alive-2.0.1.tar.xz 172320 BLAKE2B 9fdee5169ef5bc39527b68bc1acf4a5fed38d3e95fb67e2bf2fb82a457f1135d8e19cca2e06235c1c9368e40ed47eb764cbba3c412e5d3751882764cfd169fa1 SHA512 9f1d4020b72568e96ea67010728cb1274a883f7328444009839be999a1fc9466e8199d8415e589e27314106a8ae1c4a18f0b1bd342185e7878895ad962289ecf
 DIST alive-2.0.2.tar.xz 174936 BLAKE2B f3998d1cbf81d77be449cf1157bc570837b87fd15a860041273059de69536ff9cab8d00b8cb1191b2d6d692b41fb3fa5863248267a86ad542326f48c8ab43730 SHA512 7e9c88f62ab5c0248d1e42b81e2106f43fc9587543782623e8a564ab99fd1d4a55058a175dc46d25520454c07f732101c7e62248ce992d1a8a615f531b1c090e
-EBUILD alive-2.0.1.ebuild 381 BLAKE2B 4142c7a19795ab1d2c2664c64bf01b9179937b709b1ff8d8cc8e9850cd049a4167bf2933593978a0260c3e150a385a7be4b8ac00b94159dc7a1b72aefdcd08fb SHA512 8b50355d330264922ebe4b14d4a507cdaf814b738ff18664b87ea63f3b5f3f6b0d02526a3e4f02793fb2c057d1d10cbe31d1bd227af57cbc92299884f5257fd6
 EBUILD alive-2.0.2.ebuild 535 BLAKE2B 69c5af5669ccd0dd8e92f2e5e98a770e1ee65ac0df6e8b2880cd60e7d96f64a7f679c027ea9d9c221aac9b3c9086ba2501c6274d4a48c6e9586df5a53860dd62 SHA512 a6b1b826070288fc1192a28cc8860e73610218611e9c36a0d21ca59420cc8a45582ef9113aede2e7fe28e6207d3b41a8625ce66f5e639e4d757b414d5515e374
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/alive/alive-2.0.1.ebuild b/net-analyzer/alive/alive-2.0.1.ebuild
deleted file mode 100644
index 56023534aa01..000000000000
--- a/net-analyzer/alive/alive-2.0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="a periodic ping program"
-HOMEPAGE="https://www.gnu.org/software/alive/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND="
-	dev-scheme/guile
-	net-misc/iputils
-"
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
index f0ba55ce6186..0b742aa2679e 100644
--- a/net-analyzer/arp-scan/Manifest
+++ b/net-analyzer/arp-scan/Manifest
@@ -1,4 +1,6 @@
 DIST arp-scan-1.9.6.tar.gz 462479 BLAKE2B 21383167d83ba1cd9792f0a8d569c51ff196186fb59a2161c00d6963bcedecb706a419b08aeef2956bad72563f56a9a58b4231715b472a8ab083229b333d2e8f SHA512 c2d56ab8c6e1a046919892f6c2750593d6fbb3a539c3e1736184bd37ff7ae6033f84b62a3d2b4f56c0f2cdc1752002cb010ce77f701ee2f87b6f14b2e1753fe6
-EBUILD arp-scan-1.9.6.ebuild 441 BLAKE2B fd6f503bdb34b089583091cfb5d98542a453a2f8fa0c99fea08323b1563c8dfa1ede37e4d336be0241c1b0f601c2f4a11eadb493e5141df332a305f6508ee67f SHA512 ee28aeb1ed841f9bdab894759ae5b8eab86ef992f5e515fe7d9cc4be27e1ec89d8f602e0171d96b2878410e2242a87a5ae118ba52d8edda0f00dcd2c2a99a216
-EBUILD arp-scan-99999.ebuild 412 BLAKE2B 7f4bb83706ee8ea67722e2aa5a37e481ed738d96b84038dcc2a34f221aa6249c72c8fb8e961336496f7cc13224ec01c7ee74528dee23916eb491ccabd610ef40 SHA512 495867de23e70d5491d07c63afc4c7804df7ac1a61bb93a16fce80e2b048e7be4c25e79bc6f2c647a60c58134454ae51bacabaadf401187c842b85d55373002f
+DIST arp-scan-1.9.7.tar.gz 459544 BLAKE2B bd70b2dd9e005096ce80fca07b8f2d8482b1073d25a2a9f82e8f5c1206148dbeab095046292cb46b5823aa18b56c208a5e86d0b7252d8566ddee5cd714b78cc6 SHA512 2aa808521a64cd3e2a6a270c6725f2cffa4cfce5c251e5483053c8ea9f56fb1368dd9aae2afcf8fffe1030fe2fc37723f0701c9eafa7cd1d52df459c07a80870
+EBUILD arp-scan-1.9.6.ebuild 466 BLAKE2B df0472c3ab4b460912fdf6c2cdee09db76a33c10c550d701f3a598abd5508508a26b2204bf099a1a820fa7c32068576b00525d4c65957279a51d54ac7b22fd90 SHA512 69c822f1d85edca29c4c4943978ad85f55940f8545c69027b24bc8d19ed65199bbcd0849aedb66b20aa7136d71f5faab1f96380dcd8219849a9559d77f70a1e5
+EBUILD arp-scan-1.9.7.ebuild 466 BLAKE2B df0472c3ab4b460912fdf6c2cdee09db76a33c10c550d701f3a598abd5508508a26b2204bf099a1a820fa7c32068576b00525d4c65957279a51d54ac7b22fd90 SHA512 69c822f1d85edca29c4c4943978ad85f55940f8545c69027b24bc8d19ed65199bbcd0849aedb66b20aa7136d71f5faab1f96380dcd8219849a9559d77f70a1e5
+EBUILD arp-scan-99999.ebuild 437 BLAKE2B 7a306bfc3b31f3da8e1d5974fc50f90e32f3f01d766cbcc7f9b9408347a37a771da8f83df3a8fd0dcffe5ab80528927e5876f584e08361644a282e445c4f7bfe SHA512 eb8d8ac754ec26d4c122586596a649afee8f9de1a701ee36d24838a37dd3f6256a5820c818c8fdcda171eeacc29dbda8e03778b92a300c6b1ee31c7820e467b0
 MISC metadata.xml 362 BLAKE2B 2f3d110218aa8df05bd9e10d31a23b40ad51f5ee3134133baf9dea867989b8c2f4c1a6424ffb97829f69b2309bc4262d4821844c7a699c2245629dbc31d29a71 SHA512 513df53208e314f55d1f2a2b14fbbfe7f28ab654f4b38be1adeb24490279a8f6cf276cd29941d4453702d208425380f926c43d9aac1e045b52bf67d118438ea8
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild
index b98d876c237a..96432c7a989f 100644
--- a/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild
+++ b/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="ARP scanning and fingerprinting tool"
 HOMEPAGE="https://github.com/royhills/arp-scan"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild
new file mode 100644
index 000000000000..96432c7a989f
--- /dev/null
+++ b/net-analyzer/arp-scan/arp-scan-1.9.7.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
+
+DESCRIPTION="ARP scanning and fingerprinting tool"
+HOMEPAGE="https://github.com/royhills/arp-scan"
+SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/arp-scan/arp-scan-99999.ebuild b/net-analyzer/arp-scan/arp-scan-99999.ebuild
index 3b3dd50a2be4..c0d127582510 100644
--- a/net-analyzer/arp-scan/arp-scan-99999.ebuild
+++ b/net-analyzer/arp-scan/arp-scan-99999.ebuild
@@ -6,7 +6,7 @@ inherit autotools git-r3
 
 DESCRIPTION="ARP scanning and fingerprinting tool"
 HOMEPAGE="https://github.com/royhills/arp-scan"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/royhills/arp-scan"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/cryptcat/Manifest b/net-analyzer/cryptcat/Manifest
index 2ec708d3336c..53d95addbdd9 100644
--- a/net-analyzer/cryptcat/Manifest
+++ b/net-analyzer/cryptcat/Manifest
@@ -1,6 +1,5 @@
 AUX cryptcat-1.2.1-build.patch 1092 BLAKE2B d90db2081b9ff87272d52e8188436ca4f72b31a972ad90eea4a7e8bc22a43439e52efa9c4a18ca17b99ae5ccb30f0b86c002b7125bf9069e837d489085f80098 SHA512 2c591122844c76fd43b18468b11e268315c9173431eab1bc992bba3e175387aed38ad4d4135aeabe261d2625bacf2ba8061dd57c43b1bfe945cf93be43f5284a
 AUX cryptcat-1.2.1-misc.patch 1596 BLAKE2B 6ba6b09de2a98311559f23681aa478dda6204525645b9963532bc876fa3789ffab74527d9a48667bd9c698a3c3589514f9c7d02a5e5a10600228c02ece627f94 SHA512 e0a71361d5e8033f221402661310dfad18c9c040e78920db8376388dc41cb8d7e4bb0127b2575634628be80be8e604e089b41e729ae30ec983f9a17f38239a6b
 DIST cryptcat-unix-1.2.1.tar 190464 BLAKE2B 8029962a3dca21c981a4adaa4e5f347219ac0da7d5b5997101e8c20ac88b2c6e397120018672646a38c58313ad04fad96e930c20a0e2404293679f2fab29fe6a SHA512 2de6521903e489bc6d4f242aaac7f35a3a7fb226e1812ef5f1c3554420fce4378427e94b3e90eca5476d1068f1a9b44d9c5dbd0362888ad893cf66be106deb17
-EBUILD cryptcat-1.2.1-r1.ebuild 766 BLAKE2B 7492730ddebb33518110485fcf7a49a1fe6ba7f09d5c687adbaca2764a3942675c57b1635d739666c897906ff6849760943502acb33dc2147e4510e814871e90 SHA512 4cdc55268e5b7ff347fbb374a0931f882ae5277b26948685b1d83ccdac5680b8ec30d00f34e8aa04c28634c290527f6ef6d9eb2b43d601cb72771a52b6ee5fe8
 EBUILD cryptcat-1.2.1-r2.ebuild 605 BLAKE2B 3f1a5a1f293a04029a25c2dad248ad7c562388bf73c2d924ccf862c60b15dfda6791c9080ce5c7ed27d9985e024533742b7de8f91a63bc12beb7d5fc6a89b34f SHA512 8b27ee24e02e8c30de8bcdccc0edd1775d11c5f5b37a4b5d97c2688dc1ab49fa21d10d23c84cc6e071f37da8e279bf1189a0fca0b4b46f7f2b88e29caeb5f3a2
 MISC metadata.xml 358 BLAKE2B 595f61b36922129176b386392d2de4c2941126c3eabb70ef3041ffa2083d05016afa915ded2df2340c9aa13a7777dbc046938b49945ae92a6a31aa811389ad4c SHA512 0deed41b2d8d5f038f7d61622230e5db913303a5419790127e300c65aa6603b79f0c1ce7adcd560550a0cdef577b360da9c53ba1569c141d850c7f92b607c8f4
diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r1.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r1.ebuild
deleted file mode 100644
index b53c88f3c22f..000000000000
--- a/net-analyzer/cryptcat/cryptcat-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="netcat clone extended with twofish encryption"
-HOMEPAGE="http://farm9.org/Cryptcat/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-unix-${PV}.tar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/unix
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	echo "#define arm arm_timer" >> generic.h
-	sed -i \
-		-e 's:#define HAVE_BIND:#undef HAVE_BIND:' \
-		-e '/^#define FD_SETSIZE 16/s:16:1024:' \
-		-e 's:\<LINUX\>:__linux__:' \
-		netcat.c generic.h
-	tc-export CC CXX
-}
-
-src_install() {
-	dobin cryptcat
-	dodoc Changelog README README.cryptcat netcat.blurb
-}
diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest
index 2c3841dd110c..c01009106dd0 100644
--- a/net-analyzer/ike-scan/Manifest
+++ b/net-analyzer/ike-scan/Manifest
@@ -1,4 +1,3 @@
 DIST ike-scan-1.9.tar.gz 1412689 BLAKE2B 97a18ca35a80b66859e2ab99de916041eb9c9d869f96bbd799be88079b84022dcc2ecb5df2cecefff793192333da915957adc6b0c3d4bb376397941d4a731323 SHA512 c586ad4d485f04398c2800af5ced1392eee0f7f7d7d117602be45134a47442b38c4fa23fbbf137af5a37298b471a6bcdd6e94559dde695d06e96dd39f0681906
-EBUILD ike-scan-1.9-r1.ebuild 790 BLAKE2B 4a86e4d141d6012b1f267f0ec0ebbb7648c6cd0b6347cb27573efaa171f0c288509bd8d1b59d9672e1310b3c43a5058ed2f5f2386bce98c739366bd4c9a5e65b SHA512 cc93382f90b009c9971b5b01ac1589669fbbb6dbec594772611c7b46975530484b513d6beb440832a107592bdcb1fbe5b6190aa0093b7533fa5e575cb93b29fc
-EBUILD ike-scan-1.9-r2.ebuild 855 BLAKE2B 64c5bdaab7b0d0d1f51fa1df791ecb0c8568c001edc1cee47ff841eca454a3e7cea4d22a873a8584f89609b416ee0786d9e5320aa05f94e66143ecc662bed8e9 SHA512 179bd4cf30f3fba5f6900673108f7d4811d3d7ede731d830b93fcd2c16bd410092e4d39ddc89e2f342895cb4c7e31e773aeea0c269f6992ffe98af896da5c4b8
+EBUILD ike-scan-1.9-r2.ebuild 854 BLAKE2B 0c43f0e6fd898b87dd661ed1ba724abf70c5c7643868ef5beedcba5d1def1099c7e9a8940dc095d195c4ce31fe120e44623c96cd12d200c45954d6ae34427566 SHA512 25548c44a017fdfa1d8cf891046b9f978c4b6e592c204a1148d5321e2891da374e0e7763a4de8f85c18a6998b3d68e16203f5eabae1606daa067602b40f75958
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/ike-scan/ike-scan-1.9-r1.ebuild b/net-analyzer/ike-scan/ike-scan-1.9-r1.ebuild
deleted file mode 100644
index 72e47e829d53..000000000000
--- a/net-analyzer/ike-scan/ike-scan-1.9-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers"
-HOMEPAGE="http://www.nta-monitor.com/ike-scan/"
-SRC_URI="http://www.nta-monitor.com/ike-scan/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Fix buffer overflow, bug #277556
-	sed \
-		-e "/MAXLINE/s:255:511:g" \
-		-i ike-scan.h || die
-}
-
-src_configure() {
-	# --disable-lookup prevents ike-scan from phoning home
-	# for more information, please see bug 157507
-	econf $(use_with ssl openssl) --disable-lookup
-}
-
-src_install() {
-	default
-	dodoc udp-backoff-fingerprinting-paper.txt
-}
diff --git a/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild b/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
index 6fa3edca229f..8792715b52a2 100644
--- a/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
+++ b/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.nta-monitor.com/ike-scan/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="libressl ssl"
 
 DEPEND="ssl? (
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index 18d0a417ea7b..f5bb8f2d27a8 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -5,6 +5,6 @@ DIST iptraf-ng-1.1.4-github.tar.gz 556843 BLAKE2B 6f4e2bd8c4cf271d90732810f0ba6a
 DIST iptraf-ng-1.1.4.tar.gz 583306 BLAKE2B c06fdc25838901fc5528057ade5ebe28b5679a6a545f461cef2a5f4d3cbc1346a7ab3e94f4fe317a1760067e480c3c622df1027591d978b0ac1236ba9203e9da SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774
 EBUILD iptraf-ng-1.1.4-r1.ebuild 1330 BLAKE2B 909e0003854fd0fc6221705b7e1a43fa9ecad1f2a2e1660479288ae8a265efebb51743f08096d03b9e7c470e18df92e458fc79e8c331fd5de4a99d6f634dbf9e SHA512 8e47e2b556632445670916d1fddea8254f9078c3237c4c48f076cf7b61ebe5ccae30600d7485cb518b56ccf9e235dbdd72e3bbcd18a08a591bfde3ba3702b85c
 EBUILD iptraf-ng-1.1.4-r2.ebuild 1434 BLAKE2B 557210a6fd82005b9dc18c56b531d34d35f47d87090a807818eb59107853b8a41e5a5ba4f5f7d4ee0e79a8c60b3194b7cf1903927579471966699e4565340bf0 SHA512 71fd8f9b5fcc3f36b46a09d15e6a1d1bfcf1643574a958b0a8228cfb1c56f542ee163de7aa661ad79fd4d6df06fb4d02399843d1372bf4552464ab468afda8e7
-EBUILD iptraf-ng-1.1.4-r3.ebuild 1424 BLAKE2B c7c984b211d11d24f62eb9c27972ef13a08eb9c82b20a21a47a8d3a5c649b2195142456f76c44e1cadcea82ee1d46a0e0821e45208fa236aa6e37696fd716a2e SHA512 894659dca195030e0a3ab7683bb49c1b772fdaf5614a62966d52e03a589d0abadd51607d495940e3f8a155978a9a48c5689ccfebb9389a856253378c37fade85
+EBUILD iptraf-ng-1.1.4-r3.ebuild 1452 BLAKE2B fbbd65c88f6eaf0d715e6afd1a29ba83faa1e2a4bb86c08037808f1ea963f85fe6751e0cd124a9bdcce91d74247c86ec414f9db1cfe5df9b4afaefe2b5fccba2 SHA512 a9562595ce49b76f2edcef73a76219ede0c98a02e37bd79cce2797e79591d445a08c5b5bfdb5b617f5dcd5c20070842dad832939b207b923609822685e8b1f1d
 EBUILD iptraf-ng-9999.ebuild 1211 BLAKE2B de919ac3801e2b9b526f0c7064b5f5eb6ecaeab908b063e550060b93961dbb7b7bd9fc8cd2519c56bbad174d169ec2028c87b000f42c192c1046da6e0d4ba512 SHA512 68ab03abef69a33d4dd9e1349ec95e7ff0c932d116226f1fad114f805f05e58257d3616623b52da59b69836e6a03a3c4fb028e5b8308250d7507c675f78341fd
 MISC metadata.xml 376 BLAKE2B e5dd4ba7396c36e80ee1eed3eda4444bdd914e4701dd5acb0780b51a2e0e37020982bf624e1e8ecb81b5ba9af20f199885b52c03329d8238e43ca16c468a1900 SHA512 440bbe472188ac3acd7f0dcdddf8390e690a8f81cda49d6be5bed8a46cdf1fb10416f4313d426c408bd9f88501312af812badc765a24e76927b5ecfc64e7c225
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild
index b068ef51aeb0..12ba38d3c69a 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild
@@ -6,7 +6,7 @@ inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A console-based network monitoring utility"
 HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng/"
-SRC_URI="${HOMEPAGE}archive/v${PV}.tar.gz -> ${P}-github.tar.gz"
+SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}-github.tar.gz"
 
 LICENSE="GPL-2 doc? ( FDL-1.1 )"
 SLOT="0"
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 3dcc07ea8df4..47147a44c706 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,4 @@
-AUX 99_nagios4-r1.conf 310 BLAKE2B 985059dfdef2159680e554149c805fc31d2cc635ff745cf8fa848f79a70577d825d50da05f63c4ff3b2171bd1683d40574df7c2650c12c7018f57118190cdb5c SHA512 8356e87bc69522838b17ecbcdcb8c9a9ceb51c9289651ff86160d3915fcf758d28e860f5f4f4465f319dec0712dd9e9c16a3aed682d5f8902ead4179a763dd10
+AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef8d28c38ee380b2043d86c9b0097c158dbc5d486f1c53e22ef6f52a96286d0c50d1d47d9eb025fb6b8a9 SHA512 cb93d6af5b6f43b172cec276f669ef786268c1ba51ffda994733c98a8ad5f625229aecaed68b5cb433a66257a8eb66ec16f9569aa87b6dcecf21d8339bd5fb8f
 AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161
 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
@@ -7,5 +7,5 @@ DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b057
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411
 EBUILD nagios-core-4.4.5-r3.ebuild 7470 BLAKE2B ceb783a9c27047b42b6464a2570452125f2ff6f5c7c6a3333a63f113b2c78037ca7cea1db6cd6ca783d58d3d4bfaa491fade7217bff29b76f2cbaa7496c74dc4 SHA512 4962381b6508363c2f330e81dd81d3de878cb7ef7428f8ba9fc71193c6a3de2c93c8c32298212312feaa72e76b0094fec7ff9e04a9f07072be8181c12497a82a
-EBUILD nagios-core-4.4.5-r4.ebuild 8065 BLAKE2B b60bdbed3ec5570ba690b1341889b504da237f7d0b5f676d5152098ce4e6e3bb3aa4c0ae6f33f4a251ca974e74b6534f201beaf5108da8f8f7399d5d561d52b6 SHA512 48e8a38aad29fed8908d8148e2dc69400e95daa900ec91121818a6168d24a9d381fadb7fd4687e3964509caef85fc7ef3259391752ab2317c23d6b49134a2af8
+EBUILD nagios-core-4.4.5-r5.ebuild 8080 BLAKE2B a7f849c7eac614e3f834a52440991a210e268f2462c5047cef127ec3e6f53af93e3b4e62d4a8b5ace9df3e5179e244593df0b072c9c7a19283792c2d0e3c1edb SHA512 2c2942cc48a7956708c6e0409941f98b3e4a3078af6df8c32adafce633d52dc3cace5f8df5a3240c8ca21c78d247885795f9c17f1dc1317186f75e01710124ec
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/files/99_nagios4-r1.conf b/net-analyzer/nagios-core/files/99_nagios4-r1.conf
index 54531ed6275b..8d080d5c17b1 100644
--- a/net-analyzer/nagios-core/files/99_nagios4-r1.conf
+++ b/net-analyzer/nagios-core/files/99_nagios4-r1.conf
@@ -1,6 +1,6 @@
 <IfDefine NAGIOS>
 
-  ScriptAlias /nagios/cgi-bin/ @CGIBINDIR@
+  ScriptAlias /nagios/cgi-bin @CGIBINDIR@
   <Directory "@CGIBINDIR@">
     AllowOverride AuthConfig
     Options ExecCGI
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild
index 4a5ffee95d4f..a1922298fa0f 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild
@@ -105,8 +105,8 @@ src_configure() {
 	# The paths in the web server configuration files need to match
 	# those passed to econf above.
 	cp "${FILESDIR}/99_nagios4-r1.conf" \
-	   "${FILESDIR}/lighttpd_nagios4-r1.conf" \
-	   "${T}/" || die "failed to create copies of web server conf files"
+		"${FILESDIR}/lighttpd_nagios4-r1.conf" \
+		"${T}/" || die "failed to create copies of web server conf files"
 
 	sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
 		-e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
@@ -189,7 +189,7 @@ src_install() {
 		if use apache2 ; then
 			# Install the Nagios configuration file for Apache.
 			insinto "/etc/apache2/modules.d"
-			doins "${T}/99_nagios4-r1.conf"
+			newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf"
 		elif use lighttpd ; then
 			# Install the Nagios configuration file for Lighttpd.
 			insinto /etc/lighttpd
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 5c41072df43e..14a786cd6f81 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,4 +1,4 @@
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-EBUILD tcpdump-4.9.3.ebuild 1944 BLAKE2B 6a28589740cb8797b91bd210db7dfbf4827f8d653cfa15df03d5bcaee66ccc839f1086428f6d8d6326a1d3c7916945f91cd6c4c0419236d9433bc119017e195f SHA512 fec1c620cb96c1d76c66b05086ff2a604cfc2155998989e6ce797821db0734443f0a873f021a2c7b058fc8cb2678c1c7363ae731ac30b1f6543374b1193052d8
-EBUILD tcpdump-9999.ebuild 2190 BLAKE2B 29650a330e482a82589b8472b62cba24bc3ddfc931465557ef7695938a8d208ceef862d09f9f4a5aaf9d917c58396451f071909c5ab3c808f5185b9b49ddb0f1 SHA512 974ff9bed610720376d46f54316e7aa25cba88255d40327f7325ae3101ddee62210d9eb70f32336eeb507bfd267258f072e299a149c16a4a1218ccea0262c13c
+EBUILD tcpdump-4.9.3.ebuild 1945 BLAKE2B c004f77736af83932ca4389cedfcd5c884532fe482d321d0b8c54a8114f5d26dfe1dcc3b453dc7e7c8a8e232b5f7e7c94ceb2675ec17ad8a61a951e49d463037 SHA512 0d08b888904454e7a338f117ec357201bfb6a991ccc7dba2b6a7a45a3d639c6f02226082ba701f019aa7a1b719bb444c3edf0b359ad1c7c15e414587120fb4c7
+EBUILD tcpdump-9999.ebuild 2191 BLAKE2B a190910ce7f61bf76e80e861c317f73f8b28e66fe53f34a87b2d0e91055f3ec25c9ff08c053ea80809aa3d9e87cbee33b8e081f3fa0e8ceac0855ffa193c1b6e SHA512 ff33a6b2385aa5eefd6624ee91123ccf3891be27199c529156f644913e3d06ba8190ba311e715595f59f2010839755504022799e836cf9ed26ccbfb2b3014356
 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
index 1a4eeea68b81..3ea9ef51738d 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
@@ -54,7 +54,7 @@ src_configure() {
 		$(use_enable samba smb) \
 		$(use_with drop-root chroot '') \
 		$(use_with smi) \
-		$(use_with ssl crypto "${EPREFIX}/usr") \
+		$(use_with ssl crypto "${ESYSROOT}/usr") \
 		$(usex drop-root "--with-user=tcpdump" "")
 }
 
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 7fd150b21bd2..f4831f210d9a 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -66,7 +66,7 @@ src_configure() {
 		$(use_enable samba smb) \
 		$(use_with drop-root chroot '') \
 		$(use_with smi) \
-		$(use_with ssl crypto "${EPREFIX}/usr") \
+		$(use_with ssl crypto "${ESYSROOT}/usr") \
 		$(usex drop-root "--with-user=tcpdump" "")
 }
 
diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest
index c209e79115e5..0adc21e4d8cb 100644
--- a/net-analyzer/traceroute-nanog/Manifest
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -1,4 +1,5 @@
 DIST traceroute-nanog_6.4.2-1.diff.gz 18417 BLAKE2B eec999aae1e728e9c255715042ee7be66bc32c19eff3ab32b85fecd281032d24eea27fa19d27793d9820b61539791ed82b0a0a7845636970a8d2433d0e3ba40a SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e
 DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 BLAKE2B 427a7af1f65271b1b4f46522d76da00628e1c6b877b576ff571dc09d7c1bd0232abd626296b46a16785cccaf091b086ea61b5081035572b846e04fff97d0dafb SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304
 EBUILD traceroute-nanog-6.4.2-r1.ebuild 908 BLAKE2B 410763ccd772317187ba9bab3b8d75f0c796fb229796294e8f6442a3eefcf2e1fc6ab8973687821f750e91828c49edb74a49670e8624781bea716aaf927f0095 SHA512 8c390c84866ba38e150ce73d3ad126bca4a327064ad9507a12630c1e4de36ec5b453cbc569d368aa92b9e8abeb7a0395cde1149a6945178dfe5d02b553d6a838
+EBUILD traceroute-nanog-6.4.2_p1.ebuild 945 BLAKE2B 3795c0fd471664504c14ff5081a67cad311ca096f2fd45926e67c799a06db6edb41aad3e33009a8b722441e9e92fc3d4c127316c5a12c972de1a690339c06635 SHA512 ea5f8470fc6b4c79c16b76102f89197773b5d5b556d0e2bad6bb5a9cb943b413501478c461002b65e8097851fe10201749afb8d09d4a92a129ef661c67113e2a
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
new file mode 100644
index 000000000000..975f26afff90
--- /dev/null
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DEB_PL="1"
+DESCRIPTION="Traceroute with AS lookup, TOS support, MTU discovery and other features"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}_${PV/_p*}.orig.tar.gz
+	https://dev.gentoo.org/~jer/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+S=${WORKDIR}/${P/_p*}.orig
+
+src_prepare() {
+	eapply "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
+
+	eapply \
+		$(
+			for i in $( cat "${S}"/debian/patches/00list )
+			do
+				echo "${S}"/debian/patches/$i.dpatch
+			done
+		)
+
+	eapply_user
+}
+
+src_compile() {
+	$(tc-getCC) traceroute.c -o ${PN} ${CFLAGS} -DSTRING ${LDFLAGS} -lresolv -lm \
+		|| die
+}
+
+src_install() {
+	dosbin traceroute-nanog
+	dodoc 0_readme.txt faq.txt
+	newman "${S}"/debian/traceroute-nanog.genuine.8 traceroute-nanog.8
+}