gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /net-analyzer
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
100 files changed, 857 insertions, 2445 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 11a32727cb54..31ed472aedcf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/authforce/Manifest b/net-analyzer/authforce/Manifest
index 37ab724b0f09..84990f34b8f7 100644
--- a/net-analyzer/authforce/Manifest
+++ b/net-analyzer/authforce/Manifest
@@ -2,4 +2,4 @@ AUX authforce-0.9.9-curl.patch 227 BLAKE2B e241e1ca54a51a39d8d57036467a892812c07
 AUX authforce-0.9.9-locale.patch 325 BLAKE2B 4379902c336744609ecd3a0a3d4039a10b83fe8ab3859d6e7faf9fd4aef3a74fc55f05f6c2fead2898bf112f1da774fa7c3ef54fae543d8af8bb9cd62e19e02d SHA512 0aa863400f54709a726fd2913d2d6039d3591221f9fcf60c843a3a24a2191f9eab70dd03cc574dc34cbc7e2824a58071b7167cc291f7e5cfad13da6e145f9206
 DIST authforce-0.9.9.tar.gz 424557 BLAKE2B 3b962f7c3d445525364b8e40e3b47d0c951e04b7b5d40077540b1dc34721aca5163f9328451f23b7f1891d3a5440d003568ca6eb5104a523bdccb33ade61546d SHA512 fd94c6ac5f98f480af4acba2de7c0ad81dbc4c759cce8f3f722dcf8870b0c16a9e7d462f4542784737e021f9c8d480b26895dddb4d5953f730ff8a181ad474b3
 EBUILD authforce-0.9.9-r2.ebuild 872 BLAKE2B 71560cdde0fa460b22953a85ea0f6a2b3d8c8d149acd4c31224c02c2fde9b8df903d01ed74dd1ec7aaeaa9cbf9ead9e7a8dfba688ad74e71a813332a97e6c2a4 SHA512 64920923498c8532fc64f8147a42383c0d60a1abbeb8cb3305fa36b14086fcd94103dfcadf3b63c1dde23e05c467e55163f3fae902dadff5f4372047b800a7e1
-MISC metadata.xml 374 BLAKE2B b8e8fbec4bfcc8377695c3b95c0433d456ce69fc49bb9b9f0aa4cab50c2934f5d5825f8780266ced3d5d8deab3405833b5d8313f5e56b6e06d140f76332a5527 SHA512 440297159e51ec774ae0e8a30f20eb39902f5e587dd121ce8461e9fae47eae84d259f8eda43b803f8d3bd44b8e2e417fe8094d4ba2bc11d962b19d0cc3089e3e
+MISC metadata.xml 382 BLAKE2B 2a1952e7ba3806db62d8b3c6d1251af18707ddca296b137c786fb6713a75b472446f5b9f7746d51eedd58408cb429868886fba43bf78fbef5b33dc7a4897a069 SHA512 9db5772c5ccd05d53b3c6bb2fabe790348fa3933d95eae80e4347bb781b58bce870f4d3ea2fe9feccf7dccdffcaacca081231069774c345162d0d8219f8144d6
diff --git a/net-analyzer/authforce/metadata.xml b/net-analyzer/authforce/metadata.xml
index a565dfe5457d..2d4f0f870b48 100644
--- a/net-analyzer/authforce/metadata.xml
+++ b/net-analyzer/authforce/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>bu9zilla@gmail.com</email>
+		<email>m.mairkeimberger@gmail.com</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 8d597361a63a..cc1d6e4b0505 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -2,6 +2,8 @@ AUX cacti-spine-0.8.8d-ping.patch 235 BLAKE2B ab0390faaa8cd7b473ae2341a0f80d4eb8
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
 DIST cacti-spine-1.1.38.tar.gz 805437 BLAKE2B 32d934f54e00d83e9807dd194a7cacf8d5526c8e5b84c44ffad201c07edcb117f862266843552299fe04cc780575b9b2dc7129a106a20bd709cb82844ade7812 SHA512 5409a690e89fcc74e1e87e34e1918cab27d1243825955eb8256a92f8e9658f312345c66b338a4a07a0e38c94e3275131cb4e58fb70e7b59837c0e6c47746e45e
 DIST cacti-spine-1.2.2.tar.gz 2310298 BLAKE2B 782fb21fda6acf06434c6e996863a235670970b19e5218624723df4736c388c2d9f00c1e3cc623dad7973bcbbe7ae5d4bbe89e366c1f47ce83eac9b416f88cb4 SHA512 ef2f839f7b247439a8576d49e311546cfd2346eea06cfb26b7a05d4757ae28334e6ed6ea00396027dc6c0c6e107121ed38f356ba62d8202003553fea3b5d139e
+DIST cacti-spine-1.2.5.tar.gz 105494 BLAKE2B 1bd2f33cee841fb7b05a1a32d3d0d2824c36ccdc69fbf52c48cfe2d7bdbface4c1925261c8643c19addde90346c5ecdee547d8014705dc34800f59eab6ac248c SHA512 5bbf5f68e0d3477d43afee57bc86bfeb61a3ddaa18f7c0e5e0c2413bde6646bcd662d93e4c124daa6eaef5bca5843fb359b733c5189d9f43a34a14fba7f03682
 EBUILD cacti-spine-1.1.38-r2.ebuild 865 BLAKE2B d3ee48575e06d3936d7b05417549a6bbd0655f8b04f8e62b44f220615020016e373c9854b7b830efeda4fea76b0a133574a9e97f150ae6c62e029be6ec812147 SHA512 93a55f613d7f0be9301ab7d36e4bcbd9f518aa514bb43a70eec540848274b98574af5c8fb26ba8b21849c9c698005a7b7e404dfd29b2b04378308ca87cdda740
 EBUILD cacti-spine-1.2.2-r1.ebuild 887 BLAKE2B d8680ed1e6ae3b749b5bcb3d0a37f7d52aed0bfdcb31072f38d604b6800317bfdb1f0da7758f9265b27f8c5b4a456ce97bc434cb7a0833a73a02988025bee152 SHA512 1c6116e9609629559fe8a8462f4449b8535ad44bd2e8d7212f119c179d7e21a2befd378bcaa5e0ee60e344b24acb31501ea41f984fdd92f9ce905f3978d8d335
+EBUILD cacti-spine-1.2.5.ebuild 887 BLAKE2B d8680ed1e6ae3b749b5bcb3d0a37f7d52aed0bfdcb31072f38d604b6800317bfdb1f0da7758f9265b27f8c5b4a456ce97bc434cb7a0833a73a02988025bee152 SHA512 1c6116e9609629559fe8a8462f4449b8535ad44bd2e8d7212f119c179d7e21a2befd378bcaa5e0ee60e344b24acb31501ea41f984fdd92f9ce905f3978d8d335
 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild
new file mode 100644
index 000000000000..9a49a5087926
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	dev-libs/openssl:0=
+	net-analyzer/net-snmp:=
+	dev-db/mysql-connector-c:0=
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+
+	doman spine.1
+	dodoc CHANGELOG
+}
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 29c23a2af201..6e13cd5047c6 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,6 +1,8 @@
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
 DIST cacti-1.1.38.tar.gz 9081347 BLAKE2B 9f64bc7cd33187c4c744e1473409ea8998cd953c6fd047c66af6ff07d288678cbd944d2e70d0fc3838a42c7f7a9dbf7b094963391791a46bc50c3ed65ed4251f SHA512 1f91156416a9988fa149f9b8fc9fc7df904e4cf6d9a19a62d06c7de1ded99ddaec2f5b5f1a21b0effc4dee7b9c1d1911ca5aaa6113b57edc7e2f42b7969343b5
 DIST cacti-1.2.2.tar.gz 23800723 BLAKE2B 3608edd60d796dcd8c875f2611c268605813d9f4102ecac99dd71d1b7a904f7bb74031d1c5692d0af7964af9e1a13fb46a88d98bbb6961bde0696b339fe84505 SHA512 4a41aff20f06ad56f4723e52084d1a09e3b3eb017e8f1c957f700e4e2f9b12e8f0e599cb56611241c6fcc59bbd6bf957e948631f3beca72e2a7fdadacc473c65
+DIST cacti-1.2.5.tar.gz 24677665 BLAKE2B 098a855c9eda7c6eca255a96be0d6abe016be00ffd985ce356773e8af4114ecdca4753e1b288a697c8defbbe481a9244eecf553f228518e1c223b582e0974eb7 SHA512 991847ded6045c8c6111c58c5f8687f2497183a545158924bba92ee5d0b7de3e658ddbfce6f59c651fa29118aedb271a438c5668a3db4b93f97f82fe721f0a32
 EBUILD cacti-1.1.38-r1.ebuild 1031 BLAKE2B 3e1d8d36763dd27d5823b458e80312ee7569fc906f13448bfd5af32d42a57abba4f336dbf9e6679573074b395f47e43e25453c29498835e96acd3bc594104445 SHA512 cebe81f683c4fc0c2cea917a9c29cb02933a34a11bc2e971baa2a12724f8dcd16bbdb9fab9dc50fffd5de8b551d995fc650dec0c69586cc46d055dcdedba9338
 EBUILD cacti-1.2.2.ebuild 1014 BLAKE2B d70d882dc895750ce208924f471075cede60644877edc87eace012a370b4cc5d34b4b3e4ef87924ab81381da0480d63ca5f85ece715463822261d951bd1b7497 SHA512 0c5a87b7c75a5f464e6a68308e678a05f5dc3385892e939bde653786a0ea7789fd0720f09509fcbc645b2ab52d63f8db569437a46205eb3552052a1407822c0a
+EBUILD cacti-1.2.5.ebuild 1014 BLAKE2B d70d882dc895750ce208924f471075cede60644877edc87eace012a370b4cc5d34b4b3e4ef87924ab81381da0480d63ca5f85ece715463822261d951bd1b7497 SHA512 0c5a87b7c75a5f464e6a68308e678a05f5dc3385892e939bde653786a0ea7789fd0720f09509fcbc645b2ab52d63f8db569437a46205eb3552052a1407822c0a
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.2.5.ebuild b/net-analyzer/cacti/cacti-1.2.5.ebuild
new file mode 100644
index 000000000000..c44b77bddbdf
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.2.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_compile() { :; }
+
+src_install() {
+	dodoc CHANGELOG
+	dodoc -r docs
+	mv docs .. || die
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index 4dee5b570ce9..6aba44ac3d03 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -3,4 +3,4 @@ AUX chaosreader-0.96-divisionbyzero.patch 661 BLAKE2B 529dce5b432e6636aee92526ce
 AUX chaosreader-0.96-zombies.patch 343 BLAKE2B 85dd641d9c20a5f90a0f102fbae1abee3042974c40b166a1c8f6fc8e78f2f3a6eafa8ac2ffd1de66baf751bc05b581bdf6742df68cac5254b0a363a6d99ba9a8 SHA512 7aa70a9e5dc543cc583ee825b0bee00aaecc7dbb12c0888376354cbdc403e194af37685b10e339f7fb59e031ff92b6b0f24634311572a5ba43e89706d700ec9c
 DIST chaosreader-0.96.tar.gz 99124 BLAKE2B 04e9dd45543033bb3d15264fcc9168b7e2cec6f304f10142df36c363e841afc91659d7956bbb60b05cc6ab4e8fd519adaf9a2e69be2efc129fd2f38ca0d99f1f SHA512 46ba4a66152403e150e652bf6fa08af98cd3d709ea2cb834a32411ca5dde5f94a7e972404626787e604c1449c29ab5f335673b305ab83856c0dfff7cbf2f4de4
 EBUILD chaosreader-0.96.ebuild 724 BLAKE2B 33936dddbff112b78e99ffb0d2f4421d317c354434b870bb30b33a49ce1f7293ff349d6f11771956533eeda20d1b1bbef9b0f5f5954419c908c52e84e573daf0 SHA512 0ff77d9619e81f3fde969c781620c117ddcab6cf8cd2f892550bb7d835c64a20bb7a5f06876830737a3c6335db90e9c64d740bb7d342bab940eaa2ecd18fea95
-MISC metadata.xml 519 BLAKE2B bb962789720f669f73a42bb2b4b0cf80f39d8efc8c7ef191048ed554813dd2ca3e3e8b0fecdbd46513fe7bf815d0129fc9d11be45ef240ba280d931a751377b6 SHA512 1c1018ea975b13592ac38a1d5207ad599f8a6f36f58718232a27870e23d5d5b2c7b3977b31975bf24c42176e0d8043259a130e4020a05942fe6d7aca073444a4
+MISC metadata.xml 527 BLAKE2B eb4c32bf37b0cea06eac16416682f76636bb5bcaa0a2af5892bab3dd6c8eb8ae2e0f5cbe7dae236ef08e62137ee68954d1786e711dce0ca305e1d80b12a7a9c9 SHA512 6204b936c828254b9c6a8b05cd4027c1f0cb79fc32c0aa0b68e93b0d09c9427a3b3f5cb13b6da0734e81d5875527e3c1367c56b925a1af8e90f9c73180e5a780
diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml
index 4cd76b15bbeb..f74b571ce679 100644
--- a/net-analyzer/chaosreader/metadata.xml
+++ b/net-analyzer/chaosreader/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>bu9zilla@gmail.com</email>
+		<email>m.mairkeimberger@gmail.com</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 607dd6c0e171..2776c976b45e 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -3,6 +3,6 @@ AUX ettercap-0.8.2-openssl-1.1.patch 8769 BLAKE2B 6c9d7e8c60264b6ac0724891f9cbc9
 DIST ettercap-0.8.2.tar.gz 8082561 BLAKE2B 851df0a8700de45ce0e3427f7fdbdcd13feb2f75c0d1136563449db634b1f02276bade0d82a1a51bf8de726d6faddf05ff537e397c2e56cfc3e3181d25566fe9 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415
 DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
 EBUILD ettercap-0.8.2-r2.ebuild 1789 BLAKE2B a23ee25a8d7c4b95a072183c1cbc6f1465b013ba5cb9cd894481b9063af043f7802ffd2b4311b030973b9acc04bf956e49922b2ed6105c67073f50b62b798946 SHA512 29bb82ce78874bf7b0b512b4a6033a80d1eafa125e4bbae14d6df3d89d92e55158ed6dea064fee50d04d82472b07082e177ffde512274c9e037f7a62299eb7ba
-EBUILD ettercap-0.8.3.ebuild 1755 BLAKE2B ce833bba1d3ffdf58036646cf1e35fb2ef16ab3fde6a5a9949c1eb61f084ed40dbe85fc8f3131ef5dd59e24a12faa4f71c5997a372e90854f7b696217573e5c9 SHA512 14e9ca6d102aaf37fb947c349333816aba6f414e7bfb8f5cff1cd73c6402ea2c22f5c3ad491c7d29739a880a23e0b95eb766b1c4d8d743c11ece05078d0cacdd
+EBUILD ettercap-0.8.3.ebuild 1758 BLAKE2B 743c128bc562577efe2d8e5ee07ecadbf4924932458776ccdf9a33b0a69cd48de8b1a0192b1a4da26b2b72e8556d7c57fa41c3c81503d8601059adfe7fa09aaf SHA512 5d40815ba0d90dd0db649e136b92d09bb9e25a767ce42879eaca4332bcbb6fd9d1c1ef32bd559b1bb2fa240f4e280f04cc24452d2e34656d05c428b735759433
 EBUILD ettercap-9999.ebuild 1711 BLAKE2B 0ed80f63f24c4c595f2b1caf410259fbe974d0833bf8bdaa14f964009a9bd5c75540fcd6beff17622a355bce45408ea2ca52d2378196c7b37a515c6222d96441 SHA512 9d4fd99f08e11126ba68519404490c7000997aa349805a8d4a6d271e52fcda764dc3c8164a3f5ddfe63e819343d24c7f792d229da9d44ec56f039c87854e37ec
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
index 12a0ca3162d5..ec323be8df10 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
@@ -63,7 +63,7 @@ src_configure() {
 		-DENABLE_GEOIP="$(usex geoip)"
 		-DBUNDLED_LIBS=OFF
 		-DSYSTEM_LIBS=ON
-		-DINSTALL_SYSCONFDIR="${EROOT}"etc
+		-DINSTALL_SYSCONFDIR="${EPREFIX}"/etc
 	)
 		#right now we only support gtk2, but ettercap also supports gtk3
 		#do we care? do we want to support both?
diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest
index 835d47b3aab9..08c5a7b41701 100644
--- a/net-analyzer/fragroute/Manifest
+++ b/net-analyzer/fragroute/Manifest
@@ -1,4 +1,5 @@
 AUX fragroute-1.2.6-pcap_open.patch 1171 BLAKE2B cdd664bea732c2abab0813526eba79a7dd7beef3c373a7f86414356d786f47b950561a74ed5bc9d404a7b39f63ab12c5b711835b056fccbda8583f8e7541c5ed SHA512 f60abf95fa5bd8798cf88f40d972311bbee4f877ee46cee1aa6e4438b5e4dd6c3b990b5e2565d24d1ce9c72d23f950ef13abd889d11a2f1bf6f34fb01957e7c6
 DIST fragroute-1.2.6-ipv6.tar.gz 163309 BLAKE2B c1927fdb6fbe6873b62fa48c5355b0b0d2be7b2183c94f259b8e0b4b3dec8a171defc4c6fbde507e522b28dffcc86dd68ae0ffe380a9d21eb478ebe7068d4beb SHA512 76c6fbe37100a43df477f0ba455a2bed6ac53c1f369e147d220562a34eca0eb273171e4b9ff4f3fc473c3f99a8344f6d49963c20d7cfaf6879200322a491ffc3
 EBUILD fragroute-1.2.6-r1.ebuild 1037 BLAKE2B 81e3443bdd270b36cbf94e88412cd3220befc5faf843bf1619e3ba2f8fca3a5eadaf5cf40983e265bb214c12fb7af9bc2e59780f26bb5992f4dbdbf38514b687 SHA512 49b02420969d14fcba01898ac514f8fe2342a0cb9eae0e74eb3f685930d9bd7802200c3d9c4b9f62061ab1422018a8b93a45ef0819547fd092c5f134b26ce534
+EBUILD fragroute-1.2.6-r2.ebuild 1040 BLAKE2B 7a4260437f050d4f501a31d95544625076a49c6919ae856c04924a8a91647504876d6eb316442755dc0d1a8f859dc2dc448277bcf03b583dd122060d1da2391e SHA512 d95b688b5e782cf9d9ac3978424c9bb807fa252226385039f2fe0478201c63f878d8d3c202e49ac9235905246450d039ef0899e045d9f63d4247adf4e601b011
 MISC metadata.xml 364 BLAKE2B 6f99923afef64e689bb2169801086f433f54879999551e8ac7e74f3c49ae10b2381041e626a024efe57b167a9394219b3ff3f313b049b2d40ba5404134b766c1 SHA512 3b38ee5be21d5a6957e39fea01461187f01f5b34a0538df8b6f6c217e0832a5d6cb5dbd9b6508cb5a977618dd9f8ffb0d0feefb0ec6c050efcfb4fa68a00ed78
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r2.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r2.ebuild
new file mode 100644
index 000000000000..1043d0fd9879
--- /dev/null
+++ b/net-analyzer/fragroute/fragroute-1.2.6-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P}-ipv6"
+
+inherit autotools
+
+DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks"
+HOMEPAGE="https://github.com/stsi/fragroute-ipv6"
+SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-libs/libevent:=
+	net-libs/libpcap
+	>=dev-libs/libdnet-1.12[ipv6]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/awk
+"
+DOCS=( INSTALL README TODO )
+PATCHES=(
+	"${FILESDIR}"/${P}-pcap_open.patch
+)
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# Remove broken and old files, autotools will regen needed files
+	rm *.m4 acconfig.h missing Makefile.in || die
+	# Add missing includes
+	sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-libdnet="${EPREFIX}"/usr \
+		--with-libevent="${EPREFIX}"/usr \
+		--with-libpcap="${EPREFIX}"/usr
+}
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index f84dabe56048..4a7ee1876564 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,4 +1,3 @@
-AUX greenbone-security-assistant-5.0.3-run.patch 504 BLAKE2B 3e14a5e2d559bfa0f487760ebe081013627038a6ceb690b444c0eb680c05293e4a031074ba05438366a8b01fab4ad1a48f4e9fd97bb7150bdc288cacb718b999 SHA512 fead69c99f8cfb376d19c684495ed4cec7a90672fed378f3ae9ea245393ab3d52c34a2c8e5dd84ce7c5b844f1aa01d70b7a143f417e93f320a240bf1f683bb5d
 AUX greenbone-security-assistant-7.0.3-auth.patch 4606 BLAKE2B aa9698aea86c1f0253d4f9ce263c83bce8a440184693ec5e438435517a04a87e9e3df7990522a212e6509b61ee1455e4fb11ccb4aa434c01edb4027c8fb38e2d SHA512 8012de90a92518acd71716790730e7ca736e2b64be026a11fa648b569bfb4229813a39be134efa1b1c09ce394aaeb44db6d31687279a6f5468f7cc97bb1a54ba
 AUX greenbone-security-assistant-7.0.3-memleak.patch 1206 BLAKE2B 1349e2cf9d82fa9bc0b05bb471e4ad8c298a12c6ae0ecdc12a44f686440d5cc1b5f6bab8a7fb97a643e2457e99040da9aaf5f0285bbb6582131af3bda297803d SHA512 5ec8404ae8d8c40dc7d1d4cab7572888dc08cedf9c17e8e95e138b9441c34e5d0eeb24f066d15ef5b69d5da9f3a3bbc70ebb6eaf275763b3ec5583af9265652d
 AUX gsa-daemon.conf 1166 BLAKE2B 2611553aa0aa13d105182bd12f7b6f79f94888458aaf142f67111a94bdd3b7c6fb33a8e33844977fb95e09a13d04595ddd5e789624be2eaacbbc78564c05d4ba SHA512 2f085e0b8df0f778b7c9446278d4748b5780abebaa4ac590e1d44280975f22e37d8fe12c2e05b0381391504f42d437597ab4a4880daf20f35315fb4e74753a6d
@@ -7,14 +6,6 @@ AUX gsa.logrotate 134 BLAKE2B 56bd0128621688a1b1fc5cb0a96503e60b0a2975bfbe74b4db
 AUX gsa.nginx.reverse.proxy.example 3835 BLAKE2B c4ec87cd5f1a0e5aedb93f95c7010a3f19b9123355b24b2899c157a532b020ba192ee6f5a382448b17fe0ff1d8473be6a390e0779d3f8c3963d050d0f5c91775 SHA512 c323f37f4dd1bc4633213f9aede141e2a915344df7aa8e7be043583e6a5415ec8fefea707f1cab29f478423165f3285c629da683515f08d6e046385fb7177751
 AUX gsa.service 641 BLAKE2B 526736f052166e74eca48986609d3a688ba8562a57aee0136ab9d2cea9884e4c17ba8355e3e55cf30fbe6cf93b15d32e54b3a330d814d9116d65ccf8918d59fa SHA512 975d1a02041d25d2e21eefe73de0f083d2bb58e7a0da895ea9455d86941ae6ed2c952b282f05dd48f9706a0c4a883f6b58b9aa2af0b73c54cb91d8f3d703c91a
 AUX gsa.tmpfiles.d 28 BLAKE2B b9343651fc4923451b02a5f72cad7da95e4d790a7b77eb72ca239588568a5d2b88cad1f9f698ad61403c332a44005989e8d6e67ff1ad06cab26abdf67f8d8621 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754
-AUX gsad 440 BLAKE2B 30fcd923866fb7b17aac3a02a03bb5584c2a43b3cd2a0805706834a008a9f0107bb0553e0c51d180e080c1ec98f45ad58baaad709897110b80383cdbc3f4c924 SHA512 4fd03f00530253e824905a79b7f482b2307d181c8a182096d9fa694d0efce78bba12147961d35ed2616bbc5e5ea3adb0621b5bbacf8401db6d323a266c50ca76
-AUX gsad-daemon.conf 378 BLAKE2B ec130e95c087effff1e4f36037bd688583561fac4e3186cac8a4c9204488af60187221a84311cf15269baa61cfcaf765984a394a0b73121b538ae6c90758c1fe SHA512 a4802e41391b4ac51a88924dd3246390fe13c7119eac1130f34e8ff0f7b7df9096c9176569ac63fc2cc7ad8dae9e1bfa762f4853d2c3f7845208bdee0e8072e8
-AUX gsad.init 391 BLAKE2B d4167cc68208773dfee0b93930f40ffbf9f68ad70fcb8dc3e4ee42057148414bebc814f1269b8a1b0687462f3847dc5e111a7e5cd3789d0d82f414f6f8bd7c02 SHA512 3955aae20e32ceb61bef9a937ac6e63ec16e33994f88f0daa21cb4160feebabeefdec27dbd0451eabd07ee50d10ff02c1dedb8a37e69e6d5b93dd053d13925ba
-AUX gsad.logrotate 199 BLAKE2B 1e1e68c2c5b0bcc097498e30fd007dc3e5b73b5e87592f844a69ad974e18b7ca4b2692b92ee5d1758ada800abb75ee16f214ea5540da7fc4716b8b4fc408b537 SHA512 0d459084f95e00dfb06912b9d89af011fac117a32687ffd3da3887c24e80c074b681c0d87532a4a7511e42c540f8d8b2ceaa04208fff531b94047a08decddd0f
-AUX gsad.service 386 BLAKE2B a87330e9d243b4cf951e5a9d21821a501ac2b4a4fbd37e951554ca4fe5ab5e5b84c23b19ff8a685c43d25db31df4b1bd269bd163cb4a522db0bcfba1cd4248ca SHA512 6a706bb3d9fe474818aad419ad50f315a144ac489af5e8225deee773439d12b1296d026ae38bcc3f7fa5b826e2fdcf902b1f072024dda40d9431e12026627a32
-AUX gsad.tmpfiles.d 28 BLAKE2B b9343651fc4923451b02a5f72cad7da95e4d790a7b77eb72ca239588568a5d2b88cad1f9f698ad61403c332a44005989e8d6e67ff1ad06cab26abdf67f8d8621 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754
-DIST greenbone-security-assistant-6.0.9.tar.gz 1476238 BLAKE2B 3311056256885102518e3b0e3106c23965e5a69ad4cfe13a2b34c68079a916466915b3296c80984656ff8a9f9b0aa35f5256c225250ae549d9727ad61f3a6b2b SHA512 4afb50f044b6853181c3c3e6466e7329915356bbcccecf98b89d9dc39a193392f45850f9073ac055ec826753af78e8a6368e7f9ac52734a3b5e254d124180d68
 DIST greenbone-security-assistant-7.0.3.tar.gz 2918954 BLAKE2B 4a6cd5d8378bcbb0a9df6cb5b8f6560060f15d0b0cb53d2c61692cb2bc2cd86af6e9cdeb5040c4d7020c3b016779a76ec517d54614388c62aaedd596f55fa3c4 SHA512 7e1c1ef939ba08dab3b78baf1aa9c110be2febfbed5d67eefe8110c60f5089a1af44bc26693657226f417c6bd516a4a656eb159dae2a78f878e1a1b6c222b117
