gentoo resync : 03.11.2019

127 files changed, 2066 insertions, 3600 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a2dd736272cd..a01b9bcf7bcf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
index 93901e44b00e..f0ba55ce6186 100644
--- a/net-analyzer/arp-scan/Manifest
+++ b/net-analyzer/arp-scan/Manifest
@@ -1,6 +1,4 @@
-DIST arp-scan-1.9.5.tar.gz 414114 BLAKE2B 8a38f74bc2660a43905a6db1411dbea4a29b030bc66e22cd569a7f3001a4a32553a9c09ace4b56db6b91d5a2bc2854b40b8af87034fed86e79f2d602893e71ae SHA512 a10c510dc668b103fc508619d04e5870fdf6f576b79222904cfe988b4e9255604ce1a724100318a662d5f77d33270bc733f0e3091fb9da034a54b9ab402cbcab
-DIST arp-scan-1.9.tar.gz 488442 BLAKE2B f4170736c07ff69e044ca0c17150fafb5aee9de67463ce828a856d21e264c43e9354ba1663f630fa6c40628b97e97884588ca6c4b0f372263af087a78c45730b SHA512 5061ac82d1acad3dd5dab998e4e2d2d9d2dbf436a2839ee1f68dd2997278df7e77f5dda7e54bdb13c9200d7a714b8d82737c041cec8438571d1d14c9d7f936ac
-EBUILD arp-scan-1.9.5.ebuild 441 BLAKE2B fd6f503bdb34b089583091cfb5d98542a453a2f8fa0c99fea08323b1563c8dfa1ede37e4d336be0241c1b0f601c2f4a11eadb493e5141df332a305f6508ee67f SHA512 ee28aeb1ed841f9bdab894759ae5b8eab86ef992f5e515fe7d9cc4be27e1ec89d8f602e0171d96b2878410e2242a87a5ae118ba52d8edda0f00dcd2c2a99a216
-EBUILD arp-scan-1.9.ebuild 459 BLAKE2B fbdf821002462a8c4c2f9d1fc34429b57947a40353d071401d5b04347e30c0702b531f8083e5d1b942b940f64d50f40f3de05b6b82965a470f1b338b5b15cc3b SHA512 942f0976f6516572819ae3676e6cd0bebed767b991c577652c805b6f472a49a93da206f69955d83d354639deff18188c65c8a5f51d92029a22a20fc97930abe2
+DIST arp-scan-1.9.6.tar.gz 462479 BLAKE2B 21383167d83ba1cd9792f0a8d569c51ff196186fb59a2161c00d6963bcedecb706a419b08aeef2956bad72563f56a9a58b4231715b472a8ab083229b333d2e8f SHA512 c2d56ab8c6e1a046919892f6c2750593d6fbb3a539c3e1736184bd37ff7ae6033f84b62a3d2b4f56c0f2cdc1752002cb010ce77f701ee2f87b6f14b2e1753fe6
+EBUILD arp-scan-1.9.6.ebuild 441 BLAKE2B fd6f503bdb34b089583091cfb5d98542a453a2f8fa0c99fea08323b1563c8dfa1ede37e4d336be0241c1b0f601c2f4a11eadb493e5141df332a305f6508ee67f SHA512 ee28aeb1ed841f9bdab894759ae5b8eab86ef992f5e515fe7d9cc4be27e1ec89d8f602e0171d96b2878410e2242a87a5ae118ba52d8edda0f00dcd2c2a99a216
 EBUILD arp-scan-99999.ebuild 412 BLAKE2B 7f4bb83706ee8ea67722e2aa5a37e481ed738d96b84038dcc2a34f221aa6249c72c8fb8e961336496f7cc13224ec01c7ee74528dee23916eb491ccabd610ef40 SHA512 495867de23e70d5491d07c63afc4c7804df7ac1a61bb93a16fce80e2b048e7be4c25e79bc6f2c647a60c58134454ae51bacabaadf401187c842b85d55373002f
 MISC metadata.xml 362 BLAKE2B 2f3d110218aa8df05bd9e10d31a23b40ad51f5ee3134133baf9dea867989b8c2f4c1a6424ffb97829f69b2309bc4262d4821844c7a699c2245629dbc31d29a71 SHA512 513df53208e314f55d1f2a2b14fbbfe7f28ab654f4b38be1adeb24490279a8f6cf276cd29941d4453702d208425380f926c43d9aac1e045b52bf67d118438ea8
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.5.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild
index b98d876c237a..b98d876c237a 100644
--- a/net-analyzer/arp-scan/arp-scan-1.9.5.ebuild
+++ b/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.ebuild
deleted file mode 100644
index 822ad877ab64..000000000000
--- a/net-analyzer/arp-scan/arp-scan-1.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="ARP scanning and fingerprinting tool"
-HOMEPAGE="
-	http://www.nta-monitor.com/tools-resources/security-tools/arp-scan
-	https://github.com/royhills/arp-scan
-"
-SRC_URI="http://www.nta-monitor.com/files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest
index 692d5bd1a145..fb1db0ee2712 100644
--- a/net-analyzer/arpon/Manifest
+++ b/net-analyzer/arpon/Manifest
@@ -1,5 +1,8 @@
+AUX arpon-2.7.2-CFLAGS.patch 407 BLAKE2B 5cb747ba4f8153a1f1e13da49fc9cb8f55b75b8f80b17ea3c336d4feb863f23dfe08d93209a646b85301d8d0ba7d76a958e5d5468b47b08dcb6ec8be307d7b92 SHA512 9029ddc9b024e62f21a49faab5c39008bec22b88cd6fac5f31ebb7327357159d6ec36f0f750bb4d5e985115d553b95b8c1daf2794e9edb7c40dae06fd8872a07
+AUX arpon-2.7.2-etc.patch 356 BLAKE2B 5cbec9b24dfd2a75f1a743e7a08031945fbadb7f6f50d3b62c611fa797abf3f866fca7f4f2e8d880544effa5411c1fec408ef4e43d96af2859bcb16215ae4121 SHA512 2bafa030d87d9b216902246053d2521ed4395c89d12b2bddef4e38671442a5d1e54afc8bde3a77944e93f93b703f1f60b0f6f84535fefc8331ec59aecb69e492
 AUX arpon.confd 128 BLAKE2B 864417d8892d037f005123938b3ffd970c69f6ad06fdc6e031872250a126fb92a63ccb247e6f49a8e6e716a1138443df29d2838e5a1c73e44e04632977f78789 SHA512 1300ffd903366a5970c5c2b6b7a570ee6e1e696d18a5f16340c7f192c5ff4e41694a180e0d5ab86c1fb64bd015dab94eb52ef5ff429280b56f5ec4112abe3b11
 AUX arpon.initd 406 BLAKE2B b519b05207a2cf54301493d85a5b50205d27bacc5c4eb2dedb18ccc450a01b74b9d159da0c66b6aed20a31ec454747e0ab533906633cd8dc7ab6bdaaa9d44ca0 SHA512 5a889f94fa495ee63475a8ca2774b09247548a0a7170b32b0c74ed5808822818fda23516959ad4c3598ed39f31ad2a2ab68b81f00a715267b0d12e194532324a
 DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd601533a6ab9a22b24f07e037b6f3debcbe0f3c1f09a87b7e0cdf9217a38f52b85431db023d12b0f1ee58765e0bfb SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4
+EBUILD arpon-2.7.2-r1.ebuild 739 BLAKE2B c339647bd01e8d1b6dc4b2c60b13f06ed87f72ba0a9514265139cd5a4f82baf7505f97fd829b3bfa8a143b46a18fb0a0630cca47fd4cbdb563b9552eb0b2bfb1 SHA512 b8ea3e5c19ef796c3aae4206ebe022f1d2dd1424f23b9282fe65999f96ca38280bb832516c1035a5732806e25a096cd1aa1ecb2a0f4d310c58c593f978283622
 EBUILD arpon-2.7.2.ebuild 884 BLAKE2B e83db5a744d62b0a7f7f3e7441a300345f81799617c93f220f320cb61f653c209aaa631fb0525d159c95337d83d339ca19e979a8cd3f4a35580e487c8085101d SHA512 4427110fc2ac7557d57d2bf9b453bb2b121ac5121e287d4273f1aea4bdc503ab38f64092c1776ca64d2ad66fddbeae4a25c82b53b98d6734b3a3347b070adbbe
 MISC metadata.xml 242 BLAKE2B ff85d6f7c94b7a327031d666c89344f6d69ed7a8c5cac45f89650c5f3aeb43edd3a4c7b5814ace420c7804a411235ba0f7deda58424e417681f74f9468e0ef0e SHA512 a01133ba691e36e58aa94e18a91db4a4a42b8ae621540319cab84241a07cc541263f753268ab759430699332a77018423c1a54d886d9c2fd3fab24537b64742d