-EBUILD greenbone-security-assistant-6.0.9.ebuild 1308 BLAKE2B 3698cf939f27d441dbdc9feeb5b29be859e2b80360eec531e3a2e54b58d12f18d7be7f7f82d4152f0331e471cf8d862e8ffb942366391662b0706edfb3404f69 SHA512 c44a805020ed43474435946aa514a5cd712b7e0872d30600bbf4d875f8f9f8837bb43efab5104c263bf4bf05d10de89cdcf82ff0ad21e8e3f7b9b50b56c69905
 EBUILD greenbone-security-assistant-7.0.3-r1.ebuild 2084 BLAKE2B 458e7fe2a2129d1862a20b4da13ba443267f7337bac016e41c611657d345882a7a8e0ee675d5a666f8c5ef0d9fd0165372659f086d4e49df1eb8e8ceffd5b635 SHA512 ff913784bab0ad214d6ec98ebf5411d6187313ef4c98b486d0655ab7203db123509c6fbfa1faaf66802be17858ee2931759e39f1adede00adc425f9ccfd44d6a
 MISC metadata.xml 461 BLAKE2B 734b873325f2519d61fe25c81061f2344cccffbbe7c6915b716dfa11cdbd09dabfdebe218749680c7bcca47899a8eba97e3152d2b9ac32f7246310408acd3a10 SHA512 87b57dc463871d595b3448b57d4038ad5391eaac1143ee3dc50800d736030abc9ee82387b4127c68b9b106c4972cf75acf42a6e8726c6eaa60cdcc1bde886896
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch
deleted file mode 100644
index ec5ee92fd73b..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-5.0.3-run.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 67cf344..c15f785 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -272,7 +272,7 @@ endif (NOT DATADIR)
- 
- set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
- set (OPENVAS_LOG_DIR   "${LOCALSTATEDIR}/log/openvas")
--set (GSAD_PID_DIR   "${LOCALSTATEDIR}/run")
-+set (GSAD_PID_DIR   "/run")
- set (GSA_DATA_DIR "${DATADIR}/openvas/gsa")
- 
- # TODO: Eventually use own certificates
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad b/net-analyzer/greenbone-security-assistant/files/gsad
deleted file mode 100644
index f5d76179a55b..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Greenbone Security Assistant Daemon"
-	start-stop-daemon --start --name gsad \
-		--exec /usr/sbin/gsad \
-		--pidfile /var/run/gsad.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stop openvassd"
-	start-stop-daemon --stop --name gsad \
-		--pidfile /var/run/gsad.pid
-	eend $?
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf b/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf
deleted file mode 100644
index 0de530635122..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-#Listen on given address - by default assistant listens on all addresses
-# ASSISTANT_LISTEN=--listen=127.0.0.1
-
-#Listen on given port - by default 9391
-#ASSISTANT_PORT=--port=9392
-
-#Contact manager on given address
-#MANAGER_LISTEN=--mlisten=127.0.0.1
-
-#Manager listens on given port - by default 9390
-#MANAGER_PORT=--mport=9390
-
-# Additional arguments
-# ASSISTANT_EXTRA_ARGS=""
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.init b/net-analyzer/greenbone-security-assistant/files/gsad.init
deleted file mode 100644
index df69f2fb7f88..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-name="Greenbone Security Assistant Daemon"
-command="/usr/sbin/gsad"
-command_args="${ASSISTANT_LISTEN} ${ASSISTANT_PORT} ${MANAGER_LISTEN} ${MANAGER_PORT} ${ASSISTANT_EXTRA_ARGS}"
-pidfile="/run/gsad.pid"
-
-depend() {
-	after bootmisc
-	need localmount net openvasmd
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate b/net-analyzer/greenbone-security-assistant/files/gsad.logrotate
deleted file mode 100644
index f0948cbea1f5..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# logrotate for openvas
-/var/log/openvas/gsad.log {
-        rotate 4
-        weekly
-        compress
-        delaycompress
-        missingok
-	postrotate
-	    /bin/kill -HUP `pidof gsad`
-	endscript
-}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.service b/net-analyzer/greenbone-security-assistant/files/gsad.service
deleted file mode 100644
index 8825f52f0949..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Greenbone Security Assistant Daemon
-After=network.target
-Before=openvasmd.service
-
-[Service]
-EnvironmentFile=-/etc/openvas/gsad-daemon.conf
-ExecStart=/usr/sbin/gsad -f ${ASSISTANT_LISTEN} ${ASSISTANT_PORT} ${MANAGER_LISTEN} ${MANAGER_PORT} ${ASSISTANT_EXTRA_ARGS}
-Restart=always
-RestartSec=1
-User=root
-Group=root
-TimeoutSec=1200
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d b/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d
deleted file mode 100644
index 18e820caec1b..000000000000
--- a/net-analyzer/greenbone-security-assistant/files/gsad.tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d	/var/cache/openvassd 0775
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild
deleted file mode 100644
index e65316ebf6f1..000000000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=gsad
-
-DL_ID=2287
-
-DESCRIPTION="Greenbone Security Assistant for openvas"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+ BSD MIT"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libgcrypt:0
-	dev-libs/libxslt
-	>=net-analyzer/openvas-libraries-8.0.3
-	net-libs/libmicrohttpd[messages]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.3-run.patch
-	)
-
-S="${WORKDIR}"/${P}
-
-src_prepare() {
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 827e635bd6e6..874f6e48a7e3 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -5,9 +5,10 @@ DIST hydra-8.5.tar.gz 1193694 BLAKE2B bf202ccf58f64e2b57a15b5aaf8d4357b8d37d0a63
 DIST hydra-8.6.tar.gz 1200238 BLAKE2B d9470be5280ec51dfcb701cc3dd87ffaef7076c990a30e833c3fe7bc0f2b951f40eae26dab28ebbb1116f3d5e884a3c0819a5913c68e714a3b8597af75140829 SHA512 d5d70b5df54fbc556c6db9e9e44b869f29e54aca03dc3cc9e1777d310fcf604b9602ba08250c5bb0d009963dc0ca5c169e61d3f64d7ec2383760fc819d6b6c61
 DIST hydra-8.9.1.tar.gz 1186320 BLAKE2B 97c29cda5e26197ed66aa29555b0e4de3ef5b08bf65aa09fd0d564ee5f63825af71d6a41c4552a06a4c86a98dab5a69913c0b0200fe4e5068284ec7fc1f1061b SHA512 68b07dcb22bc55937e79035954417d820691e3a1eea169c959886ce6a741f545efe7879f31f41a1751779c923410dcc67fe8914bb9b5cf567edfc6fad3997d72
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
-EBUILD hydra-8.1.ebuild 2233 BLAKE2B bfab4cabfd270198cebef133e46f02c0d37f31c6fe25e2328bea8afad5d1a6245e91935e241a7ebf641e2a6494c8ee375e51e095a38a1a133c2d3e7c1079b411 SHA512 ec97e4046bba01f8bb5e42c2524e88ede9dbb92d92d13cf02218ccabb8cbf94372af4b55e87cb64c73b745138f16cd63b2fef552304289db6761d5f1568ebd3c
-EBUILD hydra-8.5-r1.ebuild 2384 BLAKE2B 5baadb7ef9b87ad01b91cb1cb72bc5494b7d5dae8e3af2b2f5942bf2b49c8bbfdcd56c8b106fe8ceb466c35319bb7bc22e5341277e103a0b6fba24a5df9865b6 SHA512 9f1420cf1752c897c81e94f28c745d29d28d5d2a398e13e1d54f60089c8ab9d7fb40ca48836a1cad8714ce2066bd1ac2908749b2e162841830f8ca74c0f68ea7
-EBUILD hydra-8.6-r1.ebuild 2383 BLAKE2B 8632d894bc07e6f8a6582d062e6e2313771c468b47313634962388250d1a375b9ebb54d9c1a25ca57d246a825fc1b479868afa572813bfa6d6f11e09fc6cc927 SHA512 80a5bdf8bbd61d899c90c8b54e2a8a072ffcd8cc64e68479581c5895f6600b6ffd461b124e6ea0f406788ded984f4463c563bd2a73d2d0fed65b7553e70763e0
-EBUILD hydra-8.9.1.ebuild 2365 BLAKE2B a774ceb88fbc563a1306d9ec8b3e09095e693c73c037f064f1fc0d58d2be81eaab1ffaf7b0b278132dca3f93ec6fcb74f12ef19071da30a25856f6a11cc97b0a SHA512 4a9021fd787fdfc587b5ad585f5ec223e0876ef75baef4c7c397ecc54598858760d651ff4c10cc03e225708ebd26b86f0b4cfe22f8be752e419c510afde8d763
-EBUILD hydra-9.0.ebuild 3632 BLAKE2B 530888e77109cdea282a15c056a1d14e805826675689317663c72b131f5e78d0085000773cd511772181e9cdef06f338636ed80f69e79d15569836b9bd30bf0c SHA512 67639cac1e89042f9754980abf0f16b732c1a1705ccb980574b6bf808b92a6971091dbc0370228bb0c3973bafb186ca6c6c5edbadcc78b592609d668cee1cb54
+EBUILD hydra-8.1.ebuild 2231 BLAKE2B 95092e808318ddde9e4dfdffde525efba03a9327fcee14ea7e3b02c21b823d9d2b546a4a60e69d045fc2866ad30660ab796406a09c520aa4d09d1933a8fe1df2 SHA512 77b003b5e8c5118dc81c318974ae2af2b0e973a272eccf3666ada23ed2712762792c725c1d2f5b3bb1df37277d3a6951ea92dd3995ea79ec97bb053ab339cac5
+EBUILD hydra-8.5-r1.ebuild 2385 BLAKE2B 21d08357ab57670feb857ec4151df73eb760957c195514c890b5906698347d607211323c9905be22ea94fce87b270b9ae07cdf170d16041ecdb052ef9684d835 SHA512 7f9d38cf69559f85cc90a77d455c23ab08eff9cc4f32d2d93d12128ad903ec901462433b7870b10d4d221982eb496d4f72eadf060eff8d0dcd0ff600e19c1180
+EBUILD hydra-8.6-r1.ebuild 2384 BLAKE2B cb3e96abad9e6cf477042c583516373e774efaee1088218a092adeabbf2120e6807f5d29f92c338ab58f4a740041e5f0c993880c04d6fb3edba021d1ecbc99b6 SHA512 c6c98e5b9a379c058fc7bb041136bfc05d15f68e0af5873582af93826662a5e90d91aab32238efefc5f66fdc81f3f2a5626769d9ca85d41d0ab2bf145e17cb9e
+EBUILD hydra-8.9.1.ebuild 2366 BLAKE2B ba12d4eca5289fcb1142dafd6114a037097ebcf61e3cdf08c0befacdcbd799358b8db0df251201bcb3a9e690063c3a6b7bafe2917b3bb2fdfff4acbdfeae761c SHA512 1888c365da61c5e2e873dc4c7d76cc0f0e30d6638d9416df8857deb84bc844e7ae0ce3f71c897c1eedd1b9e1efdcbdef9b1cd9eac23b89df4b4a5147a6f68bdc
+EBUILD hydra-9.0.ebuild 3633 BLAKE2B fef1fb1edc77744dcd5e24321e4e67bd4f215c9439396455809b35a6f37409b379049356ea3f4fcb066b4ee772bff328023fe5fcc9528441b4e5a8767845331d SHA512 e9b1be609ea4c7ba487fab8865943a7f319e2040f6cdb42db78dd6dba9288f7c2307f76fb30d26db738f96d3564503f31db1b69d2c3c3e3b363f8417c9e26452
+EBUILD hydra-9999999.ebuild 3571 BLAKE2B 1bdb57bf900c1a3a3ae3e63858cef8dec1408d544f101d90485f11cb7705bafce7e708ee2006bed412e0cdb31238e8bd9719014ec416540d6f7ab88f1b7e8656 SHA512 dfd6138ea0fdcdd1c839eb1a2e094749e23cc6603c61e9975db6e5d94d792492c87fb918977307dde72fde2042690375b306c440280aad44c8d5ba622c2dcb77
 MISC metadata.xml 571 BLAKE2B 15177ec654ebb1b0a8afe4fcf48578579765545b0a8c1477900b7bfb24718f2645ae1b4fbdeb7110e3a2958be58869bf57181d6d9518a26f0e6f7d751fec2d3e SHA512 41e64b2953d3512bebf56e82ba27690ef3cfa87ae6b6508838e0678229c06f7bea6b9cf50046c41c76f519fdf23b08971fbe3cd5176b2b4f3875ee66e78d7e5f
diff --git a/net-analyzer/hydra/hydra-8.1.ebuild b/net-analyzer/hydra/hydra-8.1.ebuild
index 64a4453dc1f3..80610ce9cb2e 100644
--- a/net-analyzer/hydra/hydra-8.1.ebuild
+++ b/net-analyzer/hydra/hydra-8.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Advanced parallized login hacker"
+DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="http://www.thc.org/thc-hydra/"
 SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
 
diff --git a/net-analyzer/hydra/hydra-8.5-r1.ebuild b/net-analyzer/hydra/hydra-8.5-r1.ebuild
index 79aa16aa49ea..78edf98bb463 100644
--- a/net-analyzer/hydra/hydra-8.5-r1.ebuild
+++ b/net-analyzer/hydra/hydra-8.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit toolchain-funcs
 
-DESCRIPTION="Advanced parallized login hacker"
+DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://www.thc.org/thc-hydra/"
 SRC_URI="
 	https://github.com/vanhauser-thc/thc-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
diff --git a/net-analyzer/hydra/hydra-8.6-r1.ebuild b/net-analyzer/hydra/hydra-8.6-r1.ebuild
index 741256b459a2..c1e0721b8577 100644
--- a/net-analyzer/hydra/hydra-8.6-r1.ebuild
+++ b/net-analyzer/hydra/hydra-8.6-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit toolchain-funcs
 
-DESCRIPTION="Advanced parallized login hacker"
+DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://www.thc.org/thc-hydra/"
 SRC_URI="
 	https://github.com/vanhauser-thc/thc-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
diff --git a/net-analyzer/hydra/hydra-8.9.1.ebuild b/net-analyzer/hydra/hydra-8.9.1.ebuild
index 04d20a0858d9..060223524177 100644
--- a/net-analyzer/hydra/hydra-8.9.1.ebuild
+++ b/net-analyzer/hydra/hydra-8.9.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit toolchain-funcs
 
-DESCRIPTION="Advanced parallized login hacker"
+DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
 SRC_URI="
 	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
diff --git a/net-analyzer/hydra/hydra-9.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild
index d71a62a645f8..a7894804ea79 100644
--- a/net-analyzer/hydra/hydra-9.0.ebuild
+++ b/net-analyzer/hydra/hydra-9.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit toolchain-funcs
 
-DESCRIPTION="Advanced parallized login hacker"
+DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
 SRC_URI="
 	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild
new file mode 100644
index 000000000000..419882a47354
--- /dev/null
+++ b/net-analyzer/hydra/hydra-9999999.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 toolchain-funcs
+
+DESCRIPTION="Parallelized network login hacker"
+HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="
+	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
+	oracle pcre postgres rdp libssh subversion zlib
+"
+
+RDEPEND="
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	firebird? ( dev-db/firebird )
+	gcrypt? ( dev-libs/libgcrypt )
+	idn? ( net-dns/libidn:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	memcached? ( dev-libs/libmemcached[sasl] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ncp? ( net-fs/ncpfs )
+	ncurses? ( sys-libs/ncurses:= )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:* )
+	rdp? ( net-misc/freerdp )
+	libssh? ( >=net-libs/libssh-0.4.0 )
+	subversion? ( dev-vcs/subversion )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# None of the settings in Makefile.unix are useful to us
+	mv Makefile.unix{,.gentoo_unused} || die
+	touch Makefile.unix || die
+
+	sed -i \
+		-e 's:|| echo.*$::' \
+		-e '/\t-$(CC)/s:-::' \
+		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
+		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
+		Makefile.am || die
+}
+
+src_configure() {
+	# Note: the top level configure script is not autoconf-based
+	tc-export CC PKG_CONFIG
+
+	export OPTS="${CFLAGS}"
+
+	hydra_sed() {
+		if use ${1}; then
+			einfo "Enabling ${1}"
+			if [[ -n "${3}" ]]; then
+				sed -i 's#'"${2}"'#'"${3}"'#' configure || die
+			fi
+		else
+			einfo "Disabling ${1}"
+			sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die
+		fi
+	}
+
+	hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD'
+	hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT'
+	hydra_sed idn '-lidn' '$( "${PKG_CONFIG}"  --libs libidn )' '-DLIBIDN -DHAVE_PR29_H'
+	hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}"  --libs libssh )' '-DLIBSSH'
+	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}"  --libs libmemcached )' '-DLIBMCACHED'
+	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}"  --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
+	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
+	hydra_sed ncp '-lncp' '' '-DLIBNCP'
+	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}"  --libs ncurses )' '-DLIBNCURSES'
+	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}"  --libs libpcre )' '-DHAVE_PCRE'
+	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}"  --libs libpq )' '-DLIBPOSTGRES'
+	hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
+	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}"  --libs freerdp2 )' '-DLIBFREERDP2'
+	# TODO: https://bugs.gentoo.org/686148
+	#hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}"  --libs libsvn_client )' '-DLIBSVN'
+	hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
+	hydra_sed zlib '-lz' '$( "${PKG_CONFIG}"  --libs zlib )' '-DHAVE_ZLIB'
+
+	sh configure \
+		$(use gtk || echo --disable-xhydra) \
+		$(usex debug '--debug' '') \
+		--nostrip \
+		--prefix=/usr \
+		|| die
+
+	if use gtk ; then
+		pushd hydra-gtk || die
+		econf
+	fi
+}
+
+src_compile() {
+	emake XLIBPATHS=''
+	use gtk && emake -C hydra-gtk
+}
+
+src_install() {
+	dobin hydra pw-inspector
+	use gtk && dobin hydra-gtk/src/xhydra
+	dodoc CHANGES README.md
+}
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 3288286ed036..f94440947402 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -5,7 +5,9 @@ AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f3842583
 DIST gtk-2.0-for-mtr.m4.bz2 2508 BLAKE2B 86d1eb64e21084d1455783765b0be088893c260658913b9c522c35c88443e9876b39952ec33c5c69810425b7a309e382dcb32bba1443345daf81c9cfd2f84b63 SHA512 0f593b761d7a9399469f1f7bb3992133b391a2ce760ecfad96237561992802c192b810f4722763685d5f6e7a76bd2806abf08e1850bdce00e5cd3af4c810210f
 DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea3629b2668631f25e9181cf4236ba0e2cfc0517e7c70683bbb6347d9c26a2b09701d89e225c27aa2faae4 SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9
 DIST mtr-0.92.tar.gz 296430 BLAKE2B 0f7dfcbd77d6f9cd0a9ba4c7e6829ce8f3fa0e1de4009632d10c3a1c2acc280db5830296695c27d89317d38d507af8f7e9bdd12b1c0e0d198872dc39f13032e7 SHA512 d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f
+DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d1ed257a2c238ab78ac16e1a1e152ef1359ca530b0eced14c9333df2b691c27cbc29173c843ebc64eaaa9 SHA512 046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021
 EBUILD mtr-0.87.ebuild 1160 BLAKE2B b2387d41479707319b51be3877f58aa6cf13e832780a75ebf4a9f0ffd013f83cb5e129e0c254f2fba7d7aa7a3d7a0bc73aaffd0769adfaaa5421d99ef2b347e2 SHA512 93f02f5f2f477f5aeef30fcdf9d589870af55b7076989be6cfd00513796acef1657a0f92558d97807fdfc70764da7b61a8c8f3dd67cdf73e7f9d417ee5fe5e82
 EBUILD mtr-0.92-r1.ebuild 1428 BLAKE2B 6adaa9e1d16e8b8969d5f3fcefb078cc3aa9ec6cd26e476ee3b3f3d13f6d1426f00d51c026fa44af03bb2713d0e60544b3a5b269e79bed03450108f2cbc02caa SHA512 b7dd855dfe63c4d069150cc2c78faad630dfc11e02afa5f9d1262df8ad35cc9d43602f7ca3721ce421285fb40ca362df35a196560726d0f1ca78262388b16ea4
-EBUILD mtr-9999.ebuild 1585 BLAKE2B 93a9fcfa7e0d5f2c0b6a89d779fe253623158867e8ba7456e1d5bf28f7fafc470d44467bde32f19f46c18926bc7d758ed13c1874b7836311b42031f6701729c8 SHA512 87c0fa6f69d98219c9916b595f1e9868bcc886168448da8f4ce55599dd6fc566c2841e631c152393dadb7c4c72a9405b32b78c521f0a2e7cc620d7800eb9225c
+EBUILD mtr-0.93-r1.ebuild 1517 BLAKE2B 64ecaf414af0a278a8c3a75e065a8d0e0a333b203254e56f050352a867e21faefe0e699b6225e5ad25439410f784c161cff64d47b69c5b25c9444ff90d547a85 SHA512 a6c755d5d559227c09527ae024b0aa83954a511cd550e471a0c9de1aafe97d87df8fe3e75968d970987473bedc2710cfe1d2efe5b8606221756baf4d3a1ce554
+EBUILD mtr-9999.ebuild 1581 BLAKE2B e52533acb767ab356958eeb91e19deada75245671b24e201283a0db85493f2850db3c66351ee25c7471133eaed9fc1a1b1db715b78c496b6af002eda1cc31da0 SHA512 7a43bba45d9a2b17bbfa92dcdd9ede2ed9c1c7a5a6ed8a95e4ad6d1dc0be3783bd7cfe148674a1469e196da9a6c8b19d13d2abf6ae88464ed2e0b181dd61ca7e
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/mtr/mtr-0.93-r1.ebuild b/net-analyzer/mtr/mtr-0.93-r1.ebuild
new file mode 100644
index 000000000000..a18dbb143fe6
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.93-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic
+
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
+HOMEPAGE="http://www.bitwizard.nl/mtr/"
+SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="gtk ipv6 ncurses"
+
+RDEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS SECURITY TODO )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|m4_esyscmd(\[build-aux/git-version-gen .tarball-version\])|'"${PV}"'|g' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# In the source's configure script -lresolv is commented out. Apparently it
+	# is needed for 64bit macos still.
+	[[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
+	econf \
+		$(use_enable ipv6) \
+		$(use_with gtk) \
+		$(use_with ncurses)
+}
+
+src_test() {
+	[[ "$UID" = 0 ]] && default
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "mtr needs root privileges to run.  To grant them:"
+		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
+		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
+	fi
+}
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 06c55d456ae3..6185590ebe48 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -6,7 +6,7 @@ inherit autotools eutils fcaps flag-o-matic git-r3
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="http://www.bitwizard.nl/mtr/"
-EGIT_REPO_URI="https://github.com/traviscross/mtr.git"
+EGIT_REPO_URI="https://github.com/traviscross/mtr"
 SRC_URI="mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 5e7633532eae..ba8180abf1cc 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,8 +1,8 @@
 AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
-DIST nagios-4.4.3.tar.gz 11302228 BLAKE2B d22ab64268832897dfa67d805a5d74656f7aa96ce1427c7326b632060d8c1ea0fbd07564f3c7a978bb5e2c0cba0c06290e7b0d579017fe73b900eb290c7853ae SHA512 07c91a796d634ffda73305edb54e01e46cb4fc9dc996c937e657c18f8067d7e2d31421b058a04b7395ef739962445ea149c486caaac94b7d422b4032bdaa07d4
+DIST nagios-4.4.4.tar.gz 11303598 BLAKE2B e4015ca5c0383b0540f2eaf3d608343df850c6045a4539c1f1ab8c19dc95e9223816efe71034b37f6995cb623dc6b83c92e22a677fe687a34d2215b1a2758c90 SHA512 c8f2b83bad744d67be4ba8356d9eea0be3efbf42d9a215d64815cdf7d944eba798348ce0faea6cebe64f1c99e0edbf12540d83ca42f8b4b563cbcc60139afdb0
 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.3-r1.ebuild 6606 BLAKE2B 158f1629920032d07ccef39a5f6c8b596f894a957fae83b4efee89a42560f20eb4c2c248c0634ceac84b7315e1e0825a7608f1053a5485ab58d83b3b4dc33a44 SHA512 79985b40a69782d73780b5c0d85d758c96e57e87f24725d2bb338c8e761cadca4ac17e82d22a3662657408bb8cc1b03cc1e1eea2220424d75314f81fdccc6e75
+EBUILD nagios-core-4.4.4.ebuild 6606 BLAKE2B 158f1629920032d07ccef39a5f6c8b596f894a957fae83b4efee89a42560f20eb4c2c248c0634ceac84b7315e1e0825a7608f1053a5485ab58d83b3b4dc33a44 SHA512 79985b40a69782d73780b5c0d85d758c96e57e87f24725d2bb338c8e761cadca4ac17e82d22a3662657408bb8cc1b03cc1e1eea2220424d75314f81fdccc6e75
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.3-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild
index 74ddb853c43e..74ddb853c43e 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.3-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index ed210743750e..a9ef6160cdaa 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,3 +1,3 @@
 EBUILD nagios-4.3.4.ebuild 391 BLAKE2B 31a1586c68f74b862b0ee308ae8818c574a1e33f94a2b3daaa6d3a7d52622a61bcda61a5c968dcd911ad55ac03797dd0b54f85d4d98ebc79630fb0ed655c671e SHA512 80f20980638b39862e3026ff34e1a4827161366ad1c8079a32b8bd2736a67a3d4da2d042e9da54b6c0eef6dd2b3d196c7cdcb2949ac796d614e92fa9817cd85b
-EBUILD nagios-4.4.3.ebuild 397 BLAKE2B 244121a98f46b570281d36276ca17413b51a015a46835b1bd1f568328d0b12a90bd5f001199a3bd11f4121287bb78762e36007f9e206e75dcfad5af792ce10e0 SHA512 c260ebfa1f7578fd20bb76ba8ae0dfe9dcd495b185c8c5272b09657918b08d194b539428642f4e9e20afa9ba6cdb73a73806f47e9e4e80a321021e04c3f5b405
+EBUILD nagios-4.4.4.ebuild 397 BLAKE2B 244121a98f46b570281d36276ca17413b51a015a46835b1bd1f568328d0b12a90bd5f001199a3bd11f4121287bb78762e36007f9e206e75dcfad5af792ce10e0 SHA512 c260ebfa1f7578fd20bb76ba8ae0dfe9dcd495b185c8c5272b09657918b08d194b539428642f4e9e20afa9ba6cdb73a73806f47e9e4e80a321021e04c3f5b405
 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1
diff --git a/net-analyzer/nagios/nagios-4.4.3.ebuild b/net-analyzer/nagios/nagios-4.4.4.ebuild
index 39d47b09dafc..39d47b09dafc 100644
--- a/net-analyzer/nagios/nagios-4.4.3.ebuild
+++ b/net-analyzer/nagios/nagios-4.4.4.ebuild
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 9255055edbbc..f164c3c4e831 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,8 +1,6 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-7.1.2-es7.x86_64.rpm 15663484 BLAKE2B 6b7290a39984acfc95ec0b75c8f9e6b04ecdfe630fe792f32ffb539676bad73a7db02789dcbfb6dae3d40c1e9eef1065282c20ca9a3c51b29fe0540f70cc82bc SHA512 64aff80fd5115b0f261e0156c83a67b47a7f68d7d1e8803be87a54cecaf6be1f03bf213ee68a0ffae9a2b2ad35ea7766445444ed132c077f46127cd5772f7a39
-DIST NessusAgent-7.3.2-es7.x86_64.rpm 15690964 BLAKE2B 8be82fc99abdf9ffa58af6e4ad0b19313406c0d5db4b7a231360f82414a0fef7c5b3237ac1653ee8fab222b0866fd0071729e0320e6a6a7da76171642a2be32f SHA512 5009d125d917e2aba25d1743f19954302d27e02860df89d7081715e28539e6e44dfee5d9a9ca471ba7c008c27a59843034daf46b13f2b08b02a1a823ff0a3fa8
 DIST NessusAgent-7.4.0-es7.x86_64.rpm 15719960 BLAKE2B 3ea992c54d7a5acf09bc0097b6780993daab68ef2ac4816b247dba8deb949f5fd3202f9244d8ca6d9b53414163deb942b4e2739e14b42396a9a64b2265dea18e SHA512 35d948807a5110a3b1e32abf8a427aebbf082555ffd7f11abff037909119eed8f866f09121d2523107a6b2c374a45f0ff42933b1148d7679436540956d227c4b
-EBUILD nessus-agent-bin-7.1.2.ebuild 1970 BLAKE2B e041a1556fb042ad02231c1fb5decc60bd0c31ab5a5193506cebca6b58d3424ec205c21045a672787312650ad74907d647cba6370a315b7b397314985c060c3e SHA512 86927ab4ae3d5cd12abbb5ba497bbc055c8365fd9025e2b1a3b98fd0f22331090bcabdbf91bb332a7360f098584d9f248a4d1321038c017e0147f3cd541c1327
-EBUILD nessus-agent-bin-7.3.2.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
+DIST NessusAgent-7.4.1-es7.x86_64.rpm 15719896 BLAKE2B 16e0c578c01edeb54156e6228569ad3c179ac421887dc5f844aa957ef0c12f69d72a22efd8f0fecec9d3d23dcd8a9fdc017561f05f1aaf1cc3a426f83b9b914d SHA512 ff3704706d740e70cac083eb748e9e0e410709b8718c7fd77851ee7591fd5cb0c162bc7308662f864cd1d527ae33171c089d0b32e88c278399aaf8d95d013c22
 EBUILD nessus-agent-bin-7.4.0.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
+EBUILD nessus-agent-bin-7.4.1.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
 MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.1.2.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.1.2.ebuild
deleted file mode 100644
index 661ac2505653..000000000000
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.1.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm pax-utils systemd
-
-MY_P="NessusAgent-${PV}-es7"
-
-DESCRIPTION="A remote security scanner for Linux - agent component"
-HOMEPAGE="https://www.tenable.com/"
-SRC_URI="${MY_P}.x86_64.rpm"
-
-LICENSE="GPL-2 Nessus-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-QA_PREBUILT="opt/nessus_agent/bin/nasl
-	opt/nessus_agent/bin/nessus-mkrand
-	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
-	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
-	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
-	opt/nessus_agent/sbin/nessus-check-signature
-	opt/nessus_agent/sbin/nessus-service
-	opt/nessus_agent/sbin/nessuscli
-	opt/nessus_agent/sbin/nessusd"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}/download/nessus-agents"
-	einfo "The archive should then be placed into your DISTDIR directory."
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
-
-	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
-
-	# Make sure these originally empty directories do not vanish,
-	# Nessus will not run properly without them
-	keepdir /opt/nessus_agent/com/nessus/CA
-	keepdir /opt/nessus_agent/etc/nessus
-	keepdir /opt/nessus_agent/var/nessus/logs
-	keepdir /opt/nessus_agent/var/nessus/tmp
-	keepdir /opt/nessus_agent/var/nessus/users
-
-	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
-	systemd_dounit usr/lib/systemd/system/nessusagent.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
-		elog "obtain an appropriate linking key and run"
-		elog ""
-		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
-		elog ""
-		elog "This can be done before the agent is started."
-	fi
-}
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.3.2.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.1.ebuild
index 20d896ea6290..20d896ea6290 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.3.2.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.1.ebuild
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 2b1937d744cb..104b5e4b396f 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,8 +1,6 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-6.10.5-es7.x86_64.rpm 41596796 BLAKE2B 2d9078eb3a53bc9fe63a649f6829ac757424bdecd007bdcaefcda661951a18918ce4f2823fe3ae88ded68453e82a06ccd2d225db26713c5b72bdd09f9e665b1d SHA512 a407aa010d3d59d5c4d717159851a6b81ef9e1f1b4327c8382abe1b866c4969cf6e32251077270eae719b66af9ce29641c40ca6093df30f88ce9be81ba168f75
-DIST Nessus-8.3.2-es7.x86_64.rpm 68708928 BLAKE2B 7a5bea2de3ca5ad9f18ffa61857e611e137c4f78decb7b4c855e6e55d01c11e2b5d26960070d2d06a383018692ff6b7844c7872903e505422f73b3d5001d95b9 SHA512 6e84a1f85ae98bd352d0ed77dfc3bbb7117e6cdf64b8fc0718f9f2200a95c53828e7e5ecce586d1b9abe55b3318c63ef03f28ada7365c7a9f0046e65fb59e615
 DIST Nessus-8.4.0-es7.x86_64.rpm 69321556 BLAKE2B 678a93b51a57688c45512e91f940fa372070484b67b5d716faada48b1d6a1d95126dc1a482c6e43b8ff37b9c1e99fa538c0cf01dfca05e22edb83d1156c4fd4d SHA512 cdbd1e94c283104c47ea29950339962b4aa541c783f849cd92b6ce83f04632d9ed7eb88a3791d1054a98b256ef787d84c70bb3b56af3fb1801e16d8412d4b763
-EBUILD nessus-bin-6.10.5.ebuild 1769 BLAKE2B 7fa43dc45ad25e40adbd568636257f1514a9464ec33fe4b9bd850564ba8deaeceedc2fafa259d7c53dab3293bbed0e34947bf28ec75df2842e1ba899572beeb6 SHA512 7302cbbabb12cb59b88a80055e4ff3c535bd866e175070736116dd5c98546e0c7b24742822a6a64a7b01979703452c4c7419c512e9a9185a3a99ffe822fb75c0
-EBUILD nessus-bin-8.3.2.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
+DIST Nessus-8.5.2-es7.x86_64.rpm 72892020 BLAKE2B c5ae05c02da4fe3265ae1b31da0d8dc025c7275ef466d7f889ebefe6a6006e500e2df029ab90ab37cd0c5089078a22b4f0474a4cfa830a378aead68337154f91 SHA512 ef96ee30b693c72a33981757a8e9616ce7813837de90065c8d140e9702552798e09c0941c282d1a54817f036f606a9934bc9020e86dce12baf50a1a57dbcec08
 EBUILD nessus-bin-8.4.0.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
+EBUILD nessus-bin-8.5.2.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df
 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c
diff --git a/net-analyzer/nessus-bin/nessus-bin-6.10.5.ebuild b/net-analyzer/nessus-bin/nessus-bin-6.10.5.ebuild
deleted file mode 100644
index e29c3a053c5c..000000000000
--- a/net-analyzer/nessus-bin/nessus-bin-6.10.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm pax-utils systemd
-
-MY_P="Nessus-${PV}-es7"
-
-DESCRIPTION="A remote security scanner for Linux"
-HOMEPAGE="https://www.tenable.com/"
-SRC_URI="${MY_P}.x86_64.rpm"
-
-LICENSE="GPL-2 Nessus-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-QA_PREBUILT="opt/nessus/bin/nasl
-	opt/nessus/bin/ndbg
-	opt/nessus/bin/nessus-mkrand
-	opt/nessus/lib/nessus/libjemalloc.so.${PV}
-	opt/nessus/lib/nessus/libnessus-glibc-fix.so
-	opt/nessus/sbin/nessus-check-signature
-	opt/nessus/sbin/nessus-service
-	opt/nessus/sbin/nessuscli
-	opt/nessus/sbin/nessusd"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}/download"
-	einfo "The archive should then be placed into your DISTDIR directory."
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
-
-	pax-mark m "${D}"/opt/nessus/sbin/nessusd
-
-	# Make sure these originally empty directories do not vanish,
-	# Nessus will not run properly without them
-	keepdir /opt/nessus/com/nessus/CA
-	keepdir /opt/nessus/etc/nessus
-	keepdir /opt/nessus/lib/nessus/plugins
-	keepdir /opt/nessus/var/nessus/logs
-	keepdir /opt/nessus/var/nessus/tmp
-	keepdir /opt/nessus/var/nessus/users
-
-	newinitd "${FILESDIR}"/nessusd-initd nessusd-bin
-	systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To get started launch the nessusd-bin service, then point your Web browser to"
-		elog "  https://<yourhost>:8834/"
-	else
-		elog "You may want to restart the nessusd-bin service to use"
-		elog "the new version of Nessus."
-	fi
-}
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.3.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.5.2.ebuild
index 45aa75d3c45a..45aa75d3c45a 100644
--- a/net-analyzer/nessus-bin/nessus-bin-8.3.2.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-8.5.2.ebuild
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index 9a09786eb45d..28e6f44b5901 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -1,6 +1,9 @@
 AUX ngrep-1.45-build-fixes.patch 4778 BLAKE2B 058c0414edf1c37efd85f00a38d41d27ceb65e4f4c5e7636f6133964cd8fb75d66f02a45844cf56a8822d321d7937a5f3f8cdd99f85b79fec335c9d02dde75d2 SHA512 5e11682d6b360e96840135d8963bdf4c9bf5def0bd38ba716ce201c7bf9b5ce787338f2cff86d38318e0356d9118fde6985ed9a71728549842577ecdb3a5011e
 AUX ngrep-1.45-prefix.patch 575 BLAKE2B 1d5933c457507bdd10662005dac7a14a1b78d221f126a8cc33d0d952b81b10c936a86b83471be76219445d9332ea165a0fac3d3e6f37ae15096fef337ece404a SHA512 e33321ded5c0b86a279108a0d72d5e1d65699c39f50ac9291c4256867ce3f2b06d86d7186e51359deac82beadb7e8503ca5023c5401068aecebaffa4d01c2afc
 AUX ngrep-1.45-setlocale.patch 495 BLAKE2B 10d70be3c787344f120ed2faf527425af68ab723b23840ae5d1c460431b06777b0b691760854bf3fb64a72dfec85aa1b8110558f0037981f10a674cd53428ffb SHA512 007cf6793ef407b4069ebe84b9fe5e5a23c3d2d7f5c538ce0a81d1b6c2643b79387136854d50eb68b13aaaf6e3d7b1a469e7afdeebedba79efea1960b2d1a87e
+AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de
 DIST ngrep-1.45.tar.bz2 463361 BLAKE2B 31f7828fb28197f06a583cd6d250b5d70bfbd2bc5dae657daaed3f7ea286aec4dff9cca449c72a3c27d8e8b30d861304872eaaaa11abc9eb71f2acc94d9fc9f2 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7
+DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
 EBUILD ngrep-1.45-r3.ebuild 1064 BLAKE2B 2aaa8fbcf88736d9a0158234cb814ddae81fbf42620d5e5d441db9944b100f338752c75038b13b8ae22d6f1a52aa6506673d4a71ead769193028c55f66ebd404 SHA512 df65d35cd87e740eb28892572a897f90705d0db40669eda2422b82e77af2da3280433ec5386c4e2d82ba014eb263777e3bcd797f7f7b44a57a613e7add93077c
+EBUILD ngrep-1.47.ebuild 980 BLAKE2B 9a7c50222fe1a25d1142c13fbe902ae96487d6101508a675f8e7b919aee2bf1169bbf8ad47ae96048e79d5452f978fe404f84d92b005e473a26966a16341896d SHA512 55ba01f51dec30c33ceffc6de85d119c310b0ae0aae5fcc2f58d2aa5ff35e418d0f1244389fa35747559017b4263ccde16adfe3a1d8f857613cea7e566fbfb43
 MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
diff --git a/net-analyzer/ngrep/files/ngrep-1.47-regex.patch b/net-analyzer/ngrep/files/ngrep-1.47-regex.patch
new file mode 100644
index 000000000000..613643cf0e6d
--- /dev/null
+++ b/net-analyzer/ngrep/files/ngrep-1.47-regex.patch
@@ -0,0 +1,29 @@
+--- a/configure.in
++++ b/configure.in
+@@ -6,6 +6,7 @@
+ dnl NOTE: configure.in requires autoconf 2.57 or more recent.
+ 
+ AC_INIT(ngrep.c)
++AC_CONFIG_SUBDIRS([regex-0.12])
+ 
+ AC_MSG_RESULT
+ AC_MSG_RESULT(Configuring System ...)
+--- a/regex-0.12/Makefile.in
++++ b/regex-0.12/Makefile.in
+@@ -26,13 +26,13 @@
+ #   -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to
+ #           the corresponding C procedures).  If not -DDEBUG, the macros
+ #           are used.
+-CPPFLAGS = 
++CPPFLAGS ?= 
+ 
+ # Likewise, you can override CFLAGS to optimize, use -Wall, etc.
+-CFLAGS = -g
++CFLAGS ?= -g
+ 
+ # Ditto for LDFLAGS and LOADLIBES.
+-LDFLAGS =
++LDFLAGS ?=
+ LOADLIBES =
+ 
+ srcdir = @srcdir@
diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
new file mode 100644
index 000000000000..1816037305bb
--- /dev/null
+++ b/net-analyzer/ngrep/ngrep-1.47.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools user
+
+DESCRIPTION="A grep for network layers"
+HOMEPAGE="https://github.com/jpr5/ngrep"
+SRC_URI="${HOMEPAGE}/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ngrep"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6"
+
+DEPEND="
+	dev-libs/libpcre
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=(
+	CHANGES
+	CREDITS
+	README.md
+)
+S=${WORKDIR}/${P/./_}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.47-regex.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--disable-pcap-restart \
+		--enable-pcre \
+		--with-dropprivs-user=ngrep \
+		--with-pcap-includes="${EPREFIX}"/usr/include/pcap
+}
+
+src_compile() {
+	emake -C regex-0.12
+	emake STRIPFLAG="${CFLAGS}"
+}
+
+pkg_preinst() {
+	enewgroup ngrep
+	enewuser ngrep -1 -1 -1 ngrep
+}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index be8a77093645..0858d221ba59 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -8,8 +8,11 @@ AUX nmap-7.25-libpcre.patch 291 BLAKE2B f63a80d6e25309d4706f7f428cd70f5926df99f7
 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
+AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c13cebf97007867e737bd8f2c4d45e0716ddd0a8ea0e193eca17fd26d8f5acc1c2b4cd7166d8ddc1942e75e0adbaca17f01 SHA512 e1c1aee3fc5e0030409b258c7bb8838844c2008cde48457105ae43e6d8dd705672bfba269911807105e0735ff0b25fc86304be9dc4c3dc33b3f722a9c492ecd4
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
+DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
 EBUILD nmap-7.70.ebuild 4549 BLAKE2B 7923242126a368798da7c84e2f60fe719a27e452e0c067b15c704e70f6919fd62623cf4bfae1afd93714b0bf399b1c5dbfa6ee42fb8d94ca6b925febd853268b SHA512 33308a5492a447d3aa059a0f69cd339e20131f901b3fe19a668929a4a5840a5303361bf23002a32a67ed7699f70e82e19f430b89f5302776358b204286ba3519
-EBUILD nmap-9999.ebuild 4320 BLAKE2B 1700d6cd07baa6dc94163cafee22768a945aa72d9e843797ffa3d2bfece588d883e2b3413ea3eaab8aa77b3266afbf0afccfdd65a71d11d0649fd2e2926946fd SHA512 25c03e8fbbcd28e6440589c0c762f1c82cfac13ad7825949bff44ce2ce88f7188644b026561078238a1ad2ea3eea242df95ccbd300c65100784a6ac8b4636b84
+EBUILD nmap-7.80.ebuild 4442 BLAKE2B 3da85c36e19cdf0971649278358fae032ae83acb861c965a59d664321bde596b55897d7be3ae8d7f787ae3e5b2529662f16795771bb32af9ba99060d61662d95 SHA512 3c732ab8478f740d130353cb8ba8bd7d1512e6cf848ef4d8c1c64abec284947355a9c71442e9b7b0353e484a70ff80cce94a304f9b283f5b09f207ab80618b4a
+EBUILD nmap-9999.ebuild 4269 BLAKE2B bb6b027fa1ec70811bee19603285f470b58efa83f93bd7d6ff3470363b12731b54b15709b95738a000935cfab04d5866cefafc2ffd0788a3dbeb09f0bb695e9f SHA512 ee859d47d92d21cfe8c0e0bcc24063229eb52ebce081aa6e3b3df420f7ce41e310ba1b21e50573801f728858b449eef0f882ddbc54dc085660f57093d4a62f0e
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch b/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch
new file mode 100644
index 000000000000..583f7f1d1aa3
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch
@@ -0,0 +1,26 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -468,7 +468,6 @@
+ fi
+ 
+ if test $have_libpcap != yes; then
+-  AC_CONFIG_SUBDIRS(libpcap)
+   if test "${LIBPCAP_INC+set}" = "set"; then
+     CPPFLAGS="$CPPFLAGS -I$LIBPCAP_INC"
+   else
+@@ -611,7 +610,6 @@
+   fi
+ 
+   if test $have_libz != yes; then
+-    AC_CONFIG_SUBDIRS(libz)
+     # TODO: This doesn't work because libssh2's configure script is looking for
+     # already-built libs.  Giving up for now: build libz first or install
+     # headers/libs on your own if you want compression support for SSH.
+@@ -697,7 +695,6 @@
+   # If we still don't have it, we use our own
+   if test $have_libssh2 != yes; then
+     have_libssh2=yes
+-    AC_CONFIG_SUBDIRS(libssh2)
+     CPPFLAGS="-I\$(top_srcdir)/$LIBSSH2DIR/include $CPPFLAGS"
+     LIBSSH2_LIBS="$LIBSSH2DIR/lib/libssh2.a"
+     LIBSSH2_BUILD="build-libssh2"
diff --git a/net-analyzer/nmap/nmap-7.80.ebuild b/net-analyzer/nmap/nmap-7.80.ebuild
new file mode 100644
index 000000000000..b3ddc62aa35b
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.80.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs user
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="https://nmap.org/"
+SRC_URI="
+	https://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
+	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
+	net-libs/libpcap
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+	nse? ( sys-libs/zlib )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+)
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	local lingua
+	if use nls; then
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! has ${lingua} ${LINGUAS-${lingua}}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with libssh2) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 6b625c9459bf..4c5cd498f494 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -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.80-ac-config-subdirs.patch
 )
 S="${WORKDIR}/${MY_P}"
 