diff --git a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild b/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
new file mode 100644
index 000000000000..92f553b7ab10
--- /dev/null
+++ b/net-analyzer/arpon/arpon-2.7.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils
+
+DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
+
+MY_PN="ArpON"
+MY_P="${MY_PN}-${PV}"
+HOMEPAGE="http://arpon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/libdnet
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7.2-CFLAGS.patch
+	"${FILESDIR}"/${PN}-2.7.2-etc.patch
+)
+DOCS=( AUTHOR CHANGELOG )
+S="${WORKDIR}"/${MY_P}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch b/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch
new file mode 100644
index 000000000000..525f03740dd9
--- /dev/null
+++ b/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,11 +51,9 @@
+ if(cmake_build_type_tolower STREQUAL "debug")
+   message(STATUS "Build Type: Debug")
+   set(CMAKE_BUILD_TYPE "Debug")
+-  set(CMAKE_C_FLAGS "-Wall -Werror -pedantic -O0 -g")
+ else()
+   message(STATUS "Build Type: Release")
+   set(CMAKE_BUILD_TYPE "Release")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
+ endif()
+ 
+ include_directories(
diff --git a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch b/net-analyzer/arpon/files/arpon-2.7.2-etc.patch
new file mode 100644
index 000000000000..03e80f9d5955
--- /dev/null
+++ b/net-analyzer/arpon/files/arpon-2.7.2-etc.patch
@@ -0,0 +1,11 @@
+--- a/etc/CMakeLists.txt
++++ b/etc/CMakeLists.txt
+@@ -14,7 +14,7 @@
+     COMPONENT Etcfile)
+ else(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
+   install(FILES ${arpon_etc_src}
+-    DESTINATION ${CMAKE_INSTALL_PREFIX}/etc
++    DESTINATION /etc
+     PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
+     COMPONENT Etcfile)
+ endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 68662fe2dadf..7acf1b5d08db 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,8 +1,4 @@
-AUX cve-2017-6430.patch 2437 BLAKE2B 4267c1028467734e45f0a2b730498b6b1de86d9aca95377d7afe76d872ae05c0c9c5e600e8c35f7e0f74d00a125cbffce7f372d543e1728a83121c234ef65366 SHA512 fd3477e7ab087d2b0fdfff6ef331ca8ae4aa838ece54a84d4e597d57cf45425a4dc4be60b9caadf0af25ebe8072eea542092e400e6fe219696b0dc13ca4e205b
-AUX ettercap-0.8.2-openssl-1.1.patch 8769 BLAKE2B 6c9d7e8c60264b6ac0724891f9cbc9b2436bb943680d3e8612aee152bd360ea9f38a778175906787039041e654b49f91353f4cdc678f36753e289270c4b148b3 SHA512 0ba60719cde9648aae37499c1caa6f3e0630e31f1e819945648d778aa6359f0b3771d7673f16a81c4e7ea8efdcf84bf3fb55979d952cb767cb5334f5d154ca9d
-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 1779 BLAKE2B 502382e406d3c0611b6ba9387ff389ca73852f521e72b09a1ad1753413f873107ccaf2ad81dfa65d5ed56cc47d45e904d84112be03246ffd6680a509cf171946 SHA512 ed30bc84ec63f0019453195457c1ec99e196330f3d5ed57920b5cee0d1285ea681aa1742e2ca7a90d9113c048309444e756f604ca4f0f48a18816ef6cbb375e1
 EBUILD ettercap-0.8.3.ebuild 1742 BLAKE2B cc0211f64fd7b19a5dca22b14dd56f0fb39467451887b04bc2b3f33177187776fad9bd904be4101293be96968ece4924a4a0bfb7a6ba93d9f4dd7d8299b85606 SHA512 94ebd442f5f6ed0bd7daf7fdf1e1faecef5e80a6b1111ee83c00af5ba2c8c03ceb55c1e5db5d580644f0dfd0f84cc4ac9a6a9f5c0c384e5ce68624d0f0873ac9
 EBUILD ettercap-9999.ebuild 1701 BLAKE2B b1cea3586da1d8193878fd793a8bce5ec6674d9ce2d257b2f2d6d58d58133316cf7100392a6efa71c885ed598b92e46f658bcb933982c34c4c319e8c450ec9ed SHA512 4054f3a885f9c4916a1124d62e7cdf99e9e51ab367892ddc1da337e8e2b1e49eddc64f6ff01c7aa8491768be99fbda203e032e0404dc2f5cf0514c04b8c27d39
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
deleted file mode 100644
index 40b3700c376d..000000000000
--- a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A suite for man in the middle attacks"
-HOMEPAGE="https://github.com/Ettercap/ettercap"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
-else
-	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
-	KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
-fi
-
-IUSE="doc gtk ipv6 libressl ncurses +plugins test"
-
-RDEPEND="dev-libs/libbsd
-	dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libnet:1.1
-	>=net-libs/libpcap-0.8.1
-	sys-libs/zlib
-	gtk? (
-		>=dev-libs/atk-1.2.4
-		>=dev-libs/glib-2.2.2:2
-		media-libs/freetype
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.2.2:2
-		>=x11-libs/pango-1.2.3
-	)
-	ncurses? ( >=sys-libs/ncurses-5.3:= )
-	plugins? ( >=net-misc/curl-7.26.0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/ghostscript-gpl
-		sys-apps/groff )
-	test? ( dev-libs/check )
-	sys-devel/flex
-	virtual/yacc"
-PATCHES=(
-	"${FILESDIR}"/cve-2017-6430.patch
-	"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-src_prepare() {
-	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CURSES="$(usex ncurses)"
-		-DENABLE_GTK="$(usex gtk)"
-		-DENABLE_PLUGINS="$(usex plugins)"
-		-DENABLE_IPV6="$(usex ipv6)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_PDF_DOCS="$(usex doc)"
-		-DBUNDLED_LIBS=OFF
-		-DSYSTEM_LIBS=ON
-		-DINSTALL_SYSCONFDIR="${EROOT}"etc
-	)
-		#right now we only support gtk2, but ettercap also supports gtk3
-		#do we care? do we want to support both?
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/ettercap/files/cve-2017-6430.patch b/net-analyzer/ettercap/files/cve-2017-6430.patch
deleted file mode 100644
index 67483dcc0249..000000000000
--- a/net-analyzer/ettercap/files/cve-2017-6430.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4ad7f85dc01202e363659aa473c99470b3f4e1f4 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Tue, 7 Mar 2017 22:05:31 +0100
-Subject: [PATCH] Fix issue #782
-
----
- utils/etterfilter/ef_compiler.c |  4 +++-
- utils/etterfilter/ef_main.c     | 10 +++++++---
- utils/etterfilter/ef_output.c   |  3 +++
- 3 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/utils/etterfilter/ef_compiler.c b/utils/etterfilter/ef_compiler.c
-index db876636e..ddb73bd30 100644
---- a/utils/etterfilter/ef_compiler.c
-+++ b/utils/etterfilter/ef_compiler.c
-@@ -239,7 +239,9 @@ size_t compile_tree(struct filter_op **fop)
-    struct filter_op *array = NULL;
-    struct unfold_elm *ue;
- 
--   BUG_IF(tree_root == NULL);
-+   // invalid file
-+   if (tree_root == NULL)
-+      return 0;
-   
-    fprintf(stdout, " Unfolding the meta-tree ");
-    fflush(stdout);
-diff --git a/utils/etterfilter/ef_main.c b/utils/etterfilter/ef_main.c
-index ae4591344..431084b91 100644
---- a/utils/etterfilter/ef_main.c
-+++ b/utils/etterfilter/ef_main.c
-@@ -39,7 +39,7 @@ struct globals *gbls;
- 
- int main(int argc, char *argv[])
- {
--
-+   int ret_value = 0;
-    globals_alloc();
-    /* etterfilter copyright */
-    fprintf(stdout, "\n" EC_COLOR_BOLD "%s %s" EC_COLOR_END " copyright %s %s\n\n", 
-@@ -84,8 +84,12 @@ int main(int argc, char *argv[])
-       fprintf(stdout, "\n\nThe script contains errors...\n\n");
-   
-    /* write to file */
--   if (write_output() != E_SUCCESS)
--      FATAL_ERROR("Cannot write output file (%s)", GBL_OPTIONS->output_file);
-+   ret_value = write_output();
-+   if (ret_value == -E_NOTHANDLED)
-+      FATAL_ERROR("Cannot write output file (%s): the filter is not correctly handled.", GBL_OPTIONS->output_file);
-+   else if (ret_value == -E_INVALID)
-+      FATAL_ERROR("Cannot write output file (%s): the filter format is not correct. ", GBL_OPTIONS->output_file);
-+
-    globals_free();
-    return 0;
- }
-diff --git a/utils/etterfilter/ef_output.c b/utils/etterfilter/ef_output.c
-index 5ae591904..fcf19f010 100644
---- a/utils/etterfilter/ef_output.c
-+++ b/utils/etterfilter/ef_output.c
-@@ -51,6 +51,9 @@ int write_output(void)
-    if (fop == NULL)
-       return -E_NOTHANDLED;
- 
-+   if (ninst == 0)
-+      return -E_INVALID;
-+
-    /* create the file */
-    fd = open(GBL_OPTIONS->output_file, O_CREAT | O_RDWR | O_TRUNC | O_BINARY, 0644);
-    ON_ERROR(fd, -1, "Can't create file %s", GBL_OPTIONS->output_file);
diff --git a/net-analyzer/ettercap/files/ettercap-0.8.2-openssl-1.1.patch b/net-analyzer/ettercap/files/ettercap-0.8.2-openssl-1.1.patch
deleted file mode 100644
index b7703d3ef5ca..000000000000
--- a/net-analyzer/ettercap/files/ettercap-0.8.2-openssl-1.1.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From f0d63b27c82df2ad5f7ada6310727d841b43fbcc Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Mon, 27 Jun 2016 12:41:33 +0200
-Subject: [PATCH 1/2] First draft of openssl 1.1 compatibility layer (from
- https://github.com/curl/curl/commit/cfe16c22d7891a1f65ea8cd4c5352504a2afbddc)
- Closes: #739
-
----
- src/dissectors/ec_ssh.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++-
- src/ec_sslwrap.c        | 14 ++++++++
- 2 files changed, 106 insertions(+), 1 deletion(-)
-
-Index: ettercap-0.8.2/src/dissectors/ec_ssh.c
-===================================================================
---- ettercap-0.8.2.orig/src/dissectors/ec_ssh.c
-+++ ettercap-0.8.2/src/dissectors/ec_ssh.c
-@@ -36,6 +36,10 @@
- #include <openssl/md5.h>
- #include <zlib.h>
- 
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */
-+#endif
-+
- #define SMSG_PUBLIC_KEY 2
- #define CMSG_SESSION_KEY 3
- #define CMSG_USER 4
-@@ -138,6 +142,11 @@
-    char tmp[MAX_ASCII_ADDR_LEN];
-    u_int32 ssh_len, ssh_mod;
-    u_char ssh_packet_type, *ptr, *key_to_put;
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+   BIGNUM *h_n, *s_n, *m_h_n, *m_s_n;
-+   BIGNUM *h_e, *s_e, *m_h_e, *m_s_e;
-+   BIGNUM *h_d, *s_d, *m_h_d, *m_s_d;
-+#endif
- 
-    /* don't complain about unused var */
-    (void) DECODE_DATA; 
-@@ -383,12 +392,25 @@
-             if (session_data->ptrkey == NULL) { 
-                /* Initialize RSA key structures (other fileds are set to 0) */
-                session_data->serverkey = RSA_new();
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+               s_n = BN_new();
-+               s_e = BN_new();
-+               RSA_set0_key(session_data->serverkey, s_n, s_e, s_d);
-+#else
-                session_data->serverkey->n = BN_new();
-                session_data->serverkey->e = BN_new();
-+#endif
- 
-                session_data->hostkey = RSA_new();
-+
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+               h_n = BN_new();
-+               h_e = BN_new();
-+               RSA_set0_key(session_data->hostkey, h_n, h_e, h_d);
-+#else
-                session_data->hostkey->n = BN_new();
-                session_data->hostkey->e = BN_new();
-+#endif
- 
-                /* Get the RSA Key from the packet */
-                NS_GET32(server_mod,ptr);
-@@ -396,19 +418,37 @@
-                   DEBUG_MSG("Dissector_ssh Bougs Server_Mod");
-                   return NULL;
-                }
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+               RSA_get0_key(session_data->serverkey, &s_n, &s_e, &s_d);
-+               get_bn(s_e, &ptr);
-+               get_bn(s_n, &ptr);
-+#else
-                get_bn(session_data->serverkey->e, &ptr);
-                get_bn(session_data->serverkey->n, &ptr);
-+#endif
- 
-                NS_GET32(host_mod,ptr);
-                if (ptr + (host_mod/8) > PACKET->DATA.data + PACKET->DATA.len) {
-                   DEBUG_MSG("Dissector_ssh Bougs Host_Mod");
-                   return NULL;
-                }
-+
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+               RSA_get0_key(session_data->hostkey, &h_n, &h_e, &h_d);
-+               get_bn(h_e, &ptr);
-+               get_bn(h_n, &ptr);
-+#else
-                get_bn(session_data->hostkey->e, &ptr);
-                get_bn(session_data->hostkey->n, &ptr);
-+#endif
- 
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+               server_exp = BN_get_word(s_e);
-+               host_exp   = BN_get_word(h_e);
-+#else
-                server_exp = *(session_data->serverkey->e->d);
-                host_exp   = *(session_data->hostkey->e->d);
-+#endif
- 
-                /* Check if we already have a suitable RSA key to substitute */
-                index_ssl = &ssh_conn_key;
-@@ -424,7 +464,7 @@
-                   SAFE_CALLOC(*index_ssl, 1, sizeof(ssh_my_key));
- 
-                   /* Generate the new key */
--                  (*index_ssl)->myserverkey = (RSA *)RSA_generate_key(server_mod, server_exp, NULL, NULL);
-+                  (*index_ssl)->myserverkey = (RSA *)RSA_generate_key_ex(server_mod, server_exp, NULL, NULL);
-                   (*index_ssl)->myhostkey = (RSA *)RSA_generate_key(host_mod, host_exp, NULL, NULL);
-                   (*index_ssl)->server_mod = server_mod;
-                   (*index_ssl)->host_mod = host_mod;
-@@ -443,11 +483,25 @@
- 
-             /* Put our RSA key in the packet */
-             key_to_put+=4;
-+
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+            RSA_get0_key(session_data->ptrkey->myserverkey, &m_s_n, &m_s_e, &m_s_d);
-+            put_bn(m_s_e, &key_to_put);
-+            put_bn(m_s_n, &key_to_put);
-+#else
-             put_bn(session_data->ptrkey->myserverkey->e, &key_to_put);
-             put_bn(session_data->ptrkey->myserverkey->n, &key_to_put);
-+#endif
-             key_to_put+=4;
-+
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+            RSA_get0_key(session_data->ptrkey->myhostkey, &m_h_n, &m_h_e, &m_h_d);
-+            put_bn(m_h_e, &key_to_put);
-+            put_bn(m_h_n, &key_to_put);
-+#else
-             put_bn(session_data->ptrkey->myhostkey->e, &key_to_put);
-             put_bn(session_data->ptrkey->myhostkey->n, &key_to_put);
-+#endif
- 
-             /* Recalculate SSH crc */
-             *(u_int32 *)(PACKET->DATA.data + PACKET->DATA.len - 4) = htonl(CRC_checksum(PACKET->DATA.data+4, PACKET->DATA.len-8, CRC_INIT_ZERO));
-@@ -482,19 +536,34 @@
-             key_to_put = ptr;
- 
-             /* Calculate real session id and our fake session id */
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+            temp_session_id = ssh_session_id(cookie, h_n, s_n);
-+#else
-             temp_session_id = ssh_session_id(cookie, session_data->hostkey->n, session_data->serverkey->n);
-+#endif
-             if (temp_session_id)
-                memcpy(session_id1, temp_session_id, 16);
-+
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+            temp_session_id=ssh_session_id(cookie, m_h_n, m_s_n);
-+#else
-             temp_session_id=ssh_session_id(cookie, session_data->ptrkey->myhostkey->n, session_data->ptrkey->myserverkey->n);
-+#endif
-+
-             if (temp_session_id)
-                memcpy(session_id2, temp_session_id, 16);
- 
-             /* Get the session key */
-             enckey = BN_new();
-+
-             get_bn(enckey, &ptr);
- 
-             /* Decrypt session key */
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+            if (BN_cmp(m_s_n, m_h_n) > 0) {
-+#else
-             if (BN_cmp(session_data->ptrkey->myserverkey->n, session_data->ptrkey->myhostkey->n) > 0) {
-+#endif
-               rsa_private_decrypt(enckey, enckey, session_data->ptrkey->myserverkey);
-               rsa_private_decrypt(enckey, enckey, session_data->ptrkey->myhostkey);
-             } else {
-@@ -534,7 +603,11 @@
-                  BN_add_word(bn, sesskey[i]);
-             }
- 
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+            if (BN_cmp(s_n, h_n) < 0) {
-+#else
-             if (BN_cmp(session_data->serverkey->n, session_data->hostkey->n) < 0) {
-+#endif
-                rsa_public_encrypt(bn, bn, session_data->serverkey);
-                rsa_public_encrypt(bn, bn, session_data->hostkey);
-             } else {
-@@ -716,7 +789,16 @@
-    u_char *inbuf, *outbuf;
-    int32 len, ilen, olen;
- 
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+   BIGNUM *n;
-+   BIGNUM *e;
-+   BIGNUM *d;
-+   RSA_get0_key(key, &n, &e, &d);
-+   olen = BN_num_bytes(n);
-+#else
-    olen = BN_num_bytes(key->n);
-+#endif
-+
-    outbuf = malloc(olen);
-    if (outbuf == NULL) /* oops, couldn't allocate memory */
-       return;
-@@ -744,7 +826,16 @@
-    u_char *inbuf, *outbuf;
-    int32 len, ilen, olen;
- 
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+   BIGNUM *n;
-+   BIGNUM *e;
-+   BIGNUM *d;
-+   RSA_get0_key(key, &n, &e, &d);
-+   olen = BN_num_bytes(n);
-+#else
-    olen = BN_num_bytes(key->n);
-+#endif
-+
-    outbuf = malloc(olen);
-    if (outbuf == NULL) /* oops, couldn't allocate memory */
-       return;
-Index: ettercap-0.8.2/src/ec_sslwrap.c
-===================================================================
---- ettercap-0.8.2.orig/src/ec_sslwrap.c
-+++ ettercap-0.8.2/src/ec_sslwrap.c
-@@ -53,6 +53,10 @@
- #define OPENSSL_NO_KRB5 1
- #include <openssl/ssl.h>
- 
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */
-+#endif
-+
- #define BREAK_ON_ERROR(x,y,z) do {  \
-    if (x == -E_INVALID) {            \
-       SAFE_FREE(z.DATA.disp_data);  \
-@@ -974,9 +978,19 @@
-    index = X509_get_ext_by_NID(server_cert, NID_authority_key_identifier, -1);
-    if (index >=0) {
-       ext = X509_get_ext(server_cert, index);
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+      ASN1_OCTET_STRING* os;
-+      os = X509_EXTENSION_get_data (ext);
-+#endif
-       if (ext) {
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+         os->data[7] = 0xe7;
-+         os->data[8] = 0x7e;
-+         X509_EXTENSION_set_data (ext, os);
-+#else
-          ext->value->data[7] = 0xe7;
-          ext->value->data[8] = 0x7e;
-+#endif
-          X509_add_ext(out_cert, ext, -1);
-       }
-    }
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index 4a7ee1876564..945b4c01bbdd 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,11 +1,24 @@
 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 greenbone-security-assistant-8.0.1-cmakelist.patch 1122 BLAKE2B f675217b1cd2164ca8437a6fda22ef050134b3ace1323b111f3491ef23892b34f4398cd11d663daba7c5a0c2897ca9a736ea22c21eaf265e298df13b7ba1956c SHA512 1d725a6b43730675f0c499b5d27a0abc0d326ff9c5e3eb32da543651065e01e55321ee69ebef43f605f91caa619ae0d2a2386e174a822e0bc37a412f414a5659
+AUX greenbone-security-assistant-8.0.1-node.patch 1706 BLAKE2B a075c37a233679eb175a177e2605dd933b3c3d5440c0ae74075267d8f64d32afe2a7b4ae40b79692fef46020c5a5dd649c5f329ad1b786569219c339ad659043 SHA512 c5bbd495e9b5dd82896db841fde03a72c9937cbb3135123b578cb2dc8f86b8ed57226b7b46fc90e3587a94ca6505c61058669937bba1f6f7ad3d0953cb025ca9
+AUX greenbone-security-assistant-8.0.1-pid.patch 283 BLAKE2B 15f3c15da9cc198a0bb933d867c476d505fc11321026a723b4a2826856439edd6f402e14ce2efd4353de84988da3c7f6b7b30f6a404b9301123205bd73d83e4c SHA512 224c29d800e3bd3a79d9386fdbfff7f9e77f4e4abd750513b7ee2b6c1bafe2294517ae804b8a4e7b62ce015755827b71e8422628e28e184a0d8e58d6973b0b14
+AUX greenbone-security-assistant-8.0.1-reactjs.patch 988 BLAKE2B b2e7929ac17d9bd8f7d2ef964b8ab479245a105a42c7c27cb1c0533014c93335683a465b2e67e324d692a61561a912aea484604cd650e79ebcc64390fb214556 SHA512 6dbff78f70620983ada5918d5ebc06b5a2f1077cffcf8b74fdb217fd7df45648c0b6b06367ca9b894b0106cdc7f4be1c05e926c0b9f5819507a548fc3fc26d84
+AUX greenbone-security-assistant-8.0.1-sbin.patch 361 BLAKE2B dfa390d0545a470c73af5cc24059e09967a9134a9f361ba606450ce046999ba200198b8051b515d6c33361bcc33678037a65c7ba68f97f0ff140f0ce622fcacc SHA512 307ca36d757d6ec6e710b1d4ef14bc55a611f0b3b23eb1cf349faf5be298f3f5a6ba852900c2c9b5f03231627364dba021ce8fa3e4859fcfb65eb9049f18e292
+AUX greenbone-security-assistant-8.0.1-uninstall-snippet.patch 398 BLAKE2B 8f9b4c754e4406d6830c69d029a05a3525bce3553550931424a12710b4b88f37257a8415e7219e2714985bf2ed76134e52e52a867f03c35c675debd5cfb0d540 SHA512 b0e44673687b09421beff5eadd02b86a25d87c531144a7c2ec087f48dda4463588d8c462c3b51431f1b5f69d7241ccb86e1eb702ddc8dfeb1402f2a142b29a4d
 AUX gsa-daemon.conf 1166 BLAKE2B 2611553aa0aa13d105182bd12f7b6f79f94888458aaf142f67111a94bdd3b7c6fb33a8e33844977fb95e09a13d04595ddd5e789624be2eaacbbc78564c05d4ba SHA512 2f085e0b8df0f778b7c9446278d4748b5780abebaa4ac590e1d44280975f22e37d8fe12c2e05b0381391504f42d437597ab4a4880daf20f35315fb4e74753a6d
 AUX gsa.init 634 BLAKE2B 7a99d7bf37475df138acc3e8d3909f91ea4014d29315df8e912b0a3904a1bd7e58f3f527c5e6056d7318f7677f27658a230a37ed6dd2a862f55a8df6377d3668 SHA512 19f8401266923e9c5f86540401c0ac3a04986c442bc0c0b45206b50ff5bfb533291d635d3af91d70e6e4a251b8660815ee4f3beb30ad61e96e9d86b58e285f00
 AUX gsa.logrotate 134 BLAKE2B 56bd0128621688a1b1fc5cb0a96503e60b0a2975bfbe74b4db0853b45356610081996004923bc958b8d71ea8e5add097cc8083ce9cd83af38e87995d9386fc1d SHA512 e6164c4b494d87ad55a9b1120bad2cc8619a623382417e0301738e728c535ea78f89f935807eb7616ae7a17d05942f105a7c76795e636f9bcc672a04e3444149
 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-daemon.conf 416 BLAKE2B 7c6dff183ceb8afdbe7abb75333fb8aa570be406ecb18641e96d8045d793b6ef81b46acbfd243c4bb9a4bcb98cb6c039ebd0793c13855b7f5404e552a6088ef5 SHA512 7e696a3bb61310d7e8c553ed3744adb5fd60a75c83c0b9f99c76c092f78b4cf25d8b9c72b10d4a79ed501da16a27b8beddcda36f48acb550dfa01dbc19379f68
+AUX gsad.init 569 BLAKE2B 8fdfa94dd969e7947e1920c778034bd6db07ccf1be102e69a7c32cda0fb6111b7770d9458b4a86fad25629aba20768b8e6224d04c3d26088a253f665a9773e73 SHA512 806e669529fdaad52cf530df70aaa53889c3947f1dd3b6ec485501dca37fc2383452a7c2877ddca4e23e344f5bef612bbdbee8ca9921f32c907cccb6ced61a28
+AUX gsad.logrotate 325 BLAKE2B 00fb4953308bbfb47f328a88541778adb2f8523108b72058e16f6e93c4c55b01bf668c57b0151555401d3bc989f3b8e5a4cb872f1b2cbae691a40dd590facb40 SHA512 ab43f8c54cf72e2a800bdcf4daebeabfa18a7ef49f098d65e70f97ccab3d36606c353b82b8fd6b4f2cecd289d36f48f805a5c34cba86f8e8c61bf074b0afe695
+AUX gsad.service 434 BLAKE2B 43ac179a66d1f4ddeecddae1804ff9bbb48ddce7e7cd18feff6c5ca681ecd5f6401e1a26b94b6f5d5e83a9e59bcccf2f773edca50d1d2f9abca0934ac813fd40 SHA512 d842531486d852b710b512a631ddde75bdfaee1db097e024f0de439d9c8c3ed699f7116a685650f1acf23b1be982987d38bc16a0c3bd4c6405b16c8cffc5a476
 DIST greenbone-security-assistant-7.0.3.tar.gz 2918954 BLAKE2B 4a6cd5d8378bcbb0a9df6cb5b8f6560060f15d0b0cb53d2c61692cb2bc2cd86af6e9cdeb5040c4d7020c3b016779a76ec517d54614388c62aaedd596f55fa3c4 SHA512 7e1c1ef939ba08dab3b78baf1aa9c110be2febfbed5d67eefe8110c60f5089a1af44bc26693657226f417c6bd516a4a656eb159dae2a78f878e1a1b6c222b117
-EBUILD greenbone-security-assistant-7.0.3-r1.ebuild 2084 BLAKE2B 458e7fe2a2129d1862a20b4da13ba443267f7337bac016e41c611657d345882a7a8e0ee675d5a666f8c5ef0d9fd0165372659f086d4e49df1eb8e8ceffd5b635 SHA512 ff913784bab0ad214d6ec98ebf5411d6187313ef4c98b486d0655ab7203db123509c6fbfa1faaf66802be17858ee2931759e39f1adede00adc425f9ccfd44d6a
-MISC metadata.xml 461 BLAKE2B 734b873325f2519d61fe25c81061f2344cccffbbe7c6915b716dfa11cdbd09dabfdebe218749680c7bcca47899a8eba97e3152d2b9ac32f7246310408acd3a10 SHA512 87b57dc463871d595b3448b57d4038ad5391eaac1143ee3dc50800d736030abc9ee82387b4127c68b9b106c4972cf75acf42a6e8726c6eaa60cdcc1bde886896
+DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2
+DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8
+EBUILD greenbone-security-assistant-7.0.3-r1.ebuild 2083 BLAKE2B 5ae58fee712384339facec71085f9d1f8b5344605cfaa9187041d1e27cfc92276a4dbe2f56ffef3ae6317339b04da680dd1a702d49ce9e710cd7c10bb89f04bd SHA512 03adc25258afd8be87e5565f02712069513e03b3be1cb0c31b4468fdf148eea6dd9a30a43be8a4ab5460ebe1ec71ffb4ec334ba80377db88e5eca864488bf97a
+EBUILD greenbone-security-assistant-8.0.1.ebuild 3367 BLAKE2B 76811d4d6b361238845beba2a41996eec4552b07f3705389182228210508a1d88dbf9b29f01c6db25664de6e9ec6834448a88b0a2423bd5c3bfcb5e8e4ae9330 SHA512 d5ecb70f8b6b3567b619908ab6a23a54662e0572789869441238dcd566d0610763afe9c61a03e4c10e27d25673dedd66a20b65e8277adb0db82a33b67112e544
+MISC metadata.xml 961 BLAKE2B cd5edd05b4ebc657f40a20a5edf6d33e065ecd5ae6971c36c1640999b1f4e05382363f288cf57dd56ad8c4cdebd307cbaf86fb80b31ef478e278e03293dfe72a SHA512 a5d74e05d38115b2741f5d4f8a781a07a434976dbad9c427701f50a38efc5db5d18f03bd6e2eaf617c7e6c05c2616249babb0bc5dc857f16a509fff85598d3e4
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch
new file mode 100644
index 000000000000..d0fc7963a501
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch
@@ -0,0 +1,30 @@
+--- a/gsad/config/CMakeLists.txt	2019-07-18 20:39:10.331949702 +0300
++++ b/gsad/config/CMakeLists.txt	2019-07-18 20:40:18.946830294 +0300
+@@ -16,27 +16,3 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-if (NOT SYSTEMD_SERVICE_DIR)
+-  set (SYSTEMD_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system")
+-endif (NOT SYSTEMD_SERVICE_DIR)
+-
+-if (NOT DEFAULT_CONFIG_DIR)
+-  set (DEFAULT_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc/default")
+-endif (NOT DEFAULT_CONFIG_DIR)
+-
+-if (NOT LOGROTATE_DIR)
+-  set (LOGROTATE_DIR "${CMAKE_INSTALL_PREFIX}/etc/logrotate.d")
+-endif (NOT LOGROTATE_DIR)
+-
+-configure_file (gsad.service.in gsad.service)
+-configure_file (gsad.logrotate.in gsad.logrotate)
+-
+-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gsad.service
+-         DESTINATION ${SYSTEMD_SERVICE_DIR}/)
+-
+-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/gsad.default
+-         DESTINATION ${DEFAULT_CONFIG_DIR}/ RENAME gsad)
+-
+-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gsad.logrotate
+-         DESTINATION ${LOGROTATE_DIR}/ RENAME gsad)
+-
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch
new file mode 100644
index 000000000000..116bd48264dd
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch
@@ -0,0 +1,34 @@
+--- a/gsa/CMakeLists.txt	2019-07-17 16:45:39.000000000 +0300
++++ b/gsa/CMakeLists.txt	2019-07-17 22:24:49.466906757 +0300
+@@ -1095,28 +1095,17 @@
+      ${GSA_JS_SRC_FILES}
+      PARENT_SCOPE)
+ 
+-
+-add_custom_command (OUTPUT node-modules.stamp
+-                    DEPENDS ${GSA_PKG_FILES}
+-                    COMMAND ${INSTALLER} "${INSTALLER_ARGS}" "install"
+-                    COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp
+-                    WORKING_DIRECTORY ${GSA_SRC_DIR}
+-                    COMMENT "Install gsa-ng js dependencies")
+-
+-
+ add_custom_command (OUTPUT bundle.stamp
+-                    COMMAND ${CMAKE_COMMAND} -E env REACT_APP_VERSION=${PROJECT_VERSION_STRING} ${INSTALLER} "${INSTALLER_ARGS}" run build
++                    COMMAND ${CMAKE_COMMAND} -E env REACT_APP_VERSION=${PROJECT_VERSION_STRING} ${INSTALLER} --offline run build
+                     COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp
+                     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-                    DEPENDS  ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp
+-                             ${GSA_PKG_FILES}
++                    DEPENDS  ${GSA_PKG_FILES}
+                              ${GSA_STATIC_SRC_FILES}
+                              ${GSA_JS_SRC_FILES}
+                     COMMENT "Build gsa-ng install files")
+ 
+ add_custom_target (gsa-ng ALL
+-                   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp
+-                           ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp)
++                   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp)
+ 
+ set (GSA_STATIC_BUILD_FILES
+      ${GSA_BUILD_DIR}/index.html)
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch
new file mode 100644
index 000000000000..a318c87225e1
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -222,7 +222,7 @@ if (NOT DATADIR)
+ endif (NOT DATADIR)
+ 
+ if (NOT GSAD_PID_DIR)
+-  set (GSAD_PID_DIR "${LOCALSTATEDIR}/run")
++  set (GSAD_PID_DIR "/run")
+ endif (NOT GSAD_PID_DIR)
+ 
+ set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch
new file mode 100644
index 000000000000..19a4731db75b
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch
@@ -0,0 +1,20 @@
+--- a/gsa/package.json	2019-07-17 16:45:39.000000000 +0300
++++ b/gsa/package.json	2019-07-17 22:40:31.371899489 +0300
+@@ -66,12 +66,12 @@
+     "x2js": "^3.2.6"
+   },
+   "scripts": {
+-    "test": "react-scripts test",
+-    "test:coverage": "react-scripts test --coverage --maxWorkers 2",
++    "test": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js test",
++    "test:coverage": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js test --coverage --maxWorkers 2",
+     "lint": "eslint --max-warnings 0 src",
+-    "start": "react-scripts start",
+-    "build": "react-scripts build",
+-    "eject": "react-scripts eject"
++    "start": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js start",
++    "build": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js build",
++    "eject": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js eject"
+   },
+   "devDependencies": {
+     "@types/jest": "^24.0.12",
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch
new file mode 100644
index 000000000000..c1825ba3f5db
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch
@@ -0,0 +1,12 @@
+--- a/gsad/src/CMakeLists.txt	2019-07-21 23:07:38.375683800 +0300
++++ a/gsad/src/CMakeLists.txt	2019-07-21 23:08:17.301651451 +0300
+@@ -175,7 +175,7 @@
+ ## Install
+ 
+ install (TARGETS gsad
+-         RUNTIME DESTINATION ${SBINDIR}
++         RUNTIME DESTINATION ${BINDIR}
+          LIBRARY DESTINATION ${LIBDIR}
+          ARCHIVE DESTINATION ${LIBDIR}/static)
+ 
+
diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch
new file mode 100644
index 000000000000..3b075951aba6
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch
@@ -0,0 +1,12 @@
+--- a/gsa/CMakeLists.txt	2019-07-18 23:14:04.639202986 +0300
++++ b/gsa/CMakeLists.txt	2019-07-18 23:21:54.568052589 +0300
+@@ -1116,9 +1116,6 @@
+ install (FILES public/robots.txt
+          DESTINATION ${GSA_DEST_DIR})
+ 
+-# remove old generated files
+-install (CODE "file(REMOVE_RECURSE ${GSA_DEST_DIR}/static)")
+-
+ install (DIRECTORY
+          ${GSA_BUILD_DIR}/static
+          ${GSA_BUILD_DIR}/img
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf b/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf
new file mode 100644
index 000000000000..f7c7ee514e50
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf
@@ -0,0 +1,19 @@
+# Greenbone Security Assistant command args
+
+# e.g. --foreground | e.g. --no-redirect
+GSAD_OPTIONS="--no-redirect"
+
+# GSAD listen adress
+GSAD_LISTEN_ADDRESS="--listen=127.0.0.1"
+
+# GSAD listen port  
+GSAD_LISTEN_PORT="--port=9392"
+
+# GVMD listen address
+GVMD_LISTEN_ADDRESS="--mlisten=127.0.0.1"
+
+# GVMD listen port
+GVMD_LISTEN_PORT="--mport=9390"
+
+# TLS Settings
+GSAD_GNUTLS_PRIORITIES="--gnutls-priorities=NORMAL"
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.init b/net-analyzer/greenbone-security-assistant/files/gsad.init
new file mode 100644
index 000000000000..6d431bd21196
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsad.init
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${GSAD_USER:=gvm}
+: ${GSAD_GROUP:=gvm}
+: ${GSAD_TIMEOUT:=30}
+
+name="Greenbone Security Assistant (GSA)"
+command="/usr/bin/gsad"
+command_args="${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}"
+command_background="true"
+command_user="${GSAD_USER}:${GSAD_GROUP}"
+pidfile="/run/gsad.pid"
+retry="${GSAD_TIMEOUT}"
+
+depend() {
+	after bootmisc
+	need localmount net gvmd
+}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate b/net-analyzer/greenbone-security-assistant/files/gsad.logrotate
new file mode 100644
index 000000000000..f80bba881c7b
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsad.logrotate
@@ -0,0 +1,13 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# Daemon ignore HUP so we use 'copytruncate' instead of 'create' 
+# with safe file size to prevent losing log entries.
+
+/var/log/gvm/gsad.log {
+	compress
+	missingok
+	notifempty
+	sharedscripts
+	copytruncate
+	maxsize 10M
+}
diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.service b/net-analyzer/greenbone-security-assistant/files/gsad.service
new file mode 100644
index 000000000000..91e791878008
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/files/gsad.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Greenbone Security Assistant
+After=network.target
+After=openvassd.service
+After=gvmd.service
+Wants=gvmd.service
+
+[Service]
+Type=forking
+User=gvm
+Group=gvm
+EnvironmentFile=-/etc/gvm/sysconfig/gsad-daemon.conf
+ExecStart=/usr/bin/gsad $GSAD_OPTIONS $GSAD_LISTEN_ADDRESS $GSAD_LISTEN_PORT $GVMD_LISTEN_ADDRESS $GVMD_LISTEN_PORT $GSAD_GNUTLS_PRIORITIES
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild
index c58b1ab920e2..6fc3cbaf5271 100644
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-7.0.3-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 
 RDEPEND="
 	${DEPEND}
-	>=net-analyzer/openvas-scanner-5.1.3
+	~net-analyzer/openvas-scanner-5.1.3
 	>=net-analyzer/openvas-manager-7.0.3
 	extras? ( dev-texlive/texlive-latexextra )"
 
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1.ebuild
new file mode 100644
index 000000000000..6177f8f13836
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake-utils flag-o-matic systemd toolchain-funcs
+
+MY_PN="gsa"
+MY_DN="gsad"
+MY_NODE_N="node_modules"
+
+DESCRIPTION="Greenbone Security Assistant"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	 https://github.com/greenbone/gsa/releases/download/v8.0.1/gsa-node-modules-8.0.1.tar.gz -> ${P}-${MY_NODE_N}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras"
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	dev-libs/libxslt
+	>=net-analyzer/gvm-libs-10.0.1
+	net-libs/gnutls:=
+	net-libs/libmicrohttpd[messages]"
+
+RDEPEND="
+	${DEPEND}
+	!~net-analyzer/greenbone-security-assistant-7.0.3
+	~net-analyzer/openvas-scanner-6.0.1
+	>=net-analyzer/gvmd-8.0.1"
+
+BDEPEND="
+	>=net-libs/nodejs-8.12.0
+	>=sys-apps/yarn-1.15.2
+	virtual/pkgconfig
+	extras? ( app-doc/doxygen[dot]
+		  app-doc/xmltoman
+		  app-text/htmldoc
+		  dev-python/polib
+		  sys-devel/gettext
+	)"
+
+BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
+S="${WORKDIR}/${MY_PN}-${PV}"
+MY_NODE_DIR="${S}/${MY_PN}/"
+
+PATCHES=(
+	# QA fix for 8.0.0.
+	"${FILESDIR}/${P}-pid.patch"
+	# Disable yarn-fetch during compile.
+	"${FILESDIR}/${P}-node.patch"
+	# Fix react-env path for react.js.
+	"${FILESDIR}/${P}-reactjs.patch"
+	# Remove ugly uninstall-snippet that causes failing re-emerge.
+	"${FILESDIR}/${P}-uninstall-snippet.patch"
+	# Remove unnecessary install paths/files.
+	"${FILESDIR}/${P}-cmakelist.patch"
+	# Install exec. to /usr/bin instead of /usr/sbin
+	"${FILESDIR}/${P}-sbin.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# We will use pre-generated npm stuff.
+	mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
+	# Update .yarnrc accordingly.
+	echo "--modules-folder ${MY_NODE_DIR}" >> "${S}/${MY_PN}/.yarnrc" || die "echo failed"
+	# QA-Fix | Remove !CLANG doxygen warnings for 8.0.1
+	if use extras; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in gsad/doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+	)
+	# Add release hardening flags for 8.0.1
+	append-cflags -D_FORTIFY_SOURCE=2 -fstack-protector
+	append-ldflags -Wl,-z,relro -Wl,-z,now
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use extras; then
+		cmake-utils_src_make -C "${BUILD_DIR}" doc
+		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." )
+	fi
+	cmake-utils_src_make rebuild_cache
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /etc/gvm/sysconfig
+	doins "${FILESDIR}/${MY_DN}-daemon.conf"
+
+	dodir /etc/gvm/reverse-proxy
+	insinto /etc/gvm/reverse-proxy
+	doins "${FILESDIR}/${MY_PN}.nginx.reverse.proxy.example"
+	fowners -R gvm:gvm /etc/gvm
+
+	newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}"
+	newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
+
+	systemd_dounit "${FILESDIR}/${MY_DN}.service"
+}
diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/greenbone-security-assistant/metadata.xml
index 6a3196eff3b2..5a350f963a3c 100644
--- a/net-analyzer/greenbone-security-assistant/metadata.xml
+++ b/net-analyzer/greenbone-security-assistant/metadata.xml
@@ -12,4 +12,13 @@
 	<use>
 		<flag name="extras">Pdf results, extra fonts, html docs support</flag>
 	</use>
+	<longdescription lang="en">
+	The Greenbone Security Assistant is the web interface developed for the Greenbone Security Manager appliances.
+	It connects to the Greenbone Vulnerability Manager GVM to provide a full-featured user interface for vulnerability management.
+	Greenbone Security Assistant consists of GSA - The webpage written in React and 
+	GSAD - The HTTP server talking to the GVM daemon.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">greenbone/gsa</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest
new file mode 100644
index 000000000000..1d5ebd16e2dd
--- /dev/null
+++ b/net-analyzer/gvm-libs/Manifest
@@ -0,0 +1,4 @@
+AUX gvm-libs-10.0.1-pid.patch 312 BLAKE2B 805c21d61dfc6bf29cab6c6dd768fe6c9249aa7613ab18f21d347d1aeab58afc4bb75d17cc62687f3fa2270a05f16c883ba5293534e84e045f1d67dc527f8194 SHA512 dc42f495f2e45687ce221ba72fbdde4ca8fec11b4e55a46dd011e0d7169d5b20e1ba4473aa33180c698b655fce25fac2f8c6283fde04137b43c9c16af34eec43
+DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4dd07f17ab53957ac4a1452ecba595885abdf01402a78aa784163aaba60b5c452fb9c2b5a11d38c40706e820c22c2 SHA512 961570e8fa8f89f0b462991bff1bf4e512ed6419cff6871c7432899847fb9edcc9f0adb7c280d12ee69fbb5c8e306c9e4366e2cbbb05fc3bae06795dcfb42206
+EBUILD gvm-libs-10.0.1.ebuild 2406 BLAKE2B 165415542d7d6a063e748d596ab2cdeeb8a1fb620edc452bee660551bd40b8cea3ad30d646d32e5d04c137eb27292a078a59fd70245670ee9cfab6b28d599ba6 SHA512 729365eea3bcd836b1262f89c7d3527261256b96dab37ed6fbef3296cbc856fa1daef1c5a17f2b368cabc26e9f73a5f4ef96093e2f00963dc03fdd04e1403275
+MISC metadata.xml 790 BLAKE2B c8eaf3364b9acd770faf586a9f1062da2efe28c42342a59ad60fc8d65f12c2f459d8f24e99f216fbf9c219b2444f72e4944a5c806cb1f5283d8965c258d7bb1e SHA512 267856946386f023fe1eaf42794652126891773f578bbe7c0a1d70bfc107f46e49bebfeae6e485def0104dd9ebcf17f890a4cfb59c3362f29badfd803d3eb06e
diff --git a/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch b/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch
new file mode 100644
index 000000000000..29c2a4cd83a6
--- /dev/null
+++ b/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2019-04-05 11:27:07.000000000 +0300
++++ b/CMakeLists.txt	2019-07-14 23:42:42.723081614 +0300
+@@ -172,7 +172,7 @@
+ endif (NOT DATADIR)
+ 
+ if (NOT GVM_PID_DIR)
+-  set (GVM_PID_DIR "${LOCALSTATEDIR}/run")
++  set (GVM_PID_DIR "/var/lib/gvm")
+ endif (NOT GVM_PID_DIR)
+ 
+ if (NOT GVM_SYSCONF_DIR)
diff --git a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
new file mode 100644
index 000000000000..e62251e4c866
--- /dev/null
+++ b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake-utils flag-o-matic toolchain-funcs user
+
+DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras ldap radius"
+
+DEPEND="
+	app-crypt/gpgme:=
+	dev-libs/hiredis
+	dev-libs/libgcrypt:=
+	dev-perl/UUID
+	net-libs/gnutls:=
+	net-libs/libssh:=
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	radius? ( net-dialup/freeradius-client )"
+
+RDEPEND="
+	${DEPEND}
+	!net-analyzer/openvas-libraries"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	extras? ( app-doc/doxygen[dot]
+		  app-doc/xmltoman
+		  app-text/htmldoc
+		  dev-perl/CGI
+		  dev-perl/SQL-Translator
+	)"
+
+PATCHES=(
+	# Creating pid on build time instead of relying daemon!
+	# QA fix for 10.0.1.
+	"${FILESDIR}/${P}-pid.patch"
+)
+
+pkg_setup() {
+	enewgroup gvm 495
+	enewuser gvm 495 -1 /var/lib/gvm gvm
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# QA-Fix | Remove doxygen warnings for !CLANG
+	if use extras; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
+		$(usex radius -DBUILD_WITHOUT_RADIUS=0 -DBUILD_WITHOUT_RADIUS=1)
+	)
+	# Add release hardening flags for 10.0.1
+	append-cflags -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
+	append-ldflags -Wl,-z,relro -Wl,-z,now
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use extras; then
+		cmake-utils_src_make -C "${BUILD_DIR}" doc
+		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+	fi
+	cmake-utils_src_make rebuild_cache
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/gvm
+	fowners -R gvm:gvm /var/lib/gvm
+}
diff --git a/net-analyzer/gvm-libs/metadata.xml b/net-analyzer/gvm-libs/metadata.xml
new file mode 100644
index 000000000000..dbbfe2e9f17b
--- /dev/null
+++ b/net-analyzer/gvm-libs/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hasan.calisir@psauxit.com</email>
+		<name>Hasan ÇALIŞIR</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="extras">Html docs support</flag>
+	</use>
+	<longdescription lang="en">
+	This is the libraries module for the Greenbone Vulnerability Management Solution.
+	It is used for the Greenbone Security Manager appliances and provides various 
+	functionalities to support the integrated service daemons.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">greenbone/gvm-libs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest
index ffffd788aeb8..e162b3c70b04 100644
--- a/net-analyzer/gvm-tools/Manifest
+++ b/net-analyzer/gvm-tools/Manifest
@@ -1,3 +1,5 @@
 DIST gvm-tools-1.4.1.tar.gz 52020 BLAKE2B 0648c7e26dc0aed02eeeafdc8db45ae88afd8725196457a6a8cdcb888ed7e07c9998fc83c03fd9dd4f7aca1e238b46052653216b7373f98b150f6a181ba1538c SHA512 cd1049311241ad7b4a2d9648b54224ca1636f9620ffd238282bbf1089ab0c3b4e8b8f722c93c6809695bc71b0c7cb2bc3e65561b05269c7737abdc6ddca69aea
-EBUILD gvm-tools-1.4.1.ebuild 1029 BLAKE2B 7a30aab02c17185218883c7cb01351be00924142d95a05103ac700f350aea3e9128a760d09808a45578abbf0f842c11dc63aa80f7aecb09365184153a3e08b4f SHA512 28cd81faa8202640870c9e7c3bbd7a6bec9e97bab4b392e2bee05c208e329bcc11285e5481dd6442e7c1e3016abdf8ce80b906dfb311a332a96f3a7bffc66769
-MISC metadata.xml 373 BLAKE2B 475b09852e48dea8abbad16dfe918d7cef776bbabe51814dcc4bb82d074480cd3cfd463fd23057c403464bdae86b6f411e1fad098888e29621eaf0da72f0d246 SHA512 68d62e37a26c89ab68afd24c6832553150b21ef6a2abe911f5de8169c52daf10e6e5ffd201e0124b4a5069b123aad0dbc7669420b8d1823423d98553c1a36e4d
+DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504be910266d6dac113caff1da096bc6072649ddc456b3348e1aba79c9b7e147ba019a70e4163267c474850019a076e SHA512 0adf7e06b1208c91fbc02dab42593280c95f6572e27d96d6f8777d710747a9e427c79678d9aef785b7ecd6d4fd30e79a1c063fe4256025ac0616c1d242f45025
+EBUILD gvm-tools-1.4.1.ebuild 988 BLAKE2B 1916eb91f678818b18c5add2ad1a2b4ffd17b3a78590973f81491bdf35311db3b58b2ace82e1b2684bf465a0853aa4639c477656dacfc3d8bce3315aa3f95061 SHA512 8b4b39754d89a9168b604eeb920648cdb42df5be595a941cc1a18ff9801ecaef61a217d865455ed7a5c4713da9a7bb5f34b1331b2c0451f04a4ea93b4d85303d
+EBUILD gvm-tools-2.0.0.ebuild 1017 BLAKE2B 7e6ba6f64a33ce10ae5dd33c0e0439ace14201602232f82f51f46467ec1201ceb31865fbebb3d2aa189b44f1e59829540fdd18730015400dfb6ff61564b90ed4 SHA512 8499e2acda6aed44fa811fccdd4df5a575e2f190d1d56f3007c7a19071791857dbd07458aa62570c7002b0a2e154698d5476f12308ee6fdb328290da5dffedbc
+MISC metadata.xml 879 BLAKE2B 3fbe5d9d66b98ce42e4ba158d42cd2018b41b0b505932cd4d17e6ef0555e4622bd1c12020af18ff79f155009127ebe2681b1a6eb5b062fb0d65dcefc0b24c0f1 SHA512 38beadc54c27ab14b71eff900e70242dba92d5971dbddecec45d85c844b225d6abb50584a08f825c7b70092dcb489b7fc17eeaad0f9db7ab607fc1c078ef622e
diff --git a/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild b/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild
index 98d3f4eb3995..7de92b28c91c 100644
--- a/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild
+++ b/net-analyzer/gvm-tools/gvm-tools-1.4.1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
-DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
-HOMEPAGE="http://www.openvas.org/"
+DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli"
+HOMEPAGE="https://www.greenbone.net/en/"
 SRC_URI="https://github.com/greenbone/gvm-tools/archive/v1.4.1.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
@@ -21,12 +21,10 @@ RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/pythondialog:0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=net-analyzer/openvas-manager-7.0.3
 	!net-analyzer/openvas-cli"
 
 DEPEND="
-	${RDEPEND}
-	>=net-analyzer/openvas-libraries-9.0.3"
+	${RDEPEND}"
 
 src_prepare() {
 	distutils-r1_python_prepare_all
diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
new file mode 100644
index 000000000000..8800b1ff58ba
--- /dev/null
+++ b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/pythondialog:0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!net-analyzer/openvas-cli
+	!net-analyzer/openvas-tools"
+
+DEPEND="
+	${RDEPEND}"
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+	# Exlude tests & correct FHS/Gentoo policy paths
+	sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" "$S"/setup.py || die
+	sed -i -e "s*''*'/usr/share/doc/${P}'*g" "$S"/setup.py || die
+}
diff --git a/net-analyzer/gvm-tools/metadata.xml b/net-analyzer/gvm-tools/metadata.xml
index 1b94d6737400..f85b386b890f 100644
--- a/net-analyzer/gvm-tools/metadata.xml
+++ b/net-analyzer/gvm-tools/metadata.xml
@@ -9,4 +9,15 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<longdescription lang="en">
+	The Greenbone Vulnerability Management Tools or gvm-tools 
+	in short are a collection of tools that help with remote controlling 
+	a Greenbone Security Manager (GSM) appliance and its 
+	underlying Greenbone Vulnerability Manager (GVM).
+	The tools essentially aid accessing the communication protocols 
+	GMP (Greenbone Management Protocol) and OSP (Open Scanner Protocol).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">greenbone/gvm-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/gvm/Manifest b/net-analyzer/gvm/Manifest
new file mode 100644
index 000000000000..29c79cbe30ad
--- /dev/null
+++ b/net-analyzer/gvm/Manifest
@@ -0,0 +1,2 @@
+EBUILD gvm-10.0.1.ebuild 1312 BLAKE2B a6ebb5b0cd8941af6cd380af71153beaceca088479ea254b4be86efc3c462fe51cf8d4c6b6990e566b96f1e4a33378cdb58a1262ffa2a0779f5e585107db93be SHA512 69dd297a2e8083031d365fec7b9f0708d027eac6db1b9b9479e4d887884d116021d5b7ef47efc80453e92a838b1e0071d78d11fc5e958220b317353b5c35e7e1
+MISC metadata.xml 1178 BLAKE2B 69832f118fc0ccbb384a8d7c52f45bc1bba5300bd027bcae2c692261a1226a1a9b2ec6d556225a6c4ad942a61e1dfff0733d5c3b52b815c4592409df5d5afb87 SHA512 c700eb2605fc7b56acf34eb425483024dc2d952ea9a674ef932f2eb512144ba2b176bf1c12cec6ea9351c6f9160a40c6cfaa9b811483c924e6ce06a52d898377
diff --git a/net-analyzer/gvm/gvm-10.0.1.ebuild b/net-analyzer/gvm/gvm-10.0.1.ebuild
new file mode 100644
index 000000000000..a1811d22fb5d
--- /dev/null
+++ b/net-analyzer/gvm/gvm-10.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="Greenbone Vulnerability Management,previously named OpenVAS"
+HOMEPAGE="https://www.greenbone.net/en/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli +cron +extras +gsa ldap ospd postgres radius +sqlite"
+REQUIRED_USE="|| ( postgres sqlite )"
+
+RDEPEND="
+	>=net-analyzer/gvm-libs-10.0.1[extras?,ldap?,radius?]
+	>=net-analyzer/gvmd-8.0.1[extras?,postgres?,sqlite?]
+	~net-analyzer/openvas-scanner-6.0.1[cron?,extras?]
+	!net-analyzer/openvas
+	cli? ( >=net-analyzer/gvm-tools-1.4.1 )
+	gsa? ( ~net-analyzer/greenbone-security-assistant-8.0.1[extras?] )
+	ospd? ( >=net-analyzer/ospd-1.3.2[extras?] )"
+
+pkg_postinst() {
+	elog "Additional support for extra checks can be get from"
+	optfeature "Web server scanning and testing tool" net-analyzer/nikto
+	optfeature "Portscanner" net-analyzer/nmap
+	optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
+	optfeature "Application protocol detection tool" net-analyzer/amap
+	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
+	optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny
+	optfeature "Web application attack and audit framework" net-analyzer/w3af
+}
diff --git a/net-analyzer/gvm/metadata.xml b/net-analyzer/gvm/metadata.xml
new file mode 100644
index 000000000000..8f3369bf5f0d
--- /dev/null
+++ b/net-analyzer/gvm/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hasan.calisir@psauxit.com</email>
+		<name>Hasan ÇALIŞIR</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="cli">Command Line Interface for OpenVAS Scanner</flag>
+		<flag name="cron">A cron job to update GVM's vulnerability feeds daily</flag>
+		<flag name="extras">Extra fonts, pdf-results! and html docs support</flag>
+		<flag name="gsa">Greenbone Security Assistant (WebUI)</flag>
+		<flag name="ospd">Enable support for scanner wrappers</flag>
+	</use>
+	<longdescription lang="en">
+	GVM previously named OpenVAS stands for Open Vulnerability Assessment System and is a network security scanner 
+	with associated tools like a graphical user front-end. 
+	The core component is a server with a set of network vulnerability tests (NVTs) to detect security problems in remote systems and applications.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">greenbone</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
new file mode 100644
index 000000000000..5822f9a378e2
--- /dev/null
+++ b/net-analyzer/gvmd/Manifest
@@ -0,0 +1,13 @@
+AUX greenbone-certdata-sync.conf 64 BLAKE2B e485a0f69df180834b2e2bd00da13dd86b9faa32215d2dba28f725436c0c907f2c23bb5bdca741195d400d4d8df3679362eb614aafdd7d89304c00180f2843ed SHA512 17df9386fc1dccf2fbe3b8d1fd499171f6681b61afe7b4c11ff9debc008798b31d1d02d59463031482d94e10833f0e71bde27cbbe422f23738c77b7c6ada79d2
+AUX greenbone-nvt-sync.conf 62 BLAKE2B cac8a82e44394f509aa325d940db0e67ab6cedeb0536f3f184064cef05c8cac5ee9d6c69181b7f2344d352fb28b732b454039d97b7ffe44a3d31c20fefebd3b6 SHA512 964779adc39cbed191bccf02ccc408a263860002d2dbddee755cf0d015336814b0b3c83f88a02cc0c5959657be5c49eb94380cd6ba15844e4b6088e49cd7a3f0
+AUX greenbone-scapdata-sync.conf 64 BLAKE2B 8bfa8fde583762aeb76d90d16694bc6344e23bbc0c607ff493a8e03ff02ee6534c5464fae5d6595a23e6014287b9dc66de7e5164358780ac68a7c1cd83a04309 SHA512 37dbbd3f92f8baee8e89c274d820e03cba5ed5469a826f118897035c2f7719a915a71a6069eb6bf7f9a72e798b7837af9a6f25709215683d9d264292b5ccad66
+AUX gvmd-8.0.1-sbin.patch 2224 BLAKE2B 84e13415d01e3ce996af11f3ffde68a803c8db0a25b9a13986fde763739be95c95a547078a0a65a4cdeb2256c2daf9ed022381ba75e681198071364d2bf40320 SHA512 3cf3d8d12650f6905eef7c5b2b73fef9e228c13330d85916ed52bbad2911dc186c81e25650fd0381e0c878d2712df063cd42f18ceb9e6c9afac908bc9a2d7980
+AUX gvmd-8.0.1-tmplock.patch 746 BLAKE2B afba3139cd18734d9d9b89b05e7e5a3120c44b5099463cfa74f26142c2a779f75e473b0742e21d86171b5026af0d834bbedb2fb61edb3d1b83711898c0b6fcf9 SHA512 d5b12df500cef0c598aba6d0489ec18d6882ad0c111dce970ae4268af79df9b0aba66a5c9148b91af0e579aa82afb397bab1daced11b6f0ab2918472181800b2
+AUX gvmd-daemon.conf 813 BLAKE2B b4d73d6a5cc17325f56b250bf1e63fab808bf7e36a0b357641de87d54a3238fd68cf34cba08ce606827e3441e042c514cfc4ce73ff88b70cd4dea080dd68eb97 SHA512 1fcce48ed1d53489f4509138b3570790574003931289e65ab0f767a51da1e5d6c8d33c44da8d967f6c0442f0bee500bf46554a49b113fe0bc933dffd3fb121eb
+AUX gvmd-startpre.sh 223 BLAKE2B 2b12ff7077464d089591e53c631c3b38f4d9351d98326ef65f50ef0501f165bc8393af86c21a3e9663464526dcd2b435eb1a89ba3a05946cb862f959d3efe5d7 SHA512 d532037beb7b05037c136c5b7d7bcea65d166d11c4eb3c580fdabd4a99b110d230b67f633a9661674d3186c09baaf50089b222c7c17e57b4c0a234a4470af531
+AUX gvmd.init 598 BLAKE2B 92533371b043ff4752869d44702601f214233e4eddf0ecac74555c7a3f6f9641965b1d2b160f69d906ee2311321b715541cfdfadc9526c39d309d2d9a9eacf73 SHA512 03b7a19371ba08f0c7ed1387d4bcbd3a37d0c98603719341a5fb1843027eabb807382e4c87a2a654e3c08e59939e59c0f5df12e7dd6245922cd64f82c3ab8b72
+AUX gvmd.logrotate 325 BLAKE2B 4df59e6d9484b9e60d54cb3633ffc9888ad8550bb1d1f23123da21b1269125cd7354426b97ce42e06bf547d23788cefaac5ef51f7aa83d6cc34076bce4ab7339 SHA512 e1eeef173bfab7c750efcc7faa42cf7a1cfb9e6b137716063f273bc709c1346f11262dadbdb0c49822d885dc00177d8ccb91c0491ddc33cfee0a3827f11908f6
+AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c56657ac61c0c55f81f8bf809c5d6508945972dcaf31b4e75729c7686409a2ebaea4b7a132d8d557d9 SHA512 ea9132367ee28814ed6e36c0b1fb1ce4700e5735d77e0889947618aba511c3adbc968167b4968d1fa28bd41959575a49b8b2ddb9b116957c729f51ece33dfd98
+DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8
+EBUILD gvmd-8.0.1.ebuild 3026 BLAKE2B 500e85e5773cdf5b562e80f835467d4aeb07759f132ead5168e40d5f0978b550cdfbb31f8cab815eee7658232eac8f10fb70f009ca9b021d2142e0c79cbc578e SHA512 8cf597e3a3f2de5ad57b6499a6cc275764d6ee5d3b1957cb12ec62fa532e0f89ade5ae4b299d46de90b4fda4a97bd0f08159a9c6a4fb5cda0fcc6e02e11dbede
+MISC metadata.xml 1051 BLAKE2B f0773c3dbf8eabb4823bb5f3f9b70c6374db7af731ec828a2d295faed6c4c587a64683661a915d92ddf1bd3e5f623706a036d5a702d8271e5a310234ba22da08 SHA512 efcf5992b893f1e2f5b1a905e4f331ea3bc1446e5c1a5482b4dffdafd1b6f3daf9847a9164d74588463740f4c87925f4db47722fbf87e6beda2909c1981bd339
diff --git a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf b/net-analyzer/gvmd/files/greenbone-certdata-sync.conf
new file mode 100644
index 000000000000..d31a7331d341
--- /dev/null
+++ b/net-analyzer/gvmd/files/greenbone-certdata-sync.conf
@@ -0,0 +1 @@
+COMMUNITY_CERT_RSYNC_FEED="rsync://feed.openvas.org:/cert-data"
diff --git a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf b/net-analyzer/gvmd/files/greenbone-nvt-sync.conf
new file mode 100644
index 000000000000..967c41dec2e3
--- /dev/null
+++ b/net-analyzer/gvmd/files/greenbone-nvt-sync.conf
@@ -0,0 +1 @@
+COMMUNITY_NVT_RSYNC_FEED="rsync://feed.openvas.org:/nvt-feed"
diff --git a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf b/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf
new file mode 100644
index 000000000000..4a7426bc8057
--- /dev/null
+++ b/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf
@@ -0,0 +1 @@
+COMMUNITY_SCAP_RSYNC_FEED="rsync://feed.openvas.org:/scap-data"
diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch
new file mode 100644
index 000000000000..bf21acb7b01f
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch
@@ -0,0 +1,56 @@
+--- a/src/CMakeLists.txt	2019-07-17 17:11:52.000000000 +0300
++++ b/src/CMakeLists.txt	2019-07-21 22:43:17.299106863 +0300
+@@ -248,12 +248,12 @@
+ ## Install
+ 
+ install (TARGETS ${BINARY_NAME}
+-         RUNTIME DESTINATION ${SBINDIR}
++         RUNTIME DESTINATION ${BINDIR}
+          LIBRARY DESTINATION ${LIBDIR}
+          ARCHIVE DESTINATION ${LIBDIR}/static)
+ 
+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gvmd
+-         DESTINATION ${SBINDIR})
++         DESTINATION ${BINDIR})
+ 
+ if (BACKEND STREQUAL POSTGRESQL)
+   install (TARGETS gvm-pg-server
+--- a/CMakeLists.txt	2019-07-22 11:31:13.430827400 +0300
++++ b/CMakeLists.txt	2019-07-22 11:32:29.034765809 +0300
+@@ -571,17 +571,17 @@
+          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-portnames-update
+-         DESTINATION ${SBINDIR}
++         DESTINATION ${BINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync
+-         DESTINATION ${SBINDIR}
++         DESTINATION ${BINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync
+-         DESTINATION ${SBINDIR}
++         DESTINATION ${BINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+@@ -593,13 +593,13 @@
+                      WORLD_READ WORLD_EXECUTE)
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-migrate-to-postgres
+-         DESTINATION ${SBINDIR}
++         DESTINATION ${BINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+ if (BACKEND STREQUAL SQLITE3)
+   install (FILES ${CMAKE_SOURCE_DIR}/tools/database-statistics-sqlite
+-           DESTINATION ${SBINDIR}
++           DESTINATION ${BINDIR}
+            PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                        GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif (BACKEND STREQUAL SQLITE3)
diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch
new file mode 100644
index 000000000000..40b1e0095578
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch
@@ -0,0 +1,34 @@
+--- a/tools/greenbone-certdata-sync.in	2019-07-17 17:11:52.000000000 +0300
++++ b/tools/greenbone-certdata-sync.in	2019-07-22 21:11:36.173099530 +0300
+@@ -494,13 +494,11 @@
+ fi
+ (
+   flock -n 9
+-  date > $LOCK_FILE
+   if [ $? -eq 1 ] ; then
+     log_notice "Sync in progress, exiting."
+     exit 1
+   fi
+   sync_certdata
+-  echo -n > $LOCK_FILE
+-) 9>$LOCK_FILE
++)
+ 
+ exit 0
+--- a/tools/greenbone-scapdata-sync.in	2019-07-17 17:11:52.000000000 +0300
++++ b/tools/greenbone-scapdata-sync.in	2019-07-22 21:12:49.193161531 +0300
+@@ -517,13 +517,11 @@
+ fi
+ (
+   flock -n 9
+-  date > $LOCK_FILE
+   if [ $? -eq 1 ] ; then
+     log_notice "Sync in progress, exiting."
+     exit 1
+   fi
+   sync_scapdata
+-  echo -n > $LOCK_FILE
+-) 9>$LOCK_FILE
++)
+ 
+ exit 0
diff --git a/net-analyzer/gvmd/files/gvmd-daemon.conf b/net-analyzer/gvmd/files/gvmd-daemon.conf
new file mode 100644
index 000000000000..d97da00c7688
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-daemon.conf
@@ -0,0 +1,29 @@
+# GVMD command args
+
+# e.g --foreground
+GVMD_OPTIONS=""
+
+# Manager listen address unix socket
+# Failing under non-root user (looking for solution)
+GVMD_LISTEN_ADDRESS_UNIX="--unix-socket=/var/run/gvmd.sock"
+
+# Manager listen address TCP
+GVMD_LISTEN_ADDRESS_TCP="--listen=127.0.0.1"
+
+# Manager listen port
+GVMD_PORT="--port=9390"
+
+# Manager unix socket listen owner
+GVMD_LISTEN_OWNER="--listen-owner=gvm"
+
+# Manager unix socket listen group
+GVMD_LISTEN_GROUP="--listen-group=gvm"
+
+# Manager unix socket listen mode
+GVMD_LISTEN_MODE="--listen-mode=755"
+
+# Scanner listen address unix socket
+GVMD_SCANNER_HOST="--scanner-host=/var/run/openvassd.sock"
+
+# TLS settings
+GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0"
diff --git a/net-analyzer/gvmd/files/gvmd-startpre.sh b/net-analyzer/gvmd/files/gvmd-startpre.sh
new file mode 100644
index 000000000000..d04daa09b0a2
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-startpre.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Greenbone Vulnerability Manager Systemd ExecStartPre
+touch /var/run/gvm-{checking,create-functions,helping,migrating,serving}
+chown -R gvm:gvm /var/run/gvm-{checking,create-functions,helping,migrating,serving}
diff --git a/net-analyzer/gvmd/files/gvmd.init b/net-analyzer/gvmd/files/gvmd.init
new file mode 100644
index 000000000000..9686c9b5398e
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd.init
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${GVMD_USER:=gvm}
+: ${GVMD_GROUP:=gvm}
+: ${GVMD_TIMEOUT:=30}
+
+name="Greenbone Vulnerability Manager"
+command=/usr/bin/gvmd
+command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
+command_background="true"
+command_user="${GVMD_USER}:${GVMD_GROUP}"
+pidfile="/run/gvmd.pid"
+retry="${GVMD_TIMEOUT}"
+
+depend() {
+	after bootmisc
+	need localmount net openvassd
+}
+
+start_pre() {
+	/bin/bash /etc/gvm/gvmd-startpre.sh
+}
diff --git a/net-analyzer/gvmd/files/gvmd.logrotate b/net-analyzer/gvmd/files/gvmd.logrotate
new file mode 100644
index 000000000000..453462575f8b
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd.logrotate
@@ -0,0 +1,13 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# Daemon ignore HUP so we use 'copytruncate' instead of 'create' 
+# with safe file size to prevent losing log entries.
+
+/var/log/gvm/gvmd.log {
+	compress
+	missingok
+	notifempty
+	sharedscripts
+	copytruncate
+	maxsize 10M
+}
diff --git a/net-analyzer/gvmd/files/gvmd.service b/net-analyzer/gvmd/files/gvmd.service
new file mode 100644
index 000000000000..2e3ad84c85a5
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Greenbone Vulnerability Manager
+After=network.target
+After=openvassd.service
+Wants=openvassd.service
+Before=gsad.service
+
+[Service]
+Type=forking
+PrivateTmp=yes
+User=gvm
+Group=gvm
+PermissionsStartOnly=true
+EnvironmentFile=-/etc/gvm/sysconfig/gvmd-daemon.conf
+ExecStartPre=-/etc/gvm/gvmd-startpre.sh
+ExecStart=/usr/bin/gvmd $GVMD_OPTIONS $GVMD_LISTEN_ADDRESS_TCP $GVMD_PORT $GVMD_SCANNER_HOST $GVMD_GNUTLS_PRIORITIES
+Restart=on-failure
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/gvmd/gvmd-8.0.1.ebuild b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
new file mode 100644
index 000000000000..2c6da5d39c1e
--- /dev/null
+++ b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake-utils flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras postgres sqlite"
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	dev-libs/libical
+	>=net-analyzer/gvm-libs-10.0.1
+	net-libs/gnutls:=[tools]
+	extras?   ( app-text/xmlstarlet
+		    dev-texlive/texlive-latexextra )
+	postgres? ( dev-db/postgresql:* )
+	sqlite?   ( dev-db/sqlite:3 )"
+
+RDEPEND="
+	${DEPEND}
+	!net-analyzer/openvas-manager
+	~net-analyzer/openvas-scanner-6.0.1"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	extras? ( app-doc/doxygen[dot]
+		  app-doc/xmltoman
+		  app-text/htmldoc
+		  dev-libs/libxslt
+	)"
+
+PATCHES=(
+	# Install exec. to /usr/bin instead of /usr/sbin
+	"${FILESDIR}/${P}-sbin.patch"
+	# Fix permissions for user gvm.
+	"${FILESDIR}/${P}-tmplock.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# QA-Fix | Use correct FHS/Gentoo policy paths for 8.0.1
+	sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die
+	sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die
+	# QA-Fix | Remove !CLANG Doxygen warnings for 8.0.1
+	if use extras; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+	)
+	# Add release hardening flags for 8.0.1
+	append-cflags -Wno-nonnull -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
+	append-ldflags -Wl,-z,relro -Wl,-z,now
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use extras; then
+		cmake-utils_src_make -C "${BUILD_DIR}" doc
+		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+	fi
+	cmake-utils_src_make rebuild_cache
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodir /etc/gvm
+	insinto /etc/gvm
+	doins -r "${FILESDIR}"/*sync*
+
+	dodir /etc/gvm/sysconfig
+	insinto /etc/gvm/sysconfig
+	doins "${FILESDIR}/${PN}-daemon.conf"
+
+	exeinto /etc/gvm
+	doexe "${FILESDIR}"/gvmd-startpre.sh
+
+	fowners -R gvm:gvm /etc/gvm
+
+	newinitd "${FILESDIR}/${PN}.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/gvm/gvmd
+	fowners -R gvm:gvm /var/lib/gvm
+}
diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml
new file mode 100644
index 000000000000..36ce32a69a9f
--- /dev/null
+++ b/net-analyzer/gvmd/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hasan.calisir@psauxit.com</email>
+		<name>Hasan ÇALIŞIR</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="extras">Html docs support</flag>
+	</use>
+	<longdescription lang="en">
+	The Greenbone Vulnerability Manager is the central management service between security scanners and the user clients.
+	It manages the storage of any vulnerability management configurations and of the scan results.
+	Access to data, control commands and workflows is offered via the XML-based Greenbone Management Protocol (GMP).
+	The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other 
+	remote scanner is coupled with the Open Scanner Protocol (OSP).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">greenbone/gvmd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index d5ba51c43836..69a97956abf1 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -5,6 +5,6 @@ DIST hydra-8.9.1.tar.gz 1186320 BLAKE2B 97c29cda5e26197ed66aa29555b0e4de3ef5b08b
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 EBUILD hydra-8.1.ebuild 2231 BLAKE2B 95092e808318ddde9e4dfdffde525efba03a9327fcee14ea7e3b02c21b823d9d2b546a4a60e69d045fc2866ad30660ab796406a09c520aa4d09d1933a8fe1df2 SHA512 77b003b5e8c5118dc81c318974ae2af2b0e973a272eccf3666ada23ed2712762792c725c1d2f5b3bb1df37277d3a6951ea92dd3995ea79ec97bb053ab339cac5
 EBUILD hydra-8.9.1.ebuild 2366 BLAKE2B ba12d4eca5289fcb1142dafd6114a037097ebcf61e3cdf08c0befacdcbd799358b8db0df251201bcb3a9e690063c3a6b7bafe2917b3bb2fdfff4acbdfeae761c SHA512 1888c365da61c5e2e873dc4c7d76cc0f0e30d6638d9416df8857deb84bc844e7ae0ce3f71c897c1eedd1b9e1efdcbdef9b1cd9eac23b89df4b4a5147a6f68bdc
-EBUILD hydra-9.0.ebuild 3633 BLAKE2B fef1fb1edc77744dcd5e24321e4e67bd4f215c9439396455809b35a6f37409b379049356ea3f4fcb066b4ee772bff328023fe5fcc9528441b4e5a8767845331d SHA512 e9b1be609ea4c7ba487fab8865943a7f319e2040f6cdb42db78dd6dba9288f7c2307f76fb30d26db738f96d3564503f31db1b69d2c3c3e3b363f8417c9e26452
+EBUILD hydra-9.0.ebuild 3631 BLAKE2B 579a695af32dfb017464ce8e16937b396b1b31a3bfb56c099c758a740096e5af5809664d87cd0152a9b15c4d0fefeccdf7163a0960a942cb9e1ff7456ac90c8c SHA512 7ee4d35e0122af56ebe7403a374947b605c00321f7719c27c2723c48c8e8ce98f4d75f7da59590f013f619469dc8cfd609db2d8c846823ca0ad5dc23ec8f3654
 EBUILD hydra-9999999.ebuild 3571 BLAKE2B 1bdb57bf900c1a3a3ae3e63858cef8dec1408d544f101d90485f11cb7705bafce7e708ee2006bed412e0cdb31238e8bd9719014ec416540d6f7ab88f1b7e8656 SHA512 dfd6138ea0fdcdd1c839eb1a2e094749e23cc6603c61e9975db6e5d94d792492c87fb918977307dde72fde2042690375b306c440280aad44c8d5ba622c2dcb77
 MISC metadata.xml 570 BLAKE2B fba8cf56f3f091fdf16a86ee3a1b964e9dfc0cae8a32e6fb81b8ccec3f1efe47dfac838c86fadd80e736d4a82233e8f84695c0a0987d4f426ab88fe0841df70f SHA512 45d0573055b0fe5f820e92cd43627e5c48dee8a1151ef06c7f65dddb8078ff62197bd5c8bbd1e1b12a42df61e399f2e3bff337201fa37df085339de24c8b50ba
diff --git a/net-analyzer/hydra/hydra-9.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild
index a7894804ea79..c381eec6f1b1 100644
--- a/net-analyzer/hydra/hydra-9.0.ebuild
+++ b/net-analyzer/hydra/hydra-9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="
 	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses
 	oracle pcre postgres rdp libssh subversion zlib
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 1be39e4db852..db946cdc03a7 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -3,8 +3,10 @@ AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc
 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a SHA512 c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
 DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce SHA512 ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d
 DIST icinga2-2.11.0.tar.gz 7472579 BLAKE2B 36fd54e1067e6e61ab642debaa3589e6885e0be2f68d2a2bea0d03d3149ecc8bfc985ea7806b89a3b95662b03b2fc8695ae62a0036783a9f40d759e823d116fa SHA512 2526c622f00c355aa255fc42d0350bd5eb3fc270e7b4e3c3dcab575b4f7b7e03580d742064c2c3e143f302757fd997078ca12cb01575c78f79ae5616251262e2
+DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B b3c1ebd220dc21feffa998311d743b004c83e897fee758b1398897b5ec5772b7e27840ebe925cbfff89df333c25b366ca15c16fcedddb596fdd1e1236540fa16 SHA512 88bed284aae0196b964a9998c638066f54788474f91d9e21b0f262bf889b17d46ab0c143f9dc4bb976bfcc5785a1f0521c0bf16fa7e54a7af22fd1baae1a231d
 EBUILD icinga2-2.10.5.ebuild 4739 BLAKE2B 285278c6205b785c143fdfe7ad894094f90d40d0fac34b006594138770fa27c62323ffc212beed6b142b8db6ce51eeb8b89b5026aa5f681a6cdb5d5d5fce4e57 SHA512 263ef5cc4ee4843d6b902ebd17022af7f73542d9a6f954b46cfc97f2f248e44e5316e8bf2694952934bf6772264577d9daf1039e0e516262f32eb85476ce2b99
 EBUILD icinga2-2.10.6.ebuild 4726 BLAKE2B b9b51cb8382f7239bd3ce502eab29273364d35352a84adb653dec8438fc0d94b5cbdaa52a0bad66927237e7f438b2a51ccaf44ea9851b14cbfc792dd1b1d9b71 SHA512 4a9b62fa84342c19ef4d470bdf1ab5482aa54eb052f2d514002c9e688f89629115d2a9fd3775326cd5b5c80b8a4ac0f987f95b73ce39413ec1d5ed16247a7702
 EBUILD icinga2-2.11.0.ebuild 4719 BLAKE2B be92afb9182bf01c15dca373e0655b3ce295258fae208ffb60d95c4bbfc2576631ab40652c3eda9890c845ba84df7f542809815521505eb591a2ea5792f47cd5 SHA512 bb9b015d64446301eb72af495d20a4cf74bc560c2cc1b1efca1b40e66c56baf6eb96eddcd4a350fa60b7a7b0e71db1a8614a77bc570539873376f693be2a2061
+EBUILD icinga2-2.11.2.ebuild 4719 BLAKE2B be92afb9182bf01c15dca373e0655b3ce295258fae208ffb60d95c4bbfc2576631ab40652c3eda9890c845ba84df7f542809815521505eb591a2ea5792f47cd5 SHA512 bb9b015d64446301eb72af495d20a4cf74bc560c2cc1b1efca1b40e66c56baf6eb96eddcd4a350fa60b7a7b0e71db1a8614a77bc570539873376f693be2a2061
 EBUILD icinga2-9999.ebuild 4734 BLAKE2B ec7ea399c1441b75b3690f6883488ee3a2c3dbb307055bafa4e0b6c12985316cd74a2d6f308c43bbec890e3bb741163c5c793ab7cba4092ec3dfe6e6831e9a5b SHA512 84e71c9437ff19065eef5f4e56817185af748ee896a2b2c8af8201df172cce26d5f4fc3c022644b9a8c063675c7a6407287f4094579309f9101f04a9b47a9d98
 MISC metadata.xml 834 BLAKE2B 49da117c90fdfa30311744b471933f1de2d106b74704e4daef5c33fa71f7aa99c6f05d5ca1345baf607b8e18f4036a9582f95487587f50bff90d6ac2d6c1ad48 SHA512 2e28e73e56153235ce7a69ee3f320cd6a8b9117ed6633deaf1095051d75c2c2fb499ff3748fa74262e84b340082dd6c6f08489549486d2dcba6b944d4cf460f5
diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
new file mode 100644
index 000000000000..cb76f2a6cf71
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+	EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/boost-1.66.0:=[context]
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl"
+
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+
+RDEPEND="
+	${CDEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+		-DUSE_SYSTEMD=$(usex systemd ON OFF)
+		-DLOGROTATE_HAS_SU=ON
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	# LTO
+	if use lto; then
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_LTO_BUILD=OFF
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd "${BUILDDIR}" || die
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use mariadb ; then  # same as mysql
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "DB IDO schema upgrade may be required required.
+		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+	fi
+}
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index 26ba461730ee..a82b86f53395 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -4,5 +4,5 @@ AUX iptraf-ng-1.1.4-tcplog_flowrate_msg.patch 330 BLAKE2B edf2d08df81fb65c1f05bf
 DIST iptraf-ng-1.1.4.tar.gz 583306 BLAKE2B c06fdc25838901fc5528057ade5ebe28b5679a6a545f461cef2a5f4d3cbc1346a7ab3e94f4fe317a1760067e480c3c622df1027591d978b0ac1236ba9203e9da SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774
 EBUILD iptraf-ng-1.1.4-r1.ebuild 1330 BLAKE2B 909e0003854fd0fc6221705b7e1a43fa9ecad1f2a2e1660479288ae8a265efebb51743f08096d03b9e7c470e18df92e458fc79e8c331fd5de4a99d6f634dbf9e SHA512 8e47e2b556632445670916d1fddea8254f9078c3237c4c48f076cf7b61ebe5ccae30600d7485cb518b56ccf9e235dbdd72e3bbcd18a08a591bfde3ba3702b85c
 EBUILD iptraf-ng-1.1.4-r2.ebuild 1434 BLAKE2B 557210a6fd82005b9dc18c56b531d34d35f47d87090a807818eb59107853b8a41e5a5ba4f5f7d4ee0e79a8c60b3194b7cf1903927579471966699e4565340bf0 SHA512 71fd8f9b5fcc3f36b46a09d15e6a1d1bfcf1643574a958b0a8228cfb1c56f542ee163de7aa661ad79fd4d6df06fb4d02399843d1372bf4552464ab468afda8e7
-EBUILD iptraf-ng-9999.ebuild 1204 BLAKE2B d14662a51bc8d04fc44a0de6af47fdaa24b78c30e7db67e3ef721932043b6445d226a5523fefbfdb73d3297bf46c2b62056e307264da936fdc14a3f5ea1658dd SHA512 f51efabad085887a2bd610fd08039b5a9b53d3c68949a7c117920045c3fc51196a3851ab20e0e4412f1fabab14be3ef482107ff22ac6365dbf0fdfc955323303
+EBUILD iptraf-ng-9999.ebuild 1209 BLAKE2B 1489bd6abcd4f21bdc16a1ecd15d660ba7582e0d6345cc2a8166454e3412f7666f54c1d7807fc1831197454c04556eb6fc760d25caca60cd814a0f1277dbc2b8 SHA512 922a1150e0858ff22161ad6636a6f54f95fac1e6dd683d895ecd409a18ffe14bb981d00bfa20e7fe538edcfbc5990065830ed817b5d56fa3becba4f34f3fda74
 MISC metadata.xml 376 BLAKE2B e5dd4ba7396c36e80ee1eed3eda4444bdd914e4701dd5acb0780b51a2e0e37020982bf624e1e8ecb81b5ba9af20f199885b52c03329d8238e43ca16c468a1900 SHA512 440bbe472188ac3acd7f0dcdddf8390e690a8f81cda49d6be5bed8a46cdf1fb10416f4313d426c408bd9f88501312af812badc765a24e76927b5ecfc64e7c225
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
index ea4ed84750bc..284d4bb322e4 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
@@ -1,12 +1,12 @@
-# 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 git-r3 toolchain-funcs
+EAPI=7
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="A console-based network monitoring utility"
-HOMEPAGE="http://fedorahosted.org/iptraf-ng/"
-EGIT_REPO_URI="https://git.fedorahosted.org/git/iptraf-ng.git"
+HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng"
+EGIT_REPO_URI="https://github.com/iptraf-ng/iptraf-ng"
 
 LICENSE="GPL-2 doc? ( FDL-1.1 )"
 SLOT="0"
@@ -25,6 +25,8 @@ DEPEND="
 "
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e '/^CC =/d' \
 		-e '/^CFLAGS/s:= -g -O2:+= :' \
@@ -54,7 +56,11 @@ src_install() {
 
 	doman src/*.8
 	dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES
-	use doc && dohtml -a gif,html,png -r Documentation/*
+
+	if use doc; then
+		docinto html
+		dodoc -r Documentation
+	fi
 
 	keepdir /var/{lib,log}/iptraf-ng #376157
 }
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index c573681025dd..55f7b4ae071b 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,5 +1,5 @@
 AUX database.yml 613 BLAKE2B c724103b21f7650e4c6a221a22984cbff1be21ae761b62666db5d048e087f3d4e891e30b75fcacdcb5dc2fc369dd8dff4de042d6b87f47bffffeb45bd05aca46 SHA512 b178724382a88b87b9007f950fb5e8f93936f3e5a58f89c90f67120c4d50c98d4de758c8a6e321a0a68caa12ccab003d502377621bfe762279eb5ae2a3d5ff2b
 DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9
-EBUILD metasploit-4.17.21-r5.ebuild 12470 BLAKE2B 15d5d3b943bfaadcd355d5aa8eb6691296929c9b969c66374230ed708b3d3c94f73733fdd482bff7a9ca8b4760ba2931deffdf138f1ba6c3c272906df2837ab2 SHA512 49247dc10f2689bba6f34ec5fe1da5ca589009800bf7b35f3516fe08eea015c1ea9bdd39f48bdfc5544b167bdd9fad0c50f8690c48d5da482910029b74e30873
-EBUILD metasploit-9999.ebuild 12236 BLAKE2B 9a52de12c903d51345700cdef81c206cf18416fecb12375c698d93aadd04fc8ae9f245ebeb5f04ac982ba71d4ad8cdda78cf5753d102c88657d4e8bb5d973d5f SHA512 29bbe0fbf7316a662c08bf0a71593e339ce0293f8b8edfc9515aaf49a6c76b45e359b9dbb50a8908a7e07787874bdbe9beee1917ad1026ff41b42528e42210b9
-MISC metadata.xml 853 BLAKE2B 9b0b2e6c82a4df1327ded8b8381fa1e557ba4353ae5dab9665e7b59950d36e61faead5d8672e2cc10dad68b5a3250126a7fb1c4edc7f6814f28ea3f6df663473 SHA512 9af2dae0c12ae84ae2a7887fad0e7f5ea1d945a8b6e6674ba9e3c3bbff167b00a4aeff2da8b457ff8657f83d617dad67f633b260578a1e9608475fe45585cad0
+EBUILD metasploit-4.17.21-r6.ebuild 12576 BLAKE2B 03151033fc8bab37f09633a20922ce46dfc6fb63e2360595f51cf47f65eaba83939b76cef3ca74bcc40f80a39cc7828e3829a8993582c19fabbfe27e2ea6b073 SHA512 0cedeb24e1bbd58f4de8a83e4eb324d8cd80149c26225776bc1feaedb793953a0aaa95fd4610ef596dcdd620d9a3840e1b80e031264527ca413e614c4d166c69
+EBUILD metasploit-9999.ebuild 12342 BLAKE2B 200e886af2935c5a4c865d2c5cc3f906bdb9445971d78ca05d7541d7da6c6ba0d35bd40cec62fbb746d69a6d1aebc1a3d1db0a4dcbee2fb9501272f38a4ae497 SHA512 83a43d2be1cd706057503969d039d3525e6ba2e43c288198bc4ca4a50fa26f1e2c3382f4f58d66686a7bc6b1c6f1bcff3922197819089070b397f3e7f60cc952
+MISC metadata.xml 760 BLAKE2B 1d242b9a6216631670676d4f2653fd86a414c00fd52a0f29903004b6848b95abf543e3c2fe59617b629104e886a061dede551a61c911d8e09b82d70c03c9788e SHA512 c8b659a986e68a5f063ff7637fc5f3ea1939aae6ac22844292f30587cb6396ab7f02bd08c1d28739d07887ac23b7989f956197b345a90e14a98600b3150ed4f7
diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
index e449553f4ecd..1edaa58c665f 100644
--- a/net-analyzer/metasploit/metadata.xml
+++ b/net-analyzer/metasploit/metadata.xml
@@ -9,7 +9,6 @@
 	<use>
 		<flag name="development">Install dependencies needed for metasploit and exploit development</flag>
 		<flag name="nexpose">Enable the plugin to integrate with nexpose</flag>
-		<flag name="openvas">Enable the plugin to integrate <pkg>net-analyzer/openvas</pkg></flag>
 		<flag name="oracle">Enable restricted oracle modules which have additional deps</flag>
 		<flag name="pcap">Enable libpcap for packet sniffing</flag>
 	</use>
diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
index e980b733098c..db815de8d1d6 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r5.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild
@@ -27,7 +27,7 @@ fi
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
-IUSE="development +java nexpose openvas oracle +pcap test"
+IUSE="development +java nexpose oracle +pcap test"
 
 #multiple known bugs with tests reported upstream and ignored
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
@@ -44,7 +44,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bit-struct
 	dev-ruby/bundler
 	dev-ruby/dnsruby
-	dev-ruby/faker
+	dev-ruby/faker:0
 	dev-ruby/faraday
 	dev-ruby/filesize:*
 	dev-ruby/jsobfu:*
@@ -92,7 +92,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/ruby-macho
 	dev-ruby/rubyntlm
 	dev-ruby/ruby_smb:*
-	dev-ruby/rubyzip
+	dev-ruby/rubyzip:*
 	dev-ruby/sqlite3
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
@@ -101,7 +101,6 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	nexpose? ( dev-ruby/nexpose )
-	openvas? ( dev-ruby/openvas-omp )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*
 		dev-ruby/network_interface )
@@ -216,9 +215,12 @@ all_ruby_prepare() {
 	#if ! use nessus; then
 		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
 	#fi
-	if ! use openvas; then
-		sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
-	fi
+
+	#OpenVAS support dropped on net-analyzer/metasploit. Bug:692076
+	#openvas-omp is deprecated and masked for removal. Bug:692076
+	#Remove openvas-omp in gemspec. Bug:698762
+	sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
+
 	#even if we pass --without=blah bundler still calculates the deps and messes us up
 	if ! use development; then
 		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 49691b5c0747..42bf6440d53d 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -27,7 +27,7 @@ fi
 DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
-IUSE="development +java nexpose openvas oracle +pcap test"
+IUSE="development +java nexpose oracle +pcap test"
 
 #multiple known bugs with tests reported upstream and ignored
 #http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
@@ -44,7 +44,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bit-struct
 	dev-ruby/bundler
 	dev-ruby/dnsruby
-	dev-ruby/faker
+	dev-ruby/faker:0
 	dev-ruby/filesize:*
 	dev-ruby/jsobfu:*
 	dev-ruby/json:*
@@ -91,7 +91,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/ruby-macho
 	dev-ruby/rubyntlm
 	dev-ruby/ruby_smb:*
-	dev-ruby/rubyzip
+	dev-ruby/rubyzip:*
 	dev-ruby/sqlite3
 	dev-ruby/sshkey
 	dev-ruby/tzinfo:*
@@ -100,7 +100,6 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/xmlrpc
 	java? ( dev-ruby/rjb )
 	nexpose? ( dev-ruby/nexpose )
-	openvas? ( dev-ruby/openvas-omp )
 	oracle? ( dev-ruby/ruby-oci8 )
 	pcap? ( dev-ruby/pcaprub:*
 		dev-ruby/network_interface )
@@ -215,9 +214,12 @@ all_ruby_prepare() {
 	#if ! use nessus; then
 		sed -i -e "/nessus/d" metasploit-framework.gemspec || die
 	#fi
-	if ! use openvas; then
-		sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
-	fi
+
+	#OpenVAS support dropped on net-analyzer/metasploit. Bug:692076
+	#openvas-omp is deprecated and masked for removal. Bug:692076
+	#Remove openvas-omp in gemspec. Bug:698762
+	sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die
+
 	#even if we pass --without=blah bundler still calculates the deps and messes us up
 	if ! use development; then
 		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 2bb45374cf7d..f8166e82b689 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -2,12 +2,11 @@ AUX mtr-0.80-impl-dec.patch 226 BLAKE2B ba16f81170ad40b472760f9130f139f092c69d70
 AUX mtr-0.87-ipv6.patch 1846 BLAKE2B 7d2166183a203454eca233b8ad2bc3e97c4dd7fcacd6325d83694938c026cf9cee25d8ecc3d799e8ffa09315361117f41981e382af296538cbf6fffb23b5121e SHA512 07a43b798b30893583fb08e7e65a6833ece98f18656f6a31e7e61acd1f582d68d35b63d5aada4175d5df2451cbd856370e85f514e1ee8447ada9a91a83af1345
 AUX mtr-0.87-tinfo.patch 380 BLAKE2B b81110442dde3e7d0337c2b6e6685a377593b6c91c31fd20fbf42cd54296282aec3ab73a8f047ed4742a7a369a18ecf9b26bcd3f56d5e9a5e565e6f66b906f5f SHA512 91442d319840620273c712e7668d8895a28a10615afa4e06a16a3f86c2dc319a9484c7a8b92a8ad7de97f56c52b881a230ebd3fe59e45a7a4df85fcd77c74229
 AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f384258339495abcd937271ad29b429bebe5922f5288113683e5910c5ea513d2a131aa50b230ab51bfaf332e31379 SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa
-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 1150 BLAKE2B f7157b21c48d9fb942cf90db72ab8a3969abe8f295bcc4345ccddb12b50a7797f46fec44ab40f30c556040d6f72c1d3236898bb230bc742513e5e1c44f8c4e7a SHA512 baf2f11237b50b16037f9983869f1cb890bb4e37fb8d7604ecf5bc0a28397ecc2644a960c47b01bfb9a00deb06d2ea41915315ad53b8bb92f11b83f42152331f
-EBUILD mtr-0.92-r1.ebuild 1418 BLAKE2B 7617cf78513e3987491fe9f8c735160eda5fd524274f23e57cc41a40bf6cadc2fa86ac039f71622832ac25b67632a031bd6b70c4ed080d3a90723a8ac039414c SHA512 2864b1f8722b8206bfb1a9191251dc8e07fd1537344d802056b66b33aec3c9c830c9b09c6f310124c94a914fc3194a6b4c550d8de7542d2690d95a8a12a53cf8
-EBUILD mtr-0.93-r1.ebuild 1507 BLAKE2B 25bb941cf95898609dfe5e432535c49cacceacdf5c15d04f0ef3bd6257b18babcdb8502ea315c33bad2536bfa242c71aeb093fe8e6bd8acf124592a73e50d40c SHA512 8a15dec7446bd7642bb59113ad6ae6451856abb5f337875563233e8350705d8d0d0ab6000192074cf14bc7f28267a70e837ccfa37fde29865e22e980270751cf
-EBUILD mtr-9999.ebuild 1581 BLAKE2B e52533acb767ab356958eeb91e19deada75245671b24e201283a0db85493f2850db3c66351ee25c7471133eaed9fc1a1b1db715b78c496b6af002eda1cc31da0 SHA512 7a43bba45d9a2b17bbfa92dcdd9ede2ed9c1c7a5a6ed8a95e4ad6d1dc0be3783bd7cfe148674a1469e196da9a6c8b19d13d2abf6ae88464ed2e0b181dd61ca7e
+EBUILD mtr-0.87.ebuild 1156 BLAKE2B 034cb794c10bcf59fb8ac37c0d8e7e0d9d2890c5020c79166e4e72daae1b4c20dfbd245712db04df999951e0656e955aab1700e9e5a3ea6a8a148028603f417e SHA512 aebbbceb187ae310b0b5201e9a6714c4b5edecf3a449b94898591948850b95994066d4d617cd81e00bfab3fea330be630f93d2d1953bc716d117b6b1aa95018e
+EBUILD mtr-0.92-r1.ebuild 1424 BLAKE2B b8ac6ee0aee8c14de230a724f29c9a02bf828546b68689e95cd890037ab609754560a23d5bb922a8109262916aaa6af36f8696827734f4f36ff32fab224d0c57 SHA512 66552bf4dc1f2a765cc27afa7e070fe82fd551d30d45dca4f9be10133117aa8428d608637594bdc76d784a0cf2e3608c82b4338121c2d9d5161736c23374498c
+EBUILD mtr-0.93-r1.ebuild 1516 BLAKE2B dc40f0a55e8ae08ff73b89491b7dbd56715b80871a6ab16cf91415c4d3ee5512c83b02ac4c357206fad0a160b1efbcc27b8b72120df88ce8f7226d4c725e606b SHA512 3f686ba48e6c67ce7cde669d23dcb3fb97c5405b23099f9e1857d6ec51d21823abb3a25872303346a7c5b1e9c0be69eaee58b2687a2f55c332db9b727e57af15
+EBUILD mtr-9999.ebuild 1265 BLAKE2B 8b8bdca8bbfd8b9c1a61296a34d561fc7fad185440ea00ef1d5aa3b63f70dfc65ca61d180c86d1e40045b4c1e9a456da3883853e3369c7ff9d1f4f60b8d28166 SHA512 bdb92c834b3f4c8a3b1848c6c40564ecdb1d7d1d688a77c39870be0179172b0fe6104914e5b3d3137885610a4ac63b69343af8d561f963c380832d1752642b24
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild
index 575256d8fca3..6cfd1bd5b83d 100644
--- a/net-analyzer/mtr/mtr-0.87.ebuild
+++ b/net-analyzer/mtr/mtr-0.87.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
+SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/mtr/mtr-0.92-r1.ebuild b/net-analyzer/mtr/mtr-0.92-r1.ebuild
index c0124945b425..f3684cc00ecd 100644
--- a/net-analyzer/mtr/mtr-0.92-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.92-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
+SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/mtr/mtr-0.93-r1.ebuild b/net-analyzer/mtr/mtr-0.93-r1.ebuild
index dc7f90ebcff8..d9d465764723 100644
--- a/net-analyzer/mtr/mtr-0.93-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.93-r1.ebuild
@@ -5,8 +5,8 @@ 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"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
+SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 6185590ebe48..75a592ba00d8 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -1,13 +1,12 @@
 # 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 git-r3
+EAPI=7
+inherit autotools fcaps flag-o-matic git-r3
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
 EGIT_REPO_URI="https://github.com/traviscross/mtr"
-SRC_URI="mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +16,7 @@ IUSE="gtk ipv6 ncurses"
 RDEPEND="
 	gtk? (
 		dev-libs/glib:2
-		x11-libs/gtk+:2
+		x11-libs/gtk+:3
 	)
 	ncurses? ( sys-libs/ncurses:0= )
 "
@@ -26,26 +25,17 @@ DEPEND="
 	sys-devel/autoconf
 	virtual/pkgconfig
 "
-
 DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
 FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.88-tinfo.patch
 )
-
-src_unpack() {
-	git-r3_src_unpack
-	unpack ${A}
-}
+RESTRICT="test"
 
 src_prepare() {
-	# Keep this comment and following mv, even in case ebuild does not need
-	# it: kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf
-	mv "${WORKDIR}"/gtk-2.0-for-mtr.m4 gtk-2.0.m4 || die #222909
-
 	default
 
-	AT_M4DIR="." eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index f60e7171b1dd..bfccc700fd8a 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,22 +1,5 @@
-DIST netdata-1.13.0.tar.gz 3095581 BLAKE2B 0149600d308717ce8bdab2af6b4b0403a762fff15c62cf61a94141c0a73f8867cde265a2065e6f1e42cee7291375a7c33a3eff804017d40146d5ecba6f5414a8 SHA512 dddd0005b746429255601e284f498072560bb62c4875a17a731d8e47c3c168c4934476f46eefc7b0deafb54490fcbb6e5ea97aac51a0461f7a63f34d3770c250
-DIST netdata-1.14.0.tar.gz 3116199 BLAKE2B 366fdd7fc94799f170a2957e26fadfacd0cc71ae22f1ac2390633fc2e9d48b2f725ec1f87cc21096d2ed8a948e1dfcfc5d9e90540ad3ef93fd918569a387a64f SHA512 7e4d9eb171eadd0d2b553a6ac7345a7f1ec368f22fa0d1d67b6430e2b388be5d06a1464b539b9b44c07a5440dab58ece5605c44b279889d9e4bf696102b01b25
-DIST netdata-1.15.0.tar.gz 3175237 BLAKE2B 75f4c6f0dba53e6ff01fb98767e266ede8a8b8b965c484a03d5f72a55b39d55b150ada7784a971897a365ff9ebeb9bb66cadc72d4ce33dbc1465a758321d4104 SHA512 34b783d3b550c8ac5dc22e08f30fe87de65a5cd97008e271d9328d09b59620a6807ca3daa81a2e49d7ddf1c015f868b21f4118700b2630dcb78c4f9feda3fe4d
-DIST netdata-1.16.0.tar.gz 3233403 BLAKE2B 5e51722f9f11171a38231afd918a319c18fb7c95d5605a3fe73616af955b50036d2db7729494e8cc08d95a0bd11fb0259abb50d5f4da979f977b734778b16678 SHA512 132e8c0c57798d69ca8c3f360c2d55f1b8a46deaeacbb59979bc5bb5c52c9eaf02db7f7a166848787aae5807122d86f48fa86c0b9211ed0fdfd92889d1d8e2e4
-DIST netdata-1.16.1.tar.gz 3286225 BLAKE2B 4411baa2da9282173abef872dce02bc0a3f1b1e46a449648a0e09f35db27f2864bc63caf155f84e550ea8cff60c0c0d887a9e7043ac138a45a8170805059fed5 SHA512 f16dad4395b3cd2c437e03f98a2e0945fabd1cabd8b0f294d83e2fbd429955fe1cbe92668f9d3160d1c56ea744acc3908c8df91d0b3bb0623854361878317520
-DIST netdata-1.17.0.tar.gz 3313545 BLAKE2B 4225ed7e53d9d79d4e0e5e6c4c5408a78bcb1ce05a5d20925c231d55131e13ef3426586962c85f814073fad389495ac010b6843288865a44d8a0f22e55eab065 SHA512 fb1a2295868df3a161cc777dddece3bd8c6a2338a75ba72d6eaa7ca6914a1661cb056680229ad67d3059081309130f60eeff98d8e60ab3a03622f5c1947d1b08
-DIST netdata-1.17.1.tar.gz 3332115 BLAKE2B 4811d36beade1d990ddafdef2843f2740656c1127f192c89863639a0c44753b78743cae3eab49a5a4e4c65aa36a3e52479624ea7c45248b3a55a841753b834ec SHA512 795610ef3e7153982665edd90ece1f06fef264a3eaf28f49ef59505aa83983822f9dd88035a30885db1d462e72b6ce2416ef6365abb94229d6155b896d12a8aa
-DIST netdata-1.18.0.tar.gz 3401415 BLAKE2B 2491f6d180a30e0fbc5a6af8dab9fe920188934eccd9891df11f36c8e4e9d386f5d5b5639d91f232e7cc3505fd8842844cf8c6b3120a9281701a1013609f16d6 SHA512 012400c555ea24f7f2bcc32f59bd37594811602c1e4d3428c19e1091ca21bd52f5fb2db7469de276a5461e38bd3323a2fba5aa496769e31df92a272c5300a923
-EBUILD netdata-1.13.0.ebuild 2633 BLAKE2B 917373166cefb26f30a9f62fedec407be3e7332774b419cb36db4a8ec6978d774f527a21d8b09e9bc4ed920144d7dc0378c9ecd30eaf51e855c6557b4e950556 SHA512 b964e4a3949b0ccf268cc8caa6ede03a45c3fbf5ec9b2d98e2c8ca9efec2643d8bbcf4233a087ac259c9a62c19f54ecaa15183a51fae0642c93c80d27c95cda8
-EBUILD netdata-1.14.0-r1.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
-EBUILD netdata-1.14.0.ebuild 2623 BLAKE2B 8552936e3884d9b62a6b2ee94ce4d14fb80feff59412e35b5f6174f5de2abc0506fc22311386b3337c3ee250fe0952acda36ae1524e924bf39673aa5f74a7eac SHA512 82d51a4bcd131b4dca9090ec6c6b344e37efabb5521f06315324bc006fdf5cd9930f4b68c4aa4a90f1ca7a1135803872726521f3d4ac21504a60047f8abaab96
-EBUILD netdata-1.15.0-r1.ebuild 2904 BLAKE2B 07a2bdffb08348bdb67c3458148b13a9a0c8b5d961f7a5e112202780f481c6d2876f0fd7001ac92871eed2380c46acd45c85ec4d07a58cf4a776f651af23de71 SHA512 0abc01056a0c320c84db10483c58ce31e3e1bbac5e29953afedc6481627f0f8a3ba83826a72f6105706c6c8d5dbc5a6873f134b561ebb21e9da2ced343fe212d
-EBUILD netdata-1.15.0-r2.ebuild 3006 BLAKE2B 1f48be63c01ef90eda30ce79c9bc709f3b5341d202813a19f83fcbda151b38c8b01c8efb10f0824e3a11293d7ebd851a696a2fbf7253c1fc39c3b1e184d1f3f9 SHA512 a02c16908fcc6c4def13040c2891dfdb40053b6bd7f05430f10dd08e36ec1b42e47b9d6884bc8fffbb00ff14fbd9f184316c1fc3e5388a07f154b69f9d36b93c
-EBUILD netdata-1.15.0.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
-EBUILD netdata-1.16.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
-EBUILD netdata-1.16.1.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
-EBUILD netdata-1.17.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
-EBUILD netdata-1.17.1-r1.ebuild 2905 BLAKE2B 170822976de7051309a9493de81456c05b729af237c083bd52e80eded0a264e605617a584c68d7791ca72c3a4d24583a90134297b16d5dc2daac89d158204b33 SHA512 dc5ac15f1cfb056b5d2946050c4b406c13e6a9f0c91d215e9fb7401976dbcae51317c2b8282adedb234f766db9578caf5e9fcd5a1345011c95514bebbbe55d98
-EBUILD netdata-1.17.1.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
-EBUILD netdata-1.18.0.ebuild 2905 BLAKE2B 170822976de7051309a9493de81456c05b729af237c083bd52e80eded0a264e605617a584c68d7791ca72c3a4d24583a90134297b16d5dc2daac89d158204b33 SHA512 dc5ac15f1cfb056b5d2946050c4b406c13e6a9f0c91d215e9fb7401976dbcae51317c2b8282adedb234f766db9578caf5e9fcd5a1345011c95514bebbbe55d98
-EBUILD netdata-9999.ebuild 2905 BLAKE2B 170822976de7051309a9493de81456c05b729af237c083bd52e80eded0a264e605617a584c68d7791ca72c3a4d24583a90134297b16d5dc2daac89d158204b33 SHA512 dc5ac15f1cfb056b5d2946050c4b406c13e6a9f0c91d215e9fb7401976dbcae51317c2b8282adedb234f766db9578caf5e9fcd5a1345011c95514bebbbe55d98
+DIST netdata-1.18.1.tar.gz 3413907 BLAKE2B 9047f23875f446b378c80962e7f8e5c9424fbc2a405c75b76e242b26ae48336cbb026d3fc5c0e4127b0e5d1f1d5a14652ae92661474cd11ecbd64614461ab118 SHA512 fb72f4729e05ab83fe9462e31b10fc40243472ea9f6cbb9421e2ca549810f2f80b28b05e886faa66e15c53b317ee559a3e0fb3d382c36a424dd39fec779918d9
+EBUILD netdata-1.18.1-r1.ebuild 2775 BLAKE2B 07763a5746cda7ccd6e0c7949929606d8059e2d8912e17eeaa6a6087e33c3bb98791e41f3911411947f01e0d5177bfe2e2e934d22b0afac670af3271b60e9d4e SHA512 d6a8f0998f805de16e8f0c80377419405b2ac8249e988e2714aa594cdbf69144f359b4d7465a9e132c2f82a7a3904297516b33afd4c6b7f62b014a6881b2a2fa
+EBUILD netdata-1.18.1.ebuild 2905 BLAKE2B 170822976de7051309a9493de81456c05b729af237c083bd52e80eded0a264e605617a584c68d7791ca72c3a4d24583a90134297b16d5dc2daac89d158204b33 SHA512 dc5ac15f1cfb056b5d2946050c4b406c13e6a9f0c91d215e9fb7401976dbcae51317c2b8282adedb234f766db9578caf5e9fcd5a1345011c95514bebbbe55d98
+EBUILD netdata-9999.ebuild 2775 BLAKE2B 07763a5746cda7ccd6e0c7949929606d8059e2d8912e17eeaa6a6087e33c3bb98791e41f3911411947f01e0d5177bfe2e2e934d22b0afac670af3271b60e9d4e SHA512 d6a8f0998f805de16e8f0c80377419405b2ac8249e988e2714aa594cdbf69144f359b4d7465a9e132c2f82a7a3904297516b33afd4c6b7f62b014a6881b2a2fa
 MISC metadata.xml 939 BLAKE2B fa9652dfc67eb1f088383a62d435349665f81dc9db3e1dd9c8412110f27297cc15681cbd2307c8a09cd490bd195e830311bf9a2612abfe14ecec18fb99a17eed SHA512 c9e7794f190c22d0b5a14d2431d7f15d7b048fcbcf8cf48499e6a71fb21f7fc0292bd944db6767e1f70413c484a338ffeccbf7a70c63d7c128e4bc72c7d24fe3
diff --git a/net-analyzer/netdata/netdata-1.13.0.ebuild b/net-analyzer/netdata/netdata-1.13.0.ebuild
deleted file mode 100644
index c52e2322bd9a..000000000000
--- a/net-analyzer/netdata/netdata-1.13.0.ebuild
+++ /dev/null
@@ -1,114 +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,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat6
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
diff --git a/net-analyzer/netdata/netdata-1.14.0-r1.ebuild b/net-analyzer/netdata/netdata-1.14.0-r1.ebuild
deleted file mode 100644
index 54d150969d3c..000000000000
--- a/net-analyzer/netdata/netdata-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,121 +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,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable cups plugin-cups) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
diff --git a/net-analyzer/netdata/netdata-1.14.0.ebuild b/net-analyzer/netdata/netdata-1.14.0.ebuild
deleted file mode 100644
index 59396a96cc0e..000000000000
--- a/net-analyzer/netdata/netdata-1.14.0.ebuild
+++ /dev/null
@@ -1,114 +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,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python tor"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
diff --git a/net-analyzer/netdata/netdata-1.15.0-r1.ebuild b/net-analyzer/netdata/netdata-1.15.0-r1.ebuild
deleted file mode 100644
index 19ed4f693a0a..000000000000
--- a/net-analyzer/netdata/netdata-1.15.0-r1.ebuild
+++ /dev/null
@@ -1,128 +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,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		dev-libs/libuv
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
diff --git a/net-analyzer/netdata/netdata-1.15.0-r2.ebuild b/net-analyzer/netdata/netdata-1.15.0-r2.ebuild
deleted file mode 100644
index 77427218be1f..000000000000
--- a/net-analyzer/netdata/netdata-1.15.0-r2.ebuild
+++ /dev/null
@@ -1,131 +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,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		dev-libs/libuv
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
-	doenvd 99netdata
-}
diff --git a/net-analyzer/netdata/netdata-1.15.0.ebuild b/net-analyzer/netdata/netdata-1.15.0.ebuild
deleted file mode 100644
index 54d150969d3c..000000000000
--- a/net-analyzer/netdata/netdata-1.15.0.ebuild
+++ /dev/null
@@ -1,121 +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,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		$(use_enable cups plugin-cups) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
diff --git a/net-analyzer/netdata/netdata-1.16.0.ebuild b/net-analyzer/netdata/netdata-1.16.0.ebuild
deleted file mode 100644
index b12cc034edfb..000000000000
--- a/net-analyzer/netdata/netdata-1.16.0.ebuild
+++ /dev/null
@@ -1,132 +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,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		dev-libs/libuv
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		--disable-jsonc \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
-	doenvd 99netdata
-}
diff --git a/net-analyzer/netdata/netdata-1.16.1.ebuild b/net-analyzer/netdata/netdata-1.16.1.ebuild
deleted file mode 100644
index b12cc034edfb..000000000000
--- a/net-analyzer/netdata/netdata-1.16.1.ebuild
+++ /dev/null
@@ -1,132 +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,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		dev-libs/libuv
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		--disable-jsonc \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
-	doenvd 99netdata
-}
diff --git a/net-analyzer/netdata/netdata-1.17.0.ebuild b/net-analyzer/netdata/netdata-1.17.0.ebuild
deleted file mode 100644
index b12cc034edfb..000000000000
--- a/net-analyzer/netdata/netdata-1.17.0.ebuild
+++ /dev/null
@@ -1,132 +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,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		dev-libs/libuv
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		--disable-jsonc \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
-	doenvd 99netdata
-}
diff --git a/net-analyzer/netdata/netdata-1.17.1.ebuild b/net-analyzer/netdata/netdata-1.17.1.ebuild
deleted file mode 100644
index b12cc034edfb..000000000000
--- a/net-analyzer/netdata/netdata-1.17.1.ebuild
+++ /dev/null
@@ -1,132 +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,3_6,3_7} )
-
-inherit autotools fcaps linux-info python-r1 systemd user
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		dev-libs/libuv
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		mysql? (
-			|| (
-				dev-python/mysqlclient[${PYTHON_USEDEP}]
-				dev-python/mysql-python[${PYTHON_USEDEP}]
-			)
-		)
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 / ${PN}
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=${NETDATA_USER} \
-		--disable-jsonc \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	# Remove unneeded .keep files
-	find "${ED}" -name ".keep" -delete || die
-
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
-	keepdir /var/log/netdata
-	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-
-	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
-	doenvd 99netdata
-}
diff --git a/net-analyzer/netdata/netdata-1.18.0.ebuild b/net-analyzer/netdata/netdata-1.18.1-r1.ebuild
index a9120717c5d0..955105404d12 100644
--- a/net-analyzer/netdata/netdata-1.18.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.18.1-r1.ebuild
@@ -35,8 +35,6 @@ RDEPEND="
 		net-analyzer/openbsd-netcat
 		net-analyzer/netcat
 	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
@@ -123,6 +121,5 @@ src_install() {
 	insinto /etc/netdata
 	doins system/netdata.conf
 
-	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
 	doenvd 99netdata
 }
diff --git a/net-analyzer/netdata/netdata-1.17.1-r1.ebuild b/net-analyzer/netdata/netdata-1.18.1.ebuild
index a9120717c5d0..a9120717c5d0 100644
--- a/net-analyzer/netdata/netdata-1.17.1-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.18.1.ebuild
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index a9120717c5d0..955105404d12 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -35,8 +35,6 @@ RDEPEND="
 		net-analyzer/openbsd-netcat
 		net-analyzer/netcat
 	)
-	net-analyzer/tcpdump
-	net-analyzer/traceroute
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
@@ -123,6 +121,5 @@ src_install() {
 	insinto /etc/netdata
 	doins system/netdata.conf
 
-	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
 	doenvd 99netdata
 }
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index cf204c83b5da..bc0209fa1c9d 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -1,11 +1,6 @@
-AUX netselect-0.3-bsd.patch 1621 BLAKE2B 9b9cfcbc13d08f8cbed95252ff2fe9919470b049af97301a9903420b59470680475cdf441cc0e1da67b714886a959fb0640e74b8b20adae0ee56a00fcdd3b6a3 SHA512 723be6cae82060d862bfd5afac674c701cc6c3b37fc74b7e020e347a584b31cfad1c7e1c87fe84ccf16384996ebb46da3b9b7bcfd7aa8dd323009f73b5edb966
-AUX netselect-0.3-glibc.patch 264 BLAKE2B 6f03d2cb2409edbed3d719d1356c8a767e5b019d1d21dc7258c0bac5640089dfede126a64d7d4ded2c48517b7576ae7bb9837d428b4045ccff5e6cdb2334cd9d SHA512 bcccfdb458b27903e204043c3ce5faeb0024c0f7e3c0dc4c6eff69b7168544adfe8802625daca50a0c5304e26cc2f252279aeec2013460f2a0bc6892c0df88ad
 AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd6372eaedb13f02a50bf0d8cb91889098b75a65361461580aa4340ce0cb91b43bdd1840c727891c2d728252859 SHA512 01dfb03b8e77def3d6742e827662316003ad807af41ea1ce236c4e216de3cca3678efc6405676c8022dab5f61e6ee7395aaa82b8b800e96eb0ac718b5f7b4f52
 AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a
-DIST netselect-0.3.tar.gz 22047 BLAKE2B b0039ee21382f541446c49b3a536e400e70120513217969ffb7168c906c5938d099e5e072f05f68a95829410fd013da386527ee1280938714c00a006ae6a248d SHA512 04a4b79c357a0110dcf377ad04ac729ed7854bec4b064ad16da632367ce1870379546fffc8396ea770bfa580618d7c0495c16b0ba30f736419511b890ce5dca5
 DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
-EBUILD netselect-0.3-r3.ebuild 954 BLAKE2B 6bc146a9198f60858c154539e33f78edf9dbafde99971cf4485d4ad35fdd37ce9755bfe942f32e555a3882abfd260808f293bc56f82b5d31dafc9ddf8668369b SHA512 b9ce39804bce1901285325e2224f1fdd96e00d9ad8663cfd1968505652745925204f7411c744ce0def8e53ccaa261de4be1b9aa1b3fccf914f5d4a4e40286de5
-EBUILD netselect-0.3-r4.ebuild 972 BLAKE2B 9b7516f2fa8fc90591202d47361fa6020eb2deb2ec8c4d2ebd0a5785b62f3bb005545e1e97ab70df17a2d1ff7a9d337d26f5d4db218dbd0284b1b8108a129aee SHA512 acdde16df8966c55842fb71a17078ade15df6b3e93900d0970835e0482bb1d4a5935832329ff1e909834d5e19e0d96f88f7a524ca32f4d89a237286c9b644c46
-EBUILD netselect-0.4.ebuild 925 BLAKE2B 3a629fb5bb2b8cbf83758b696d29b1c3d8942fb0c0e82f4977f95c06eb4cb7104703d7ab08b5046e3c8be484358e7745cd94fc19f91ddd403241a83d64e7ab08 SHA512 47f89b2f4bd41569ab23ad76fc8d42abd4f60cc40f22841b95abe5cd1b46984da0e2f6b0bb1ac8f5ffb0feeba6b952b54e8bc0f0e6494aa3e382bd74b8963625
+EBUILD netselect-0.4-r1.ebuild 971 BLAKE2B 763fdcf48e8117f6aee40abae77518e1368ef14cff7b11aac8d635b018dc5b88a99500963e41291618e2968a38123298ab78fd4a99f4f53814bd121ab1404653 SHA512 c827f560baefb52e52775043e610eb4baac9872dd323e0cc7a2bf0347c198fe554f5b1991eead44bdf8c4b100df7fa9fe9ae986bc3bd7a8f49d55975c5ad6de0
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netselect/files/netselect-0.3-bsd.patch b/net-analyzer/netselect/files/netselect-0.3-bsd.patch
deleted file mode 100644
index e9624d87215a..000000000000
--- a/net-analyzer/netselect/files/netselect-0.3-bsd.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/netselect.c
-+++ b/netselect.c
-@@ -39,14 +39,14 @@
-  * hey, great!  Let me know. -- apenwarr
-  */
- 
--#ifdef __EMX__
--# include <io.h>
--# include <fcntl.h>
--# include <sys/types.h>
--# include <sys/select.h>
--# include <machine/endian.h>
--#else
--# include <endian.h>
-+#ifdef __linux__
-+#include <endian.h>
-+#include <sys/types.h>
-+#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
-+#if defined(__OpenBSD__)
-+#include <machine/types.h>
-+#endif
-+#include <machine/endian.h>
- #endif
- 
- #include <sys/param.h>
-@@ -152,6 +152,7 @@
-     extern int optind;
-     int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100;
-     int ch, seq, ttl, max_ttl = 30, min_tries = 10, num_score = 1;
-+    int on = 1;
-     struct timeval now;
-     struct timezone tz;
-     OPacket outpacket;          /* last output (udp) packet */
-@@ -234,7 +235,12 @@
-     if (verbose >= 1)
- 	fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n",
- 		num_score, numhosts, numhosts==1 ? "" : "es");
--    
-+   
-+   if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)) < 0) {
-+        perror("IP_HDRINCL");
-+	_exit(EXIT_FAILURE);
-+   }
-+
-     /* keep going until most of the hosts have been finished */
-     must_continue = numhosts;
-     while (must_continue && must_continue >= numhosts/2)
-@@ -712,7 +718,7 @@
-     ip->ip_off = 0;
-     ip->ip_hl = sizeof(*ip) >> 2;
-     ip->ip_p = IPPROTO_UDP;
--    ip->ip_len = 0; /* kernel fills this in */
-+    ip->ip_len = sizeof(OPacket);
-     ip->ip_ttl = ttl;
-     ip->ip_v = IPVERSION;
-     ip->ip_id = htons(ident + seq);
diff --git a/net-analyzer/netselect/files/netselect-0.3-glibc.patch b/net-analyzer/netselect/files/netselect-0.3-glibc.patch
deleted file mode 100644
index 053e5865b341..000000000000
--- a/net-analyzer/netselect/files/netselect-0.3-glibc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/netselect.c
-+++ b/netselect.c
-@@ -780,7 +780,7 @@
- #if !defined(__GLIBC__)
-     int fromlen = sizeof(from);
- #else				/* __GLIBC__ */
--    size_t fromlen = sizeof(from);
-+    socklen_t fromlen = sizeof(from);
- #endif				/* __GLIBC__ */
- 
-     FD_ZERO(&fds);
diff --git a/net-analyzer/netselect/netselect-0.3-r3.ebuild b/net-analyzer/netselect/netselect-0.3-r3.ebuild
deleted file mode 100644
index 5709db974bbc..000000000000
--- a/net-analyzer/netselect/netselect-0.3-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Ultrafast implementation of ping"
-HOMEPAGE="http://apenwarr.ca/netselect/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-bsd.patch" \
-		"${FILESDIR}/${P}-glibc.patch"
-
-	sed -i \
-		-e "s:PREFIX =.*:PREFIX = ${ED}usr:" \
-		-e "s:CFLAGS =.*:CFLAGS = -Wall -I. ${CFLAGS}:" \
-		-e "s:LDFLAGS =.*:LDFLAGS = ${LDFLAGS}:" \
-		-e '23,27d' \
-		-e '34d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	dobin netselect
-	if ! use prefix ; then
-		fowners root:wheel /usr/bin/netselect
-		fperms 4711 /usr/bin/netselect
-	fi
-	dodoc ChangeLog HISTORY README*
-}
diff --git a/net-analyzer/netselect/netselect-0.3-r4.ebuild b/net-analyzer/netselect/netselect-0.3-r4.ebuild
deleted file mode 100644
index 59c62667dfa8..000000000000
--- a/net-analyzer/netselect/netselect-0.3-r4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Ultrafast implementation of ping"
-HOMEPAGE="http://apenwarr.ca/netselect/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-bsd.patch" \
-		"${FILESDIR}/${P}-glibc.patch"
-
-	sed -i \
-		-e "s:PREFIX =.*:PREFIX = ${ED}usr:" \
-		-e "s:CFLAGS =.*:CFLAGS = -Wall -I. ${CFLAGS}:" \
-		-e "s:LDFLAGS =.*:LDFLAGS = ${LDFLAGS}:" \
-		-e '23,27d' \
-		-e '34d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	dobin netselect
-	if ! use prefix ; then
-		fowners root:wheel /usr/bin/netselect
-		fperms 4711 /usr/bin/netselect
-	fi
-	dodoc ChangeLog HISTORY README*
-}
diff --git a/net-analyzer/netselect/netselect-0.4.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild
index 18559af3f1e5..f4159861bdb5 100644
--- a/net-analyzer/netselect/netselect-0.4.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Ultrafast implementation of ping"
 HOMEPAGE="http://apenwarr.ca/netselect/"