@@ -106,11 +107,6 @@ src_prepare() {
 		zenmap/install_scripts/unix/zenmap-root.desktop \
 		zenmap/install_scripts/unix/zenmap.desktop || die
 
-	sed -i \
-		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
-		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
-		configure.ac
-
 	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
 
 	eautoreconf
diff --git a/net-analyzer/openvas-cli/Manifest b/net-analyzer/openvas-cli/Manifest
index 9efa6ca7dff2..fb83a21e2922 100644
--- a/net-analyzer/openvas-cli/Manifest
+++ b/net-analyzer/openvas-cli/Manifest
@@ -1,3 +1,3 @@
 DIST openvas-cli-1.4.3.tar.gz 108228 BLAKE2B d8f657fde8d1cac257dac8e87fdea23401ce1f89ccb08a63c8c63f5aae9c83ff663193425eabb86481ee697ecf6bf1f893325ba472a794c83586464d24e7ecbc SHA512 a85c754612b8f8102aa1ccf0af72f3266758c4873f7c346004b4f6794bfa8e562dbe14009ae04a2792978354454fa75f8a912bc13a83bce3604ff00019c363e3
-EBUILD openvas-cli-1.4.3.ebuild 700 BLAKE2B ae3f5caeacb945926cc42296b4c42742cc78c30b08493e925974bd6b7f31ffe24bee8526f3047bcf06a3cca93d118f34ea0a6a4332c9969c6a521e645f3cb676 SHA512 31dba434ab0eb9cb00417304ccc0146b53e8b87379114c6f5529e8d0f70ab654342ac5a924b56f7120d765e8d37d1d107fa2476660b0e8a4fece623556e75f62
+EBUILD openvas-cli-1.4.3.ebuild 690 BLAKE2B 6cca66379c157fe3a4f7c4e429125ff2301729a20f5471cc47c4950d829d6ca0f8a615e8981c6150be79fd992cae3285665b044e09cc641712ce9220c619c750 SHA512 5be39313dae096bfe217d0e9685a5e7e42d2e3c97115636f14bd2cbcd6c2228176b6c0de5065d252a77d289b31cece77448598a9eef9d225e765c73857063c13
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
index 4d74bab65036..8a46aad30c25 100644
--- a/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
+++ b/net-analyzer/openvas-cli/openvas-cli-1.4.3.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=7
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.openvas.org/"
 SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
index 7847a3023089..88c4391b3301 100644
--- a/net-analyzer/openvas-libraries/Manifest
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -1,15 +1,10 @@
 AUX OPENVAS.gentoo 3648 BLAKE2B 69e29eec91e2384c7cc984cc09d8338865049d627662412748a2d16fea3043c832a448d52bba5795d0e20d2429525470bc8ce73fc321838853019136c5e06f3c SHA512 b81ef24a80c3774dc31dc2193e19767fb90fb2aa783f827fc45d2e54450b3f27789da8eb394708741ff6e96e86dd46b6b94c1f675ccf077a965b0825aa8c32b2
-AUX openvas-libraries-7.0.4-libssh.patch 664 BLAKE2B e1d0c53fbf665685514337d5491092f9ff6411e4f3fcbdf9f2148777478a84d53b1c11edf0769901ebe258df0fccf2f6d68e2aaba2cd654456d033169d27980a SHA512 5306452c48a5db599b74e7a4dcaf28fb1848238fce7c33c8ccdaac18629e5bea2ad82c619620703309b5bb19fca9356da4518a7c3a180e038309f433a0896a40
-AUX openvas-libraries-8.0.1-include.patch 3363 BLAKE2B b79ca4d652d04631343e6d918b34768d171a7a12ad2abe037e1d60b394044d1cbcde7b9ea6a50b33fa65b9b1746feba86d4fc388540c82fe9f0f7fb335c5086d SHA512 f3427464c1d3cdc875d4ef56d831e3dabed6431ef75450d86d2ba977379579e0b9f15544a22d336c24849b5aef08824139a18c137f62081718e5663e141cf114
-AUX openvas-libraries-8.0.5-underlinking.patch 1966 BLAKE2B fef13eb8eb768da537e223d85a99f5759412884dc7c56fbd03276dea7f9afa000f9e5d791ea54aab7c0ca04e53701c45da823adc29d5964eeb0903ddce8f56c1 SHA512 ca917e7615aff2f056aac8fe15f5e7670e2df7e260886155dbe8331121ef8bb8809ca7bf3bea4baa5c159c7c5e0e5fac6459d3c34080a41893dd612b0662d55d
 AUX openvas-libraries-9.0.3-cachedir.patch 793 BLAKE2B 1891f7d81f328f3b2bb63972478fab7763e17710a420aa7e592beb681b514b3361dd570d3b99fe9bd31b0ce7ff32905a23ca23cb6dd02eda04b2495305cdd0f2 SHA512 412d07104d4ce226ee95d84728308b43e51931d4705601e16b35fbad30a49d943831fa7c8f183e41e00c249bf0d3f3786eab5184ede8a2a9c5574a124c43c4ad
 AUX openvas-libraries-9.0.3-gcc8.patch 2288 BLAKE2B 1b5fb4e77cbba1ef5a80217225f726be14e3fa8a79280d6433ae7f5a89edc0bcf0c2e26b48f28ddbee515962ae9b0ac2dbf5b06df666369ca3327469a509f2dc SHA512 7e2a3d3df6db4ed64263cc99df13e0e0c1c80be25257f1d6b1034b9aa63ca68b8a42376f50b95c8357542a97abfa42fc2ba379a7c16af931bf61e08fa8a417e4
 AUX openvas-libraries-9.0.3-netsnmp.patch 424 BLAKE2B 2fca08ace15ebe55891678e55b3324b1d4da817468788b13d009a4fbe1c35c90b6a022ddf3b7d3dc3c6fb9d500e04834cc729364341b7fc1e2e066907f9a891e SHA512 b80e00c267e1848474485cc3153d659672a20ef536e6e4bec81b737360dc908027be49c0723b04b0a7cdf317f97c3d6a76204cfbed1b60ed88db65421788e3ae
 AUX openvas-libraries-9.0.3-rpath.patch 440 BLAKE2B 661d4b84ca3795dbfdd5830443259adfa30777475d063a3af14773e632948be836bd752f781fc2e8249587cae659faba18f5a340bf5fb83db4ad992ad694b87b SHA512 e2bf434ce4d7aac98c66b7175e475beab26a3d3ad680c088962a080f53528ae073f9e626d9235608151c312fbba8c51f8ca0dc0445a3c871148b8d2ae5ddf565
 AUX openvas-libraries-9.0.3-rundir.patch 1735 BLAKE2B d203bae1ee34f259ef6d6142004358d7617e1323239a6c0df87a76a7b4379277a7f4f414c6e2402f9dfa249d4df5db73c38664ee2a7e72aa29ce55fed844710c SHA512 0626e82f15e8be1c8b0e55e1a4daac78e3d848b46d6b5c039ee8e76c0891fb2dd6c51dc4096a5a1eadc9ab9c34d4313b4c93be68bdf3364a303e2572908628c1
 AUX openvas-libraries-9.0.3-underlinking.patch 2053 BLAKE2B 036fc4eab61063b330667a0c3c1a11ed0b559b61149dafa21df3fbd806f4f7cf58c50b23d9db4c17dd0dadce04725600bf362c9aced75b64ae8458946a4fbdbc SHA512 225dd41b2d96cfcf1031a0e2bf2f338ff30612fb03ce969ff4c292e10149c57f85560f0df98e697ab7dfb0a8c1ee82ccb3286bb3d1b652df902a8bc594c2e44f
-DIST openvas-libraries-8.0.5.tar.gz 603947 BLAKE2B 493a6b2f5cea7e78ce69b9fe730a4d6df89601e0c48cfbc3b0ab1480326c32bb479768c4a54d08bfcb67db0b2ad4ca28990ead57554abd9fd877e7f79b339d8f SHA512 3d788f931c55941663187f8038c15d0ff97799048c8ea9e5615ff22de3c5e6b5e4eaa599e41676778fadc50528c086060b6268b5edfbaf7289f0e498dbb1423b
 DIST openvas-libraries-9.0.3.tar.gz 643948 BLAKE2B c05fbcd2a1b9c2292ac2d7ea3c7f4fe2ff4c5a41b0dd5610283712ce136fe4184d46b9fdcfb74bf2a4a6d7c016497df31caff121d9c7b013280164b49f874f4f SHA512 bca213309e06a39d2dcd790cacb01f2a71471622887424e41cc025a2bc25feb6a9b2c1d904f739df6fd87d8ec7af5171b31d1f5d08411c5143e4be1e6723397a
-EBUILD openvas-libraries-8.0.5.ebuild 1262 BLAKE2B 21f6520e857d2b940280d6e9d6a1dbe7f7e52337589e9b66c2c136f63c717e5a6bc5abc22afdc3792dd1722ed2e154709464274e6fc045f64cf5b2d91f56f763 SHA512 b060bf8c8b5986ed901a11d222274a1ae018fc9d2ed92e9204567c25d5ac79f1e7dbb20ba77d8943a2335c9639a43be120d226e2537ef4ea309f7a44f39c7273
 EBUILD openvas-libraries-9.0.3-r1.ebuild 2046 BLAKE2B f2b7af911415b45e18868eeb6cc134c56110bca8ddb76f1a140229fce83ba08c0d9d3a217a19ce79f2d43b1f90d2818ef5fab4a2b8d4d1dd8d88b15ab5342756 SHA512 bb1518514b41fac1dcb9fde05b64e2f3c0f6aa6cbdb9a47710e7d0bd6314edfccca46c6841b528b712e36fa1840fb2f51b32189b7b70820dbfa443cd1c394577
 MISC metadata.xml 541 BLAKE2B 79eea1b719e8891759105135f233184f63e819370efebb46bad6bea7425b37ffbf9122444c3e9379953ccd30555b1a840297dc74ac3abccd1afc842fa2a2d16b SHA512 4b3f65acd3a359fbc7d69ebad4dcfc1866837605b8a413999372d451ffba322f50ea72f5372370afe1385991d2b1be87e05de265e12fc989f6f1a5a1d16c1f99
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch
deleted file mode 100644
index d89459fe2bd0..000000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://www.mail-archive.com/openvas-discuss@wald.intevation.org/msg05828.html
-Fixes build issue with the newer version of libssh
-
-diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c openvas-libraries-7.0.1.new/nasl/nasl_ssh.c
---- openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c	2014-04-14 19:15:40.000000000 +0200
-+++ openvas-libraries-7.0.1.new/nasl/nasl_ssh.c	2014-05-23 00:13:56.791111974 +0200
-@@ -1861,7 +1861,8 @@
-     return NULL;
-   session = session_table[tbl_slot].session;
- 
--  banner = ssh_get_serverbanner (session);
-+  //banner = ssh_get_serverbanner (session);
-+  banner = (char*) ssh_get_serverbanner (session);
-   if (!banner)
-     return NULL;
- 
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch
deleted file mode 100644
index e03dd085e3b1..000000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch
+++ /dev/null
@@ -1,70 +0,0 @@
- base/CMakeLists.txt | 2 ++
- nasl/CMakeLists.txt | 5 +++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
-index c2dccf5..4f17892 100644
---- a/base/CMakeLists.txt
-+++ b/base/CMakeLists.txt
-@@ -56,6 +56,7 @@ endif (MINGW)
- 
- if (BUILD_STATIC)
-   add_library (openvas_base_static STATIC ${FILES})
-+  set_target_properties (openvas_base_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
-   set_target_properties (openvas_base_static PROPERTIES OUTPUT_NAME "openvas_base")
-   set_target_properties (openvas_base_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-   set_target_properties (openvas_base_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
-@@ -63,6 +64,7 @@ endif (BUILD_STATIC)
- 
- if (BUILD_SHARED)
-   add_library (openvas_base_shared SHARED ${FILES})
-+  set_target_properties (openvas_base_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
-   set_target_properties (openvas_base_shared PROPERTIES OUTPUT_NAME "openvas_base")
-   set_target_properties (openvas_base_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-   set_target_properties (openvas_base_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
-diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
-index 52fa5c6..afd18c2 100644
---- a/nasl/CMakeLists.txt
-+++ b/nasl/CMakeLists.txt
-@@ -41,7 +41,7 @@ endif (SNMP)
- # The "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" is necessary for GPGME!
- # The "-fno-strict-aliasing" silences warnings caused by macros defined in byteorder.h.
- # Once the warnings have been addressed this flag should be removed.
--set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing")
-+set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing ${GPGME_CFLAGS}")
- 
- ## Compile the parser - note that there are (better) CMake macros to achieve
- ## that
-@@ -103,7 +103,7 @@ link_directories (${LIBDIR} ../base ../misc)
- 
- if (BUILD_STATIC)
-    add_library (openvas_nasl_static STATIC ${FILES})
--
-+   set_target_properties (openvas_nasl_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
-    set_target_properties (openvas_nasl_static PROPERTIES OUTPUT_NAME "openvas_nasl")
-    set_target_properties (openvas_nasl_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-    set_target_properties (openvas_nasl_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
-@@ -118,6 +118,7 @@ endif (BUILD_STATIC)
- 
- if (BUILD_SHARED)
-   add_library (openvas_nasl_shared SHARED ${FILES})
-+  set_target_properties (openvas_nasl_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
-   set_target_properties (openvas_nasl_shared PROPERTIES OUTPUT_NAME "openvas_nasl")
-   set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-   set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
- base/gpgme_util.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/base/gpgme_util.h b/base/gpgme_util.h
-index 56e1b85..ab4e9fa 100644
---- a/base/gpgme_util.h
-+++ b/base/gpgme_util.h
-@@ -33,7 +33,7 @@
- #ifndef _OPENVAS_LIBRARIES_GPGME_UTIL_H
- #define _OPENVAS_LIBRARIES_GPGME_UTIL_H
- 
--#include <gpgme.h>
-+#include <gpgme/gpgme.h>
- 
- gpgme_ctx_t openvas_init_gpgme_ctx (void);
- gpgme_ctx_t openvas_init_gpgme_sysconf_ctx (void);
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
deleted file mode 100644
index 817815edb317..000000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
+++ /dev/null
@@ -1,45 +0,0 @@
- base/CMakeLists.txt | 10 +++++-----
- misc/CMakeLists.txt |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
-index 07febee..40305b7 100644
---- a/base/CMakeLists.txt
-+++ b/base/CMakeLists.txt
-@@ -73,7 +73,7 @@ if (BUILD_SHARED)
-       assuan libgpg-error ole32 ws2_32 ffi z shlwapi dnsapi winmm)
-     target_link_libraries (openvas_base_shared openvas_omp_shared ${W32LIBS})
-   else (MINGW)
--    target_link_libraries (openvas_base_shared openvas_omp_shared ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS})
-+    target_link_libraries (openvas_base_shared openvas_omp_shared ${LIBSSH_LDFLAGS} ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS})
-   endif (MINGW)
- endif (BUILD_SHARED)
- 
-@@ -87,10 +87,10 @@ add_custom_indent_targets (${FILES})
- 
- # Link the test-hosts executable
- # TODO: This is currently only built for BUILD_SHARED
--if (BUILD_SHARED)
--  add_executable (test-hosts test-hosts.c)
--  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared ${GLIB_LDFLAGS})
--endif (BUILD_SHARED)
-+#if (BUILD_SHARED)
-+#  add_executable (test-hosts test-hosts.c)
-+#  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared openvas_omp_shared ${GLIB_LDFLAGS})
-+#endif (BUILD_SHARED)
- 
- ## Install
- if (BUILD_STATIC)
-diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
-index 7aaca2c..e7a0870 100644
---- a/misc/CMakeLists.txt
-+++ b/misc/CMakeLists.txt
-@@ -126,7 +126,7 @@ if (BUILD_SHARED)
-   else (MINGW)
-     target_link_libraries (openvas_misc_shared ${GNUTLS_LDFLAGS} openvas_base_shared ${UUID_LDFLAGS}
-                            ${PCAP_LDFLAGS} ${LIBSSH_LDFLAGS} ${LDAP_LDFLAGS}
--                           ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS})
-+                           ${GLIB_LDFLAGS} ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS})
-   endif (MINGW)
- endif (BUILD_SHARED)
- 
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
deleted file mode 100644
index 988e909151bc..000000000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DL_ID=2191
-inherit cmake-utils
-
-DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="ldap"
-
-DEPEND="
-	app-crypt/gpgme
-	>=dev-libs/glib-2.16
-	>=dev-libs/hiredis-0.10.1
-	dev-libs/libgcrypt:0
-	dev-libs/libksba
-	net-analyzer/net-snmp
-	net-libs/gnutls
-	net-libs/libpcap
-	>=net-libs/libssh-0.5.0
-	ldap? (	net-nds/openldap )
-"
-RDEPEND="${DEPEND}
-	!net-analyzer/openvas-libnasl
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P}
-
-DOCS=( ChangeLog CHANGES README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
-	"${FILESDIR}"/${PN}-8.0.1-include.patch
-	"${FILESDIR}"/${P}-underlinking.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/openvas-manager/Manifest b/net-analyzer/openvas-manager/Manifest
index bc0dcffe6b0c..488c455d498e 100644
--- a/net-analyzer/openvas-manager/Manifest
+++ b/net-analyzer/openvas-manager/Manifest
@@ -2,14 +2,6 @@ AUX gvmd-daemon.conf 484 BLAKE2B 440776ba66ac433b572e2defefe4ca9c1589054ccdacc76
 AUX gvmd.init 549 BLAKE2B 3eb2ac2b47e5821b04f794fdb6ea15146412ed1ccdcb8fbf54b8b3b0f742aa0fa1289ba744dcd56568fddc6e42b328fe6f3961249f492e7a506f0282d38a155b SHA512 029f80e09bf15f957398e688cb109141c38c5ccd890ad5c43b08dd43ffa96cf92cf1f3d46624469a79c19a1ea63b6beb73ebff58039ed68f14d0bade14da2cfa
 AUX gvmd.logrotate 217 BLAKE2B d6eb74a1cdc1cfb5500e5ed4e62ab9c453ec5d1665ba55c2618010480211ef6349823ecd35d62b166c771f8f795643f00cd7920c8f665a73de9fa91382d19eef SHA512 e92e6aafa30e621ed2598508216453477ce1c30eb2d9bf418c7657e3312978d514fbdd663273ca7009cfc0b61b5e95a6c3231c3d7b0e62f2e991dea9afd4d2b1
 AUX gvmd.service 516 BLAKE2B 271ee87125843ffd5ac997d6e3b9a46a2cd45e8ebb9630f2fa0adf7c5c081e102fc11e69b38fe2ca12854597186f76145044478b4908031495dbd7bc61a88217 SHA512 90165185c50c451b58f1173fe3bad0e9ebfaa6a2120b33920f8ab03960bc09e7a84c07b6658fbb2d649e1a3726addd40420ceb5b63b1d6f885429861896f8f74
-AUX openvas-manager-6.0.1-bsdsource.patch 834 BLAKE2B e22ebf888383ba7808dccb11f6db0fae4f729900b1ed97758b0513c5141e5163966ecbe7d078572ec44d17d8f3ece5fc15eb8c279e30fa0d67c53ae534f979c8 SHA512 82ab5aca2386663c851688fa4606193c3bc18095121ea4205aff78471769e5793167de89581013e5b5e12b86ac4efff57553ba34da2cf8aeedb8d14bbc76bbaa
-AUX openvasmd 459 BLAKE2B 127060292fd4f41e6915300a47c333d67885eed0a46b0311ef56aaf02b367396dd25c26f68bf07348bc2ed345d55ed17a788a37677d29ded86be5d7989a4ff3e SHA512 0b1f90c04a105eb8a3227a4f79076cfcf0402d9d2b21dd92d394c2461c3b7b8c28ace233cc7654d6662847494f30e84903d4dd8be1701f2df5c7952500d543fb
-AUX openvasmd-daemon.conf 377 BLAKE2B 450c0f849c538e261937821a7855e9aaf61b66a5aed5f339766c681d4de6735264f27bd4bdea03aaa6d26436615f33548a53e37967ae2e59554410d431dceabb SHA512 5094acf77541fe97aff0698efaa4863adc25711118857d468f096174cb71fab249f9a82a4e4b19613ffd62b3c0378043b1384ecd6cacc4a30b9ccb99f3173506
-AUX openvasmd.init 452 BLAKE2B 714f516172815230b9a2b4ac9f8a4eeefc0a8eba6410914ee88544ab3e204eea4f360050ac5e8d155dddc7468250e473b762df89220a150ab316d12284abb231 SHA512 74c354292b97bbf84e1336e38f768dc8b5ade3d930f20da7d3b9edecf1ea5843a2a2fafdb3ae856878f3f4628ee05ac9199b238ad5bfcad45a4ced532976f3c4
-AUX openvasmd.logrotate 178 BLAKE2B ba33a53ff1b38efe18906625f678e3263b3222cda8f2a49e0274cadbd423ef5cd6684a52133175d5f524550f0e057ec6128f9f14745ea890bcbc205c93a5feb5 SHA512 dad461ea48cc49c3f5e77bd69c09f2551a42e588cbd479b91ae1410ba88ae0c783ee5b273a34edb46ca196e7ba19227168efce842b1a5c39e6a46516b6fab5db
-AUX openvasmd.service 362 BLAKE2B ec99c9f570310665ea0fc84569f996a1eb9c0b22128310f8f7161cb11f9729ef61b1631d2855215633b1dab392790e84ea11f7d79dbd3e315c4e73f5563a3f22 SHA512 8753699635050da10b7d317caa60361c59f832b6a1624d9fc2cbedffadbd554fddf612a92ad1e0ef057b83420b36468fc9f7ee67e3161d4c37816e0c8e9239a8
-DIST openvas-manager-6.0.6.tar.gz 1928570 BLAKE2B 6a94dfcfb99404f6b274faf0ac3c8ca1a3d65c9feb9bc8d11818e2c23e6d73a74d619519ed30eb42e74a686ffe43eeb6016ab1065cdecbc8f83ccd34257b5185 SHA512 4c4ae0ac35d6fc6820b47da6e5e6aae1b4d14c771791b7ae2e35123d8117319f05c7619de665b96de9d92fb59e417311656d3460dff992d3ce4db217731c5900
 DIST openvas-manager-7.0.3.tar.gz 1796830 BLAKE2B b1e8bf8eb4cc0e2d3e5d67d7c17df3c79c7d65e798fc28f75ee55c2165a5e957ac950ccac14a20a5b332c15b64775f63805db00810271bce77d13b16db60a3ab SHA512 75e519e5f63fad043efe55ad5843934f9ffaefa052609e8d110b2084504a7658b5ee5797f7ffaa71592caed64b7fd4fac623bc7797bec72a51e8225d65f7fc28
-EBUILD openvas-manager-6.0.6-r2.ebuild 1278 BLAKE2B 290db543ab1941d2b827458b3caef1f0427208ff5c738576be8a8fd315f40af6385405afdba52da5c85539806d67143792915033d988b5788bb16b33f5ab7132 SHA512 3f39dff221f5a5b6bff825475c232c6ca22337f63b99608dbad342d8055db1761059359ec575079f65cc34261deedfed54a642042246e261f79eb9b42a9126d5
 EBUILD openvas-manager-7.0.3.ebuild 2103 BLAKE2B b430eee33dc2d7bcb67ac623754153f41f2cf05aa155021e02b408c72cc546fd9420404a7a305a33fedb4b857a0a1c7a024e290443016e4b75fa55de0fbf2efa SHA512 0f7fb4a53cfa942a74fc74e2e139a5c872c793d2da4085986630487907f5237cf5be192ef507fb3f28df27fce01b87a699723cc0176e7fc8073b7f5f035e7489
 MISC metadata.xml 435 BLAKE2B 4d40c4dcffe9bfd81d1c1b517b4e6d6e1e658f9d6be65f8ad962ecbbee78bf0cc6bbb5805f2e056375c7371697a453453f8eeae40bae1bdf890be8f3e23ccfbc SHA512 fc802728917b8ebc3c43e3c35ce1fa7b8aa30d89d60abcfcd82eb6baf0152d02384b2e336664942bd89c3ed27a418f37a13699b68a424f36645c51c1310a6e16
diff --git a/net-analyzer/openvas-manager/files/openvas-manager-6.0.1-bsdsource.patch b/net-analyzer/openvas-manager/files/openvas-manager-6.0.1-bsdsource.patch
deleted file mode 100644
index 011880979141..000000000000
--- a/net-analyzer/openvas-manager/files/openvas-manager-6.0.1-bsdsource.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4eb89a0..7ccfc5a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -338,7 +338,7 @@ configure_file (tools/openvas-migrate-to-postgres.in tools/openvas-migrate-to-po
- set (HARDENING_FLAGS            "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now")
- 
- set (CMAKE_C_FLAGS_DEBUG        "${CMAKE_C_FLAGS_DEBUG} -Werror")
--set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_BSD_SOURCE -D_ISOC99_SOURCE -D_SVID_SOURCE -D_DEFAULT_SOURCE -D_FILE_OFFSET_BITS=64")
-+set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_DEFAULT_SOURCE -D_ISOC99_SOURCE -D_DEFAULT_SOURCE -D_FILE_OFFSET_BITS=64")
- 
- add_subdirectory (src)
- 
diff --git a/net-analyzer/openvas-manager/files/openvasmd b/net-analyzer/openvas-manager/files/openvasmd
deleted file mode 100644
index 4dce1ce4922c..000000000000
--- a/net-analyzer/openvas-manager/files/openvasmd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net openvassd
-}
-
-start() {
-	ebegin "Starting openvasmd (manager)"
-	start-stop-daemon --start --name openvasmd \
-		--exec /usr/sbin/openvasmd \
-		--pidfile /var/run/openvasmd.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stop openvasmd"
-	start-stop-daemon --stop --name openvasmd \
-		--pidfile /var/run/openvasmd.pid
-	eend $?
-}
diff --git a/net-analyzer/openvas-manager/files/openvasmd-daemon.conf b/net-analyzer/openvas-manager/files/openvasmd-daemon.conf
deleted file mode 100644
index 2393c83f04b3..000000000000
--- a/net-analyzer/openvas-manager/files/openvasmd-daemon.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#Manager listens on given address - by default manager listens on all addresses
-#MANAGER_LISTEN=--listen=127.0.0.1
-
-#Manager listens on given port - by default 9390
-MANAGER_PORT=--port=9390
-
-MANAGER_EXTRA_ARGS=""
-
-#Contact scanner on given address
-SCANNER_LISTEN="--scanner-host=127.0.0.1"
-
-#Scanner listens on given port - by default 9391
-SCANNER_PORT="--scanner-port=9391"
-
-
diff --git a/net-analyzer/openvas-manager/files/openvasmd.init b/net-analyzer/openvas-manager/files/openvasmd.init
deleted file mode 100644
index d30b8befdd0c..000000000000
--- a/net-analyzer/openvas-manager/files/openvasmd.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-name="OpenVAS Manager"
-command=/usr/sbin/openvasmd
-command_args="${MANAGER_LISTEN} ${MANAGER_PORT} ${SCANNER_LISTEN} ${SCANNER_PORT} ${MANAGER_EXTRA_ARGS}"
-pidfile="/run/openvasmd.pid"
-
-depend() {
-	after bootmisc
-	need localmount net openvassd
-}
-
-start_pre() {
-	checkpath --directory --mode 0775 --quiet /var/cache/openvas
-}
diff --git a/net-analyzer/openvas-manager/files/openvasmd.logrotate b/net-analyzer/openvas-manager/files/openvasmd.logrotate
deleted file mode 100644
index c302b5f34ea9..000000000000
--- a/net-analyzer/openvas-manager/files/openvasmd.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# logrotate for openvas-manager
-/var/log/openvas/openvasmd.log {
-	rotate 4
-	weekly
-	compress
-	delaycompress
-	missingok
-	postrotate
-	/bin/kill -HUP `pidof openvasmd`
-	endscript
-}
diff --git a/net-analyzer/openvas-manager/files/openvasmd.service b/net-analyzer/openvas-manager/files/openvasmd.service
deleted file mode 100644
index 91edb0087bc4..000000000000
--- a/net-analyzer/openvas-manager/files/openvasmd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=OpenVAS Manager
-After=network.target
-After=openvassd.service
-
-[Service]
-EnvironmentFile=-/etc/openvas/openvasmd.conf
-ExecStart=/usr/sbin/openvasmd -f ${MANAGER_LISTEN} ${MANAGER_PORT} ${SCANNER_LISTEN} ${SCANNER_PORT} ${MANAGER_EXTRA_ARGS}
-Restart=always
-RestartSec=1
-User=root
-Group=root
-TimeoutSec=1200
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
deleted file mode 100644
index 64a151553116..000000000000
--- a/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DL_ID=2195
-MY_PN=openvasmd
-inherit cmake-utils systemd
-
-DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	dev-db/redis
-	>=dev-db/sqlite-3
-	>=net-analyzer/openvas-libraries-8.0.5
-"
-RDEPEND="${DEPEND}
-	!net-analyzer/openvas-administrator
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /etc/openvas/
-	doins "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 9f0a632a3b60..c6890335a0ce 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,9 +1,3 @@
-AUX first-start 28455 BLAKE2B 901e9a107a0ddef7d19b73eeddb6dd1e5fe00df849e0a81c115c6b002f8e4627658ab0a6849e0cc72f9cd9153df8076367feef30a4d3868c6fb36b1ba14cc284 SHA512 74e60c8e5d36933770c7acadb8534cf2bd7b0b527a179e4f766fd892278f6bd5883c2e9a10d94eab1e0c16172027fe828154dcd8da80d0832a23ae266f9bfa4e
-AUX openvas-feed-sync 32429 BLAKE2B 8035b20c47ec40d63f62a3cc81d86273991c079bf5c6661fe7b6e4a74a9ea99bc660df254060c208f077b722e7b8a34b49b93edbb9dfa91f26fd2750fd3ba65f SHA512 6211a630890c0733c15254c61723074a70a16a08726c90f4141eda306eadedeb07937f4a31d37b6fde1e0e9166f582fe0b6f6e2740f9cebecb8fa88abe0fdc0c
-AUX openvas-nvt-sync-cron 759 BLAKE2B f1b3d35f5a7426fcfe954d30a5860144cfa854463699634d49e49487db865ad0d005163edca201e5e4ff0ad540f9b234122629520ba1131b6a4edfdd0ea72b7c SHA512 88f299141e66e9d95f565307bd121c56c005f412dcdb64e105d9d4252cfb43e218f1de7b40b500d71b415d2aa437468ce1e935dec32cda8c5efc4f733978b0dc
-AUX openvas-scanner-4.0.3-mkcertclient.patch 1350 BLAKE2B feb9fec17ed2a6efc58eb2f4ea7847b745190864878cae5701bd8c2db91d73b1cd9dfa78baba5e3b449d5d0485fbd6af0dceee647cd79d268b1740e647d930dd SHA512 972eda6fe3a7b7ba195fd9198d6b63add4e0af5ff9e34e423afac945d5dd497bd65f993d7ceda3848741cb954c5517e263533867e2da7d37bcc8905e926b4f72
-AUX openvas-scanner-4.0.3-rulesdir.patch 607 BLAKE2B 9b4c2eafca38e4ccf0b71168e9b633c2287c83b08096372bbf89092e5ff9ca32808f92273a01582c74b18911f96496808fe1a726e3589c930cdf9a41d3635144 SHA512 81002d66e103bb3d0d087a2037f0431739d5d664ada3e6b9bdc9d31e67159d7da0664d43e83501bf9dd01b6887bff14b02a883e261f3273ed42a27dd4ee53fa5
-AUX openvas-scanner-4.0.3-run.patch 672 BLAKE2B 519e2eb0b5e6532148e2d2f9e3d757912eec52bafeb0dc880cfd355094ca1f03256f3e868e42c628e5b55c1742f695fe0a661b6abe0b81fe4b3172bd5af11fef SHA512 d39c0861b27623f05ecc5f962b3bf580d457c6056c11d07f903908a33a1b1a25e0098934310e01483aee7b28198b23aea34974b9864432a8dfe2600ed993f5ee
 AUX openvas-scanner-5.1.3-cachedir.patch 1605 BLAKE2B d5e54d1196000fe9f8a65efcf3d71f3ef29af1cfff5fedbfe7cd753a731e6bd4be6c1f24534b87a2194dcfa146d156ed0ddae076e72bfd229e1e01497985d7a1 SHA512 27efb9e318137390592652db1444141910ddf7975ada760bc6914c21c4eb11e4ded1aa377c37f5c7a67dfd145ec723fd77bbdd9b8ac0af6bf317a07d54642d11
 AUX openvas-scanner-5.1.3-gcc8.patch 1253 BLAKE2B ef876d70238b3b0fdaea320fdb9bcffc520bbe6762f220678a39bd99853fcabb27ed3bd44a0e02a7e1e8b93d3af530e4d4b33baaf1060c8b0589593ef5b30e8e SHA512 817e27de3b2d16bce81d3c1abbc6ced63cd6f272762ac00a8bc9ab6c5ccb765c81df1158caed58c64f897712c78fb7f0a02dcb2137dd859c3d48725e6e2699d6
 AUX openvas-scanner-5.1.3-nvt.patch 2576 BLAKE2B fed6211a6c4e9f1bed4abedf218e17f0d863e59de869424398d845e479d037f96758486fc03727c14e036814c2efa4e9dab940e032507339a1b6f2f2cda4c4c6 SHA512 b3f6b8cba51fb6c6d0eab189391a848e8f33d24f3b59bcd8f48b562812b1f79a46f3b92b01a8f231a765616fde6c0b37634f9845a5e4ba453c4aeeafed0ce8c1
@@ -12,16 +6,8 @@ AUX openvas-scanner.init 620 BLAKE2B a32349eed21d71e4968ee09fdff007aab532943e093
 AUX openvas-scanner.logrotate 222 BLAKE2B 264e3b0fa47f7d933ee1f9c5d120e267a8387df8c8e5cfb8b09b23d28b983c666684430dc9aa389938dac71bef69480d74ab24fd393134ed33d9a3518314c91e SHA512 1c8b50626de9bcd7d26323d82d28ae4d25f5ce0382cfb0b16b91e58e75c05f565c7cdf19fe441647b5cd3c2ebc312b171eb6fa22c310fac1f76a0629544f030c
 AUX openvas-scanner.service 455 BLAKE2B be6f94c3d383ea1c647effc462aeddac384e4c2507a9f1145d4dc39badcb810cbca7d4c8eba74e64942d2a5895b058cad7ac3fdcfaa4c5de7335cefcb70db366 SHA512 108a13b9cbbb86acc99a4271fa5b1a051022e42f30866bd490ae606c1ffac202c61aa5bf5a1f7ee10b276484135f8f868625debbb142a802c0ff2a4c011a8206
 AUX openvas-scanner.tmpfiles.d 28 BLAKE2B b9343651fc4923451b02a5f72cad7da95e4d790a7b77eb72ca239588568a5d2b88cad1f9f698ad61403c332a44005989e8d6e67ff1ad06cab26abdf67f8d8621 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754
-AUX openvassd 460 BLAKE2B 34edb97d0d00013914f29cb2bb2bf051be48427ccffdb64a323db5aef6bcd754d19d73a3413e4226cefcad4ad1f51d11f7bbcd3abdc91e422513a8b0ef007710 SHA512 ebe0ffbafa172a6776c537efc4910683dd0ed6954502708981cc0110ddc8e84c7a31f1c384365354e37b872b3cf3fdae94413949b7f00f3d6500a35e64f73cf9
-AUX openvassd-daemon.conf 821 BLAKE2B 37500de5f3a2731e71da3ba262bbdf5a0444903fe43f318f82310373e9fa8136f567fcd51536d5a4971fa7c690448528e506ccf99377aa2acd4b2b1f6ed93bf2 SHA512 fd8344f9c37c872868e44608a593bc7843163177b726eef31047b7357e3b5949e4c2d54be1acf8fe6642ba63a6e225e4f9c3650a9861b30174d66fd7341aefc3
 AUX openvassd.conf 1288 BLAKE2B d1ae7db928d797014e0382d8be3a08793efbcaa3663629c0d1c6c2d871ccf16588605fa4be21d71556893092b21ecfef72c31d40411d35dd97f8652eca6232c0 SHA512 5bb499fcd03aac4de981a64a17fa760b29b1f83d0afcdb73cdfdeb0f492b02bc383d32544fd133c6b953e73ea9ff0dc042e8dba76c22def3ee00d6f3bdd980b8
-AUX openvassd.init 638 BLAKE2B 8c86e700d30e08a355de8a64d0937a233adda53a26acb4a3e7999e9d992de6b18d957ffef4eb9f9ee9a0dde6bae8a35e4372a62027524f91a0c792f564e504f8 SHA512 a03608d42c90b56d832bd15628d565f8d6e00f35e8072af46e3915693f9647b010fec89d3b2006d38c4d5b2adbaf269953ab2250e7e661b2fbfa50391a55eaeb
-AUX openvassd.logrotate 209 BLAKE2B d3ac1128f5c91a9e2a247a9fedc928045d13218534107fdfb7bc39d3b4264a8cdaafb1bcd385956c08bbfac29aa73d260e07d893f4696fd36131104db19f115c SHA512 5934a31ef4b7267fd741c41bb97fe2e1e42735d2324cce07145de1942efae3f5e42e8652ec0c3482dd53477be420a58124eae943f254105547abf065febb9046
-AUX openvassd.service 353 BLAKE2B cbced6ebe3a4e1ecf12534ec14d860a4f221824cf9cdcee0eddb3da7d7566b841a8a52fd118c9fdfd3d875ec1728856a4eb9619f22a1111aab3c48f68eabb150 SHA512 418ca16f7cbfd5a2e7aff031810c9166743738eaa8b38ded7eb763796364c77dd4d19a09705a2da81df1b4591e2a0f7beed5d075c75a205133148903ec23f8f4
-AUX openvassd.tmpfiles.d 28 BLAKE2B b9343651fc4923451b02a5f72cad7da95e4d790a7b77eb72ca239588568a5d2b88cad1f9f698ad61403c332a44005989e8d6e67ff1ad06cab26abdf67f8d8621 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754
 AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64
-DIST openvas-scanner-5.0.4.tar.gz 236282 BLAKE2B 3105afe0fd819773b33c8194e0addaad70af4692578fe3bfbd76166004ca99e25f2f22a946810fe52da747242f1e45bae00766c4687676ec70df2d7349fa4509 SHA512 51267f832a104897a497b5dc71d1b804de4db77742e2234d111a00b1e0e01536613b16ff48d23a37013178b016b39408a25d18a694980c7e6fc600824e05e149
 DIST openvas-scanner-5.1.3.tar.gz 254159 BLAKE2B d90fa15e143ead53abce66f933a3a4cac327176cca0f23bd88fe771ed7726b1891784ae980644c8335e560d348753115e43cfae83af9704e2d1d02827163563f SHA512 5712ab275058877cfd656e268ed09c81db6617ae247c17092f1fcd037f692f2018daf21b09b82401f99a7361bb485f0e0f7d63f8ff2387839cfdd5a3aaf8424e
-EBUILD openvas-scanner-5.0.4-r1.ebuild 1558 BLAKE2B 72a9e2d5ed1d6ee81be46eeb4cd23383a5ffc73b0d8bd4901fc4f17c2c98068141fb9a75b565ef40e4c525cfc36829ac090520318180b38af61e5ab4618da04b SHA512 8a6f8a1fbe310ad43eb341f02dee3b75da7dc3031a9d5407f6cca41787d558ef77d2301dd96ee6a56752ed6b91b26ee2e44cfea648c021651c2fdc59bf458b72
-EBUILD openvas-scanner-5.1.3.ebuild 2304 BLAKE2B d8fb1924fdf21515595b02adff02d4b2fe68ac5adc2d04c9b5494399e820f545e3d1abdbecdfeb18d7e0ee9f3d43830cc72fe77d1766e1d5553339b23a485e9a SHA512 366a47e6ef15ae474b0654c65c061e947c41adc3e0b2aba491ebec86d2f211e4f9b50c4b3d1b33bf72afc3eeda4ce49e92999853eb3e10ca3d66c7483a1273e2
+EBUILD openvas-scanner-5.1.3.ebuild 2142 BLAKE2B 5984c99659d1a41c3739a1de5077f5ca8dd25c668e97c7a1f59a6efceb95fed25daceb8c8f6b5971c842e016d1843dff8527d253d1347ea0d91a67d633c2d859 SHA512 d66a67f3803c071f20e6a1c9132ca771e9286f9c6446e781b6077323ae32417d2061169543c34de91f3a9ca1ec7a4bfaf9472aead66b983a46d163ea88137480
 MISC metadata.xml 435 BLAKE2B 4d40c4dcffe9bfd81d1c1b517b4e6d6e1e658f9d6be65f8ad962ecbbee78bf0cc6bbb5805f2e056375c7371697a453453f8eeae40bae1bdf890be8f3e23ccfbc SHA512 fc802728917b8ebc3c43e3c35ce1fa7b8aa30d89d60abcfcd82eb6baf0152d02384b2e336664942bd89c3ed27a418f37a13699b68a424f36645c51c1310a6e16
diff --git a/net-analyzer/openvas-scanner/files/first-start b/net-analyzer/openvas-scanner/files/first-start
deleted file mode 100755
index 95811a56b19d..000000000000
--- a/net-analyzer/openvas-scanner/files/first-start
+++ /dev/null
@@ -1,634 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# This is OpenVAS first-start/check-setup script which make things automatically for first time use.
-
-
-##################################################################################################
-# If you use systemd or init.d(open-rc) for OpenVAS daemons you don't need to set below settings.#
-# If you don't use any of them you can set the below command args to start daemons manually.     #
-##################################################################################################
-
-# OpenVAS Manager command args
-OPENVAS_MANAGER_OPTIONS=""                                                # e.g --foreground
-OPENVAS_MANAGER_PORT="--port=9390"                                        # Manager listen port
-OPENVAS_MANAGER_LISTEN_ADDRESS="--listen=127.0.0.1"                       # Manager listen address
-OPENVAS_MANAGER_SCANNER_HOST="--scanner-host=/var/run/openvassd.sock"     # Scanner unix socket
-OPENVAS_MANAGER_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0"
-
-# OpenVAS Scanner command args
-OPENVAS_SCANNER_OPTIONS=""                                                # e.g --foreground
-OPENVAS_SCANNER_LISTEN_SOCKET="--unix-socket=/var/run/openvassd.sock"     # Scanner listen socket
-
-# OpenVAS Security Assistant command args for reverse proxying | SSL PassThrough
-OPENVAS_SECURITY_ASSISTANT_OPTIONS="--no-redirect"                        # Don't listen port 80 anymore for reverse proxy
-OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS="--listen=127.0.0.1"            # WebUI adress
-OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT="--port=9392"                      # WebUI Port
-OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS="--mlisten=127.0.0.1"   # WebUI Manager Address
-OPENVAS_SECURITY_ASSISTANT_MANAGER_PORT="--mport=9390"                    # WebUI Manager Port
-OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES="--gnutls-priorities=NORMAL" # TLS Settings
-
-#####################################################################################################
-
-# Update Environment
-source /etc/profile &>/dev/null
-source /etc/environment &>/dev/null
-source ~/.bash_profile &>/dev/null
-
-# Check the needed executables.They are in our environment and have +x?
-if ! [ -x "$(command -v openvasmd)" ] ||
-   ! [ -x "$(command -v openvassd)" ] ||
-   ! [ -x "$(command -v redis-server)" ] ||
-   ! [ -x "$(command -v openvas-manage-certs)" ] ||
-   ! [ -x "$(command -v greenbone-nvt-sync)" ] ||
-   ! [ -x "$(command -v greenbone-scapdata-sync)" ] ||
-   ! [ -x "$(command -v greenbone-certdata-sync)" ]; then
-     path="1"
-     else
-        path="0"
-fi
-
-# Check Security-Assistant is exist
-if ! [ -x "$(command -v gsad)" ]; then
-     gsad="1"
-     else
-         gsad="0"
-fi
-# Executables are not in our environment
-if [ $path -eq 1 ]; then
-   echo "Can't find executables! If you installed OpenVAS to specific location e.g. /opt"
-   echo "please add these PATHS to /etc/profile,also sure that they are executable"
-   exit 1
-fi
-
-# Check systemd and enable services for Gentoo/Linux
-if command -v systemctl &>/dev/null; then
-   systemctl="0"
-   echo "systemd found."
-   systemctl enable openvas-scanner.service &>/dev/null
-   if [ $? -eq 0 ]; then
-      echo "systemd.Gentoo --> openvas-scanner.service enabled."
-   fi
-   systemctl enable gvmd.service &>/dev/null
-   if [ $? -eq 0 ]; then
-      echo "systemd.Gentoo --> gvmd.service enabled."
-   fi
-   systemctl enable gsa.service &>/dev/null
-   if [ $? -eq 0 ]; then
-      echo "systemd.Gentoo --> gsa.service enabled."
-   fi
-   else
-       systemctl="1"
-fi
-
-# Check open-rc if exist
-if command -v rc-service &>/dev/null; then
-   open_rc="0"
-   else
-       open_rc="1"
-fi
-
-# open-rc variables
-if [ $systemctl -eq 1 ] && [ $open_rc -eq 0 ]; then
-   echo "open-rc found."
-   scanner_init="0"
-   manager_init="0"
-   assistant_init="0"
-   redis_init="0"
-fi
-
-# Check status of OpenVAS-Scanner systemd unit
-if [ $systemctl -eq 0 ] &&
-   ([ "$(systemctl is-active openvas-scanner.service)" = "active" ] ||
-   [ "$(systemctl list-unit-files | grep 'enabled' | grep 'openvas-scanner.service' | awk '{print $1}')" = "openvas-scanner.service" ]); then
-   scanner="0"
-   else
-      scanner="1"
-fi
-
-# Check status of OpenVAS-Manager systemd unit
-if [ $systemctl -eq 0 ] &&
-   ([ "$(systemctl is-active gvmd.service)" = "active" ] ||
-   [ "$(systemctl list-unit-files | grep 'enabled' | grep 'gvmd.service' | awk '{print $1}')" = "gvmd.service" ]); then
-   manager="0"
-   else
-      manager="1"
-fi
-
-# Check status of OpenVAS-Assistant systemd unit
-if [ $systemctl -eq 0 ] &&
-   ([ "$(systemctl is-active gsa.service)" = "active" ] ||
-   [ "$(systemctl list-unit-files | grep 'enabled' | grep 'gsa.service' | awk '{print $1}')" = "gsa.service" ]); then
-   assistant="0"
-   else
-      assistant="1"
-fi
-
-# Check status of Redis systemd unit
-if [ $systemctl -eq 0 ] &&
-   ([ "$(systemctl is-active redis.service)" = "active" ] ||
-   [ "$(systemctl list-unit-files | grep 'enabled' | grep 'redis.service' | awk '{print $1}')" = "redis.service" ]); then
-   redis="0"
-   else
-      redis="1"
-fi
-
-# We need to find correct service name for restarting.
-if [ $scanner -eq 1 ] || [ $manager -eq 1 ] || [ $assistant -eq 1 ] || [ $redis -eq 1 ]; then
-   WHICHM="ExecStart=$(type openvasmd | awk '{print $3}')"
-   WHICHS="ExecStart=$(type openvassd | awk '{print $3}')"
-   WHICHA="ExecStart=$(type gsad | awk '{print $3}')"
-   WHICHR="ExecStart=$(type redis-server | awk '{print $3}')"
-
-   # If you have unordinary systemd path you can add here
-   DIR="/lib/systemd/system/
-        /etc/systemd/system/
-        /usr/lib/systemd/system/
-        /usr/local/lib/systemd/system/"
-
-   # Find OpenVAS daemons systemd files if exist
-   for i in $DIR; do
-       if [ -d "$i" ]; then
-          grep -rilnw "$i" -e "$WHICHM" | cut -d: -f1 | grep -oP "$i\K.*" &>>/tmp/openvas_GVM_manager_service.out
-          grep -rilnw "$i" -e "$WHICHS" | cut -d: -f1 | grep -oP "$i\K.*" &>>/tmp/openvas_GVM_scanner_service.out
-          grep -rilnw "$i" -e "$WHICHA" | cut -d: -f1 | grep -oP "$i\K.*" &>>/tmp/openvas_GVM_assistant_service.out
-          grep -rilnw "$i" -e "$WHICHR" | cut -d: -f1 | grep -oP "$i\K.*" &>>/tmp/openvas_GVM_redis_service.out
-       fi
-   done
-
-   manager_service="$(while IFS= read -r service; do
-                    systemctl list-unit-files | grep -P "(^|\s)\K$service(?=\s|$)" | awk '{print $1}'
-                    done < /tmp/openvas_GVM_manager_service.out)"
-   scanner_service="$(while IFS= read -r service; do
-                    systemctl list-unit-files | grep -P "(^|\s)\K$service(?=\s|$)" | awk '{print $1}'
-                    done < /tmp/openvas_GVM_scanner_service.out)"
-   assistant_service="$(while IFS= read -r service; do
-                      systemctl list-unit-files | grep -P "(^|\s)\K$service(?=\s|$)" | awk '{print $1}'
-                      done < /tmp/openvas_GVM_assistant_service.out)"
-   redis_service="$(while IFS= read -r service; do
-                      systemctl list-unit-files | grep -P "(^|\s)\K$service(?=\s|$)" | awk '{print $1}'
-                      done < /tmp/openvas_GVM_redis_service.out)"
-
-   rm -rf /tmp/openvas_GVM*
-   COUNTM=$(wc -w <<< "${manager_service}")
-   COUNTS=$(wc -w <<< "${scanner_service}")
-   COUNTA=$(wc -w <<< "${assistant_service}")
-   COUNTR=$(wc -w <<< "${redis_service}")
-
-   if [ -n "$manager_service" ] && [ $manager -eq 1 ]; then
-      if [ "$(systemctl list-unit-files | grep 'enabled' | grep $manager_service | awk '{print $1}')" = "$manager_service" ]; then
-         echo "systemd --> OpenVAS Manager '$manager_service' found."
-         else
-            echo "systemd --> '$manager_service' found but not enabled."
-            echo "are you sure this is the correct systemd service for Openvas Manager"
-            while true; do
-    	       read -n 1 -p "do you want to enable '$manager_service'? --> (Y)es | (N)o | (Q)uit" answer
-               echo
-               case $answer in
-                    [Yy]* ) systemctl enable "$manager_service" &>/dev/null; echo "systemd --> '$manager_service' enabled"; break;;
-                    [Nn]* ) manager_service=""; echo "it seems you are not sure.ok i don't use $manager_service"; break;;
-                    [Qq]* ) exit;;
-                    * ) echo "Please answer yes,no or quit.";;
-            esac
-            done
-      fi
-   fi
-
-   if [ -n "$scanner_service" ] && [ $scanner -eq 1 ]; then
-      if [ "$(systemctl list-unit-files | grep 'enabled' | grep $scanner_service | awk '{print $1}')" = "$scanner_service" ]; then
-         echo "systemd --> OpenVAS Scanner '$scanner_service' found."
-         else
-            echo "systemd --> '$scanner_service' found but not enabled."
-            echo "are you sure this is the correct systemd service for Openvas Scanner"
-            while true; do
-               read -n 1 -p "do you want to enable '$scanner_service'? --> (Y)es | (N)o | (Q)uit" answer
-               echo
-               case $answer in
-                    [Yy]* ) systemctl enable "$scanner_service" &>/dev/null; echo "systemd --> '$scanner_service' enabled"; break;;
-                    [Nn]* ) scanner_service=""; echo "it seems you are not sure.ok i don't use $scanner_service"; break;;
-                    [Qq]* ) exit;;
-                    * ) echo "Please answer yes,no or quit.";;
-            esac
-            done
-      fi
-   fi
-
-   if [ -n "$assistant_service" ] && [ $scanner -eq 1 ]; then
-      if [ "$(systemctl list-unit-files | grep 'enabled' | grep $assistant_service | awk '{print $1}')" = "$assistant_service" ]; then
-         echo "systemd --> GSA '$assistant_service' found."
-         else
-            echo "systemd --> '$assistant_service' found but not enabled."
-            echo "are you sure this is the correct systemd service for Greenbone Security Assistant"
-            while true; do
-               read -n 1 -p "do you want to enable '$assistant_service'? --> (Y)es | (N)o | (Q)uit" answer
-               echo
-               case $answer in
-                    [Yy]* ) systemctl enable "$assistant_service" &>/dev/null; echo "systemd --> '$assistant_service' enabled"; break;;
-                    [Nn]* ) assistant_service=""; echo "it seems you are not sure.ok i don't use $assistant_service";  break;;
-                    [Qq]* ) exit;;
-                    * ) echo "please answer yes,no or quit.";;
-            esac
-            done
-      fi
-   fi
-
-   if [ -n "$redis_service" ] && [ $scanner -eq 1 ]; then
-      if [ "$(systemctl list-unit-files | grep 'enabled' | grep $redis_service | awk '{print $1}')" = "$redis_service" ]; then
-         echo "systemd --> redis '$redis_service' found."
-         else
-            echo "systemd --> '$redis_service' found but not enabled."
-            echo "are you sure this is the correct systemd service for redis-server"
-            while true; do
-              read -n 1 -p "do you want to enable '$redis_service'? --> (Y)es | (N)o | (Q)uit" answer
-              echo
-              case $answer in
-                   [Yy]* ) systemctl enable "$redis_service" &>/dev/null; echo "systemd --> '$redis_service' enabled"; break;;
-                   [Nn]* ) redis_service=""; echo "it seems you are not sure.ok i don't use $redis_service"; break;;
-                   [Qq]* ) exit;;
-                   * ) echo "please answer yes,no or quit.";;
-              esac
-            done
-      fi
-   fi
-
-   if [ $COUNTM -gt 1 ] || [ $COUNTS -gt 1 ] || [ $COUNTR -gt 1 ]; then
-      echo "you have more than one enabled systemd service for single daemon"
-      echo " check OpenVAS and Redis systemd unit files to fix it"
-      exit 1
-   fi
-fi
-
-restart_redis () {
-if [ $redis -eq 0 ]; then
-   systemctl restart redis.service &>/dev/null
-   if [ $? -eq 0 ]; then
-      echo "systemd --> redis.service is restarted."
-      else
-          echo "systemd --> redis.service cannot restarted."
-          exit 1
-   fi
-elif [[ -n "$redis_service" ]]; then
-     systemctl restart "$redis_service" &>/dev/null
-     if [ $? -eq 0 ]; then
-        echo "systemd --> $redis_service is restarted."
-        else
-            echo "systemd --> $redis_service cannot restarted."
-            exit 1
-     fi
-elif [[ -n "$redis_init" ]]; then
-     rc-service redis stop
-     sleep 5
-     rc-service redis start
-     if [ $? -eq 0 ]; then
-        echo "open-rc --> redis is restarted."
-        else
-            echo "open-rc --> redis cannot restarted."
-            exit 1
-     fi
-fi
-}
-
-build_nvt () {
-if ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" &>/dev/null; then
-   ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-   openvassd --foreground --only-cache &>/dev/null
-   if [ $? -eq 0 ]; then
-      echo "building NVT cache is done."
-      else
-          echo "building NVT cache is failed.."
-          exit 1
-   fi
-   else
-       openvassd --foreground --only-cache &>/dev/null
-       if [ $? -eq 0 ]; then
-          echo "building NVT cache is done."
-          else
-              echo "building NVT cache is failed.."
-              exit 1
-       fi
-fi
-}
-
-create_user () {
-GREEN="`tput setaf 2`"
-RED="`tput setaf 1`"
-norm="`tput sgr0`"
-echo "creating WebUI User.."
-openvasmd --create-user=admin --role=Admin &>/tmp/openvas_user.out
-if [ $? -eq 0 ]; then
-      username="admin"
-      password="$(cat /tmp/openvas_user.out | awk '{print $5}' | cut -c2-)"
-      echo "${RED}!WebUI Address : ${GREEN}127.0.0.1:9392"
-      echo "${RED}!WebUI Username: ${GREEN}$username"
-      echo "${RED}!WebUI Password: ${GREEN}${password%??}${norm}"
-      else
-          echo "$(cat /tmp/openvas_user.out)"
-          echo "these are active users for WebUI"
-          openvasmd --get-users
-fi
-rm -rf /tmp/openvas_user.out
-}
-
-# Redis & OpenVAS Scanner socket connection check for Gentoo/Linux
-if [[ -e /etc/redis.conf ]]; then
-   if [ "$(openvassd -s | grep 'kb_location' | awk '{print $3}')" = "$(cat /etc/redis.conf | grep -P '(^|\s)\Kunixsocket(?=\s|$)' | awk '{print $2}')" ]; then
-      echo "redis server properly configured."
-      else
-          redis_sock="$(openvassd -s | grep 'kb_location' | awk '{print $3}')"
-          echo "redis server is not properly configured."
-          echo "be sure redis server listening unix socket at $redis_sock"
-          echo "you can find example redis.conf file in /etc/openvas/redis.conf.example"
-          exit 1
-   fi
-fi
-
-# Redis & OpenVAS Scanner socket connection check for other linux distros
-if [[ -e /etc/redis/redis.conf ]]; then
-   if [ "$(openvassd -s | grep 'kb_location' | awk '{print $3}')" = "$(cat /etc/redis/redis.conf | grep -P '(^|\s)\Kunixsocket(?=\s|$)' | awk '{print $2}')" ]; then
-      echo "redis server properly configured."
-      else
-          redis_sock="$(openvassd -s | grep 'kb_location' | awk '{print $3}')"
-          echo "redis server is not properly configured."
-          echo "be sure redis server listening unix socket at $redis_sock"
-          exit 1
-   fi
-fi
-
-# Create certificates for fresh install
-openvas-manage-certs -a &>/dev/null
-if [ $? -eq 0 ]; then
-   echo "certificates created."
-
-elif [ "$(openvas-manage-certs -a | grep -ow 'Existing')" = "Existing" ]; then
-     echo "certificates already created."
-
-else
-     echo "certificates cannot created."
-     exit 1
-fi
-
-# Start to update FEED & First NVT.
-try=0
-until [ $try -ge 5 ]; do
-      greenbone-nvt-sync &>/dev/null && break
-      echo "can't connected! trying to update greenbone-nvt again.."
-      try=$[$try+1]
-      sleep 30
-done
-
-# Check status
-if [ $? -eq 0 ]; then
-   echo "greenbone-nvt-sync is done."
-   # Avoid your IP temporary banned because of multiple connection
-   sleep 5
-   # Try to update scapdata.
-   try=0
-   until [ $try -ge 5 ]; do
-         greenbone-scapdata-sync &>/dev/null && break
-         echo "can't connected! trying to update greenbone-scapdata again.."
-         try=$[$try+1]
-         sleep 30
-   done
-   # Check status
-   if [ $? -eq 0 ]; then
-      echo "greenbone-scapdata-sync is done."
-      # Avoid your IP temporary banned because of multiple connection
-      sleep 5
-      # Try to update certdata
-      try=0
-      until [ $try -ge 5 ]; do
-            greenbone-certdata-sync &>/dev/null && break
-            echo "can't connected! Trying to update greenbone-certdata again.."
-            try=$[$try+1]
-            sleep 30
-      done
-       # Check status
-       if [ $? -eq 0 ]; then
-          echo "greenbone-certdata-sync is done."
-          echo "building NVT cache this will take some time.."
-          build_nvt
-          # Check OpenVAS-Scanner is running
-          if ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" &>/dev/null; then
-             echo "OpenVAS-Scanner is running."
-             echo "building Database this will take some time.."
-             openvasmd --rebuild --progress &>/dev/null
-          elif [ $scanner -eq 0 ]; then
-               # Start OpenVAS-Scanner systemd unit & Rebuild Cache
-               echo "systemd --> OpenVAS-Scanner is not running! trying to up.."
-               systemctl start openvas-scanner.service &>/dev/null
-               if [ $? -eq 0 ]; then
-                  # Wait for initialize
-                  until [ "$(ps aux | grep -v 'grep' | grep -ow 'openvassd: Waiting')" = "openvassd: Waiting" ]; do
-                  sleep 15
-                  echo "waiting for OpenVAS-Scanner to become ready.."
-                  done
-                  echo "systemd --> openvas-scanner.service started and waiting for connection."
-                  echo "building database this will take some time.."
-                  # Rebuild Cache
-                  openvasmd --rebuild --progress &>/dev/null
-                  else
-                      echo "systemd --> openvas-scanner.service cannot started.."
-                      exit 1
-               fi
-          elif [[ -n "$scanner_service" ]]; then
-               echo "systemd --> OpenVAS-Scanner is down! trying to up.."
-               systemctl start "$scanner_service" &>/dev/null
-               if [ $? -eq 0 ]; then
-                  # Wait for initialize
-                  until [ "$(ps aux | grep -v 'grep' | grep -ow 'openvassd: Waiting')" = "openvassd: Waiting" ]; do
-                  sleep 15
-                  echo "waiting for OpenVAS-Scanner to become ready.."
-                  done
-                  echo "systemd --> $scanner_service is started and waiting for connection."
-                  echo "building database this will take some time.."
-                  # Rebuild Cache
-                  openvasmd --rebuild --progress &>/dev/null
-                  else
-                      echo "systemd --> $scanner_service cannot started.."
-                      exit 1
-               fi
-          elif [[ -n "$scanner_init" ]]; then
-               # Start OpenVAS-Scanner with init.d (open-rc) & Rebuild Cache
-               echo "open-rc --> OpenVAS-Scanner is down! trying to up.."
-               rc-service openvas-scanner start &>/dev/null
-               if [ $? -eq 0 ]; then
-                  # Wait for initialize
-                  until [ "$(ps aux | grep -v 'grep' | grep -ow 'openvassd: Waiting')" = "openvassd: Waiting" ]; do
-                  sleep 15
-                  echo "waiting for OpenVAS-Scanner to become ready.."
-                  done
-                  echo "rc-service --> openvas-scanner started and waiting for connection."
-                  echo "building database this will take some time.."
-                  # Rebuild Cache
-                  openvasmd --rebuild --progress &>/dev/null
-                  else
-                      echo "rc-service --> openvas-scanner cannot started.."
-                      exit 1
-               fi
-          else
-               echo "OpenVAS-Scanner is not running! Trying to up.."
-               openvassd "$OPENVAS_SCANNER_OPTIONS" "$OPENVAS_SCANNER_LISTEN_SOCKET" &>/dev/null
-               # Wait for initialize
-               if [ $? -eq 0 ]; then
-                  until [ "$(ps aux | grep -v 'grep' | grep -ow 'openvassd: Waiting')" = "openvassd: Waiting" ]; do
-                  sleep 15
-                  echo "waiting for OpenVAS-Scanner to become ready.."
-                  done
-                  else
-                      echo "OpenVAS Scanner cannot started manually.."
-                      exit 1
-               fi
-               echo "OpenVAS-Scanner started manually and waiting for connection."
-               echo "building database this will take some time.."
-               # Rebuild Cache
-               openvasmd --rebuild --progress &>/dev/null
-          fi
-           # Check status
-           if [ $? -eq 0 ]; then
-              echo "building database is done"
-              create_user
-              # Restart OpenVAS-Scanner
-              if [ $scanner -eq 0 ]; then
-                 ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                 restart_redis
-                 sleep 3
-                 systemctl restart openvas-scanner.service &>/dev/null
-              elif [[ -n "$scanner_service" ]]; then
-                   ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                   restart_redis
-                   sleep 3
-                   systemctl restart "$scanner_service" &>/dev/null
-              elif [[ -n "$scanner_init" ]]; then
-                   ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                   restart_redis
-                   sleep 3
-                   rc-service openvas-scanner start &>/dev/null
-              else
-                   ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                   restart_redis
-                   sleep 3
-                   openvassd "$OPENVAS_SCANNER_OPTIONS" "$OPENVAS_SCANNER_LISTEN_SOCKET" &>/dev/null
-              fi
-               if [ $? -eq 0 ]; then
-                  until [ "$(ps aux | grep -v 'grep' | grep -ow 'openvassd: Waiting')" = "openvassd: Waiting" ]; do
-                  sleep 10
-                  echo "waiting for OpenVAS-Scanner to become ready.."
-                  done
-                  echo "OpenVAS-Scanner is restarted."
-                  # Restart OpenVAS-Manager
-                  if [ $manager -eq 0 ]; then
-                     ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvasmd(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                     sleep 5
-                     systemctl restart gvmd.service &>/dev/null
-                     if [ $? -eq 0 ]; then
-                        success="0"
-                        echo "systemd --> gvmd.service is restarted."
-                        echo "OpenVAS setup is ok."
-                        else
-                            echo "systemd --> gvmd.service cannot restarted."
-                            echo "OpenVAS setup is not ok!"
-                            exit 1
-                     fi
-                  elif [[ -n "$manager_service" ]]; then
-                       ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvasmd(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                       sleep 5
-                       systemctl restart "$manager_service" &>/dev/null
-                       if [ $? -eq 0 ]; then
-                          success="0"
-                          echo "systemd --> $manager_service is restarted"
-                          echo "OpenVAS setup is ok."
-                          else
-                              echo "systemd --> $manager_service cannot restarted"
-                              echo "OpenVAS setup is not ok!"
-                              exit 1
-                       fi
-                  elif [[ -n "$manager_init" ]]; then
-                       ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvasmd(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                       sleep 5
-                       rc-service gvmd start &>/dev/null
-                       if [ $? -eq 0 ]; then
-                          success="0"
-                          echo "open-rc --> gvmd is restarted"
-                          echo "OpenVAS setup is ok."
-                          else
-                              echo "open-rc --> gvmd cannot restarted"
-                              echo "OpenVAS setup is not ok!"
-                              exit 1
-                       fi
-                  else
-                       ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvasmd(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                       sleep 5
-                       openvasmd "$OPENVAS_MANAGER_OPTIONS" "$OPENVAS_MANAGER_PORT" "$OPENVAS_MANAGER_LISTEN_ADDRESS" "$OPENVAS_MANAGER_SCANNER_HOST" "$OPENVAS_MANAGER_GNUTLS_PRIORITIES" &>/dev/null
-                       if [ $? -eq 0 ]; then
-                          success="0"
-                          echo "OpenVAS-Manager is restarted manually"
-                          echo "OpenVAS setup is ok."
-                          else
-                              echo "OpenVAS-Manager cannot restarted"
-                              echo "OpenVAS setup is not ok!"
-                              exit 1
-                       fi
-                  fi
-                  else
-                   echo "OpenVAS setup is not ok! OpenVAS-scanner cannot restarted."
-               fi
-               else
-               echo "OpenVAS setup is not ok! OpenVAS database build failed."
-           fi
-           else
-           echo "OpenVAS setup is not ok! OpenVAS Certdata sync failed."
-       fi
-       else
-       echo "OpenVAS setup is not ok! OpenVAS Scapdata sync failed."
-   fi
-   else
-    echo "OpenVAS setup is not ok! OpenVAS NVT sync update failed."
-fi
-
-# Restart WebUI
-if [[ -n "$success" ]] && [ $gsad -eq 0 ]; then
-      WHICHA="$(type gsad | awk '{print $3}')"
-      if [ $assistant -eq 0 ]; then
-         # Time to restart OpenVAS-Security Assistant
-         ps aux | grep -v "grep" | grep -P "(^|\s)\K$WHICHA(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-         sleep 5
-         systemctl restart gsa.service &>/dev/null
-         if [ $? -eq 0 ]; then
-            echo "systemd --> gsa.service (OpenVAS WebUI) is restarted and ready for connection"
-            else
-                echo "systemd --> gsa.service (OpenVAS-WebUI) cannot restarted"
-         fi
-      elif [[ -n "$assistant_service" ]]; then
-           if [ $COUNTA -eq 1 ]; then
-              ps aux | grep -v "grep" | grep -P "(^|\s)\K$WHICHA(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-              sleep 5
-              systemctl restart "$assistant_service" &>/dev/null
-              if [ $? -eq 0 ]; then
-                 echo "systemd --> $assistant_service (OpenVAS WebUI) is restarted and ready for connection"
-                 else
-                     echo "systemd --> $assistan_service (OpenVAS WebUI) cannot restarted."
-              fi
-              else
-                  echo "systemd --> OpenVAS WebUI cannot restarted! you have multiple enabled systemd services ($assistant_service)"
-                  exit 1
-           fi
-      elif [[ -n "$assistant_init" ]]; then
-           ps aux | grep -v "grep" | grep -P "(^|\s)\K$WHICHA(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-           sleep 5
-           rc-service gsa start &>/dev/null
-           if [ $? -eq 0 ]; then
-              echo "open-rc --> gsa (OpenVAS WebUI) is restarted"
-              else
-                  echo "open-rc --> gsa (OpenVAS WebUI) cannot restarted."
-           fi
-      else
-           ps aux | grep -v "grep" | grep -P "(^|\s)\K$WHICHA(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-           sleep 5
-           gsad "$OPENVAS_SECURITY_ASSISTANT_OPTIONS" "$OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS" "$OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT" "$OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS" "$OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT" "$OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES" &>/dev/null
-           if [ $? -eq 0 ]; then
-              echo "OpenVAS WebUI is restarted"
-              else
-                  echo "OpenVAS WebUI cannot restarted"
-           fi
-      fi
-fi
diff --git a/net-analyzer/openvas-scanner/files/openvas-feed-sync b/net-analyzer/openvas-scanner/files/openvas-feed-sync
deleted file mode 100755
index de1c69038aba..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-feed-sync
+++ /dev/null
@@ -1,627 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# This is OpenVAS cron script that updates feed and reload daemons.
-# Hasan ÇALIŞIR hsntgm@gmail.com | proxy maintainer
-
-# Mail settings
-MAIL_TO="root"
-MAIL_SUBJECT="CronJob-OpenVAS"
-
-# If you don't use systemd or open-rc for OpenVAS daemons you can set start command args here 
-# while we manually start/restart them.
-####################################################################################################
-
-# OpenVAS Manager command args
-OPENVAS_MANAGER_OPTIONS=""                                                # e.g --foreground
-OPENVAS_MANAGER_PORT="--port=9390"                                        # Manager listen port
-OPENVAS_MANAGER_LISTEN_ADDRESS="--listen=127.0.0.1"                       # Manager listen address
-OPENVAS_MANAGER_SCANNER_HOST="--scanner-host=/var/run/openvassd.sock"     # Scanner unix socket
-OPENVAS_MANAGER_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0"
-
-# OpenVAS Scanner command args
-OPENVAS_SCANNER_OPTIONS=""                                                # e.g --foreground
-OPENVAS_SCANNER_LISTEN_SOCKET="--unix-socket=/var/run/openvassd.sock"     # Scanner listen socket
-
-# OpenVAS Security Assistant command args for reverse proxying | SSL PassThrough
-OPENVAS_SECURITY_ASSISTANT_OPTIONS="--no-redirect"                        # Don't listen port 80 anymore
-OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS="--listen=127.0.0.1"            # WebUI adress
-OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT="--port=9392"                      # WebUI Port
-OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS="--mlisten=127.0.0.1"   # WebUI Manager Address
-OPENVAS_SECURITY_ASSISTANT_MANAGER_PORT="--mport=9390"                    # WebUI Manager Port
-OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES="--gnutls-priorities=NORMAL" # TLS Settings
-
-#####################################################################################################
-
-# Update Environment
-source /etc/profile &>/dev/null
-source /etc/environment &>/dev/null
-source ~/.bash_profile &>/dev/null
-
-# Check the needed executables if they are in our environment and have +x
-if ! [ -x "$(command -v openvasmd)" ] || ! [ -x "$(command -v openvassd)" ] || ! [ -x "$(command -v redis-server)" ]; then
-     path="1"
-     else
-        path="0"
-fi
-
-# Check Security-Assistant is exist
-if ! [ -x "$(command -v gsad)" ]; then
-     gsad="1"
-     else
-         gsad="0"
-fi
-
-# Executables are not in our environment
-if [ $path -eq 1 ]; then
-   echo "OpenVAS CronJob Failed! If you installed OpenVAS to specific location e.g. /opt" | tee -a /tmp/openvas_mail.out
-   echo "please add these PATHS to /etc/profile e.g. 'PATH=$PATH:/opt/openvas/bin:/opt/openvas/sbin'" | tee -a /tmp/openvas_mail.out
-   echo "also sure that they are executable e.g. 'chmod +x /opt/openvas/sbin/openvassd'" | tee -a /tmp/openvas_mail.out
-   echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-   exit 1
-fi
-
-# Check systemd if exist
-if command -v systemctl &>/dev/null; then
-   systemctl="0"
-   else
-       systemctl="1"
-fi
-
-# Check open-rc if exist
-if command -v rc-service &>/dev/null; then
-   open_rc="0"
-   else
-       open_rc="1"
-fi
-
-# open-rc variables
-if [ $systemctl -eq 1 ] && [ $open_rc -eq 0 ]; then
-   scanner_init="0"
-   manager_init="0"
-   assistant_init="0"
-   redis_init="0"
-fi
-
-# Check OpenVAS-Scanner systemd unit(common name) is active or enabled
-if [ $systemctl -eq 0 ] && ([ "$(systemctl is-active openvassd.service)" = "active" ] || [ "$(systemctl list-unit-files | grep 'enabled' | grep 'openvassd.service' | awk '{print $1}')" = "openvassd.service" ]); then
-   scanner="0"
-   else
-      scanner="1"
-fi
-
-# Check OpenVAS-Manager systemd unit(common name) is active or enabled
-if [ $systemctl -eq 0 ] && ([ "$(systemctl is-active openvasmd.service)" = "active" ] || [ "$(systemctl list-unit-files | grep 'enabled' | grep 'openvasmd.service' | awk '{print $1}')" = "openvasmd.service" ]); then
-   manager="0"
-   else
-      manager="1"
-fi
-
-# Check OpenVAS-Assistant systemd unit(common name) is active or not
-if [ $systemctl -eq 0 ] && ([ "$(systemctl is-active gsad.service)" = "active" ] || [ "$(systemctl list-unit-files | grep 'enabled' | grep 'gsad.service' | awk '{print $1}')" = "gsad.service" ]); then
-   assistant="0"
-   else
-      assistant="1"
-fi
-
-# Check Redis systemd unit(common name) is active or not
-if [ $systemctl -eq 0 ] && ([ "$(systemctl is-active redis.service)" = "active" ] || [ "$(systemctl list-unit-files | grep 'enabled' | grep 'redis.service' | awk '{print $1}')" = "redis.service" ]); then
-   redis="0"
-   else
-      redis="1"
-fi
-
-# If you don't use common systemd service names for OpenVAS
-# We need to find correct service name for restarting.
-if [ $scanner -eq 1 ] || [ $manager -eq 1 ]; then
-   WHICHM="ExecStart=$(type openvasmd | awk '{print $3}')"
-   WHICHS="ExecStart=$(type openvassd | awk '{print $3}')"
-   WHICHA="ExecStart=$(type gsad | awk '{print $3}')"
-   WHICHR="ExecStart=$(type redis-server | awk '{print $3}')"
-
-   # If you have unordinary systemd services PATH you can add here
-   DIR="/lib/systemd/system/
-        /etc/systemd/system/
-        /usr/lib/systemd/system/
-        /usr/local/lib/systemd/system/"
-
-   # Find OpenVAS daemons systemd files
-   for i in $DIR; do
-       if [ -d "$i" ]; then
-          grep -rilnw "$i" -e "$WHICHM" | cut -d: -f1 | grep -oP "$i\K.*" &>>/tmp/openvas_GVM_manager_service.out
-          grep -rilnw "$i" -e "$WHICHS" | cut -d: -f1 | grep -oP "$i\K.*" &>>/tmp/openvas_GVM_scanner_service.out
-          grep -rilnw "$i" -e "$WHICHA" | cut -d: -f1 | grep -oP "$i\K.*" &>>/tmp/openvas_GVM_assistant_service.out
-          grep -rilnw "$i" -e "$WHICHR" | cut -d: -f1 | grep -oP "$i\K.*" &>>/tmp/openvas_GVM_redis_service.out
-       fi
-   done
-
-   # Time to get our exact systemd service searching in enabled services
-   manager_service="$(while IFS= read -r service; do
-                    systemctl list-unit-files | grep "enabled" | grep -P "(^|\s)\K$service(?=\s|$)" | awk '{print $1}'
-                    done < /tmp/openvas_GVM_manager_service.out)"
-
-   scanner_service="$(while IFS= read -r service; do
-                    systemctl list-unit-files | grep "enabled" | grep -P "(^|\s)\K$service(?=\s|$)" | awk '{print $1}'
-                    done < /tmp/openvas_GVM_scanner_service.out)"
-
-   assistant_service="$(while IFS= read -r service; do
-                      systemctl list-unit-files | grep "enabled" | grep -P "(^|\s)\K$service(?=\s|$)" | awk '{print $1}'
-                      done < /tmp/openvas_GVM_assistant_service.out)"
-   
-   redis_service="$(while IFS= read -r service; do
-                      systemctl list-unit-files | grep "enabled" | grep -P "(^|\s)\K$service(?=\s|$)" | awk '{print $1}'
-                      done < /tmp/openvas_GVM_redis_service.out)"
-
-   rm -rf /tmp/openvas_GVM*
-   COUNTM=$(wc -w <<< "${manager_service}")
-   COUNTS=$(wc -w <<< "${scanner_service}")
-   COUNTA=$(wc -w <<< "${assistant_service}")
-   COUNTR=$(wc -w <<< "${redis_service}")
-
-   if [ $COUNTM -gt 1 ] || [ $COUNTS -gt 1 ] || [ $COUNTR -gt 1 ]; then
-      echo "OpenVAS CronJob Failed! You have multiple enabled systemd service for single OpenVAS daemon or redis" | tee -a /tmp/openvas_mail.out
-      echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-      exit 1
-   fi
-fi
-
-# Start to update FEED & First NVT.
-try=0
-until [ $try -ge 5 ]; do
-      greenbone-nvt-sync &>/dev/null && break
-      echo "Can't connected! Trying to update greenbone-nvt again.." &>>/tmp/openvas_mail.out
-      try=$[$try+1]
-      sleep 30
-done
-
-# Check status
-if [ $? -eq 0 ]; then
-   echo "greenbone-nvt-sync is done" &>>/tmp/openvas_mail.out
-   # Avoid your IP temporary banned because of multiple connection
-   sleep 5
-   # Try to update scapdata.
-   try=0
-   until [ $try -ge 5 ]; do
-         greenbone-scapdata-sync &>/dev/null && break
-         echo "Can't connected! Trying to update greenbone-scapdata again.." &>>/tmp/openvas_mail.out
-         try=$[$try+1]
-         sleep 30
-   done
-
-   # Check status
-   if [ $? -eq 0 ]; then
-      echo "greenbone-scapdata-sync is done" &>>/tmp/openvas_mail.out
-      # Avoid your IP temporary banned because of multiple connection
-      sleep 5
-      # Try to update certdata
-      try=0
-      until [ $try -ge 5 ]; do
-            greenbone-certdata-sync &>/dev/null && break
-            echo "Can't connected! Trying to update greenbone-certdata again.." &>>/tmp/openvas_mail.out
-            try=$[$try+1]
-            sleep 30
-      done
-
-       # Check status
-       if [ $? -eq 0 ]; then
-          echo "greenbone-certdata-sync is done" &>>/tmp/openvas_mail.out
-
-          # Check OpenVAS-Scanner is running
-          if ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" &>/dev/null; then
-             echo "OpenVAS-Scanner is running." &>>/tmp/openvas_mail.out
-             openvasmd --update --progress &>/dev/null
-
-          elif [ $scanner -eq 0 ]; then
-               # Start OpenVAS-Scanner systemd unit & Rebuild Cache
-               echo "OpenVAS-Scanner is down! Trying to up.." &>>/tmp/openvas_mail.out
-               systemctl start openvassd.service &>/dev/null
-
-               if [ $? -eq 0 ]; then
-                  # Wait for initialize
-                  until [ "$(ps aux | grep -v 'grep' | grep -ow 'openvassd: Waiting')" = "openvassd: Waiting" ]; do
-                  sleep 15
-                  echo "Waiting for OpenVAS-Scanner to become ready.." &>>/tmp/openvas_mail.out
-                  done
-                  echo "openvassd.service started and waiting for connection." &>>/tmp/openvas_mail.out
-                  # Rebuild Cache
-                  openvasmd --update --progress &>/dev/null
-                  else
-                      echo "openvassd.service cannot started.." | tee -a /tmp/openvas_mail.out
-                      echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                      exit 1
-               fi
-
-          elif [[ -n "$scanner_service" ]]; then
-               echo "OpenVAS-Scanner is down! Trying to up.." &>>/tmp/openvas_mail.out
-               systemctl start "$scanner_service" &>/dev/null
-
-               if [ $? -eq 0 ]; then
-                  # Wait for initialize
-                  until [ "$(ps aux | grep -v 'grep' | grep -ow 'openvassd: Waiting')" = "openvassd: Waiting" ]; do
-                  sleep 15
-                  echo "Waiting for OpenVAS-Scanner to become ready.." &>>/tmp/openvas_mail.out
-                  done
-                  echo "$scanner_service is started and waiting for connection." &>>/tmp/openvas_mail.out
-                  # Rebuild Cache
-                  openvasmd --update --progress &>/dev/null
-                  else
-                      echo "$scanner_service cannot started.." | tee -a /tmp/openvas_mail.out
-                      echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                      exit 1
-               fi
-               
-          elif [[ -n "$scanner_init" ]]; then
-               # Start OpenVAS-Scanner with init.d (open-rc) & Rebuild Cache
-               echo "OpenVAS-Scanner is down! Trying to up.." &>>/tmp/openvas_mail.out
-               rc-service openvassd start &>/dev/null
-
-               if [ $? -eq 0 ]; then
-                  # Wait for initialize
-                  until [ "$(ps aux | grep -v 'grep' | grep -ow 'openvassd: Waiting')" = "openvassd: Waiting" ]; do
-                  sleep 15
-                  echo "Waiting for OpenVAS-Scanner to become ready.." &>>/tmp/openvas_mail.out
-                  done
-                  echo "rc-service --> openvassd started and waiting for connection." &>>/tmp/openvas_mail.out
-                  # Rebuild Cache
-                  openvasmd --update --progress &>/dev/null
-                  else
-                      echo "rc-service --> openvassd cannot started.." | tee -a /tmp/openvas_mail.out
-                      echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                      exit 1
-               fi     
-
-          else
-               echo "OpenVAS-Scanner is down! Trying to up.." &>>/tmp/openvas_mail.out
-               openvassd "$OPENVAS_SCANNER_OPTIONS" "$OPENVAS_SCANNER_LISTEN_SOCKET" &>/dev/null
-               # Wait for initialize
-               if [ $? -eq 0 ]; then
-                  until [ "$(ps aux | grep -v 'grep' | grep -ow 'openvassd: Waiting')" = "openvassd: Waiting" ]; do
-                  sleep 15
-                  echo "Waiting for OpenVAS-Scanner to become ready.." &>>/tmp/openvas_mail.out
-                  done
-                  else
-                      echo "OpenVAS Scanner cannot started manually.." | tee -a /tmp/openvas_mail.out
-                      echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                      exit 1
-               fi       
-               echo "OpenVAS-Scanner started manually and waiting for connection." &>>/tmp/openvas_mail.out
-               # Rebuild Cache
-               openvasmd --update --progress &>/dev/null
-          fi
-
-           # Check status
-           if [ $? -eq 0 ]; then
-              echo "Updating NVT cache is done" &>>/tmp/openvas_mail.out
-
-              # Restart OpenVAS-Scanner
-              if [ $scanner -eq 0 ]; then
-                 ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                 sleep 3
-
-                 # Try to restart redis service before OpenVAS-Scanner
-                 if [ $redis -eq 0 ]; then
-                    systemctl restart redis.service &>/dev/null
-
-                    if [ $? -eq 0 ]; then
-                       echo "systemd --> redis.service is restarted." &>>/tmp/openvas_mail.out
-                       else
-                           echo "systemd --> redis.service cannot restarted." | tee -a /tmp/openvas_mail.out
-                           echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                           exit 1
-                    fi
-
-                 elif [[ -n "$redis_service" ]]; then
-                      systemctl restart "$redis_service" &>/dev/null
-
-                      if [ $? -eq 0 ]; then
-                         echo "systemd --> $redis_service is restarted." &>>/tmp/openvas_mail.out
-                         else
-                             echo "systemd --> $redis_service cannot restarted." | tee -a /tmp/openvas_mail.out
-                             echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                             exit 1
-                      fi
-                      
-                 elif [[ -n "$redis_init" ]]; then
-                      rc-service redis stop
-                      sleep 5
-                      rc-service redis start
-
-                      if [ $? -eq 0 ]; then
-                         echo "open-rc --> redis is restarted." &>>/tmp/openvas_mail.out
-                         else
-                             echo "open-rc --> redis cannot restarted." | tee -a /tmp/openvas_mail.out
-                             echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                             exit 1
-                      fi     
-                 fi
-                 systemctl restart openvassd.service &>/dev/null
-
-              elif [[ -n "$scanner_service" ]]; then
-                   ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                   sleep 3
-
-                   # Try to restart redis service before OpenVAS-Scanner
-                   if [ $redis -eq 0 ]; then
-                      systemctl restart redis.service &>/dev/null
-
-                      if [ $? -eq 0 ]; then
-                         echo "systemd --> redis.service is restarted." &>>/tmp/openvas_mail.out
-                         else
-                             echo "systemd --> redis.service cannot restarted." | tee -a /tmp/openvas_mail.out
-                             echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                             exit 1
-                      fi
-
-                   elif [[ -n "$redis_service" ]]; then
-                        systemctl restart "$redis_service" &>/dev/null
-
-                        if [ $? -eq 0 ]; then
-                           echo "systemd --> $redis_service is restarted." &>>/tmp/openvas_mail.out
-                           else
-                               echo "systemd --> $redis_service cannot restarted." | tee -a /tmp/openvas_mail.out
-                               echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                               exit 1
-                        fi
-                        
-                   elif [[ -n "$redis_init" ]]; then
-                        rc-service redis stop
-                        sleep 5
-                        rc-service redis start
-
-                        if [ $? -eq 0 ]; then
-                           echo "open-rc --> redis is restarted." &>>/tmp/openvas_mail.out
-                           else
-                               echo "open-rc --> redis cannot restarted." | tee -a /tmp/openvas_mail.out
-                               echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                               exit 1
-                        fi          
-                   fi
-                   systemctl restart "$scanner_service" &>/dev/null
-                   
-              elif [[ -n "$scanner_init" ]]; then
-                   ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                   sleep 3
-
-                   # Try to restart redis service before OpenVAS-Scanner
-                   if [ $redis -eq 0 ]; then
-                      systemctl restart redis.service &>/dev/null
-
-                      if [ $? -eq 0 ]; then
-                         echo "systemd --> redis.service is restarted." &>>/tmp/openvas_mail.out
-                         else
-                             echo "systemd --> redis.service cannot restarted." | tee -a /tmp/openvas_mail.out
-                             echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                             exit 1
-                      fi
-
-                   elif [[ -n "$redis_service" ]]; then
-                        systemctl restart "$redis_service" &>/dev/null
-
-                        if [ $? -eq 0 ]; then
-                           echo "systemd --> $redis_service is restarted." &>>/tmp/openvas_mail.out
-                           else
-                               echo "systemd --> $redis_service cannot restarted." | tee -a /tmp/openvas_mail.out
-                               echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                               exit 1
-                        fi
-
-                   elif [[ -n "$redis_init" ]]; then
-                        rc-service redis stop
-                        sleep 5
-                        rc-service redis start
-
-                        if [ $? -eq 0 ]; then
-                           echo "open-rc --> redis is restarted." &>>/tmp/openvas_mail.out
-                           else
-                               echo "open-rc --> redis cannot restarted." | tee -a /tmp/openvas_mail.out
-                               echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                               exit 1
-                        fi               
-                   fi
-                   rc-service openvassd start &>/dev/null     
-
-              else
-                   ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvassd:(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                   sleep 3
-
-                   # Try to restart redis service before OpenVAS-Scanner
-                   if [ $redis -eq 0 ]; then
-                      systemctl restart redis.service &>/dev/null
-
-                      if [ $? -eq 0 ]; then
-                         echo "systemd --> redis.service is restarted." &>>/tmp/openvas_mail.out
-                         else
-                             echo "systemd --> redis.service cannot restarted." | tee -a /tmp/openvas_mail.out
-                             echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                             exit 1
-                      fi
-
-                   elif [[ -n "$redis_service" ]]; then
-                        systemctl restart "$redis_service" &>/dev/null
-
-                        if [ $? -eq 0 ]; then
-                           echo "systemd --> $redis_service is restarted." &>>/tmp/openvas_mail.out
-                           else
-                               echo "systemd --> $redis_service cannot restarted." | tee -a /tmp/openvas_mail.out
-                               echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                               exit 1
-                        fi
-
-                   elif [[ -n "$redis_init" ]]; then
-                        rc-service redis stop
-                        sleep 5
-                        rc-service redis start
-
-                        if [ $? -eq 0 ]; then
-                           echo "open-rc --> redis is restarted." &>>/tmp/openvas_mail.out
-                           else
-                               echo "open-rc --> redis cannot restarted." | tee -a /tmp/openvas_mail.out
-                               echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                               exit 1
-                        fi               
-                   fi
-                   openvassd "$OPENVAS_SCANNER_OPTIONS" "$OPENVAS_SCANNER_LISTEN_SOCKET" &>/dev/null
-              fi
-
-               if [ $? -eq 0 ]; then
-                  until [ "$(ps aux | grep -v 'grep' | grep -ow 'openvassd: Waiting')" = "openvassd: Waiting" ]; do
-                  sleep 10
-                  echo "Waiting for OpenVAS-Scanner to become ready.." &>>/tmp/openvas_mail.out
-                  done
-                  echo "OpenVAS-Scanner is restarted." &>>/tmp/openvas_mail.out
-
-                  # Restart OpenVAS-Manager
-                  if [ $manager -eq 0 ]; then
-                     ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvasmd(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                     sleep 5
-                     systemctl restart openvasmd.service &>/dev/null
-
-                     if [ $? -eq 0 ]; then
-                        success="0"
-                        echo "systemd --> openvasmd.service is restarted" &>>/tmp/openvas_mail.out
-                        echo "OpenVAS CronJob Success!" | tee -a /tmp/openvas_mail.out
-                        echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                        else
-                            echo "systemd --> openvasmd.service cannot restarted" &>>/tmp/openvas_mail.out
-                            echo "OpenVAS CronJob Failed!" | tee -a /tmp/openvas_mail.out
-                            echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                            exit 1
-                     fi
-
-                  elif [[ -n "$manager_service" ]]; then
-                       ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvasmd(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                       sleep 5
-                       systemctl restart "$manager_service" &>/dev/null
-
-                       if [ $? -eq 0 ]; then
-                          success="0"
-                          echo "systemd --> $manager_service is restarted" &>>/tmp/openvas_mail.out
-                          echo "OpenVAS CronJob Success!" | tee -a /tmp/openvas_mail.out
-                          echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                          else
-                              echo "systemd --> $manager_service cannot restarted" &>>/tmp/openvas_mail.out
-                              echo "OpenVAS CronJob Failed!" | tee -a /tmp/openvas_mail.out
-                              echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                              exit 1
-                       fi
-
-                  elif [[ -n "$manager_init" ]]; then
-                       ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvasmd(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                       sleep 5
-                       rc-service openvasmd start &>/dev/null
-
-                       if [ $? -eq 0 ]; then
-                          success="0"
-                          echo "open-rc --> openvasmd is restarted" &>>/tmp/openvas_mail.out
-                          echo "OpenVAS CronJob Success!" | tee -a /tmp/openvas_mail.out
-                          echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                          else
-                              echo "open-rc --> openvasmd cannot restarted" &>>/tmp/openvas_mail.out
-                              echo "OpenVAS CronJob Failed!" | tee -a /tmp/openvas_mail.out
-                              echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                              exit 1
-                       fi
-
-                  else
-                       ps aux | grep -v "grep" | grep -P "(^|\s)\Kopenvasmd(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-                       sleep 5
-                       openvasmd "$OPENVAS_MANAGER_OPTIONS" "$OPENVAS_MANAGER_PORT" "$OPENVAS_MANAGER_LISTEN_ADDRESS" "$OPENVAS_MANAGER_SCANNER_HOST" "$OPENVAS_MANAGER_GNUTLS_PRIORITIES" &>/dev/null
-
-                       if [ $? -eq 0 ]; then
-                          success="0"
-                          echo "OpenVAS-Manager is restarted manually" &>>/tmp/openvas_mail.out
-                          echo "OpenVAS CronJob Success!" | tee -a /tmp/openvas_mail.out
-                          echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                          else
-                              echo "OpenVAS-Manager cannot restarted" &>>/tmp/openvas_mail.out
-                              echo "OpenVAS CronJob Failed!" | tee -a /tmp/openvas_mail.out
-                              echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                              exit 1
-                       fi
-                  fi
-                  else
-                   echo "OpenVAS CronJob Failed! openvas-scanner cannot restarted" | tee -a /tmp/openvas_mail.out
-                   echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-               fi
-               else
-               echo "OpenVAS CronJob Failed! OpenVAS NVT cache build failed" | tee -a /tmp/openvas_mail.out
-               echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-           fi
-           else
-           echo "OpenVAS CronJob Failed! OpenVAS Certdata sync failed!" | tee -a /tmp/openvas_mail.out
-           echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-       fi
-       else
-       echo "OpenVAS CronJob Failed! OpenVAS Scapdata sync failed!" | tee -a /tmp/openvas_mail.out
-       echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-   fi
-   else
-    echo "OpenVAS CronJob Failed! OpenVAS NVT sync update failed!" | tee -a /tmp/openvas_mail.out
-    echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-fi
-rm -rf /tmp/openvas_mail.out
-
-# Restart WebUI
-if [[ -n "$success" ]] && [ $gsad -eq 0 ]; then
-      WHICHA="$(type gsad | awk '{print $3}')"
-
-      if [ $assistant -eq 0 ]; then
-         # Time to restart OpenVAS-Security Assistant
-         ps aux | grep -v "grep" | grep -P "(^|\s)\K$WHICHA(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-         sleep 5
-         systemctl restart gsad.service &>/dev/null
-
-         if [ $? -eq 0 ]; then
-            echo "systemd --> gsad.service (OpenVAS WebUI) is restarted" | tee -a /tmp/openvas_mail.out
-            echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-            else
-                echo "systemd --> gsad.service (OpenVAS-WebUI) cannot restarted" | tee -a /tmp/openvas_mail.out
-                echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-         fi
-
-      elif [[ -n "$assistant_service" ]]; then
-           if [ $COUNTA -eq 1 ]; then
-              ps aux | grep -v "grep" | grep -P "(^|\s)\K$WHICHA(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-              sleep 5
-              systemctl restart "$assistant_service" &>/dev/null
-
-              if [ $? -eq 0 ]; then
-                 echo "systemd --> $assistant_service (OpenVAS WebUI) is restarted" | tee -a /tmp/openvas_mail.out
-                 echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                 else
-                     echo "systemd --> $assistan_service (OpenVAS WebUI) cannot restarted." | tee -a /tmp/openvas_mail.out
-                     echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-              fi
-              else
-                  echo "systemd --> OpenVAS WebUI cannot restarted! You have multiple enabled systemd services ($assistant_service)" | tee -a /tmp/openvas_mail.out
-                  echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-                  exit 1
-           fi
-           
-      elif [[ -n "$assistant_init" ]]; then
-           ps aux | grep -v "grep" | grep -P "(^|\s)\K$WHICHA(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-           sleep 5
-           rc-service gsad start &>/dev/null
-
-           if [ $? -eq 0 ]; then
-              echo "open-rc --> gsad (OpenVAS WebUI) is restarted" | tee -a /tmp/openvas_mail.out
-              echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-              else
-                  echo "open-rc --> gsad (OpenVAS WebUI) cannot restarted." | tee -a /tmp/openvas_mail.out
-                  echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-           fi
-      else
-           ps aux | grep -v "grep" | grep -P "(^|\s)\K$WHICHA(?=\s|$)" | awk '{print $2}' | xargs kill -9 &>/dev/null
-           sleep 5
-           gsad "$OPENVAS_SECURITY_ASSISTANT_OPTIONS" "$OPENVAS_SECURITY_ASSISTANT_LISTEN_ADDRESS" "$OPENVAS_SECURITY_ASSISTANT_LISTEN_PORT" "$OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_ADDRESS" "$OPENVAS_SECURITY_ASSISTANT_MANAGER_LISTEN_PORT" "$OPENVAS_SECURITY_ASSISTANT_GNUTLS_PRIORITIES" &>/dev/null
-
-           if [ $? -eq 0 ]; then
-              echo "OpenVAS WebUI is restarted" | tee -a /tmp/openvas_mail.out
-              echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-              else
-                  echo "OpenVAS WebUI cannot restarted" | tee -a /tmp/openvas_mail.out
-                  echo -e "Subject:$MAIL_SUBJECT\n$(cat /tmp/openvas_mail.out)" | sendmail -t "$MAIL_TO" &>/dev/null
-           fi
-      fi
-      rm -rf /tmp/openvas_mail.out
-fi
diff --git a/net-analyzer/openvas-scanner/files/openvas-nvt-sync-cron b/net-analyzer/openvas-scanner/files/openvas-nvt-sync-cron
deleted file mode 100644
index e6a83867f3d9..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-nvt-sync-cron
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-if [ -f /etc/openvas/openvassd.conf ]; then
-	. /etc/openvas/openvassd.conf
-fi
-
-if [ "$auto_plugin_update" != "yes" ]; then
-	exit 0
-fi
-
-opts=""
-case "$update_method" in
-	rsync)
-		opts = "$opts --rsync"
-		;;
-	wget)
-		opts = "$opts --wget"
-		;;
-	curl)
-		opts = "$opts --curl"
-		;;
-esac
-
-# Export openvas-nvt-sync's environment variables if they are defined
-[ \! -z "$NVT_DIR" ] && export NVT_DIR
-[ \! -z "$OV_RSYNC_FEED" ] && export OV_RSYNC_FEED
-[ \! -z "$OV_HTTP_FEED" ] && export OV_HTTP_FEED
-
-/usr/sbin/openvas-nvt-sync $opts >& /dev/null
-
-if [ $? -ne 0 ]; then
-	echo "Error updating OpenVAS plugins. Please run openvas-nvt-sync manually."
-	exit 1
-fi
-
-if [ "$notify_openvas_scanner" == "yes" ]; then
-	/etc/init.d/openvas-scanner reloadplugins
-fi
-
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-mkcertclient.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-mkcertclient.patch
deleted file mode 100644
index 05e92728f182..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-mkcertclient.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.mkcert/CMakeLists.txt
---- openvas-scanner-4.0.1/CMakeLists.txt	2014-04-23 16:00:47.000000000 +0200
-+++ openvas-scanner-4.0.1.mkcert/CMakeLists.txt	2014-05-26 16:04:23.093548608 +0200
-@@ -258,7 +258,6 @@
- #         DESTINATION ${OPENVAS_SYSCONF_DIR})
- 
- install (FILES ${CMAKE_BINARY_DIR}/tools/openvas-mkcert
--               ${CMAKE_BINARY_DIR}/tools/openvas-mkcert-client
-                ${CMAKE_BINARY_DIR}/tools/openvas-nvt-sync
-          DESTINATION ${SBINDIR}
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-@@ -269,7 +268,15 @@
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 
--install (FILES ${CMAKE_BINARY_DIR}/doc/openvassd.8
-+install (FILES ${CMAKE_BINARY_DIR}/tools/openvas-mkcert-client
-+         DESTINATION ${BINDIR}
-+         PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-+                     GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+
-+install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert-client.1
-+          DESTINATION ${DATADIR}/man/man1 )
-+
-+install (FILES ${CMAKE_BINARY_DIR}/doc/openvassd.8
-          DESTINATION ${DATADIR}/man/man8 )
- 
- install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert.8
-Only in openvas-scanner-4.0.1.mkcert/: CMakeLists.txt~
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-rulesdir.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-rulesdir.patch
deleted file mode 100644
index 90f998ffd40c..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-rulesdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.rules/CMakeLists.txt
---- openvas-scanner-4.0.1/CMakeLists.txt	2014-04-23 16:00:47.000000000 +0200
-+++ openvas-scanner-4.0.1.rules/CMakeLists.txt	2014-05-26 16:07:37.454116277 +0200
-@@ -171,6 +171,10 @@
- set (OPENVASSD_DEBUGMSG "${OPENVAS_LOG_DIR}/openvassd.dump")
- set (OPENVASSD_CONF     "${OPENVAS_SYSCONF_DIR}/openvassd.conf")
- 
-+if (NOT OPENVASSD_RULES)
-+  set (OPENVASSD_RULES    "${OPENVAS_DATA_DIR}/openvassd.rules")
-+endif (NOT OPENVASSD_RULES)
-+
- set (NVT_TIMEOUT "320")
- 
- message ("-- Install prefix: ${CMAKE_INSTALL_PREFIX}")
-
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch
deleted file mode 100644
index 51dd8389c5f5..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- CMakeLists.txt           | 2 +-
- tools/greenbone-nvt-sync | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c691100..d78ffa6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -155,7 +155,7 @@ set (OPENVAS_DATA_DIR    "${DATADIR}/openvas")
- set (OPENVAS_STATE_DIR   "${LOCALSTATEDIR}/lib/openvas")
- set (OPENVAS_LOG_DIR     "${LOCALSTATEDIR}/log/openvas")
- set (OPENVAS_CACHE_DIR   "${LOCALSTATEDIR}/cache/openvas")
--set (OPENVAS_PID_DIR     "${LOCALSTATEDIR}/run")
-+set (OPENVAS_PID_DIR     "/run")
- set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas")
- 
- set (OPENVAS_NVT_DIR     "${OPENVAS_STATE_DIR}/plugins")
diff --git a/net-analyzer/openvas-scanner/files/openvassd b/net-analyzer/openvas-scanner/files/openvassd
deleted file mode 100644
index 13070e32e1cc..000000000000
--- a/net-analyzer/openvas-scanner/files/openvassd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting openvassd (scanner)"
-	start-stop-daemon --start --name openvassd \
-		--exec /usr/sbin/openvassd \
-		--pidfile /var/run/openvassd.pid
-	eend $? 
-}
-
-stop() {
-	ebegin "Stop openvassd (scanner)"
-	start-stop-daemon --stop --name openvassd \
-		--pidfile /var/run/openvassd.pid
-	eend $?
-}
diff --git a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
deleted file mode 100644
index 628a223a4198..000000000000
--- a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-#Listen on given address - by default scanner listens on all addresses
-#SCANNER_LISTEN=--listen=127.0.0.1
-
-#Listen on given port - by default 9391
-SCANNER_PORT=--port=9391
-
-#Send the packets with the source IP of IP1,IP2,IP3....
-#SCANNER_SRCIP=--src-ip=127.0.0.1,192.168.1.2
-
-# Extra Arguments
-# SCANNER_EXTRA_ARGS=""
-
-# Set to yes if plugins should be automatically updated via a cron job
-auto_plugin_update=no
-
-# Notify OpenVAS scanner after update by seding it SIGHUP?
-notify_openvas_scanner=yes
-
-# Method to use to get updates. The default is via rsync
-# Note that only wget and curl support retrieval via proxy
-# update_method=rsync|wget|curl
-
-# Additionaly, you can specify the following variables
-#NVT_DIR		where to extract plugins (absolute path)
-#OV_RSYNC_FEED		URL of rsync feed
-#OV_HTTP_FEED		URL of http feed
diff --git a/net-analyzer/openvas-scanner/files/openvassd.init b/net-analyzer/openvas-scanner/files/openvassd.init
deleted file mode 100644
index c07d3936905d..000000000000
--- a/net-analyzer/openvas-scanner/files/openvassd.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-name="OpenVAS Scanner"
-command="/usr/sbin/openvassd"
-command_args="${SCANNER_LISTEN} ${SCANNER_PORT} ${SCANNER_SRCIP} ${SCANNER_EXTRA_ARGS}"
-pidfile="/run/openvassd.pid"
-extra_stopped_commands="create_cache"
-
-depend() {
-	after bootmisc
-	need localmount net
-}
-
-start_pre() {
-	checkpath --directory --mode 0775 --quiet /var/cache/openvas
-}
-
-create_cache() {
-	checkpath --directory --mode 0775 --quiet /var/cache/openvas
-	ebegin "Generating initial Cache"
-	/usr/sbin/openvassd --foreground --only-cache
-	eend $?
-}
diff --git a/net-analyzer/openvas-scanner/files/openvassd.logrotate b/net-analyzer/openvas-scanner/files/openvassd.logrotate
deleted file mode 100644
index 9316ba8d9629..000000000000
--- a/net-analyzer/openvas-scanner/files/openvassd.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# logrotate for openvas
-/var/log/openvas/openvassd.log {
-        rotate 4
-        weekly
-        compress
-        delaycompress
-        missingok
-	postrotate
-	    /bin/kill -HUP `pidof openvassd`
-	endscript
-}
diff --git a/net-analyzer/openvas-scanner/files/openvassd.service b/net-analyzer/openvas-scanner/files/openvassd.service
deleted file mode 100644
index 553b09b5b2fb..000000000000
--- a/net-analyzer/openvas-scanner/files/openvassd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=OpenVAS Scanner
-After=network.target
-Before=openvasmd.service
-
-[Service]
-EnvironmentFile=-/etc/openvas/openvassd-daemon.conf
-ExecStart=/usr/sbin/openvassd -f ${SCANNER_PORT} ${SCANNER_LISTEN} ${SCANNER_SRCIP} ${SCANNER_EXTRA_ARGS}
-Restart=always
-RestartSec=1
-User=root
-Group=root
-TimeoutSec=1200
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d b/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d
deleted file mode 100644
index 18e820caec1b..000000000000
--- a/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d	/var/cache/openvassd 0775
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
deleted file mode 100644
index ac7d2ea314e2..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DL_ID=2129
-MY_PN=openvassd
-inherit cmake-utils systemd
-
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	app-crypt/gpgme
-	>=dev-libs/glib-2.16:2
-	dev-libs/libgcrypt:0
-	>=net-analyzer/openvas-libraries-8.0.2
-"
-RDEPEND="${DEPEND}
-	!net-analyzer/openvas-plugins
-	!net-analyzer/openvas-server
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P/_beta/+beta}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
-	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
-	"${FILESDIR}"/${PN}-4.0.3-run.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLOCALSTATEDIR="${EPREFIX}/var"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
-	insinto /etc/openvas
-	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
-	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}"/${MY_PN}.logrotate
-
-	dodoc "${FILESDIR}"/openvas-nvt-sync-cron
-
-	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild
index c0e59479a726..ece8f93f9010 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-5.1.3.ebuild
@@ -80,10 +80,6 @@ src_install() {
 	insinto /etc/openvas/sysconfig
 	doins "${FILESDIR}"/${MY_PN}-daemon.conf
 
-	insinto /etc/openvas/scripts
-	doins "${FILESDIR}"/openvas-feed-sync "${FILESDIR}"/first-start
-	fperms 0755 /etc/openvas/scripts/{openvas-feed-sync,first-start}
-
 	newinitd "${FILESDIR}/${MY_PN}.init" ${MY_PN}
 	newconfd "${FILESDIR}/${MY_PN}-daemon.conf" ${MY_PN}
 
diff --git a/net-analyzer/openvas/Manifest b/net-analyzer/openvas/Manifest
index a95381ad2e52..86092e051156 100644
--- a/net-analyzer/openvas/Manifest
+++ b/net-analyzer/openvas/Manifest
@@ -1,4 +1,2 @@
-AUX README.gentoo 1029 BLAKE2B e44091e9ea96dd210d0e31033212893c8197bff4393b8cb6a4ce38bc53ed43b8ecad649f8b47683346c0c353c7c06e29e64d298be19ba0fc8db2d0d36411b2cf SHA512 aeff351d306e4bc818b48d254c9efd618818b9ae1025285e97105908746628db469b4fa4620cb0db3032f58f50f3615779cf35c098e3e7819c01c24ee0adefc5
-EBUILD openvas-8.0.5-r1.ebuild 1460 BLAKE2B 4e0553cdf1cdd6055e7940d96c5e2336d557f09dbcbac2ca23f78e38cfe6062e6926a79c4afdd0f0d5fbf1a0659c0866e5e0cabc23958a36a974c25ad38181a3 SHA512 46582e09a8bada805ec596ff3d11493a678d33b5133b815b4812a5258733853af3f42664657d98e53ad8de47ad1f3e7bf404ea8b63406e25d8ca7f91ae564d30
 EBUILD openvas-9.0.0.ebuild 1511 BLAKE2B 6ecacd49f16ac33eb77939e4b033ec4a4aeafe4598cf83f9aa64b9f06c944e04d5b40f616b6efafc15af4f882d8d239a8f34765927a98d918454e6263d0e687b SHA512 9db7d7c6df328ba1e15d0531a083a14706b816ff1fbb97a4b39d6330396637211d48c9a7c1e772cfbdf721ea59ea76fecea4da52d78f9fe09531975a29c66fce
 MISC metadata.xml 990 BLAKE2B 38d5a08041cad530d89c9f7f93e6e45718fcc5358d71b72e664d249ae20f6b60502fbf00a0bf5b510c7e12192b5d696b3b262083b55389e36be6b9b6b22b4843 SHA512 897ec95d4a7b86a91fe5ced1dfbf27b724ec3a5c1a83ebdc2dfae76d707013d2ac2d908a341e36f950c0bf125d3010fab4bb58012a650be8bcd988c0d14821c2
diff --git a/net-analyzer/openvas/files/README.gentoo b/net-analyzer/openvas/files/README.gentoo
deleted file mode 100644
index 71dbf185b472..000000000000
--- a/net-analyzer/openvas/files/README.gentoo
+++ /dev/null
@@ -1,34 +0,0 @@
-To allow openvasmd to work, you need to do the following
-
-# Generate a Server Certificate
-openvas-mkcert
-
-# Generate a Client Certificate
-openvas-mkcert-client -n -i
-
-# get nvt feed
-openvas-nvt-sync (free) or greenbone-nvt-sync (commercial)
-
-# get scap feed
-openvas-scapdata-sync (free) or greenbone-scapdata-sync (commercial)
-
-# get cert feed
-openvas-certdata-sync (free) or greenbone-certdata-sync (commercial)
-
-# Generate initial NVT cache (takes some minutes)
-rc-service openvassd create_cache or openvassd --foreground --only-cache
-
-# Start the OpenVAS Scanner
-rc-service openvassd start or systemctl start openvassd.service
-
-# Initialize the Database (This is going to take some time, perhaps time to get coffee?)
-openvasmd --rebuild --progress -v
-
-# Create an admin user and note down the initial password
-openvasmd --create-user=admin --role=Admin
-
-# Start the OpenVAS Manager
-rc-service openvasmd start or systemctl start openvasmd
-
-# Start the Greenbone Security Assistant
-rc-service gsad start or systemctl start gsad
diff --git a/net-analyzer/openvas/openvas-8.0.5-r1.ebuild b/net-analyzer/openvas/openvas-8.0.5-r1.ebuild
deleted file mode 100644
index eb5667c7e762..000000000000
--- a/net-analyzer/openvas/openvas-8.0.5-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.openvas.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf"
-
-RDEPEND="
-	dev-db/redis
-	>=net-analyzer/openvas-libraries-8.0.5
-	>=net-analyzer/openvas-scanner-5.0.4
-	>=net-analyzer/openvas-manager-6.0.6
-	>=net-analyzer/openvas-cli-1.4.3
-	net-analyzer/openvas-tools
-	pdf? (
-		app-text/htmldoc
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}"
-
-pkg_postinst() {
-	elog "Additional support for extra checks can be get from"
-	optfeature "Nikto — a web server scanning and testing tool" net-analyzer/nikto
-	optfeature "NMAP — a portscanner" net-analyzer/nmap
-	optfeature "ike-scan - an IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
-	optfeature "amap — an application protocol detection tool" net-analyzer/amap
-	optfeature "ldapsearch from OpenLDAP utilities — retrieves information from LDAP dictionaries" net-nds/openldap
-	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
-	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
-	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
-	optfeature "The Greenbone Security Assistant as alternative to the plain scanner" net-analyzer/greebone-security-assistant
-}
diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest
index 2841afe90ee9..ecb61469a5f0 100644
--- a/net-analyzer/ospd/Manifest
+++ b/net-analyzer/ospd/Manifest
@@ -1,5 +1,3 @@
-DIST ospd-1.0.0.tar.gz 39656 BLAKE2B 754a7fcca382617ce7eed33d8d148d516c550435da7abed0e294e216898c0ad96d53bae62e5396b590812015c9a71be5346187d521c4051d5b2dc04345336b59 SHA512 64b1b42c5292dc8cf8b1ffde9082f4d05ff62f4d0bf2ed7b2b5d2ba4d3c3611ae8af30b39c8becb9f6bdc36eb519a0b881cdeb50891e5a2273003f6181cbebfb
 DIST ospd-1.3.2.tar.gz 39097 BLAKE2B 4c102e1e6857f89015666950e2d7a107bf81c861f9c6d4d74aab33f77585ea871e353aa95deb3f84a1bb4cd391f40121ca927835ebec9db2545eb8f606e96df7 SHA512 26ec0b45d74df687264ce2d5e42a6f51cfb982f8fe00863294b990ee8db819b7f54ebf3f095094c32c2bc91a51d987ac83f15f4bf15e931d4ffd215b72ac6bec
-EBUILD ospd-1.0.0.ebuild 656 BLAKE2B ddddf826a72c516f10f3421ea7a7f45ebfa0b42dad541842d6a9209f60c6c6584bab1d9d43b4b9c0e22be54f7a4951667149dfdc17d710a828b0bd01613a48c2 SHA512 059abfdeb1701da5897b6c3d30b69228c04e7ba52e238a865861f7104465b7b94226bb391e084aeeb46c5db37bcb312054dd1af4b8908f3d20401786f7166c23
 EBUILD ospd-1.3.2.ebuild 738 BLAKE2B 59907c080ef008560f9f56157f341f2a56684d384015bfda76bf7fb38668f26f1c74b9bd2c5e32631240afdc2571d72df02f1236a084791736e78c9f7202ca92 SHA512 4ace8420652b2017aa0425e35a562c0a5e211ab2967c3af72dbbb7804aa2d3ebe6d2274c3ef48ab1158dbaf8805e7f98d5ae52d6cbce1eaa4c51a3482aa774e0
 MISC metadata.xml 435 BLAKE2B 4d40c4dcffe9bfd81d1c1b517b4e6d6e1e658f9d6be65f8ad962ecbbee78bf0cc6bbb5805f2e056375c7371697a453453f8eeae40bae1bdf890be8f3e23ccfbc SHA512 fc802728917b8ebc3c43e3c35ce1fa7b8aa30d89d60abcfcd82eb6baf0152d02384b2e336664942bd89c3ed27a418f37a13699b68a424f36645c51c1310a6e16
diff --git a/net-analyzer/ospd/ospd-1.0.0.ebuild b/net-analyzer/ospd/ospd-1.0.0.ebuild
deleted file mode 100644
index 675c92e710f5..000000000000
--- a/net-analyzer/ospd/ospd-1.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DL_ID=1999
-
-DESCRIPTION="Collection of scanner wrappers for OpenVAS"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${P/_beta/-beta}
-
-_DOCS=( ChangeLog CHANGES README )
-
-python_test() {
-	esetup.py test
-}
diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
index b0901de29b97..6e76ae8eee61 100644
--- a/net-analyzer/scanssh/Manifest
+++ b/net-analyzer/scanssh/Manifest
@@ -1,4 +1,5 @@
 AUX scanssh-2.0-fix-warnings.diff 1071 BLAKE2B c92997cd26cd03ec451ebf83a54f19ba86d6b33f90dd666c8637fceb222849b3d2703ca9c8c1645a95186059ccf049ae462d7a4c58486ee8c0d086cb8f73e625 SHA512 b9080dbe7551e905db0744ca36b8690d05d784ad7c4c77f4fcbe64ff603353e998cc28ae45c26e230f594278cdb6f130029aa633166e6636933be44845c27b06
 DIST scanssh-2.1.tar.gz 111481 BLAKE2B 08ba8439cd02d597647f865fed68ef9eb32d63726f8d14bebe3b58a067b56eee70e01a1a7911ce69cf4466c0863d92d5d22e0202bb1cc60426ac283855438079 SHA512 1ddff6f8e51735bab28032c8d7cbb641ff0cd19a404a27ab489589ef1e30e3721dd486854eb4fef15368cc53f10c9c2650ffaf7fa7f767dc2202fcc5540ae59c
+EBUILD scanssh-2.1-r1.ebuild 647 BLAKE2B 11b7cbd3020698756b9ddced2827fc4e249ad7defafc71059efa4f7079473e824c29a5b88de1aa8f75470b4bb7a4812e880992962dfe0b11e1c3cf402448c237 SHA512 89f9bae762d242c013b99a971c55b4e0bd4d1ada3253760e5de0c89a08de5ec9fcd59241a14ac5f9ed25ba8bb90a96a9bf0f8634569cf4cf722338955f93a84a
 EBUILD scanssh-2.1.ebuild 641 BLAKE2B 8023919e0452fdaa5420cf90b59466b04070b9c4b1ff733657d5a0b22ab6c870113a9234b1442d88a02b34d91d8504a41eb101e38fd77e8c58c41bb8d61bd59e SHA512 56e016f7ff11ea334c276f011b73870079e1b40bc2baeab621a141722b1f52c9da7f1d16beedc0952b6722907fe5445d3b40b7252141abd99de10e68e3329baa
 MISC metadata.xml 436 BLAKE2B a9ebfd202e124281faf98318aafe911ae9e32201540c68b5e0bc4246d56af9695bb1f3f55b50bf04ffb13afddc8128fb15d75e7995a986577529c2c527278595 SHA512 98f0bb0894f2208336cb9e42bc4445a13c01a851d1a0f964519029c639ec37d7d476cc128e0e9acc0558ad23f2312c8189784f7e08a4cd0e80fb92823fce1da7
diff --git a/net-analyzer/scanssh/scanssh-2.1-r1.ebuild b/net-analyzer/scanssh/scanssh-2.1-r1.ebuild
new file mode 100644
index 000000000000..0aa7c1f944ad
--- /dev/null
+++ b/net-analyzer/scanssh/scanssh-2.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="network scanner that gathers info on SSH protocols and versions"
+HOMEPAGE="https://monkey.org/~provos/scanssh/"
+SRC_URI="https://monkey.org/~provos/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	dev-libs/libdnet
+	dev-libs/libevent:=
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0-fix-warnings.diff
+)
+
+src_prepare() {
+	default
+	touch configure
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin scanssh
+	doman scanssh.1
+}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index c3ffdfbf862f..65238e453d01 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,10 +1,8 @@
 DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
 DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06b2ad8f8f9ebe9dfb0b9a3bc4f641cd16d99a4ba070fc0763d7cfeb8d3ecd056f162d509070cdd57d55d6ad9c SHA512 980f708a849ae26edca3eb6618a41668818c5883bca699f347f47a8964b3ee44a6ceefe4a12cb7d5fe6c13f5cbe2b7547938e53139f4ec9e6ef384e30c9bb6db