@@ -26,8 +26,10 @@ src_prepare() {
 	use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
 
 	default
+}
 
-	tc-export CC
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}"
 }
 
 src_install () {
diff --git a/net-analyzer/openvas-manager/Manifest b/net-analyzer/openvas-manager/Manifest
index 488c455d498e..3964b6e98fa7 100644
--- a/net-analyzer/openvas-manager/Manifest
+++ b/net-analyzer/openvas-manager/Manifest
@@ -3,5 +3,5 @@ AUX gvmd.init 549 BLAKE2B 3eb2ac2b47e5821b04f794fdb6ea15146412ed1ccdcb8fbf54b8b3
 AUX gvmd.logrotate 217 BLAKE2B d6eb74a1cdc1cfb5500e5ed4e62ab9c453ec5d1665ba55c2618010480211ef6349823ecd35d62b166c771f8f795643f00cd7920c8f665a73de9fa91382d19eef SHA512 e92e6aafa30e621ed2598508216453477ce1c30eb2d9bf418c7657e3312978d514fbdd663273ca7009cfc0b61b5e95a6c3231c3d7b0e62f2e991dea9afd4d2b1
 AUX gvmd.service 516 BLAKE2B 271ee87125843ffd5ac997d6e3b9a46a2cd45e8ebb9630f2fa0adf7c5c081e102fc11e69b38fe2ca12854597186f76145044478b4908031495dbd7bc61a88217 SHA512 90165185c50c451b58f1173fe3bad0e9ebfaa6a2120b33920f8ab03960bc09e7a84c07b6658fbb2d649e1a3726addd40420ceb5b63b1d6f885429861896f8f74
 DIST openvas-manager-7.0.3.tar.gz 1796830 BLAKE2B b1e8bf8eb4cc0e2d3e5d67d7c17df3c79c7d65e798fc28f75ee55c2165a5e957ac950ccac14a20a5b332c15b64775f63805db00810271bce77d13b16db60a3ab SHA512 75e519e5f63fad043efe55ad5843934f9ffaefa052609e8d110b2084504a7658b5ee5797f7ffaa71592caed64b7fd4fac623bc7797bec72a51e8225d65f7fc28
-EBUILD openvas-manager-7.0.3.ebuild 2103 BLAKE2B b430eee33dc2d7bcb67ac623754153f41f2cf05aa155021e02b408c72cc546fd9420404a7a305a33fedb4b857a0a1c7a024e290443016e4b75fa55de0fbf2efa SHA512 0f7fb4a53cfa942a74fc74e2e139a5c872c793d2da4085986630487907f5237cf5be192ef507fb3f28df27fce01b87a699723cc0176e7fc8073b7f5f035e7489
+EBUILD openvas-manager-7.0.3.ebuild 2102 BLAKE2B 7a2ab62f1b5aa3cf6629eb4cf13786cf5bb0b2c7e9655bca25b471ca367d8d3585db81ef1af92e97310c656b7359a0dad45f3ad173617961ad60a9628bc0abc8 SHA512 7d2d4ef4891717d906163447f849db9575db663995aa5c805cf6eea73d56767d3f563c7aa767ff0ef3ce10b6f116f0e4d9ec5ed919b087ad46c3a80031567a50
 MISC metadata.xml 435 BLAKE2B 4d40c4dcffe9bfd81d1c1b517b4e6d6e1e658f9d6be65f8ad962ecbbee78bf0cc6bbb5805f2e056375c7371697a453453f8eeae40bae1bdf890be8f3e23ccfbc SHA512 fc802728917b8ebc3c43e3c35ce1fa7b8aa30d89d60abcfcd82eb6baf0152d02384b2e336664942bd89c3ed27a418f37a13699b68a424f36645c51c1310a6e16
diff --git a/net-analyzer/openvas-manager/openvas-manager-7.0.3.ebuild b/net-analyzer/openvas-manager/openvas-manager-7.0.3.ebuild
index f5362840041c..39f1f277b47b 100644
--- a/net-analyzer/openvas-manager/openvas-manager-7.0.3.ebuild
+++ b/net-analyzer/openvas-manager/openvas-manager-7.0.3.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 
 RDEPEND="
 	${DEPEND}
-	>=net-analyzer/openvas-scanner-5.1.3"
+	~net-analyzer/openvas-scanner-5.1.3"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index c6890335a0ce..184c0e4075bb 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,13 +1,23 @@
+AUX gvm-feed-sync.cron 98 BLAKE2B d0af35e85c0c84e6d848de26fbf3f03e8a7473cea9d46c513fbb0d46f1664a516c334221773309d4f9682187a0f46a447320772d52c9826cc8525df26d0b2c38 SHA512 06526d33017c83c7342d9c356fb80e22f7a145bf8cae9bd49a7c74ae5854f7248b2b3609bc0f423b7a3babaad59a4b92ba14873f7f4e20e4cd5af7eb9c01c5d0
+AUX gvm-feed-sync.sh 1037 BLAKE2B 6ef8a375a06c0ce5a6181ee26eccdfaba09a5d935c56b98bed4435fdaee6b068f8cf87889789d4108361c6c2e83fa1979d533519c47f0d621f63423c43aa96a9 SHA512 a2abb96e268c8d7f74f61cc509730e4949894fe4225b22cb0f9d4fe2b215da70cc96c79405f59f3b05e290a45de2eeeb5d5ecf632cb23da80dd2102d4900b78a
 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
+AUX openvas-scanner-6.0.1-sbin.patch 716 BLAKE2B 41883486bfa0cb27c4a05ae7290b69227b166c9179546434aece15d1aa2b380f6f9da9afdbfb684ffc68a93f4dd63093b7ce2308d67ca8f806d2cd8e12433819 SHA512 66e2a99f6c7a6d0053bbb4fa797818681983a07ad66814ae0c577b27b37d41054f6241ddd3c017a0928eddef3f2d342480b4a668402c68d28bbf48c357e65b05
 AUX openvas-scanner-daemon.conf 176 BLAKE2B 9e0a248736617d3d0a163f3586db92da4a5f273b354a472977b411d29ace507977228407a57cf11378af6ce95275a3d72518ba1b069bdc7293c2fe20d7e29e0b SHA512 3b5dcae3d2770769e627e28064e73746f9ad22aca5c9927e04583bfc3907fa538c2010bd0e5de3737979cede63d44175a645adb55391a5e2a71e96e6d31dd1f9
 AUX openvas-scanner.init 620 BLAKE2B a32349eed21d71e4968ee09fdff007aab532943e093e6b1aed9c26c474c2ab419dc5eb2e382300be85d6d34c57a521b3ac67dc1a44dd3c8045bd94aac19ea6e4 SHA512 e77c5e383504817e9ab0a98517f3e5553458b482f576f1f1965d26c5808ec7f2eac836dff0248f0f6be8dfb22aa188232c9df85af4104cc5730ad587dd52a2b0
 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-daemon.conf 394 BLAKE2B 9dd55e29004d6d55f0cd44568b3b22aab21cb4ed88969934e5b1905cdfb05017843ee46f59297f8cba5d7b9db35a0b9c906d1f00075c4361d57e039d7d0cf601 SHA512 c8076ecaa04824e45d7b9b90e63c530d8bbcec6ca22b4ac4d3f2b661f05b8a684f6bef340f9f4524a311c19efa85013199f2de5088efe799969bde301ebe1e82
 AUX openvassd.conf 1288 BLAKE2B d1ae7db928d797014e0382d8be3a08793efbcaa3663629c0d1c6c2d871ccf16588605fa4be21d71556893092b21ecfef72c31d40411d35dd97f8652eca6232c0 SHA512 5bb499fcd03aac4de981a64a17fa760b29b1f83d0afcdb73cdfdeb0f492b02bc383d32544fd133c6b953e73ea9ff0dc042e8dba76c22def3ee00d6f3bdd980b8
+AUX openvassd.gvm.conf 3577 BLAKE2B dd7452f0c9e63e431cf03553e221f802f7f7463ba36ad64fe18db12a44c3e7c0c4ded80cf4b7ab346a877e95271e5b10b7811d431be533eea2bb98eab53a9cee SHA512 dde7b0fe72e5dd551afdd3817562d785c95a03bbc109465490d65f81dc02a546e9d499a0c937828d2e38d357b9a7deadde12b2408307ea02a47c651c9fff4181
+AUX openvassd.init 480 BLAKE2B 28dfdabe7935ce55615fb36e6ddae3c36c84793ba01f6d3c92274a2fea1e44efe3f96bd3e7016740f4dcabff034173b541058d18f99081bd232a098a56d8e572 SHA512 1b0f13ab77f332708e9efb9cad06c47e61e47f68597c797e3f5140a921acaa2b856c10003938f737a20b534caaee7d3bb446d427373d8be8ef3fe7c83ee11b82
+AUX openvassd.logrotate 330 BLAKE2B faf900a6882bb23c29859080d0c140c9dde8dcab42f31c31bfd43342beedab0bfe711f4e918aba5c7f8e5bb91430e251e270d0bc2e6f49e84ce98cdbbfe6d023 SHA512 397c9fd0d63ab66b463f65b6d235ec3e4e6ca52a3c811ddd4efcaeffc05fed8f9cd97605f439a628c144ecc1cfcfd31290d2a9dc6e57e8197d063b4aee63d73b
+AUX openvassd.service 472 BLAKE2B 528c25dbc32cd742753eb6b155a9221f0adde0e792b1e7af376b714831bcc210a228f5a87089f449f6f0e808f46f45d40fd68d9caed44530d57d99c37dbb8b0d SHA512 3497382e6540ddc341cf17e63f1c8d2250249bb51f8dbe379d48c1f90e81d00fdf03349a4dd08c6c6c2dc7336b385fa892b316ff2315a623952d8a2db33681bd
 AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64
 DIST openvas-scanner-5.1.3.tar.gz 254159 BLAKE2B d90fa15e143ead53abce66f933a3a4cac327176cca0f23bd88fe771ed7726b1891784ae980644c8335e560d348753115e43cfae83af9704e2d1d02827163563f SHA512 5712ab275058877cfd656e268ed09c81db6617ae247c17092f1fcd037f692f2018daf21b09b82401f99a7361bb485f0e0f7d63f8ff2387839cfdd5a3aaf8424e
+DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147
 EBUILD openvas-scanner-5.1.3.ebuild 2142 BLAKE2B 5984c99659d1a41c3739a1de5077f5ca8dd25c668e97c7a1f59a6efceb95fed25daceb8c8f6b5971c842e016d1843dff8527d253d1347ea0d91a67d633c2d859 SHA512 d66a67f3803c071f20e6a1c9132ca771e9286f9c6446e781b6077323ae32417d2061169543c34de91f3a9ca1ec7a4bfaf9472aead66b983a46d163ea88137480
-MISC metadata.xml 435 BLAKE2B 4d40c4dcffe9bfd81d1c1b517b4e6d6e1e658f9d6be65f8ad962ecbbee78bf0cc6bbb5805f2e056375c7371697a453453f8eeae40bae1bdf890be8f3e23ccfbc SHA512 fc802728917b8ebc3c43e3c35ce1fa7b8aa30d89d60abcfcd82eb6baf0152d02384b2e336664942bd89c3ed27a418f37a13699b68a424f36645c51c1310a6e16
+EBUILD openvas-scanner-6.0.1.ebuild 3324 BLAKE2B bc10da8ad9cdef4cc124f0e50879c07120a49cff1ea37d7b99462209104e1a252dc1808033cb1c69bc8010b4cf7620aef3852c9bbae424f90673892042240ad9 SHA512 7d6daa1c624ce54f5b5d683d764d972648289d4837b2f927ad9d39c5fd9149b3db4c267cb2b0d6d3032d4419d57a9881f34ef97ee66f2aefe9f2a1a1f088b1a9
+MISC metadata.xml 951 BLAKE2B 195ec0e9becddea6e9c08103473e7d26670d9fa766ed470a37f85d25a79d771654ec0305fe242d240e1255636657d086eb908f12e94fe934c7b7c66a59af7e50 SHA512 577b533837640c4131ca305e047dd6bbfc5456d19afcd91a71a8fd6b4c6cb4a464f346ac140b7e9505b2a5a4302d281616d762bc11eb123993d507cd0129b8a1
diff --git a/net-analyzer/openvas-scanner/files/gvm-feed-sync.cron b/net-analyzer/openvas-scanner/files/gvm-feed-sync.cron
new file mode 100644
index 000000000000..5563b92929b1
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/gvm-feed-sync.cron
@@ -0,0 +1 @@
+0 2 * * * gvm [ -x /etc/gvm/gvm-feed-sync.sh ] && /bin/bash /etc/gvm/gvm-feed-sync.sh > /dev/null
diff --git a/net-analyzer/openvas-scanner/files/gvm-feed-sync.sh b/net-analyzer/openvas-scanner/files/gvm-feed-sync.sh
new file mode 100644
index 000000000000..ba21632a4d6c
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/gvm-feed-sync.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# GVM cron script that updates feed.
+
+# Start to update FEED & First NVT.
+try=0
+until [ $try -ge 5 ]; do
+      greenbone-nvt-sync --curl &>/dev/null && break
+      try=$[$try+1]
+      sleep 30
+done
+
+# Check status
+if [ $? -eq 0 ]; then
+   # 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
+         try=$[$try+1]
+         sleep 30
+   done
+
+   # Check status
+   if [ $? -eq 0 ]; then
+      # 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
+            try=$[$try+1]
+            sleep 30
+      done
+
+       # Check status
+       if [ $? -eq 0 ]; then
+          exit 0
+          else
+             exit 1
+       fi
+   fi
+fi
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch
new file mode 100644
index 000000000000..d5b8a2a6b62f
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch
@@ -0,0 +1,21 @@
+--- a/src/CMakeLists.txt	2019-07-21 23:16:18.608251465 +0300
++++ b/src/CMakeLists.txt	2019-07-21 23:17:08.434210058 +0300
+@@ -175,7 +175,7 @@
+ ## Install
+ 
+ install (TARGETS openvassd
+-         RUNTIME DESTINATION ${SBINDIR}
++         RUNTIME DESTINATION ${BINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+          GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+@@ -183,7 +183,7 @@
+          DESTINATION ${OPENVAS_SYSCONF_DIR})
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-nvt-sync
+-         DESTINATION ${SBINDIR}
++         DESTINATION ${BINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+
diff --git a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
new file mode 100644
index 000000000000..6bb70d165355
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
@@ -0,0 +1,17 @@
+# OpenVAS Scanner command args
+
+# e.g --foreground
+OPENVAS_SCANNER_OPTIONS=""
+
+# Scanner listen socket
+OPENVAS_SCANNER_LISTEN_SOCKET="--unix-socket=/var/run/openvassd.sock" 
+
+# Scanner listen owner
+OPENVAS_SCANNER_LISTEN_OWNER="--listen-owner=gvm"
+
+# Scanner listen group
+OPENVAS_SCANNER_LISTEN_GROUP="--listen-group=gvm"
+
+# Scanner listen mode
+OPENVAS_SCANNER_LISTEN_MODE="--listen-mode=755"
+
diff --git a/net-analyzer/openvas-scanner/files/openvassd.gvm.conf b/net-analyzer/openvas-scanner/files/openvassd.gvm.conf
new file mode 100644
index 000000000000..5dfb8b527454
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.gvm.conf
@@ -0,0 +1,124 @@
+# You can get detailed informations from https://linux.die.net/man/8/openvassd
+# Configuration file of the OpenVAS Security Scanner
+# Every line starting with a '#' is a comment
+
+[Misc]
+
+# Path to the security checks folder:
+plugins_folder = /var/lib/openvas/plugins
+
+# Path to OpenVAS caching folder:
+cache_folder = /var/cache/openvas
+
+# Path to OpenVAS include directories:
+# (multiple entries are separated with colon ':')
+include_folders = /var/lib/openvas/plugins
+
+# Config File
+config_file = /etc/openvas/openvassd.conf
+
+# Maximum number of simultaneous hosts tested :
+max_hosts = 30
+
+# Maximum number of simultaneous checks against each host tested :
+max_checks = 10
+
+# Niceness. If set to 'yes', openvassd will renice itself to 10.
+be_nice = no
+
+# Log file (or 'syslog') :
+logfile = /var/log/gvm/openvassd.log
+
+# Shall we log every details of the attack ? (disk intensive)
+log_whole_attack = no
+
+# Log the name of the plugins that are loaded by the server ?
+log_plugins_name_at_load = no
+
+# Dump file for debugging output, use `-' for stdout
+dumpfile = /var/log/gvm/openvassd.dump
+
+# Rules file :
+rules = /etc/openvas/openvassd.rules
+
+# CGI paths to check for (cgi-bin:/cgi-aws:/ can do)
+cgi_path = /cgi-bin:/scripts
+
+# Range of the ports the port scanners will scan :
+# 'default' means that OpenVAS will scan ports found in its
+# services file.
+port_range = default
+
+# Optimize the test (recommended) :
+# Turn off for push hard but increase false positive and slow down scans
+optimize_test = yes
+
+# Optimization :
+# Read timeout for the sockets of the tests :
+checks_read_timeout = 5
+
+# Ports against which two plugins should not be run simultaneously :
+# non_simult_ports = Services/www, 139, Services/finger
+non_simult_ports = 139, 445
+
+# Maximum lifetime of a plugin (in seconds) :
+plugins_timeout = 320
+
+# Safe checks rely on banner grabbing & If enabled push harder to target:
+safe_checks = yes
+
+# Automatically activate the plugins that are depended on
+auto_enable_dependencies = yes
+
+# Do not echo data from plugins which have been automatically enabled
+silent_dependencies = no
+
+# Designate hosts by MAC address, not IP address (useful for DHCP networks)
+use_mac_addr = no
+
+
+#--- Knowledge base saving (can be configured by the client) :
+# Save the knowledge base on disk :
+save_knowledge_base = no
+
+# Restore the KB for each test :
+kb_restore = no
+
+# Only test hosts whose KB we do not have :
+only_test_hosts_whose_kb_we_dont_have = no
+
+# Only test hosts whose KB we already have :
+only_test_hosts_whose_kb_we_have = no
+
+# KB test replay :
+kb_dont_replay_scanners = no
+kb_dont_replay_info_gathering = no
+kb_dont_replay_attacks = no
+kb_dont_replay_denials = no
+kb_max_age = 864000
+#--- end of the KB section
+
+# Redis socket default setting
+db_address = /tmp/redis.sock
+
+# If this option is set, OpenVAS will not scan a network incrementally
+# (10.0.0.1, then 10.0.0.2, 10.0.0.3 and so on..) but will attempt to
+# slice the workload throughout the whole network (ie: it will scan
+# 10.0.0.1, then 10.0.0.127, then 10.0.0.2, then 10.0.0.128 and so on...
+slice_network_addresses = no
+
+# Should consider all the NASL scripts as being signed ? (unsafe if set to 'yes')
+nasl_no_signature_check = yes
+
+#Certificates
+cert_file=/var/lib/gvm/CA/servercert.pem
+key_file=/var/lib/gvm/private/CA/serverkey.pem
+ca_file=/var/lib/gvm/CA/cacert.pem
+
+# If you decide to protect your private key with a password,
+# uncomment and change next line
+# pem_password=password
+# If you want to force the use of a client certificate, uncomment next line
+# force_pubkey_auth = yes
+
+#end.
diff --git a/net-analyzer/openvas-scanner/files/openvassd.init b/net-analyzer/openvas-scanner/files/openvassd.init
new file mode 100644
index 000000000000..9bd7332134fc
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.init
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Open Vulnerability Assessment Scanner"
+command="/usr/bin/openvassd"
+command_args="${OPENVAS_SCANNER_OPTIONS} ${OPENVAS_SCANNER_LISTEN_SOCKET} ${OPENVAS_SCANNER_LISTEN_OWNER} ${OPENVAS_SCANNER_LISTEN_GROUP} ${OPENVAS_SCANNER_LISTEN_MODE}"
+pidfile="/run/openvassd.pid"
+command_background="true"
+
+depend() {
+	after bootmisc
+	need localmount net redis
+}
diff --git a/net-analyzer/openvas-scanner/files/openvassd.logrotate b/net-analyzer/openvas-scanner/files/openvassd.logrotate
new file mode 100644
index 000000000000..9cf47d54763d
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.logrotate
@@ -0,0 +1,13 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# Daemon ignore HUP so we use 'copytruncate' instead of 'create' 
+# with safe file size to prevent losing log entries.
+
+/var/log/gvm/openvassd.log {
+	compress
+	missingok
+	notifempty
+	sharedscripts
+	copytruncate
+	maxsize 10M
+}
diff --git a/net-analyzer/openvas-scanner/files/openvassd.service b/net-analyzer/openvas-scanner/files/openvassd.service
new file mode 100644
index 000000000000..b7d7df8bbab0
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Open Vulnerability Assessment Scanner
+After=network.target
+After=redis.service
+Before=gvmd.service
+Requires=redis.service
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/openvas/sysconfig/openvassd-daemon.conf
+ExecStart=/usr/bin/openvassd $OPENVAS_SCANNER_OPTIONS $OPENVAS_SCANNER_LISTEN_SOCKET $OPENVAS_SCANNER_LISTEN_OWNER $OPENVAS_SCANNER_LISTEN_GROUP $OPENVAS_SCANNER_LISTEN_MODE
+Restart=on-failure
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml
index fa26aa942e17..50c99b9436cc 100644
--- a/net-analyzer/openvas-scanner/metadata.xml
+++ b/net-analyzer/openvas-scanner/metadata.xml
@@ -10,6 +10,15 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="cron">Install a cron job to update GVM's feed daily.</flag>
 		<flag name="extras">Html docs support</flag>
 	</use>
+	<longdescription lang="en">
+	Open Vulnerability Assessment System (OpenVAS) Scanner is the Greenbone Vulnerability Management (GVM) Solution.
+	It is used for the Greenbone Security Manager appliances and is a full-featured scan engine that executes a continuously 
+	updated and extended feed of Network Vulnerability Tests (NVTs).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">greenbone/openvas-scanner</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
new file mode 100644
index 000000000000..1700d9421816
--- /dev/null
+++ b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake-utils flag-o-matic systemd toolchain-funcs
+
+MY_PN="openvas"
+MY_DN="openvassd"
+
+DESCRIPTION="Open Vulnerability Assessment Scanner"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="cron extras"
+
+DEPEND="
+	app-crypt/gpgme:=
+	dev-db/redis
+	dev-libs/libgcrypt:=
+	dev-libs/libksba
+	>=net-analyzer/gvm-libs-10.0.1
+	net-analyzer/net-snmp
+	net-libs/gnutls:=
+	net-libs/libpcap
+	net-libs/libssh:=
+"
+
+RDEPEND="
+	${DEPEND}
+	!~net-analyzer/openvas-scanner-5.1.3
+	!net-analyzer/openvas-tools"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	extras? ( app-doc/doxygen[dot]
+		  app-doc/xmltoman
+		  app-text/htmldoc
+		  dev-perl/CGI
+		  dev-perl/SQL-Translator
+	)"
+
+BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	# Install exec. to /usr/bin instead of /usr/sbin
+	"${FILESDIR}/${P}-sbin.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# QA-Fix | Correct FHS/Gentoo policy paths for 6.0.1
+	sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die
+	# QA-Fix | Remove !CLANG doxygen warnings for 6.0.1
+	if use extras; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+	)
+	# Add release hardening flags for 6.0.1
+	append-cflags -Wno-format-truncation -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
+	append-ldflags -Wl,-z,relro -Wl,-z,now
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use extras; then
+		cmake-utils_src_make -C "${BUILD_DIR}" doc
+		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+	fi
+	cmake-utils_src_make rebuild_cache
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodir /etc/openvas
+	insinto /etc/openvas
+	newins "${FILESDIR}/${MY_DN}.gvm.conf" openvassd.conf
+
+	insinto /etc/openvas
+	doins "${FILESDIR}"/redis.conf.example
+
+	dodir /etc/openvas/sysconfig
+	insinto /etc/openvas/sysconfig
+	doins "${FILESDIR}/${MY_DN}-daemon.conf"
+
+	if use cron; then
+		# Install the cron job if they want it.
+		exeinto /etc/gvm
+		doexe "${FILESDIR}/gvm-feed-sync.sh"
+		fowners gvm:gvm /etc/gvm/gvm-feed-sync.sh
+
+		insinto /etc/cron.d
+		newins "${FILESDIR}"/gvm-feed-sync.cron gvm
+	fi
+
+	fowners -R gvm:gvm /etc/openvas
+
+	newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}"
+	newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}"
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
+
+	systemd_dounit "${FILESDIR}/${MY_DN}.service"
+
+	# Set proper permissions on required files/directories
+	keepdir /var/log/gvm
+	fowners gvm:gvm /var/log/gvm
+	keepdir /var/lib/openvas/{gnupg,plugins}
+	fowners -R gvm:gvm /var/lib/openvas
+}
diff --git a/net-analyzer/openvas/Manifest b/net-analyzer/openvas/Manifest
index 86092e051156..1e8c2a3f4c24 100644
--- a/net-analyzer/openvas/Manifest
+++ b/net-analyzer/openvas/Manifest
@@ -1,2 +1,2 @@
-EBUILD openvas-9.0.0.ebuild 1511 BLAKE2B 6ecacd49f16ac33eb77939e4b033ec4a4aeafe4598cf83f9aa64b9f06c944e04d5b40f616b6efafc15af4f882d8d239a8f34765927a98d918454e6263d0e687b SHA512 9db7d7c6df328ba1e15d0531a083a14706b816ff1fbb97a4b39d6330396637211d48c9a7c1e772cfbdf721ea59ea76fecea4da52d78f9fe09531975a29c66fce
+EBUILD openvas-9.0.0.ebuild 1509 BLAKE2B 6eeb7438a3b0f529830cfa7e815628b96f27c5a5bf8fcea685efde35b4c6ed28e1ff78795f1120ef132ed9cafef97f4ab57327da164956bfa2328851cc0f51b1 SHA512 ee374829aca084cfbe3e8e73015fbaa37287ee73f310c291baf852cb3eda5bfbcec5b51cd962db282e0b83f62a5593a1796b150d26f3268b810b4c0d1d62b165
 MISC metadata.xml 990 BLAKE2B 38d5a08041cad530d89c9f7f93e6e45718fcc5358d71b72e664d249ae20f6b60502fbf00a0bf5b510c7e12192b5d696b3b262083b55389e36be6b9b6b22b4843 SHA512 897ec95d4a7b86a91fe5ced1dfbf27b724ec3a5c1a83ebdc2dfae76d707013d2ac2d908a341e36f950c0bf125d3010fab4bb58012a650be8bcd988c0d14821c2
diff --git a/net-analyzer/openvas/openvas-9.0.0.ebuild b/net-analyzer/openvas/openvas-9.0.0.ebuild
index e97e18e0cdb8..b9d86a8e6da4 100644
--- a/net-analyzer/openvas/openvas-9.0.0.ebuild
+++ b/net-analyzer/openvas/openvas-9.0.0.ebuild
@@ -16,9 +16,9 @@ IUSE="+cli +extras +gsa ldap +ospd radius"
 RDEPEND="
 	>=net-analyzer/openvas-libraries-9.0.3[extras?]
 	>=net-analyzer/openvas-manager-7.0.3[extras?]
-	>=net-analyzer/openvas-scanner-5.1.3[extras?]
+	~net-analyzer/openvas-scanner-5.1.3[extras?]
 	cli? ( >=net-analyzer/gvm-tools-1.4.1 )
-	gsa? ( >=net-analyzer/greenbone-security-assistant-7.0.3[extras?] )
+	gsa? ( ~net-analyzer/greenbone-security-assistant-7.0.3[extras?] )
 	ldap? ( >=net-analyzer/openvas-libraries-9.0.3[ldap] )
 	ospd? ( >=net-analyzer/ospd-1.3.2[extras?] )
 	radius? ( >=net-analyzer/openvas-libraries-9.0.3[radius] )"
diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest
index ecb61469a5f0..16b01a37b29f 100644
--- a/net-analyzer/ospd/Manifest
+++ b/net-analyzer/ospd/Manifest
@@ -1,3 +1,5 @@
 DIST ospd-1.3.2.tar.gz 39097 BLAKE2B 4c102e1e6857f89015666950e2d7a107bf81c861f9c6d4d74aab33f77585ea871e353aa95deb3f84a1bb4cd391f40121ca927835ebec9db2545eb8f606e96df7 SHA512 26ec0b45d74df687264ce2d5e42a6f51cfb982f8fe00863294b990ee8db819b7f54ebf3f095094c32c2bc91a51d987ac83f15f4bf15e931d4ffd215b72ac6bec
-EBUILD ospd-1.3.2.ebuild 738 BLAKE2B 59907c080ef008560f9f56157f341f2a56684d384015bfda76bf7fb38668f26f1c74b9bd2c5e32631240afdc2571d72df02f1236a084791736e78c9f7202ca92 SHA512 4ace8420652b2017aa0425e35a562c0a5e211ab2967c3af72dbbb7804aa2d3ebe6d2274c3ef48ab1158dbaf8805e7f98d5ae52d6cbce1eaa4c51a3482aa774e0
-MISC metadata.xml 435 BLAKE2B 4d40c4dcffe9bfd81d1c1b517b4e6d6e1e658f9d6be65f8ad962ecbbee78bf0cc6bbb5805f2e056375c7371697a453453f8eeae40bae1bdf890be8f3e23ccfbc SHA512 fc802728917b8ebc3c43e3c35ce1fa7b8aa30d89d60abcfcd82eb6baf0152d02384b2e336664942bd89c3ed27a418f37a13699b68a424f36645c51c1310a6e16
+DIST ospd-2.0.0.tar.gz 81645 BLAKE2B 4c0c7af3caf274ea9e6a43790eb1e9d386ce42d9976e5e9625b49ffe12d8db2e613109458dcc59f322bc00aee39a4a89045caf302182474d1fab4ca1c4ff1bcf SHA512 971b4b57c39844ef08a0ae56d4bf87f0440c993960b5ad37516c622ad41eb2ab30fabb9d0a05fd043a9a1d98e446eaab9d5018cc1607fd711c533475f4703012
+EBUILD ospd-1.3.2.ebuild 721 BLAKE2B 6c3700ac9a17745447f82f5468d7f077b8d5c98b658870ec58fd36ca0afc788446bde9a1374f2442fe465ca5dc829d16ca0681e67abfd155a04f288534a99c50 SHA512 29e7f73153030fe522041d1728872076e91507da86d6a468df00eee07dcf20c476650eb787780251891304f92f7cd5352980b85b7450bb3028531a7db3c9a9b0
+EBUILD ospd-2.0.0.ebuild 720 BLAKE2B ded312a73884a2a16ab8f94a98ae17a7b49a240f8c5cdc82baf6f6aa3980c3574888f728cc5cacb8748ac2cd7ae7d6325bb8aa65243eb697a2ab21471b329f88 SHA512 d82bc6fc8f91d3be650b0a1d1337e7967155e87bac293b748936bf8a8e16f64d5b37c9823a5eaa84604eb148142cffbf8261c96ae6af5712b6e59a2227cc32f4
+MISC metadata.xml 879 BLAKE2B 312903697fda388ac1a9b8c773f69836154e9ea62ee28c1b8248c3e751a6df14dd0f25e1f5d05cca297309aadc0785139ea35c87eab0f5d0f3639a17cb19b570 SHA512 4c276360cc13793e6f505ac0e0b767fa8af277a696a9e64aa37a671780d1b7fa82812d25c2be25dd4542201ab5083d2721746344f46fe548999d4b615c2ceadc
diff --git a/net-analyzer/ospd/metadata.xml b/net-analyzer/ospd/metadata.xml
index fa26aa942e17..c20e7ad3a230 100644
--- a/net-analyzer/ospd/metadata.xml
+++ b/net-analyzer/ospd/metadata.xml
@@ -12,4 +12,14 @@
 	<use>
 		<flag name="extras">Html docs support</flag>
 	</use>