-DIST scapy-2.4.3_rc2.tar.gz 2785738 BLAKE2B f0318b90d02f2e54033d1d2c6c0d3eff63302a3df3e4b6f14913741c7f677b3cfa79abcfcfed38c81dfb893434009eb3f809dfccb8b493a0f42c8547d67f7a18 SHA512 0d7dac163028fcb596175c532b594fe8bf80f1382518e971259c9e92eafd8c7665e517d9bc7bf8f335b147fcc14d0225d7e24fd08adca0029fb5e4e6e5ae09c5
-DIST scapy-2.4.3_rc3.tar.gz 2947420 BLAKE2B 43c9ffebfd87c6918c15dd403a58e85cb44f38c540fd28117a5586b2ad1f341ad793a5f6b2e5c1a8204e9c682c1ef6da3c20a313c0ba7f4ff3617ec674f5bb2d SHA512 ef0c6ef97868a3489eaa30acbd7eb203a61f311e50ecd9ec375fb05ae78ba5f33f854928440aa84dbd35e4178469c93a4f6073a33082572b133df93ee18000bd
+DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede
 EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5
 EBUILD scapy-2.4.2.ebuild 1015 BLAKE2B 84ed365afa54aca1f499902ebc7a200f3464f9f7e9157fdab17749ce59cf25524e18ae9f7181e09e760d2a02ddd701eeccb5b10371573e33961f0037ebfced13 SHA512 434e19fcee3d9c71b7967440cd8af2dd2cae36f8e26f99e9b02de202fe80116a0e8eb501be8db7ff7d633f6f1bec7202b5b65826a7a21881042f1b9b5f723dc4