+	<longdescription lang="en">
+	OSPD is a base class for scanner wrappers which share the same communication protocol: 
+	OSP (Open Scanner Protocol). OSP creates a unified interface for different security scanners 
+	and makes their control flow and scan results consistently available under the central 
+	Greenbone Vulnerability Manager service.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">greenbone/ospd</remote-id>
+	</upstream>
 </pkgmetadata>
+
diff --git a/net-analyzer/ospd/ospd-1.3.2.ebuild b/net-analyzer/ospd/ospd-1.3.2.ebuild
index 9b9c31af66ea..ce11b4a1aa1d 100644
--- a/net-analyzer/ospd/ospd-1.3.2.ebuild
+++ b/net-analyzer/ospd/ospd-1.3.2.ebuild
@@ -6,20 +6,19 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
 inherit distutils-r1
 
-DESCRIPTION="Openvas OSP (Open Scanner Protocol)"
-HOMEPAGE="http://www.openvas.org/"
+DESCRIPTION="Base class for scanner wrappers,communication protocol for GVM"
+HOMEPAGE="https://www.greenbone.net/en/"
 SRC_URI="https://github.com/greenbone/ospd/archive/v1.3.2.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 IUSE="extras"
 
 RDEPEND="
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	>=net-analyzer/greenbone-security-assistant-7.0.3"
+	dev-python/paramiko[${PYTHON_USEDEP}]"
 
 DEPEND="
 	${RDEPEND}"