-EBUILD scapy-2.4.3_rc2.ebuild 1015 BLAKE2B 4217feb98a994332d8efc0f8a5ab46352aaccc3125fd962ed18a1da49731399a5826ccbe8de1c963ca8becf9c9d1c5f7389d995a3d763e9fbcf822bf30a231ab SHA512 990f4c97c5f86a33c41f1af6ea761eabcccfff6bc7f492f0c552765fcaf6c0b6122940da696d06cea3b08de1b702b38ac17cc29aeed7513ad6d6107e5c29fad7
-EBUILD scapy-2.4.3_rc3.ebuild 1015 BLAKE2B 4217feb98a994332d8efc0f8a5ab46352aaccc3125fd962ed18a1da49731399a5826ccbe8de1c963ca8becf9c9d1c5f7389d995a3d763e9fbcf822bf30a231ab SHA512 990f4c97c5f86a33c41f1af6ea761eabcccfff6bc7f492f0c552765fcaf6c0b6122940da696d06cea3b08de1b702b38ac17cc29aeed7513ad6d6107e5c29fad7
-EBUILD scapy-9999.ebuild 977 BLAKE2B a15521edc49f7bf13c8aed716444ad120bde4d1208a4dee50737e21ab49b79870dbefb3a0793814bf81dffc778da0902f31fd6bc7ffe8268214c25da62db3e54 SHA512 d038dfbb47a750cc6cd7067f97d92f8f728e82d446fda21d1110d55886e9fc2defe54299946ca30be335b4dac40eb7fffc79ae5aa9f1b0f04149bd7e978fc4c5
+EBUILD scapy-2.4.3.ebuild 1009 BLAKE2B caacdac8cebdf60d50f02589e0cf0232cc0fef9e1f327b1d3143235703fcee0b162b31c2b3c0d2195be2ec42538e8f7ec198331d4d12bf1e31c5cb01fb75969f SHA512 585bb1d4ed1c391ff7727d847c4fd3ed9ab8598ef00898c41f852c9843719f00d1f07bd4d41186dbac472031d501084754bfd26cd307d347c8799f7c065d1a3d
+EBUILD scapy-9999.ebuild 971 BLAKE2B 633a8a0de6c713957cd4d0c775244310fc039057295602ef127e2f899e7f3fca94ffd61d5964ab44cae4bdae19041a99f8b774df17f325ddea8eeebda0f4be07 SHA512 8e367a693eb6d62ffba9e8db226314c0524c258501c024a0dbeb395f4f1fd1ed4a29b2550c6c5e3eb41cfb274309119763f5f1d977849d7fbfe20ec65a2c8908
 MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf
diff --git a/net-analyzer/scapy/scapy-2.4.3_rc3.ebuild b/net-analyzer/scapy/scapy-2.4.3.ebuild
index 25877178edf3..ccaf35b48e6c 100644
--- a/net-analyzer/scapy/scapy-2.4.3_rc3.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/scapy/scapy-2.4.3_rc2.ebuild b/net-analyzer/scapy/scapy-2.4.3_rc2.ebuild
deleted file mode 100644
index 25877178edf3..000000000000
--- a/net-analyzer/scapy/scapy-2.4.3_rc2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
-SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RDEPEND="
-	net-analyzer/tcpdump
-"
-S=${WORKDIR}/${P/_/}
-DOC_CONTENTS="
-Scapy has optional support for the following packages:
-
-	dev-python/cryptography
-	dev-python/gnuplot-py
-	dev-python/ipython
-	dev-python/pyx
-	media-gfx/graphviz
-	net-analyzer/tcpreplay
-	virtual/imagemagick-tools
-
-	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
-"
-
-src_prepare() {
-	echo ${PV/_/} > ${PN}/VERSION
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc -r doc/${PN}/*
-	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
-}
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index 55240a18ff01..955a856de149 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index 8959b5943cde..fcf9c4c80896 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1,4 +1,5 @@
-DIST sslsplit-0.5.2.tar.gz 1526606 BLAKE2B 2eb9e1525072626cfdfdfe344a61d92cf340a87dbbabfd06c5a7b46ce6dd0305b27949f91260fe192ecf97484676600e39f79a74995b45fb5b59138726cfbffe SHA512 5f0560dbf89355ad0ef443df2fb0358046efd8c35be6c45f27b04495fd6194c826ef1c7b261683e7f22eb14436293d00395329284d9e709e1188c3c885251935
-EBUILD sslsplit-0.5.2.ebuild 996 BLAKE2B b4fd683858430b4e4ed81f70ee05edb921fb0924365087b31eb39c287bbdafbe05d69c3d47d37689c07c73c3dccaa8ee4b70aa154c708dafde4a480ca4f7b4fa SHA512 a1d21421197f0e07227dd26590b56b3162888238f99bf3e861bb9fa9f50d3853ae212967e95283469639da65948f0945742c666610a00a5658c7f6683d05d3a0
-EBUILD sslsplit-9999.ebuild 994 BLAKE2B d88bc6536da3f3bcb071fe8c6c102a0906a5fc8de959484a5aeb59ab151202a6e77975ce7cfc6cc480108b4fedca87e019c0d5682988acb6902eb77b7290003e SHA512 28041f647509751509fff7db400e53849c912bad1ce150d918d1bd4bbe2d7b789def1ba256fa5abf5aff2c2f29078f44dda182bc86c50693f5ef63814c57863c
+AUX sslsplit-0.5.4-install.patch 1131 BLAKE2B 1f81f8fbc8861e4ccfc0b2068d19e1a5dbb1485cf72d7aa0799e7addf7c73e4836b427afd510de8b6c98037e473e5699c33920fb7931c99ccc989fd0cb956bb3 SHA512 0219d175cf9f8a6a89f9a807bb5981a83c1e62c6738f5fafd93970045fa56dd0595761f3915cc223f60541b39a8bff9222233f176a5a608cdcf7a6774b69f56c
+DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b SHA512 5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed
+EBUILD sslsplit-0.5.4.ebuild 1062 BLAKE2B 21b643d7ea3e2b6227c1f51d1113b708da07624357fef757361150ec8a2d29d8e5b4c1a9a217b23e9ce0b106e2d7c13568aa3c3c2fdbfd828b717170a20697a5 SHA512 7aff2062038061115f4e59d706585da52ffba89f2a12f9d0da2c7be19844c0a3530771f6ee28b2b91bf4a6abd648180ee92052e6815ee4ff911fd5977d33109f
+EBUILD sslsplit-9999.ebuild 1029 BLAKE2B 84433424dce11eb473146ce9d4caa229f6f648d2ad627059992b9877140caf720f126b03b96655bec689ae5042e296573fe3ee77b9d938699133fd6a2666e57e SHA512 a44176eb89f13fa2f337116026d9ceb363c6d22ffcaf6c635b23ca8edffd8fd145ea6fa6129991a57b50187a083890215e7da069b11f045764f09bb6409ac820
 MISC metadata.xml 873 BLAKE2B 2025dba83d4a6c2c48f8297da057360bc42269093af9292a8baa3096a5ec5cb3644da47effd8977ee9829e318bea5c11680c5eccab0407d5f14ed29a12e615b3 SHA512 d6d408cf00e3201acd6de22a0f10a2322398a889c84480da8eebd005da099f9306ac8d88d13c4186fa369915c39b4ad04d7aff558ad263896591374c9a4c78a1
diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
new file mode 100644
index 000000000000..65959f3e1090
--- /dev/null
+++ b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
@@ -0,0 +1,26 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index ebdcf0a..02cb4b7 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -519,21 +519,12 @@ $(TARGET).conf.5: $(TARGET).conf.5.in $(MKFS) FORCE
+ 
+ install: $(TARGET) $(TARGET).conf $(TARGET).1 $(TARGET).conf.5
+ 	test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
+-	test -d $(DESTDIR)$(PREFIX)/$(TARGET) || \
+-		$(MKDIR) -p $(DESTDIR)$(PREFIX)/sslsplit
+ 	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \
+ 		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
+ 	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \
+ 		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5
+-	test -d $(DESTDIR)/var/log/$(TARGET) || \
+-		$(MKDIR) -p $(DESTDIR)/var/log/$(TARGET)
+-	test -d $(DESTDIR)/var/run/$(TARGET) || \
+-		$(MKDIR) -p $(DESTDIR)/var/run/$(TARGET)
+ 	$(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \
+ 		$(TARGET) $(DESTDIR)$(PREFIX)/bin/
+-	$(INSTALL) $(CNFOWNERFLAGS) -m $(CNFMODE) \
+-		$(TARGET).conf \
+-		$(DESTDIR)$(PREFIX)/$(TARGET)/$(TARGET).conf.sample
+ 	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
+ 		$(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/
+ 	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
index f823d37044fe..af09469872b6 100644
--- a/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
@@ -22,23 +22,29 @@ else
 fi
 
 RDEPEND="
-	elibc_musl? ( sys-libs/fts-standalone )
 	dev-libs/libevent[ssl,threads]
-	dev-libs/openssl:0="
+	dev-libs/openssl:0=
+	net-libs/libnet:1.1
+	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-install.patch"
+)
 
 src_prepare() {
 	default
 
 	use elibc_musl && append-libs "-lfts"
 
-	sed -i 's/-D_FORTIFY_SOURCE=2 //g' GNUmakefile || die
-	sed -i 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile version.c || die
+	sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
+		-e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die
 	sed -i '/opts_suite/d' main.t.c || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc AUTHORS.md NEWS.md README.md
+	dodoc AUTHORS.md NEWS.md README.md sslsplit.conf
 }
diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild
index f013b4bb5552..5ea7c49b62cf 100644
--- a/net-analyzer/sslsplit/sslsplit-9999.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
@@ -22,23 +22,25 @@ else
 fi
 
 RDEPEND="
-	elibc_musl? ( sys-libs/fts-standalone )
 	dev-libs/libevent[ssl,threads]
-	dev-libs/openssl:0="
+	dev-libs/openssl:0=
+	net-libs/libnet:1.1
+	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
+BDEPEND=""
 
 src_prepare() {
 	default
 
 	use elibc_musl && append-libs "-lfts"
 
-	sed -i 's/-D_FORTIFY_SOURCE=2 //g' GNUmakefile || die
-	sed -i 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile build.c || die
+	sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
+		-e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die
 	sed -i '/opts_suite/d' main.t.c || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" SYSCONFDIR="${EPREFIX}/etc" install
 	dodoc AUTHORS.md NEWS.md README.md
 }
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index e77e6461e01e..16f52119a27f 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,3 +1,5 @@
 DIST testssl-2.9.5_p7.tar.gz 8955971 BLAKE2B 6ca3bc60445c9448c3dc24ee7262e57bc03a2c686bbeebcc1cc850edfa652538c1ba5365189c27e78f0cb977e68d2ea1a9f940d47cd0a53402d1fa9a31a33483 SHA512 35ab900b84db8a0a210cb9ce8bb794ff7e8cddd5c85a151083bc76eba834dce37597b29b6235fcf2ce37b004dd295b1756e01374a4943e1e2ed0d2a8cf8761f6
+DIST testssl-2.9.5_p8.tar.gz 8956035 BLAKE2B 692e08e6ff3dedf52dad5ba960291043740fa4e8e8f117b5dff93adfe1a620add3a34660fcbc1c68b53e23b0df5a0ff1862a33b12a50e78312c65791e0a55b42 SHA512 4c0fd1faa8978f85b46a6ae41471e16c8ab2d5651bdb6e009478aeed7b363a3648ff44e6e7689ccf421bd5e6374a2b5bfe9e5a13f7284c3a46371ed58ce4e5fb
 EBUILD testssl-2.9.5_p7.ebuild 1527 BLAKE2B 8dddf30b779034c519b25dc3c7b1951517ad2ed2623a3ba6b85d259521509032457206034735d80bc1f8475f80786594f9de11b3623c090bfcc1903afe497c1b SHA512 ae42c3b0397f7bbcb19dc1547c7d27cea64f4613482ed2b06df504533edc8b41d84ab2be9d486694d711d9c7019689cd28e1a7efa630aabb47cf3345bf0d752f
+EBUILD testssl-2.9.5_p8.ebuild 1512 BLAKE2B dbb066094e2e89f1a95ca71e19e7714f929e89698acd19984d25aa198ebf14791f4c7f8b1b4bff079fd2ef94a7be58755b5323fb2ce1c0f92ebec2ff0e6971cc SHA512 b99b54101b6d19b0adee93d1a42eadd42dfe5b521b0b3eb1cdf70f86b4477c9d184bec7d24719955edf846d6c4e3c3f47fa181a3ed65e706b7aeb7a2422059f1
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-2.9.5_p8.ebuild b/net-analyzer/testssl/testssl-2.9.5_p8.ebuild
new file mode 100644
index 000000000000..122ae7a422b5
--- /dev/null
+++ b/net-analyzer/testssl/testssl-2.9.5_p8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}.sh"
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bundled-openssl kerberos"
+
+RDEPEND="
+	app-shells/bash[net]
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+	bundled-openssl? (
+		kerberos? (
+			sys-libs/zlib
+			virtual/krb5
+		)
+	)
+	!bundled-openssl? ( dev-libs/openssl:0 )
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	if use amd64; then
+		if use kerberos; then
+			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
+		else
+			BUNDLED_OPENSSL="openssl.Linux.x86_64"
+		fi
+	elif use x86; then
+		BUNDLED_OPENSSL="openssl.Linux.i686"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+
+	if use bundled-openssl; then
+		sed -i ${PN}.sh \
+			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
+	fi
+}
+
+src_install() {
+	dodoc CHANGELOG.md CREDITS.md Readme.md
+	dodoc openssl-rfc.mappping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+
+	if use bundled-openssl; then
+		exeinto /opt/${PN}
+		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+	fi
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 9551926f8d72..791854b89309 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -17,6 +17,6 @@ EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e4
 EBUILD wireshark-3.0.1.ebuild 6644 BLAKE2B ec4baa9e82e85d4d4f12c8d8952fd67fc01c4452a0baa709d4dcf71313a4f01e8c711aa3735a329868b9627099872a3bb4665e6fe70a7caa84ea0fa910947c14 SHA512 9c48c6c03aa455dda7178f77c1fa32d404d36c814043b3bc71ea60437779f85c5d4af38d35599eab548d7fd856eb1227398a78629acbef2d3f9edb3fa7d05147
 EBUILD wireshark-3.0.2.ebuild 6646 BLAKE2B a83359278ffcc89e54efe7367b13e060884985bc0c4817639b1513815fc62877f6edea5224768ce75f006f569ec01fa950a2554d3048dbad7b32f51f3147c838 SHA512 7273fbcd9a25a1312979cdc244825d6c3139d9b161d396a2f1a6ac58701912228b3a380d415d36d8d37cb1295cb6c0b49f2bd73d95f28853879d4d5917e3dfd9
 EBUILD wireshark-3.0.3.ebuild 6582 BLAKE2B 903e0d9984291cf6a19d02b037ebaf81dbada4e64665800bd8411291bcb4835d4d89f167c5e4626bb7c103376c51d6504759df17c82983f9dcf61fee08c13b57 SHA512 7f6b2b4333b81835f719ce22684e0a5c0a213399b16aa41575544957376ce258de5784abf088c78347fd5bdc1e95a9482bbfe2a9a64f51fc276ab0388478b5c5
-EBUILD wireshark-3.1.0.ebuild 6736 BLAKE2B f06505598eaafeb3299579665ebc28a3e01c14b595c39b62aea0b48e5d00c9dd01a6f54a1b420cedabaf560cddc7a19009717c8a4cc759a0eaa55eb2f16e5752 SHA512 7b442698ccda0e6c932012aaec2530c7b3c835b8568575c6e2c6459cc93094f50c85c7a40e11bca3786ca354b667fad593451feb4ce0cfc52423ac2cef1b093e
-EBUILD wireshark-99999999.ebuild 6741 BLAKE2B 32a56fe750a8f75cb8dd242570171c63ab6b06f209ba01109aed7cca903f47ed6b4b77be567a58ee7720f410e83432b16042601c5ba1f6bb4b941f5bf0e469cd SHA512 b42a66200147a7ea82f038fa1766b2cee29575f4df5a02eb62d908e9d347a7fc494eb5fe8099d1464863d5ed48d778e7c59c88e4a51b4e88673b45d9a699e272
-MISC metadata.xml 5078 BLAKE2B f6cce66c296cee00dc8409609f502a88ea9acbc76f2bb8ab5bf0ea7468b91899ad301c1f56e32c9244c1acba6b8572e2f0bef0b416a833226d5c91b9f0ae6923 SHA512 1c8b1596001ac29e32fe2252584acbf53495305f5d894927b9e193f224f45c42cd182e96bb32420488e371ef51d4cdb927148de53f2f797ddefcf43a60cfa5bd
+EBUILD wireshark-3.1.0.ebuild 6786 BLAKE2B 7b05213d7d7ba5b672a5f220ddf59933d32cc0a3a721794748309e7db4084ab850f7f8b7cb41ef7ae766d5aaaf15e39e29383490084c97a3f592eee8e0d06582 SHA512 df91871153094a2a3c0ab7346c6f88ae96ec1ca094585bbc7caf1640a1569f637a4b83faa27aad13a8f36eaa13563bb64c6176bdd93d4e83510e5cbd931a46a4
+EBUILD wireshark-99999999.ebuild 6791 BLAKE2B 30a9e0c25a67f859feabdee9edf89b4ce04399dd0e5ab32b49555bed905d133fa6cd6c6c987d8a687a49a1f153740dc8917369ce34c0c6a0febdcaeb8348032c SHA512 ba9ee5fb66214cac558e2b4aed29760535c095b5df46ec24b02a344d414613c41b09322c8ad644ca78f27090b8d2d0e4abfb0405909c88709a2d471a624d427d
+MISC metadata.xml 5146 BLAKE2B f126bc073b880c4c0fac986cef21b7cd6951826df28032ec546b21f5b4472192c91cb6442f765d8e408c1ac7d725518ae316e63a931996c01724154404f879e4 SHA512 895920a9ee9a7f4587d063581b36d00c08b85d554087ddbfb6acbbbd6c066795d8b484826c50740fb4c2db5cf0058ed4d85c0082ab42f7d5e96bd96413701b69
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 4a20e26519da..17945000941a 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -42,6 +42,7 @@ be exported to XML, PostScript®, CSV, or plain text.
 <flag name="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag>
 <flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag>
 <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag>
+<flag name="minizip">Build with zip file compression support</flag>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
 <flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
 <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
diff --git a/net-analyzer/wireshark/wireshark-3.1.0.ebuild b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
index bd412c65b24c..cb28f93ddffa 100644
--- a/net-analyzer/wireshark/wireshark-3.1.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -15,9 +15,9 @@ KEYWORDS=""
 IUSE="
 	adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
 	dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
-	+netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump
-	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-	+text2pcap tfshark +tshark +udpdump zlib
+	+minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
+	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
+	sdjournal +text2pcap tfshark +tshark +udpdump zlib
 "
 S=${WORKDIR}/${P/_/}
 
@@ -34,6 +34,7 @@ CDEPEND="
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
 	netlink? ( dev-libs/libnl:3 )
 	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
@@ -81,7 +82,6 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-wireshark )
 "
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
 	plugin_ifdemo? ( plugins )
 "
 PATCHES=(
@@ -118,7 +118,7 @@ src_configure() {
 		append-cxxflags -fPIC -DPIC
 	fi
 
-	python_setup 'python3*'
+	python_setup
 
 	mycmakeargs+=(
 		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
@@ -158,6 +158,7 @@ src_configure() {
 		-DENABLE_LIBXML2=$(usex libxml2)
 		-DENABLE_LUA=$(usex lua)
 		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
 		-DENABLE_NETLINK=$(usex netlink)
 		-DENABLE_NGHTTP2=$(usex nghttp2)
 		-DENABLE_PCAP=$(usex pcap)
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index c964508b1b07..a4453c74df19 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit fcaps flag-o-matic git-r3 multilib python-r1 qmake-utils user xdg-utils cmake-utils
+inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user xdg-utils cmake-utils
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -15,9 +15,9 @@ KEYWORDS=""
 IUSE="
 	adns androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
 	dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap
-	+netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt +randpktdump
-	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
-	+text2pcap tfshark +tshark +udpdump zlib
+	+minizip +netlink nghttp2 +plugins plugin_ifdemo +pcap +qt5 +randpkt
+	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
+	sdjournal +text2pcap tfshark +tshark +udpdump zlib
 "
 S=${WORKDIR}/${P/_/}
 
@@ -34,6 +34,7 @@ CDEPEND="
 	lua? ( >=dev-lang/lua-5.1:* )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
 	netlink? ( dev-libs/libnl:3 )
 	nghttp2? ( net-libs/nghttp2 )
 	pcap? ( net-libs/libpcap )
@@ -81,7 +82,6 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-wireshark )
 "
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
 	plugin_ifdemo? ( plugins )
 "
 PATCHES=(
@@ -118,7 +118,7 @@ src_configure() {
 		append-cxxflags -fPIC -DPIC
 	fi
 
-	python_setup 'python3*'
+	python_setup
 
 	mycmakeargs+=(
 		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
@@ -158,6 +158,7 @@ src_configure() {
 		-DENABLE_LIBXML2=$(usex libxml2)
 		-DENABLE_LUA=$(usex lua)
 		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
 		-DENABLE_NETLINK=$(usex netlink)
 		-DENABLE_NGHTTP2=$(usex nghttp2)
 		-DENABLE_PCAP=$(usex pcap)
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /net-analyzer
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)