diff --git a/net-analyzer/ospd/ospd-2.0.0.ebuild b/net-analyzer/ospd/ospd-2.0.0.ebuild
new file mode 100644
index 000000000000..ae035362d7db
--- /dev/null
+++ b/net-analyzer/ospd/ospd-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Base class for scanner wrappers,communication protocol for GVM"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/ospd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras"
+
+RDEPEND="
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}"
+
+python_compile() {
+	if use extras; then
+		bash "${S}"/doc/generate || die
+		HTML_DOCS=( "${S}"/doc/. )
+	fi
+	distutils-r1_python_compile
+}
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index d6292901fca5..8fc85c32d50f 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -4,5 +4,7 @@ AUX packit-1.0-nostrip.patch 125 BLAKE2B 52d77227d70a59c372b15757edb03f1d0d91c29
 AUX packit-1.0-overflow.patch 1444 BLAKE2B 6c5d13b342890effd4f2d0da982e6deb05adbf53b4b9e91e144286211a9e6b9825c719e91691eabd5ad152569bd0dfa18fe2be582606dfce8190072f1c06729e SHA512 7798177a770e81b0db4bd2cf879d17f1dd6a0ae763e4546f2136e5cfc0e49e22d7c0b8eac1bb4409a026a8a072baae93f4c5d1079a3ac0dfc589a2fad15ecdd1
 AUX packit-1.0-pcap-header.patch 448 BLAKE2B f7d1932dd9394d00bb866a6d312ab0c9d2a24dfdb3cc22bd96c631f46486a964d0d2c63f28e3e34a0a432e5e71654c25310f1155188bad12d462f22113f8be08 SHA512 a88baa7cde0e333fa604f219dbabe77db4452dcf3a8071a8e3e4977b45947ea7827b5746cd187ab32bf236777e415e4f7cb0b3d18ee6ef776783bdbf9e6ef886
 DIST packit-1.0.tgz 138367 BLAKE2B d3677368d248aefaefbf2fbee51035ade7923db8cdc4ee4b19fef97b606beacbef52e1e704de50bf0f042a38fa9ed1d4149ab1dbd5726aeeef7093786407e282 SHA512 cc7e957d2149edbc92d4d914c9f29aecb7945bab43f2df7435bc4c21a4724f92e9d99990683e4d301384117f79819f87f423eaa28dbef11b37a96c4aa40a1398
+DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2
 EBUILD packit-1.0-r2.ebuild 788 BLAKE2B d3bd4f3e7da093d5900ca52f45509e8c0c050b8a8a1378cbcab40e5c519ce9b5f312289fa63b9464618427dddc88bac60eb00131a582206c8661490ce8f5b5eb SHA512 dccbb6d0e960d51db35ade7da0df07ac28e25aee0a2f55774e385d5c240c073922bb02e0f8da4417e595ac2a2f259bd062bb7921ac655696dfd355de7e37dd09
+EBUILD packit-1.6.1.ebuild 608 BLAKE2B 58fb813c1a9377029c06d370498d1bce4c0d9bf34df76d2404b67ab3d1cc9db269867e15e2e2f046c4738ca8f85e07b89fa197548091de92f96393d3f7243384 SHA512 84b472e05fbc9c2ab46c8e869119b685e8945e15c59634643bb5018176923a2bda02eba6e90735f52866f6794f791373dea6434444c263248bb53bc4338a75d9
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild
new file mode 100644
index 000000000000..cd4fb1dfab52
--- /dev/null
+++ b/net-analyzer/packit/packit-1.6.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="network packet generator and capture tool"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-noopt.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc docs/*
+}
diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest
index f02eebee867d..3efc1fc3004d 100644
--- a/net-analyzer/sniffit/Manifest
+++ b/net-analyzer/sniffit/Manifest
@@ -1,6 +1,9 @@
 AUX sniffit-0.3.7-gentoo.patch 1164 BLAKE2B 0d35dab5ae42180ae0eab4133f2a5c752d39fbf20577b06d697ea2bcfa745c3fa51b2318e5043783eea0c54c398478f8939d050fcb9a6c28aa4e3ac483f09135 SHA512 e71684e0be70228c347fe61afdee7e6bf0f116b0ecb603ed4dd6838f457b5b480092ac735297ce64f84f9c8858b5b11d7a1e746c0790380fbf6f7cf8d9875865
 AUX sniffit-0.3.7-misc.patch 2957 BLAKE2B 7315c4f977642819cb7ccff3f1337d5d3f0ee4a298a6984338a44cd8f1295a6a490aeb89e4d06d61c863665f67ca8894951fe4a3d1d52d226895581d84038e49 SHA512 d07298642bab1903c7a93a2b076dcf2cf50a2a5ef5b05e7e9abacaa88cff3089c9028e7721cacbc403b992ad170f64976e83835e441b44e6ac69ee0753e2714e
 AUX sniffit-0.3.7-tinfo.patch 1063 BLAKE2B 8d3b781c7c71201639ba77e8dadb063dd85d7bd0a04c4717bb2f6dbad8b2245f2a43b6c563567f813e76f2bc3dab5d414081cd8c337a8ff81e4bab3856d7cd29 SHA512 d4959d6c27928c3d3f85fdfdfb1afd4f7ad24000adb61f565fef68b46b46aba96b61572177db058875dc3a70154223cb620077e6681c8a7f62483e614f8e92c6
+AUX sniffit-0.4.4-tinfo.patch 434 BLAKE2B 15295b6ed19928dcbf9f3905278cb3e3390bcf34feb7eb59ac438bba61459625376b6a9c2903605fd4a232db42ce9b782d50a2ebd43b1fa0a1e83b886daaa7ac SHA512 27d5e6fa9bc786b5a3018d26613131e257e5f4cfe0e688b1868857521d7aa931b41319dee7abfd6ef8d76c24f28bfef699c48e82df6e24c90507e1ee462e47d6
+DIST sniffit-0.4.0.tar.gz 59640 BLAKE2B 0cb335e7fc308155d0b3b3163695745ba1b0b71f212341238074d80782d99b12ed3f4991eed766161bfb65aeffe8bbf5e8e71a987b431fd414ac34ab0be416ab SHA512 a31c39859ab308f3ad4bf2f32a61d0f419ed6ad5d1668efc79e996c4a99557e511fc0b36c21e30316cfa82217fb10fd16d4e3473f5f1fdd70cdeba959d643aab
 DIST sniffit.0.3.7.beta.tar.gz 212419 BLAKE2B 938f4eb775cfd0c604ec107573b8e4bba93fc60b40428ae3894b008fa4eaee3c9bf1ef29daf28caef4f22c4574faf2c6a8e3e8c32b7f84d643b8364ab31412ab SHA512 b32d1f17d589ee1d1afc7986640a2b9f451cdb26ee2d077db1eaec1bb77ed353bbbb6a79bd25f915b3a40b7a279f9fc7855706150ec3a24f8937a152ac91b8d1
 EBUILD sniffit-0.3.7-r4.ebuild 792 BLAKE2B 91723d785619de8ab8de16708d365e07a43310e093cae0f3b794d5b38054588a9760cf9c26639feef7cb83f612aacfe08b804ff585ec2b01469ac54105254c12 SHA512 2f44f2881473aa1744c62b68d6eab2f4eebf9470a17a069430bf9c2fdaef1c755de543c42d9153d975cc1bef7a848ae8b78398a56f1400c4d1280d5ddc344d35
+EBUILD sniffit-0.4.0.ebuild 538 BLAKE2B 00b519b5ca3d480e6aaa2182902d916b13f88ec78732aeaceb2b6ad9c72d7353b734ce0b1614f7ab4450e43efa9bf18dc59f2b4506517e019e63e006e3d31b47 SHA512 4100dfa8a93c0be3d43a11c0a7d07900461d0fe23dc402a0845ff687ac0bbbc8df7f216e2f99fb484577bae36076d718e5750fd1f19df2622c5f60b9fe80eaf9
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/sniffit/files/sniffit-0.4.4-tinfo.patch b/net-analyzer/sniffit/files/sniffit-0.4.4-tinfo.patch
new file mode 100644
index 000000000000..85e266fb5d13
--- /dev/null
+++ b/net-analyzer/sniffit/files/sniffit-0.4.4-tinfo.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,7 +12,8 @@
+ AC_PROG_CC
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB(ncurses, main, , [AC_MSG_ERROR([Couldn't find libncurses])])
++AC_CHECK_LIB(ncurses, initscr, , [AC_MSG_ERROR([Couldn't find libncurses])])
++AC_SEARCH_LIBS(keypad, tinfo, , [AC_MSG_ERROR([Couldn't find libncurses])])
+ AC_CHECK_LIB(pcap, pcap_open_live, , [AC_MSG_ERROR([Couldn't find libpcap])])
+ 
+ # Checks for header files.
diff --git a/net-analyzer/sniffit/sniffit-0.4.0.ebuild b/net-analyzer/sniffit/sniffit-0.4.0.ebuild
new file mode 100644
index 000000000000..33937675b70c
--- /dev/null
+++ b/net-analyzer/sniffit/sniffit-0.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Interactive Packet Sniffer"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/sniffit"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	net-libs/libpcap
+	>=sys-libs/ncurses-5.2
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.4-tinfo.patch
+)
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index e2186a80a2d8..5c41072df43e 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,8 +1,4 @@
-AUX tcpdump-4.9.2-includedir.patch 2027 BLAKE2B b9fc28ec180095f9b6e47e9a1ccd75d479029cfb19d6f1ff53595a25cab4c68d1ca55df0f702dfae86e264e4b7d3f645f3fac1b548bb6d62cec58306ae19e88a SHA512 054af892c4948926d23b6b7a4f93ac00ab8f258181784598a4097dd8f8b641ddeaedf3c9924b940b860929e086810037d3a672fabd03427b4bb41d3020013c27
-DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-EBUILD tcpdump-4.9.2-r1.ebuild 2188 BLAKE2B c0c4a55475be8412eec59fdc0f32c8008144d1e355b28d064c4ab379882b60e1d45f6463a6cdab600ac8476267dc363e1a85810a506f6c2101b5b90427a11dc7 SHA512 a4a54a5554afa51e1305a8de0fbd2559685070036cee416fb3bc02133123b4e438ec41f1c7ed8afb124fd12acd2df538113bdfd937777c12724e4b41737b00e1
-EBUILD tcpdump-4.9.2.ebuild 2063 BLAKE2B 724f8b73ac79e4d25ad27e8530f289edbabc0f9606c2d2f195b0084e0701d9d37ea039652f9c0f46099fe6b21f2dabe55f9a613be7ce08b8b0c6f5294226f930 SHA512 4f792631df6effa11a6e09a286e612bfbaca812530bbb05deb6b0b468b164d70974eb69d021f4ca4539bcd994cb8c00de09a95cee750563d6a1665875cfff3a2
-EBUILD tcpdump-4.9.3.ebuild 1947 BLAKE2B c773686b1362f6b6c4e6e988dab7e90eede28f039c8b785a27b7484b00534f15b3c25d994600f58ee5e37e780b2251e3c542554b7c2921853b081e8c61da1653 SHA512 227eca309c750e4bb3761d395b733e85163f9c4bdf13aea19034f2236ea3c44f300eaa1455b11958c42cc8bbe2bdcc4e32894a936f13a3cc01759322a765d0d5
+EBUILD tcpdump-4.9.3.ebuild 1944 BLAKE2B 6a28589740cb8797b91bd210db7dfbf4827f8d653cfa15df03d5bcaee66ccc839f1086428f6d8d6326a1d3c7916945f91cd6c4c0419236d9433bc119017e195f SHA512 fec1c620cb96c1d76c66b05086ff2a604cfc2155998989e6ce797821db0734443f0a873f021a2c7b058fc8cb2678c1c7363ae731ac30b1f6543374b1193052d8
 EBUILD tcpdump-9999.ebuild 2190 BLAKE2B 29650a330e482a82589b8472b62cba24bc3ddfc931465557ef7695938a8d208ceef862d09f9f4a5aaf9d917c58396451f071909c5ab3c808f5185b9b49ddb0f1 SHA512 974ff9bed610720376d46f54316e7aa25cba88255d40327f7325ae3101ddee62210d9eb70f32336eeb507bfd267258f072e299a149c16a4a1218ccea0262c13c
 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
deleted file mode 100644
index 0f74fa9a8a3f..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -534,40 +534,6 @@
- 		if test $libpcap = FAIL ; then
- 		    AC_MSG_ERROR(see the INSTALL doc for more info)
- 		fi
--		dnl
--		dnl Some versions of Red Hat Linux put "pcap.h" in
--		dnl "/usr/include/pcap"; had the LBL folks done so,
--		dnl that would have been a good idea, but for
--		dnl the Red Hat folks to do so just breaks source
--		dnl compatibility with other systems.
--		dnl
--		dnl We work around this by assuming that, as we didn't
--		dnl find a local libpcap, libpcap is in /usr/lib or
--		dnl /usr/local/lib and that the corresponding header
--		dnl file is under one of those directories; if we don't
--		dnl find it in either of those directories, we check to
--		dnl see if it's in a "pcap" subdirectory of them and,
--		dnl if so, add that subdirectory to the "-I" list.
--		dnl
--		dnl (We now also put pcap.h in /usr/include/pcap, but we
--		dnl leave behind a /usr/include/pcap.h that includes it,
--		dnl so you can still just include <pcap.h>.)
--		dnl
--		AC_MSG_CHECKING(for extraneous pcap header directories)
--		if test \( ! -r /usr/local/include/pcap.h \) -a \
--			\( ! -r /usr/include/pcap.h \); then
--		    if test -r /usr/local/include/pcap/pcap.h; then
--			d="/usr/local/include/pcap"
--		    elif test -r /usr/include/pcap/pcap.h; then
--			d="/usr/include/pcap"
--		    fi
--		fi
--		if test -z "$d" ; then
--		    AC_MSG_RESULT(not found)
--		else
--		    $2="-I$d $$2"
--		    AC_MSG_RESULT(found -- -I$d added)
--		fi
- 	    fi
-     else
- 	    $1=$libpcap
-@@ -1351,11 +1351,4 @@
- 			  	    -f "$1/$tmplib/libcrypto.dylib" \); then
- 		ac_cv_ssleay_path="$1"
- 	fi
--
--	#
--	# Make sure we have the headers as well.
--	#
--	if test -d "$1/include/openssl" -a -f "$1/include/openssl/des.h"; then
--		incdir="-I$1/include"
--	fi
- ])
---- a/configure.in
-+++ b/configure.in
-@@ -908,7 +908,6 @@
- 		# Put the subdirectories of the libcrypto root directory
- 		# at the front of the header and library search path.
- 		#
--		CFLAGS="-I$withval/include $CFLAGS"
- 		LIBS="-L$withval/lib $LIBS"
- 	fi
- ],[
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
deleted file mode 100644
index 193cb91dd2e7..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs user
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/tcpdump
-"
-SRC_URI="
-	https://www.tcpdump.org/release/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+drop-root libressl smi ssl samba suid test"
-
-RDEPEND="
-	drop-root? ( sys-libs/libcap-ng )
-	net-libs/libpcap
-	smi? ( net-libs/libsmi )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	drop-root? ( virtual/pkgconfig )
-	test? (
-		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
-		dev-lang/perl
-	)
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.9.2-includedir.patch
-)
-
-pkg_setup() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
-src_prepare() {
-	default
-
-	mv aclocal.m4 acinclude.m4 || die
-
-	eautoreconf
-
-	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
-
-	# bug 630394
-	sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
-}
-
-src_configure() {
-	if use drop-root; then
-		append-cppflags -DHAVE_CAP_NG_H
-		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
-	fi
-
-	econf \
-		$(use_enable samba smb) \
-		$(use_with drop-root chroot '') \
-		$(use_with smi) \
-		$(use_with ssl crypto "${EPREFIX}/usr") \
-		$(usex drop-root "--with-user=tcpdump" "")
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
-		emake check
-	else
-		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
-	fi
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README.md
-
-	if use suid; then
-		fowners root:tcpdump /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_preinst() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
deleted file mode 100644
index 632d82283d9c..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs user
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="
-	https://www.tcpdump.org/
-	https://github.com/the-tcpdump-group/tcpdump
-"
-SRC_URI="
-	https://www.tcpdump.org/release/${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+drop-root libressl smi ssl samba suid test"
-
-RDEPEND="
-	drop-root? ( sys-libs/libcap-ng )
-	net-libs/libpcap
-	smi? ( net-libs/libsmi )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	drop-root? ( virtual/pkgconfig )
-	test? (
-		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
-		dev-lang/perl
-	)
-"
-
-pkg_setup() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
-
-	# bug 630394
-	sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
-}
-
-src_configure() {
-	if use drop-root; then
-		append-cppflags -DHAVE_CAP_NG_H
-		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
-	fi
-
-	econf \
-		$(use_enable samba smb) \
-		$(use_with drop-root chroot '') \
-		$(use_with smi) \
-		$(use_with ssl crypto "${EPREFIX}/usr") \
-		$(usex drop-root "--with-user=tcpdump" "")
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
-		emake check
-	else
-		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
-	fi
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README.md
-
-	if use suid; then
-		fowners root:tcpdump /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_preinst() {
-	if use drop-root || use suid; then
-		enewgroup tcpdump
-		enewuser tcpdump -1 -1 -1 tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
-}
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
index b299f9098c09..1a4eeea68b81 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+drop-root libressl smi ssl samba suid test"
 
 RDEPEND="
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c0ea0a5bca36..6a0ec1be14d9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,10 +7,12 @@ AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
 DIST wireshark-3.0.4.tar.xz 30938336 BLAKE2B ab97cbfd9999a4e326787639debb67f0d0b8509572fb85297385a461dbaf081691d59fc2cb16b4a69baee8ca0ef873503f85f0238bf0fbedfcb3e0755749d3df SHA512 eb9ddc8ba3d78bc6c1f2e1d277e81c00939638793ed21b98999310231d13a0fc8a6149dc5e78f58026778b8137e954ad7f67069f8cb80465078ca2d9795b25d1
 DIST wireshark-3.0.5.tar.xz 30929864 BLAKE2B 0e3d8eb37e6d1d1976e8084176fc9c75dab43a74f65f8247c9b18b85cdd82d207791b839743a59c4ad299d63f5f41a94f931901e9245dbfb3d4a239046c874c4 SHA512 237ee66cfe0a7073f0e3623f327f7eb7204d1cd274e006dcc6890972d4135c2baa6c9d2426ea03ee64b7fc6dc45cb4cfe823e5cfc6f90e252d35b3ad7750884e
+DIST wireshark-3.0.6.tar.xz 30846672 BLAKE2B c20bef980edb470564dff15e0133e6d65c3273e400a136faeabf92f6e4b907236f88f025baad6d4d592703d2063e56b42de28849c84ce7babeeece950e4afdb8 SHA512 fcd621c1434db69e6319e5932e2dcc378e004055378123f86bdce8dec095bbffbf2b85a880c7f46c69555fe3c9ddb7c79ee59ca2576e0fdf2cfb7eb6ce775b25
 DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9
 EBUILD wireshark-3.0.3.ebuild 6581 BLAKE2B b9caaad314347dc3a02cd2994344f3113c604487b36c6b785018c0683a11dcf5e1714871431e1305ca9e1ba2eb3b542d91044f5b2c5afd0419a13b53c3f256c2 SHA512 154f303dc3c9c84088db981d00218cdf9dc7bb6dd5719d25201b9460b9dd9998093d179475c97cdc54aaf27da659acc5609ad333f0cccea3ba23f13cd837bf91
 EBUILD wireshark-3.0.4.ebuild 6585 BLAKE2B 06d39f7d056b73ea4d7180cd7373975831dbb1f1d5a4b28faa5d9ab37452d70f78247a4727cfd7acb15879917a7be703733fa42dc77ac4b61b26c5b46b383e06 SHA512 b627ce7283791654aeec6f7400b5d12e309ba98548f382256cb5732e171811637462af036c676b936217f00f24a3f0ad566a1ed9a95ca4eb8f9504a48a2d74dd
 EBUILD wireshark-3.0.5.ebuild 6588 BLAKE2B f76ebf3af16e8f11f97af85b599b7555b3c85db8cb7c37698252be645622623cc8549aa591bf627909ebd04b9008c1581f607376a6fdf849783e31cb57294d74 SHA512 348cf90f7c319ab19a4befc74ca261c286eb9b778a6c21d65a4b462d422e7d382741102260d2155d5e415b2348499d1dbd3ea7bedc91e4f81596331d337c5263
+EBUILD wireshark-3.0.6.ebuild 6588 BLAKE2B f76ebf3af16e8f11f97af85b599b7555b3c85db8cb7c37698252be645622623cc8549aa591bf627909ebd04b9008c1581f607376a6fdf849783e31cb57294d74 SHA512 348cf90f7c319ab19a4befc74ca261c286eb9b778a6c21d65a4b462d422e7d382741102260d2155d5e415b2348499d1dbd3ea7bedc91e4f81596331d337c5263
 EBUILD wireshark-3.1.0.ebuild 6790 BLAKE2B 7acc05ba1e54b2a9b68d775c639c60d19ad98e7f0d35caa70cf42400618cef1306de4514d21bc249e19ffda36ee6e96a8425a57bfb72de44ea439565eca2b98d SHA512 e1bcccdf1ca7fa2e97fb55591c6d067e3bb2d4a03188254b8decd6e277b8ff584f2c8590c578109fc3045b908d46a76892d952c1c264665c36cd02fa4b36ebfd
 EBUILD wireshark-99999999.ebuild 6795 BLAKE2B 615b65c6838e00c5b0c54a05508d0758f761387dd0a9488ad39608054c4940fc3d5b557a370bc1e14b9b70734ea9c0ac4df4cd8a06a84b1854c41cab12b96182 SHA512 0d5b143ad8f104f4ddb66195a000bc94fe26997ef5c9269f967e20c9832deafe31443ac53558046aa7f300bf036194c23fb6a9a5611237bf31d039ebfc567978
 MISC metadata.xml 4963 BLAKE2B b3c0a51c2ffc96313fe46be2f4b970c0a22d7b479a3701a717531f7b9c46ff5b00b1d3a29a54295abb90989226afb679f2d4842c2ade5f4f1c2d7923121591b8 SHA512 03cdfa1a78a23ae572eb0eacf787b1edba135541ab94d899dad77c6f0d482d9303fa0168033a3a60a8e12dd54506999ea5bd323dc0a90c58d87d8640bda139d2
diff --git a/net-analyzer/wireshark/wireshark-3.0.6.ebuild b/net-analyzer/wireshark/wireshark-3.0.6.ebuild
new file mode 100644
index 000000000000..f4fbb9dc3bcd
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.0.6.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
+	+udpdump zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libgcrypt:0
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+	${PYTHON_DEPS}
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+"
+BDEPEND="
+	!<perl-core/Pod-Simple-3.170
+	!<virtual/perl-Pod-Simple-3.170
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup 'python3*'
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index c3d2443a0faf..65fc5a89a443 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -24,23 +24,15 @@ AUX zabbix-proxy.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5ce
 AUX zabbix-server.service 281 BLAKE2B ca25d550875bc16ebc2cbe3193ec46072d288fa2d87e292949677c66bb7e3e4b9290274a43d88551bc320775fe0efc9fb8302a43147b3f7541c877726c40222e SHA512 b002e8efdc58300fc06ed1e1028f64d525dfaff52d74e661dbb4da3750b785d817d2bdff96f4ea3a28545fda4e37df962ec7a28b70868cc4b50b63ea27b088ff
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1fd45ecfcf3cc2bdf7e625d54b0fcfa3690ce5d766e987d320d9ccbf7f430957f532c31f180a0a037334d6eb5b51a SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd
-DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B e00fe140977f0ce995497954a15ff647c813c048a706e536a12010a649d3467d6c63343c3c0d11b1900f91f8fcc5bb235f9e4a030362c93ad3c1c31e68699f54 SHA512 29e3cba0663e7160dce5141cc389959571e5e298206baed26209facab206cc4f66611d48d76306a53925a2096db6f0bed1753435ec1be20bd8db53862cb902a4
-DIST zabbix-2.2.23.tar.gz 15504361 BLAKE2B c0eec293a92564607ed56c570aca30385481cf028fdee2bb51fbb29b40d7a1908a6065a6ee21c019ed6fb9eee294bc8fb58414669ae8e16e50f614a0650e2dbd SHA512 178e193f83dbaaa8aa0a0b87dd621acf7aa24e0d84d0010532b419139ed02e3cf892e4e772362bb855efb5966a64b9da8d3512eb91e759835039dc8c3529ea56
-DIST zabbix-3.0.26.tar.gz 14724426 BLAKE2B d887f0dd77cf051e2b6ae16221c02c20aa3a7b8bee07eaff5a0837eb25962a4d0b42a9adace4d68d5e141fcd89a0896e3e2f64b6af5e28b2e63109a89791ced3 SHA512 de3ebee12a4be3b81d64fd0ce718866d55c9696da97f54c546c882f0e70656066c825c9383caf80fdf5ea6a6ac4801cb8ae88c1a83d9be051935111a72e31917
-DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
+DIST zabbix-3.0.28.tar.gz 14706285 BLAKE2B ef7f7e59e229847daa92d1bc4771cd0feb627adb914978b1213dbf93ee52d102dedff2a502dc076a6f13456e8808cca9b556b407af81c2af9e1141f973143d17 SHA512 e406c8e51319a05bdf70093f6b9ef47cbe9b276ff0969369b022a260e38f12acf43fb8e2e8295fafe55d2288853a522bdb6cb339f79cad74cb2233807eb27a46
 DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f
-DIST zabbix-4.0.6.tar.gz 17162202 BLAKE2B 8f03830d5493719cbabd770527dfc99e1bd2d80a3eaeb691e07cd7d8bfe587317ee045ed13a297494539d3cc2e3a26bafe29cd6eb6126c7fe74ee5de44e98b39 SHA512 43b7ccadfaebc34098a827ef7e27c2c637d4bb74db4d06cdaee7650171b7b5e14787a473a66b638a252c1342e841b546e089bd762de703e99e0a34b0549393ca
-DIST zabbix-4.0.7.tar.gz 17175571 BLAKE2B 3173881e093c58175e014d55c74d09656dbb6e99321f808a3ce6fe61aef56325aa94c4a3ff0b1edd2872734cc970052c63e5db377f8e8d605bf25f2eb8505802 SHA512 67373383ef961426901d8c27e1e51c902d8580b9af1877d4012c934f0ee52c5cf85e3f81fd16b244cd9c8e869cf13dbdd7597d8e2591356efc61570b354961f8
-DIST zabbix-4.0.9.tar.gz 17118478 BLAKE2B 0b3761085c9fac577061ca3a0e5839c3d33f13802ff4e752c575f4428339dfbc7e02e5ae8abbf7870a0286c45777c670aa74cd93b2cdbf9cf62961e4723aa0ae SHA512 4e04d80490f43d2e7833a4e11dbc7ce0ed70dc1f43653eeff923f5bfa16bbeedf37597599d68e0de3194820501d896d785a20d6ae0dce9328c458fd711a6a7bf
-DIST zabbix-4.2.3.tar.gz 18241315 BLAKE2B 38f9e61ccfe68de553e115e35466430b9f8b4211ca72b3c0265a9c9e5494575d8b026cda11cb7ef10644df35b8f168b7e5ca72ace8a412445008299c6c513877 SHA512 2e7d7372d5ce84798743d3c10fea0230aac470b0d9936a722687eefbe818b51e16f5dc64040b8b1b1189f64e8785ceca108914534efecd152473d213b15f7e07
-EBUILD zabbix-2.2.16-r1.ebuild 9437 BLAKE2B c31b9519737b01d27baf9edbfced815dc05da1d5cd64963e97ca228d854794c39e50c9d8c028ff0da7bf813cdae5011bd99ef608980a3c2de55840752fa872fb SHA512 901bff4d135b436879f890aad4c23251edcc78f7d6dd7fe5d03677ffc8338a40fbf96a50b000a7f9d17bd3ab4a3d15e0f39ce77de9512559886414f6aadad49f
-EBUILD zabbix-2.2.21-r1.ebuild 9439 BLAKE2B 88e198ba41060624100419240e023c9f905058cad9c30ae3f4e44b7464cdf80c26283b624bc2b1d6ed731fd5c2df28f018286ff5b5d5ce3c2e2cd3bf37c9bd5b SHA512 534a266defeb9a02dbf56cd39162280a7c0d367fbe8a53004430436c8f3c4dd23b4b818a002aa5bc52595097fabdc5faedff8015b01ffce8f9395468c61e5cab
-EBUILD zabbix-2.2.23-r1.ebuild 9439 BLAKE2B 88e198ba41060624100419240e023c9f905058cad9c30ae3f4e44b7464cdf80c26283b624bc2b1d6ed731fd5c2df28f018286ff5b5d5ce3c2e2cd3bf37c9bd5b SHA512 534a266defeb9a02dbf56cd39162280a7c0d367fbe8a53004430436c8f3c4dd23b4b818a002aa5bc52595097fabdc5faedff8015b01ffce8f9395468c61e5cab
-EBUILD zabbix-3.0.26.ebuild 9275 BLAKE2B 072b2fde37e9b098ab6767249a8967d558bf561f72e11f55497f9db47d0810cdd751bf3a9d36a5135ca94c2a0dfb88ce21caf31a95180e06a6d6acb5d76acdea SHA512 f30893b5c51596ea6db4bdd19e0a647cb03a6e9f527a70579c8378495250cb63bc056e0807c2be9f39dbceb4cb5f228dc51135e3f9e96cf4d4e2c14df1b00374
-EBUILD zabbix-3.2.11-r1.ebuild 9266 BLAKE2B b944050634710ed53be3348a0d4f49c1b4de458ce4085d4ea8968fe2ed9ec4c529a910460c8104788448efb6760f25214fce08fdd03632b8a0fa28278f8aec47 SHA512 b6251332a4db49445c42662a2c029fce99f9df6368396d2c52f822939bc0ee9aa3b08329f99b080ea11e0f4f29f41e9a1d193533584e7e65ddabe5c177b82dbe
-EBUILD zabbix-3.4.15.ebuild 9253 BLAKE2B f381475686894409266e9c642872a728306a89ea472b337709ca45683be504e9ae2822f9d105c256630113f6c874595d130204ca512b6ecd93126fb4926447ef SHA512 d4929f2687c5c0a58ceb7a8a98fed706a62a5a717ba7892d85058b7e1e827095245b022a523daf0d3f53727f42b4ff83c693c1a2195eb3656d589bede632db4d
-EBUILD zabbix-4.0.6.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
-EBUILD zabbix-4.0.7.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
-EBUILD zabbix-4.0.9.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
-EBUILD zabbix-4.2.3.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
+DIST zabbix-4.0.13.tar.gz 17150333 BLAKE2B fe4eaf999c0fbe4c87ca2bb621ce229480840f3e86de5e7b02d3668d5705046e62bf04f4f4ad75e814c1fa795642df3c0a9d1bfb07ef25c33003b12e0fe44c7b SHA512 150d28b1be88821be30ef1a9d74ac62e6939f556ef13e6acc6c99b915d36d1655d776aeb2399009285404724dfa41acf249b9047797890a954941831c8b5ecba
+DIST zabbix-4.2.7.tar.gz 18286402 BLAKE2B 36fbd5938d6d188b29fb2e284a8b2ddec1e3cfda08517094e06fae6ccad9dea8027368f4a1a98cb49957caf0aee580df01a17f4aa19a98e746e2c1164db4b590 SHA512 92341e4efe721f043b66bdd382fc69bc408c4e0435a594fadf51989c37d8ecbd72ae0092517929b521527b41331f933310e9c14da42f18902ca54460170dddf9
+DIST zabbix-4.4.0.tar.gz 20689807 BLAKE2B 7be62a7b124a016a9f3ab5022b349452b1a99c9ef8cff8ba4b8278f7c48a7632d7f3e6677764fd778c44c05fdb86bbe2b066eb6a51f076274fffcbbd94202db4 SHA512 021e7454decb885065417f6f6a0ecc8a9d4f184f68da6ab4efea68280b3a0c0641eab05620ce14016b6e57ce32c44075e53b45f03e764e8726c00bfdd6039406
+EBUILD zabbix-2.2.16-r1.ebuild 9422 BLAKE2B 66f0a9ce2aff2c7d34beacf835cccacb4c35b94d25bc36bc78cc175dac974800b84fe63f989defab49d188051bb9591a026f517a87e73971575bb1fc759cab9a SHA512 19f91b0eb3a26ef92f223f29c40e0edfa0a26657b3d2d5c5edb24dc16d3a04f6786f6a0a6414417d7bd60135dc2a2d534711bd5a0876301c15fbc84d9df4acb3
+EBUILD zabbix-3.0.28.ebuild 9260 BLAKE2B f914d67e72fa9c65bb852b3bdc710c162f1b3689432d0e62a46b315cb692cc114d006a29ed8d8078ad036f3fdd9ea548d06cbe96a8cce27df465fe0df6976faa SHA512 f3cd17ef30f681aee2a86a743fee8bcc6140b6cf2330b65653ba81b02b7476e019b33f31c70645a48e07d564ac8bbebc096eea4c27b358091912418f2fa51623
+EBUILD zabbix-3.4.15.ebuild 9238 BLAKE2B c45583e3147ecf8db898697aa4fb1ea31617c7e3bdab693de043d5504005efb3d6033cb8e1f1370dc5d8e64dfb182c7b671f38b302e71c93d258dea998f2a062 SHA512 e9da0542219528829ac44bec5e93631a2b0cd4e2d4275b2ee1a442136c45b787fe6babab30a02ef7cecb7fa1ebd69ab7631555d4a6c9faaf32d02f179da43c79
+EBUILD zabbix-4.0.13.ebuild 9426 BLAKE2B 1f85e07ce0f90019d4d5c5d6e02e1f930afedf4b6ebc8086c70dd3f3eee85150580c4a251a2facc41cae5516b881b95926ba27bcc76066b5f255aa41088bc092 SHA512 6dacbd9fa2428de7009ca59bd956c1412448006919b5a3fdd6e5b5c48b43551766b5429575c0eeaabb7bcc7addc8c774ab6074f1f5939f9f3c5b5130a069727f
+EBUILD zabbix-4.2.7.ebuild 9565 BLAKE2B 3c7f954dc470cf4b612e9d787390c3893f9620bef0e55ff787e78edd2b09e1c5d7e9c27ea0b5d2df2b4238aee128a198d22e8f63dd50043839f963bd242172ee SHA512 b5380a0f992d00d30950ff25fb5459c5a9f872c6256fcb8bb6b4166e48c5fd52492631a895eaefb950d56a6ee442311ad68d49212171bfe320bfce84cc3d7490
+EBUILD zabbix-4.4.0.ebuild 9565 BLAKE2B 3c7f954dc470cf4b612e9d787390c3893f9620bef0e55ff787e78edd2b09e1c5d7e9c27ea0b5d2df2b4238aee128a198d22e8f63dd50043839f963bd242172ee SHA512 b5380a0f992d00d30950ff25fb5459c5a9f872c6256fcb8bb6b4166e48c5fd52492631a895eaefb950d56a6ee442311ad68d49212171bfe320bfce84cc3d7490
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
index 6449f4cd9d50..cd75b8d90b24 100644
--- a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
@@ -70,7 +70,7 @@ DEPEND="${COMMON_DEPEND}
 	postgres? ( dev-db/postgresql:*[static-libs] )
 	libxml2? ( dev-libs/libxml2[static-libs] )
 	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
+	ssh? ( net-libs/libssh2 )
 	odbc? ( dev-db/unixODBC[static-libs] )
 	)
 	virtual/pkgconfig"
@@ -169,7 +169,7 @@ src_install() {
 		doins "${FILESDIR}/2.2"/zabbix_server.conf
 		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
 		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
 		fperms 0640 /etc/zabbix/zabbix_server.conf
 		dodir /usr/share/zabbix
 		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
diff --git a/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild
deleted file mode 100644
index 5cf012564554..000000000000
--- a/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/2.2"/zabbix_server.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd \
-			"${FILESDIR}/2.2"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_agent.conf \
-			"${FILESDIR}/2.2"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agent.conf \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild
deleted file mode 100644
index 5cf012564554..000000000000
--- a/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/2.2"/zabbix_server.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd \
-			"${FILESDIR}/2.2"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_agent.conf \
-			"${FILESDIR}/2.2"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agent.conf \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.26.ebuild b/net-analyzer/zabbix/zabbix-3.0.28.ebuild
index 4b96b6154b16..64dc6af6ad83 100644
--- a/net-analyzer/zabbix/zabbix-3.0.26.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.28.ebuild
@@ -71,7 +71,7 @@ DEPEND="${COMMON_DEPEND}
 	postgres? ( dev-db/postgresql:*[static-libs] )
 	libxml2? ( dev-libs/libxml2[static-libs] )
 	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
+	ssh? ( net-libs/libssh2 )
 	odbc? ( dev-db/unixODBC[static-libs] )
 	)
 	virtual/pkgconfig"
@@ -171,7 +171,7 @@ src_install() {
 		doins "${FILESDIR}/3.0"/zabbix_server.conf
 		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
 		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
 		fperms 0640 /etc/zabbix/zabbix_server.conf
 		dodir /usr/share/zabbix
 		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
diff --git a/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild b/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild
deleted file mode 100644
index 39902958a7e2..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.15.ebuild b/net-analyzer/zabbix/zabbix-3.4.15.ebuild
index dd57544e3c45..4d9f2799daa6 100644
--- a/net-analyzer/zabbix/zabbix-3.4.15.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -72,7 +72,7 @@ DEPEND="${COMMON_DEPEND}
 	postgres? ( dev-db/postgresql:*[static-libs] )
 	libxml2? ( dev-libs/libxml2[static-libs] )
 	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
+	ssh? ( net-libs/libssh2 )
 	odbc? ( dev-db/unixODBC[static-libs] )
 	)
 	virtual/pkgconfig"
@@ -172,7 +172,7 @@ src_install() {
 		doins "${FILESDIR}/3.0"/zabbix_server.conf
 		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
 		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
 		fperms 0640 /etc/zabbix/zabbix_server.conf
 		dodir /usr/share/zabbix
 		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
diff --git a/net-analyzer/zabbix/zabbix-4.0.9.ebuild b/net-analyzer/zabbix/zabbix-4.0.13.ebuild
index cab89e4b3b1e..7b8602240625 100644
--- a/net-analyzer/zabbix/zabbix-4.0.9.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.13.ebuild
@@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
 	postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
 	libxml2? ( dev-libs/libxml2[static-libs] )
 	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
+	ssh? ( net-libs/libssh2 )
 	odbc? ( dev-db/unixODBC[static-libs] )
 	)
 	virtual/pkgconfig"
@@ -176,7 +176,7 @@ src_install() {
 		doins "${FILESDIR}/3.0"/zabbix_server.conf
 		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
 		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
 		fperms 0640 /etc/zabbix/zabbix_server.conf
 		dodir /usr/share/zabbix
 		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
diff --git a/net-analyzer/zabbix/zabbix-4.0.7.ebuild b/net-analyzer/zabbix/zabbix-4.0.7.ebuild
deleted file mode 100644
index cab89e4b3b1e..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.7.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( >=dev-db/postgresql-8.1:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	server? ( sys-libs/zlib )
-	proxy?  ( sys-libs/zlib )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config
-		dev-libs/libpcre
-		dev-libs/libevent )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-4.2.3.ebuild b/net-analyzer/zabbix/zabbix-4.2.7.ebuild
index cab89e4b3b1e..ce4694480bfa 100644
--- a/net-analyzer/zabbix/zabbix-4.2.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.2.7.ebuild
@@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
 	postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
 	libxml2? ( dev-libs/libxml2[static-libs] )
 	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
+	ssh? ( net-libs/libssh2 )
 	odbc? ( dev-db/unixODBC[static-libs] )
 	)
 	virtual/pkgconfig"
@@ -176,7 +176,7 @@ src_install() {
 		doins "${FILESDIR}/3.0"/zabbix_server.conf
 		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
 		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
 		fperms 0640 /etc/zabbix/zabbix_server.conf
 		dodir /usr/share/zabbix
 		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
@@ -189,6 +189,8 @@ src_install() {
 		dosbin src/zabbix_proxy/zabbix_proxy
 		insinto /etc/zabbix
 		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
 		dodir /usr/share/zabbix
 		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
 		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
@@ -198,12 +200,13 @@ src_install() {
 	if use agent; then
 		insinto /etc/zabbix
 		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
 		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
 		dosbin src/zabbix_agent/zabbix_agentd
 		dobin \
 			src/zabbix_sender/zabbix_sender \
 			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
 		fperms 0640 /etc/zabbix/zabbix_agentd.conf
 		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
 		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
diff --git a/net-analyzer/zabbix/zabbix-4.0.6.ebuild b/net-analyzer/zabbix/zabbix-4.4.0.ebuild
index cab89e4b3b1e..ce4694480bfa 100644
--- a/net-analyzer/zabbix/zabbix-4.0.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.4.0.ebuild
@@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
 	postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
 	libxml2? ( dev-libs/libxml2[static-libs] )
 	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
+	ssh? ( net-libs/libssh2 )
 	odbc? ( dev-db/unixODBC[static-libs] )
 	)
 	virtual/pkgconfig"
@@ -176,7 +176,7 @@ src_install() {
 		doins "${FILESDIR}/3.0"/zabbix_server.conf
 		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
 		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
 		fperms 0640 /etc/zabbix/zabbix_server.conf
 		dodir /usr/share/zabbix
 		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
@@ -189,6 +189,8 @@ src_install() {
 		dosbin src/zabbix_proxy/zabbix_proxy
 		insinto /etc/zabbix
 		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
 		dodir /usr/share/zabbix
 		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
 		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
@@ -198,12 +200,13 @@ src_install() {
 	if use agent; then
 		insinto /etc/zabbix
 		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
 		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
 		dosbin src/zabbix_agent/zabbix_agentd
 		dobin \
 			src/zabbix_sender/zabbix_sender \
 			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
 		fperms 0640 /etc/zabbix/zabbix_agentd.conf
 		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
 		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf