gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /net-analyzer
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
82 files changed, 1400 insertions, 131 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b2c39895e38e..569a4f4a0003 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/authforce/Manifest b/net-analyzer/authforce/Manifest
index 84990f34b8f7..6bc37f12e06e 100644
--- a/net-analyzer/authforce/Manifest
+++ b/net-analyzer/authforce/Manifest
@@ -1,5 +1,9 @@
 AUX authforce-0.9.9-curl.patch 227 BLAKE2B e241e1ca54a51a39d8d57036467a892812c070609892fb2eaa44aec7c9ef4430f6f2b3fe59fb316fa2b3199375ea4f03299bae13ef38b23c3a088d4fb2ea83b5 SHA512 15467c0e12cf3739ef786ace9a8e83ee6e443681ecdc58c9c9258307036c66db35556400d8baaf44cb17e1c322db5bd52da8570a5a8c05506f2b7624e0ec3563
+AUX authforce-0.9.9-fix-parsing-of-sample-config-file.patch 1518 BLAKE2B 28216a6011065365bde5cb21b794181ef5da9592036190cad28e186feafd2fb61f98f1a7b489ef67aab4aca91ec177428d50db56df45aeef6752dc7a5d0ec96a SHA512 3e80da0fc91ad750d2c7ce1e97d42fb43bbdef018c366dc849206ac6327f643ba9208f8c97fe5823bf1ff265bcf11d30a905df23f49f6723796fc44a6919bfc3
+AUX authforce-0.9.9-fix-submit_dummy_list-re-declaration.patch 674 BLAKE2B fe773755eea616de618f748e0d917f5675a1b52cde43050ee0a4bd70abe50c22ed8a231eb65b1ce2c421e367963b40feb3f87f6b0ca4944c153b7254c233bd05 SHA512 a227bc06b34e2df5b82b884fedc99e205855a09c667ffdd2e4f6a3f455f470a9c22dde3ab355cf958165875411034327fb53ce0ad1c33da6ce15de6fe0af5be0
+AUX authforce-0.9.9-fixes-for-Wall-warnings.patch 2867 BLAKE2B 20289a3409c5aff4a58094039abdda48efd5d1af30c1ece802381295ddbd358a6b0b5998c69f80a89866cbd3739db143a504991cabd4cdf440f16993e83206de SHA512 bced2b7a28c5da2cb6615a791d258d786da66abc5d30e4a2be8cab63b2faa893eb63103122051ade275bad311944ff8c8595cd33f596625727167cf7a1f640cd
 AUX authforce-0.9.9-locale.patch 325 BLAKE2B 4379902c336744609ecd3a0a3d4039a10b83fe8ab3859d6e7faf9fd4aef3a74fc55f05f6c2fead2898bf112f1da774fa7c3ef54fae543d8af8bb9cd62e19e02d SHA512 0aa863400f54709a726fd2913d2d6039d3591221f9fcf60c843a3a24a2191f9eab70dd03cc574dc34cbc7e2824a58071b7167cc291f7e5cfad13da6e145f9206
 DIST authforce-0.9.9.tar.gz 424557 BLAKE2B 3b962f7c3d445525364b8e40e3b47d0c951e04b7b5d40077540b1dc34721aca5163f9328451f23b7f1891d3a5440d003568ca6eb5104a523bdccb33ade61546d SHA512 fd94c6ac5f98f480af4acba2de7c0ad81dbc4c759cce8f3f722dcf8870b0c16a9e7d462f4542784737e021f9c8d480b26895dddb4d5953f730ff8a181ad474b3
 EBUILD authforce-0.9.9-r2.ebuild 872 BLAKE2B 71560cdde0fa460b22953a85ea0f6a2b3d8c8d149acd4c31224c02c2fde9b8df903d01ed74dd1ec7aaeaa9cbf9ead9e7a8dfba688ad74e71a813332a97e6c2a4 SHA512 64920923498c8532fc64f8147a42383c0d60a1abbeb8cb3305fa36b14086fcd94103dfcadf3b63c1dde23e05c467e55163f3fae902dadff5f4372047b800a7e1
+EBUILD authforce-0.9.9-r3.ebuild 1047 BLAKE2B d52edda68977f6fee8a21fa7b61361d77afbde4dbe2f3651f72b404c86fdf0fc4ced3504666456ab9797dfb7ed23400246f0fc4ba2dbdb80df2ae952b248126d SHA512 a66f1c99632be37f3b5c189ede27130093effd6d05428f21c3f4210c104ce741f05f11fa778f7a002ba8d0f6d57550265e37c75847375d6f46a7db35da4dc865
 MISC metadata.xml 382 BLAKE2B 2a1952e7ba3806db62d8b3c6d1251af18707ddca296b137c786fb6713a75b472446f5b9f7746d51eedd58408cb429868886fba43bf78fbef5b33dc7a4897a069 SHA512 9db5772c5ccd05d53b3c6bb2fabe790348fa3933d95eae80e4347bb781b58bce870f4d3ea2fe9feccf7dccdffcaacca081231069774c345162d0d8219f8144d6
diff --git a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild
new file mode 100644
index 000000000000..183912b43cae
--- /dev/null
+++ b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An HTTP authentication brute forcer"
+HOMEPAGE="http://www.divineinvasion.net/authforce/"
+SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="curl nls"
+
+RDEPEND="sys-libs/readline:0=
+	curl? ( net-misc/curl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS BUGS NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-curl.patch
+	"${FILESDIR}"/${P}-locale.patch
+	"${FILESDIR}"/${P}-fixes-for-Wall-warnings.patch
+	"${FILESDIR}"/${P}-fix-parsing-of-sample-config-file.patch
+	"${FILESDIR}"/${P}-fix-submit_dummy_list-re-declaration.patch
+)
+
+src_prepare() {
+	default
+	gunzip doc/${PN}.1.gz
+	sed -i -e "s/${PN}.1.gz/${PN}.1/g" \
+		-e "s/\/mang/\/man1/g" doc/Makefile* || die
+}
+
+src_configure() {
+	econf \
+		$(use_with curl) \
+		$(use_enable nls) \
+		--with-path=/usr/share/${PN}/data:.
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+}
diff --git a/net-analyzer/authforce/files/authforce-0.9.9-fix-parsing-of-sample-config-file.patch b/net-analyzer/authforce/files/authforce-0.9.9-fix-parsing-of-sample-config-file.patch
new file mode 100644
index 000000000000..902b2a086e0d
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.9-fix-parsing-of-sample-config-file.patch
@@ -0,0 +1,54 @@
+From 294ef3529016c29769d10dee9e5f639c2ce02b91 Mon Sep 17 00:00:00 2001
+From: "Zachary P. Landau" <zlandau@jellofund.net>
+Date: Wed, 5 Feb 2020 23:18:31 -0800
+Subject: [PATCH 3/4] Fix parsing of sample config file
+
+This code is horribly broken, but we should at least be able to parse
+the authforcerc.sample file, and report the right line number when
+failing.
+---
+ src/config.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/config.c b/src/config.c
+index 4462fcc..66313d9 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -11,7 +11,7 @@
+ #endif /* MEMWATCH */
+ #include "extern.h"
+ 
+-#define BUFFER_LEN 82
++#define BUFFER_LEN 100
+ #define IS_BIT(x) (!strcmp(x, "0") || !strcmp(x, "1"))
+ 
+ static void process_boolean(char *option, char *value, int *variable) {
+@@ -30,7 +30,7 @@ void parse_config(char *config) {
+ 	char *option;								/* config file option */
+ 	char *value;								/* value for option */
+ 
+-	int line_number = 1;
++	int line_number = 0;
+ 	char *chop;
+ 
+ 	/* MEMWATCH: reports this isnt freed, why? */
+@@ -45,6 +45,7 @@ void parse_config(char *config) {
+ 	}
+ 
+ 	while (fgets(buffer, sizeof(buffer), fp)) {
++		line_number++;
+ 		if (buffer[0] == '#' || buffer[0] == ';' || buffer[0] == '\n')
+ 			continue;
+ 		remove_crud(buffer);
+@@ -123,8 +124,6 @@ void parse_config(char *config) {
+ 		else
+ 		if (!quiet)
+ 			printf("parse_config: option %s is not valid\n", option);
+-
+-		line_number++;
+ 	}
+ 
+ 	debug(3, "parse_config: read %s [%i]\n", config, line_number-1);
+-- 
+2.25.0
+
diff --git a/net-analyzer/authforce/files/authforce-0.9.9-fix-submit_dummy_list-re-declaration.patch b/net-analyzer/authforce/files/authforce-0.9.9-fix-submit_dummy_list-re-declaration.patch
new file mode 100644
index 000000000000..e6ca243fcad7
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.9-fix-submit_dummy_list-re-declaration.patch
@@ -0,0 +1,25 @@
+From d7f718e78444acef635acdd19e34dc4783e741fa Mon Sep 17 00:00:00 2001
+From: "Zachary P. Landau" <zlandau@jellofund.net>
+Date: Wed, 5 Feb 2020 23:00:06 -0800
+Subject: [PATCH 1/4] Fix submit_dummy_list re-declaration
+
+---
+ src/extern.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/extern.h b/src/extern.h
+index 6798bd7..cc08e0a 100644
+--- a/src/extern.h
++++ b/src/extern.h
+@@ -61,7 +61,7 @@ extern void initialize_submit(void);
+ extern int submit(char *username, char *password);
+ extern void shutdown_submit(void);
+ #ifdef USE_DUMMY
+-char **submit_dummy_list;
++extern char **submit_dummy_list;
+ #endif /* USE_DUMMY */
+ 
+ /* files.c */
+-- 
+2.25.0
+
diff --git a/net-analyzer/authforce/files/authforce-0.9.9-fixes-for-Wall-warnings.patch b/net-analyzer/authforce/files/authforce-0.9.9-fixes-for-Wall-warnings.patch
new file mode 100644
index 000000000000..083bb93d1296
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.9-fixes-for-Wall-warnings.patch
@@ -0,0 +1,111 @@
+From ef74da31208f1390bbc17d4c455c821f141ec78b Mon Sep 17 00:00:00 2001
+From: "Zachary P. Landau" <zlandau@jellofund.net>
+Date: Wed, 5 Feb 2020 23:17:50 -0800
+Subject: [PATCH 2/4] Fixes for -Wall warnings
+
+---
+ src/files.c   | 10 +++++-----
+ src/http.c    |  4 ----
+ src/methods.c |  4 ++--
+ 3 files changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/src/files.c b/src/files.c
+index 1068616..92d45ac 100644
+--- a/src/files.c
++++ b/src/files.c
+@@ -70,7 +70,7 @@ char **textlist(char *textfile) {
+ 
+ 	/* MEMWATCH: this isnt freed, why? */
+ 	wordlist[count] = malloc_w(sizeof(NULL));
+-	wordlist[count] = (char)NULL;
++	wordlist[count] = NULL;
+ 
+ 	fclose(fp);
+ 
+@@ -83,7 +83,7 @@ char **copy_list(char **list) {
+ 	char **n_list; /* new list */
+ 
+ 	/* find num of elements */
+-	while (list[i] != (char)NULL) 
++	while (list[i] != NULL)
+ 		i++;
+ 	/* plus one for NULL */
+ 	i++;
+@@ -91,12 +91,12 @@ char **copy_list(char **list) {
+ 	n_list = malloc_w(i*sizeof(char*));
+ 
+ 	i=0;
+-	while (list[i] != (char)NULL) {
++	while (list[i] != NULL) {
+ 		n_list[i] = (char*)strdup_w(list[i]);
+ 		i++;
+ 	}
+ 
+-	n_list[i] = (char)NULL;
++	n_list[i] = NULL;
+ 
+ 	return (n_list);
+ }
+@@ -104,7 +104,7 @@ char **copy_list(char **list) {
+ void free_list(char **list) {
+ 	int i=0;
+ 
+-	while (list[i] != (char)NULL) {
++	while (list[i] != NULL) {
+ 		free(list[i]);
+ 		i++;
+ 	}
+diff --git a/src/http.c b/src/http.c
+index 88acdfc..397ac1f 100644
+--- a/src/http.c
++++ b/src/http.c
+@@ -40,7 +40,6 @@ int submit(char *username, char *password) {
+ 	CURLcode result;
+ 	char error[CURL_ERROR_SIZE] = "";
+ 	char authstring[92];
+-	time_t before, after;
+ 
+ 	
+ 	num_connects++;
+@@ -59,8 +58,6 @@ int submit(char *username, char *password) {
+ 	} else
+ 		printf("trying %s->%s\n", username, password);
+ 
+-	before = time(0);
+-
+ 	if (curl) {
+ 		curl_easy_setopt(curl, CURLOPT_URL, url);
+ 		curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error);
+@@ -79,7 +76,6 @@ int submit(char *username, char *password) {
+ 		result = curl_easy_perform(curl);
+ 	}
+ 
+-	after = time(0);
+ 	/* num_connects jumps the gun earlier on */
+ //	acs = stats(acs, after-before, num_connects-1);
+ 
+diff --git a/src/methods.c b/src/methods.c
+index 3c74c65..bdb6efc 100644
+--- a/src/methods.c
++++ b/src/methods.c
+@@ -76,7 +76,7 @@ char *transform(char *username, char *password) {
+ 
+ 	strncpy(old_password, password, sizeof(char)*41);
+ 
+-	while ((cur_element = elements[i]) != (char)NULL) {
++	while ((cur_element = elements[i]) != NULL) {
+ 		if (!strcmp(password, "{username}"))
+ 			strncpy(insertion, username, sizeof(insertion));
+ 		else if (!strcmp(password, "{emanresu}"))
+@@ -120,7 +120,7 @@ void common_pairs(void) {
+ 	}
+ 
+ 	while (1) {
+-		if (common_pairs_list[i] == (char)NULL)
++		if (common_pairs_list[i] == NULL)
+ 			break;
+ 		strncpy(username, common_pairs_list[i], sizeof(char)*81);
+ 		password = extract(username, ':');
+-- 
+2.25.0
+
diff --git a/net-analyzer/bigeye/Manifest b/net-analyzer/bigeye/Manifest
index c24b47de0e13..fdab36185a64 100644
--- a/net-analyzer/bigeye/Manifest
+++ b/net-analyzer/bigeye/Manifest
@@ -3,5 +3,5 @@ DIST bigeye-0.3-gcc34.diff.bz2 2774 BLAKE2B 51b1c4702b65b3e6b484d17e500b00d26bd1
 DIST bigeye-0.3-gcc34.patch.xz 2564 BLAKE2B 17508c780f339aa2409616aa2bd4e37c3e9f8ba48626e9a3782ea60da2989d4a8543c8a97cecef34554265385b13019d3bc04a05c8809870e0cba20c72a76bf8 SHA512 c7005975a7b798521f0d8f7b646f168ff215c1b5a760e303f7cad8bb78e2324e8303f77a724bc6902ef7ee525d7e6dd5ccfdf366c39abcc436fc6edf503205af
 DIST bigeye-0.3.tgz 32462 BLAKE2B 509e958852d958f5fbb7197e567f8ebd1d7004027e4d8f3fe868d3af6719f76e445890a241d4438609b12695bd403fa246cec03b382a2c339d23c1456aa198e0 SHA512 73a146fd2f5df86a3d16dec05cf3f278393347f341a5cc319feccf6d23e1f2fe9d29070ac154a5b2336ade146843ab163e3545e9aefad1a0fa8903928d9b1ed0
 EBUILD bigeye-0.3-r3.ebuild 826 BLAKE2B 256f3468799929d0d3d15a4502756bb3c867aaf4e7b43e36970b3b8e0a8acc4d7af3f21d1a27873af05a2df33b5c9c7fc69b6a4a9b022ab012231e9dc5ebd504 SHA512 5e55b334a0201118cf00363a29c86846573666bb01709858d1f8955473aba0526da6e52c7b59dcb34dabff0081946a262afca27c6fe0dd0f004aa8e9b15efaf7
-EBUILD bigeye-0.3-r4.ebuild 837 BLAKE2B 4cee36264c8cdb5054c699d76b659987779b6b3450338a5b5463b490190ab263da46886cf79671d3cf419ee53cc795943cd36121aa6999927cb4ee233f4b6585 SHA512 b26a4f59598031bfcbd2c8bd82ed7b86764059c5a3e817a765516c7cd750f8f42890204e3063fb151fe74a43f44c51b0f5fc3e17bc9cf623a7995377b9c1cf14
+EBUILD bigeye-0.3-r4.ebuild 874 BLAKE2B ecd30f594b2ad015732344e249776b964a7fea18afc2668581cf710e1a08393290e6aad5925bb44441ca3339cbbc220da3436c216ebc3ea9ae9c11d5c68c7c97 SHA512 86a3afa38971842b7765731931c107e460fffbc1df0fbc075e23028a83f343a1eaade1cd84df8ca15741ab97dd0d4f1e3931778ced23a9bb7ea28d17945bdf12
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
index e92408b8df42..b349042d1ded 100644
--- a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
+++ b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="network utility dump and simple honeypot utility"
 HOMEPAGE="http://violating.us/projects/bigeye/"
@@ -27,6 +27,7 @@ src_prepare() {
 }
 
 src_compile() {
+	append-cflags -fcommon
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} src/bigeye.c src/emulate.c -o src/bigeye || die
 }
 
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index de6b15f08f3d..a235a3fa2f5d 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,6 +1,8 @@
 AUX cacti-spine-0.8.8d-ping.patch 260 BLAKE2B 4c6ac12fcb0fd31f6e53e46e5de39f34c565ee8ae1dbc947949ded2cc65816f697b6f4de40e0441c710b092f30a3b1eadf292b1065a17f385327c70071ca9713 SHA512 5bd91a390e352930d2b89f580fb0c3e93dfa9d52c86b16a0b8c036452088757e2b739aae05b3f07301a3ed94dafe6f05cc593b28359261b6664d002c907cfb49
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
 DIST cacti-spine-1.2.8.tar.gz 106801 BLAKE2B 813d4b6d4a4a632cc6d59c5c4eeeb37df78995ca5952e77204a9b5f8b599b34fe043b9f8c1ae81ad20600c08403ff06c04119db53bb03e37788fc11e5e39be6a SHA512 7f9a90f5e41a8a72d0068321b119f5ed7768fd7939bf5a994627b2f199158440639e88d31da35444e28fb73f8dbb57c1012f01ae09d24f0478d8e75a21bb942a
+DIST cacti-spine-1.2.9.tar.gz 106572 BLAKE2B 803d16b6708e4cc5fc5ea9a5cb49bfd535fea421a873ce9baf74e1de75597a5a4941a909219d729e291ff3201c0f9c2a8304381144d935778ef331779395c688 SHA512 668b25cb89fad331ae4bc726b797bbeade74c90500af348748a995be0de2f699264cd24e98ea709214453328058e1dba6399dca2074bb6ce71e0d4b434b9dee4
 EBUILD cacti-spine-1.2.8.ebuild 932 BLAKE2B 3e2b4334458dcc925064bb077de3ca579f77c4ea9ca1e9f3be99d83ca588c55a83bd692fde51a1e72120e8bbf803cddbc1c01b08bc17545018267b876bb5fdd4 SHA512 8d15cdfd14fdd29e7ce8aa205e8ad0a44c9763c774582d161840cabb1655f9ebbd47fe3c1610c056e16b77d62e1ab1679289ff05b4cb070cbfffa8609586e689
+EBUILD cacti-spine-1.2.9.ebuild 897 BLAKE2B 758281b5f3c9e1449012bcc8448ef79e90bc8930d16348316845721e3e2fe9d6aea8ab3599c3999199d5cfa2bbc92d93d2e485b29f9d4fa1fcb6989dd597495e SHA512 3fa686c3532650697c71c6630200cfe142dc24e9c224e82f5dfb89f40f665dc319e01276a21374025ad9f3eeb2c4dc109e13e0b2883cb26cfb5099f5cee6c3dd
 EBUILD cacti-spine-99999.ebuild 884 BLAKE2B 5df3c6c34e5b6d1fdf833d49a5a4cd1e9c6137199bd54879f47f632059b8cfa1d836d68f3f0abf126f66a0f78e6c3166a322b86df6f1b8f2acd709691f1e22b1 SHA512 7d2dface1745bc2847de70b2b8067822438b4d51d0039e1e9a9e4599d2ff64cbdc2d2e431a7e6d81694c1c23158a2f1f99cada8f374eff60a31ef9da6e6c0566
 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.9.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.9.ebuild
new file mode 100644
index 000000000000..a5c1da23c064
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="libressl"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-analyzer/net-snmp:=
+	dev-db/mysql-connector-c:0=
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin spine
+
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+
+	doman spine.1
+	dodoc CHANGELOG
+}
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 2a27bff4175d..2b5bb656e4b6 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,4 +1,6 @@
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
 DIST cacti-1.2.8.tar.gz 24881361 BLAKE2B 181b2eebf43c81a221b65eb9391ad758c05bb5871a35766a1f5323f453a0a6a533a1120963e04f7a01d4ac444942e37bf50a3c6cebe5f7261558142baad2f282 SHA512 e24d9de47a06c1741c7bcfe5c5f68a5a0f0cc2eb859fc930ced28f797f84ad537ff1a0a703dc8c26735cc4b54ba09699e33a30ac666e1f8ec2ec26ae4ceccde3
+DIST cacti-1.2.9.tar.gz 24906227 BLAKE2B 65a4459f9f55c55db853f81bcac6c60f146ba50f6dfd0abde449a41847afdb8564452ede1a493291c19ee7732ccc4a76d485af078021c7e0fcb6d1b265994940 SHA512 e50eb5587dc0274788b35cb701383ba897ab7c45a65efc7a8d32963b492c1ff1b96b0271ab7b6f9b53ad7dff5dd66b3ce4bd4a91c3ecf8ccd8d4b19b3ac972e4
 EBUILD cacti-1.2.8.ebuild 1010 BLAKE2B 9c967abbc8ab2e20b2b4dc8c54b5ff933fde488f5321f5bcce7459a97786f70a35a1162b92194f77b9b886e714b6b3b9f2488476f753488f445290d89ec088aa SHA512 ddd995b9afc9f7c9c1a8f95b824ad56a498b8d210f71bf81deecc4b823e6e4b6c9a6142343bd06e70db202c3dd8bcd7e2d0cc06dfdfbdca0d6face2ed0fae424
+EBUILD cacti-1.2.9.ebuild 1014 BLAKE2B 6a411ccf50676e6fbe8f67144d445a7519318ccf83f7003ad9b322ff8cd0c4871c8b582e646041ca1920fda51f6c7dd96f9e598eb0195a4e22abd603c5bd4d3a SHA512 a564373a907200a00816b135240c10eb1dc8741dbcb88a2488e43a4794be0194b470b55e31c481ccc36b75d1b7dd6a2ed761bc48f02944562785db311b35fe8b
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.2.9.ebuild b/net-analyzer/cacti/cacti-1.2.9.ebuild
new file mode 100644
index 000000000000..66775efc3b40
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.2.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_compile() { :; }
+
+src_install() {
+	dodoc CHANGELOG
+	dodoc -r docs
+	mv docs .. || die
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index a40b72523f82..d0fd73d7e2e1 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,9 +1,9 @@
 DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4fb8c700142480ba0212072d8820126bfabf5dd417835bdac5f5b65d599c6dde859d8c57267e90cfb569dc4a2073 SHA512 ee53f2e8dc3cda4f588c60da5227d3d71550496ddfdf5bdbffced25bafd442b8e2352a9ad9f27bf76489903b5b779cdb9614963342de907c1036ae9268b8f35f
 DIST fail2ban-0.10.5.tar.gz 520460 BLAKE2B 872b1b2d96d5c79b228cf7c38923161336e452c33fddce75d25004454a5b5d119d435aeb789d55576de4e24bbf8d8288d9fc2fb3f17323074a27857a08e3c6a4 SHA512 d2ad64999031537f2adfc01efd02d2db0718485e38745736339c2e3a1792cd82147fb6cf5a3d371d83dbe91d1afe34e741e038ed4d84d6f444ea1922dc4bb658
 DIST fail2ban-0.11.1.tar.gz 538660 BLAKE2B c88765ac3f49c19e0570248891814c647f2c3515290982de21c7b6c377508189fa53182fca84d62f61b231e250395992e8cf06cc61394dd41150f02d8a254f8b SHA512 019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6
-EBUILD fail2ban-0.10.4-r2.ebuild 3253 BLAKE2B b5c9029ea540ba99cff9a91b19ace9a94080092c0ad283f973c21a98c405ac59432d11b3353c1dee0afc562910957b215d22b76bce9ee2db2ff5aed71725dbcf SHA512 9c5d57795148503c6e3d94f9b120b9798f3b5f816bf0d508afc1eaee12d80c3c181d859f7061fd8e7145f3633a11bb4fb501baadc6d8eddf87fae6dbb5e06637
-EBUILD fail2ban-0.10.4.ebuild 3210 BLAKE2B 803d84132701b9f7b832322a8058a883751ba6a57cbd479470543c3743fb9e5628284eba1d930da0e4ffee56dcf541884c7f880827c5bf95c1512995d185b3b9 SHA512 7e25b8c1f8271e4d45cc39427255ce5b29a33140cfac31820b2bcc7493dc02cf5b31de3e0701a79d60af7baba52e0b35659b5865ff7b29013e17e218297caa9e
-EBUILD fail2ban-0.10.5-r1.ebuild 3375 BLAKE2B 2caf8bb71a3f8383545bd1a838cf97d8b251b663440c69910a7d4e2de293a5828072dfc499d5b151a2540a855e44aebba683adc0ff49f9e490abd2a74da765d3 SHA512 79b65d7c462988fad37a8d6a92d2e2904240ab1a52adb7601d1ceae0a22bf9f0f7c58ab1cc01dc45e4eb860cb41c01b10e5e766ade479f70b6407dbc13a895b9
-EBUILD fail2ban-0.11.1-r1.ebuild 3325 BLAKE2B e860b1f850a3a2b1e8b45ec1fdafd6847d6699c68d9c623f09f1292c33839c436f22fa80bdccad83b9d542fdd4ef7a89a0a3e8de456c3063a058ee510e751bf3 SHA512 413c0c0f67cf4fbcc4c91e79400b52dcf9a448bc7a5315e9089dec70f2cbfabe6256b436da7cda8557ec84a0abf42c4d6c0284b97a67b7ccaa09afaabb301ca3
-EBUILD fail2ban-99999999.ebuild 3254 BLAKE2B 88ae6054ad2c1bf962ad98f8f53d5bb11a01d21077712a5a6344312169adb6272afbb9a2fd1b44e0235f4752052bdf3e0e0cded86da48e9051953322049e6205 SHA512 162c2f7ab46427731c87bb12f07392e04bb9a8937540027adf725462bb236bcf54d07d3ddbade544768d7bf7023725edca6d7f452f31e15f1b5731b2681bede7
+EBUILD fail2ban-0.10.4-r1.ebuild 3216 BLAKE2B d807e5422811d4a703133ee2b435926d4f3aa17f94281ded5972374180203a7baa3045c7f3a306be8a3e9105250a06279e097544378c8e9ae82003470eed9de1 SHA512 1ffb020f2cfa7927553a6715be23681d6f7917273036af304b4e44bdab1342662824efbf3c9d5822bded8bf552eb4bfa1d439d972ff27f282b41ed052442a74f
+EBUILD fail2ban-0.10.4-r2.ebuild 3259 BLAKE2B 1f10e15e5baa979906974fdee8d6a3050f9570b2861dd72ea2b4a7282fa1492885590fc22e9d5445f79720f1f52f65544ce286c57e43ff73156af5b2d038fabf SHA512 606d8b0bb9f1b66a5b65dce012f19e3d90231d033bc72dab513af2179bad23b0cf96378f65b3437c73c6c38a69ea91a71e65d837a1afcead25312ffbd3abb8d9
+EBUILD fail2ban-0.10.5-r1.ebuild 3381 BLAKE2B 27c5f4a366091b2e64c8cf1b133bdba9739673a85613ef5130d42eee7296355796c2b9c862129c41e2b0a4e3881bd23ae7cf47781c08c4b91689f75ecd0f2bf3 SHA512 6021f943f4d5bf45b137df2631c73a16e4e38dd4a190d059b401179daaa4938ed94b55eb769fed0bb96eb2c9ca054768fd50a9ed74438730635f2ecf41bf453c
+EBUILD fail2ban-0.11.1-r2.ebuild 3331 BLAKE2B 2b9c142ff0c09146bc13f1fc948ce6ed4bf24c1f579c7eb4c37e427540b031a7ed9b110e4811ccc64274e4ff0d580e88968440f7f5b2217b278ff617df5387a5 SHA512 0e319a557b1defbd9ea3b21185e93f8aef6240d397478de3747392f10a7eb6b91bac9e6669512b63f08c6c749e2e9b76bda66b5b55eccc82dac29e35ec802d4b
+EBUILD fail2ban-99999999.ebuild 3260 BLAKE2B 1eb373ec59419250e94593453c2b3940c4cf6e6df0061b4c019d8df0b783a88a0ec4d36c29bc004105eb3f25f29989d25a11a00e9cb5b8b3ad9d770549fd8d0e SHA512 d85e54971603803631fac51ad5a65fbea837dbae3ce9bbab0a5f26af4e501261362aa71b7482933e6398727894fb5b99c6453779ec378a40f401fd9708cbd0aa
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild
index 7acd5a03851b..1db3b7bffdde 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 eutils systemd vcs-snapshot
@@ -25,8 +25,8 @@ RDEPEND="
 	virtual/mta
 	selinux? ( sec-policy/selinux-fail2ban )
 	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
 	)' 'python*' ) )
 "
 
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
index 85730ff0b684..652d96b809db 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 systemd
@@ -21,8 +21,8 @@ RDEPEND="
 	virtual/mta
 	selinux? ( sec-policy/selinux-fail2ban )
 	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
 	)' 'python*' ) )
 "
 
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild
index 56a0f3046d23..e00569c23f08 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 systemd
@@ -21,8 +21,8 @@ RDEPEND="
 	virtual/mta
 	selinux? ( sec-policy/selinux-fail2ban )
 	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
 	)' 'python*' ) )
 "
 
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
index 8481a7ca53ff..12997e0f764a 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 systemd
@@ -21,8 +21,8 @@ RDEPEND="
 	virtual/mta
 	selinux? ( sec-policy/selinux-fail2ban )
 	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
 	)' 'python*' ) )
 "
 
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index 1618b1f20e24..4bde96c6afe5 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 git-r3 systemd
@@ -21,8 +21,8 @@ RDEPEND="
 	virtual/mta
 	selinux? ( sec-policy/selinux-fail2ban )
 	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
 	)' 'python*' ) )
 "
 
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 8bdf9d522260..1a350d330bc4 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,6 +1,6 @@
 DIST goaccess-1.2.tar.gz 423103 BLAKE2B 87c527a52db9fa69d6e6a02ffbda64a6a32e6214ca6bc1f2654e1451fe5d73e7caa02cf1416c93c511bee329b7885e4914fb7dfd37562ef5347ea3912d030c14 SHA512 bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889
 DIST goaccess-1.3.tar.gz 541374 BLAKE2B 55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019 SHA512 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
 EBUILD goaccess-1.2.ebuild 1398 BLAKE2B 8c819456c94145829b9509e8938790acd090831fb46efe02d32b6494eef9004f77fd264e36927cba70c2517a41e8fe6782b781d59643bda826fff747083a39ac SHA512 b08146d7354977cc33070b01807a5a0ce86a529bfe6002e2a900a4e263d562566477de61ca24ffcfaba9974deae93a525d2d930b0bf2725583440ab39fdc0d3e
-EBUILD goaccess-1.3.ebuild 1514 BLAKE2B a0c9c26a6300fa49c3b99778b2e2fc246939d9d21229cf61107a3ea2be381ff972b6d1eee28b09d09d40d84f25db3e02bcd0e250c8318d6fe5981b4209dc081f SHA512 d9f9425bad510a2c454cb717e6ecf35e6342513288b14e8a80bf11f0bfa7889381af95f5f84c486a7bab8f1e4257306bc0a24b636999e461a36e00eabeb4e14f
+EBUILD goaccess-1.3.ebuild 1512 BLAKE2B a97b3b51181914e8d410f05eae40dc74eeedfe1208da4b4482e8ed9e4666722edfa09fa78add572aabecb46a118996b8a2dab7cdd8f0ce50fa790e3df29159cc SHA512 76223212a4e7978f9648e4d15e58d6658b5427a4f25ce5280bc5e3037ad7df6a35179af4b47c6b7775dd3fa2c3089a0212bdf1f27794863c8155d8aee953f261
 EBUILD goaccess-9999.ebuild 1462 BLAKE2B fe2a895d73c2ee02481cfce7883cafff413eede2717428c98cf581c1854ed10529b6c910c7ae1c096e091845d73a204075d745fa51f7721d223d2a938f402456 SHA512 572eaf67fbfeaafd8d3783a75400f179fc2687f94d4410a2091d9f264b795273775af810e60309cb9e82618b20c70f8ac7502b3b5bb996c5af727d5d40368e55
 MISC metadata.xml 1111 BLAKE2B bb28688ec15c422d544dc1aabb460a855687dffad74938643efc545c6c99b2369ab19db620dbaa047f0644b65ba355f4f0e42822400478a5f7d5fcf8960abd7f SHA512 30623dd40bc45ab6bb29f2413a62dd17c66565f9261c3f8b764b97e3b300078897b573b5ebae7f021408792da6d518c294955b8a1fb1dd58d000c4c5cfd0fb4a
diff --git a/net-analyzer/goaccess/goaccess-1.3.ebuild b/net-analyzer/goaccess/goaccess-1.3.ebuild
index a38a46ce6f72..2a0e8b7a3841 100644
--- a/net-analyzer/goaccess/goaccess-1.3.ebuild
+++ b/net-analyzer/goaccess/goaccess-1.3.ebuild
@@ -47,7 +47,7 @@ src_configure() {
 
 pkg_preinst() {
 	# Change path to GeoIP bases in config
-	sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess/goaccess.conf || die "sed failed for goaccess.conf"
+	sed -e s':/usr/local:/usr:' -i "${ED}"/etc/goaccess/goaccess.conf || die "sed failed for goaccess.conf"
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index 05ab059883ef..9d7bec1013b1 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-fosphor-9999.ebuild 1317 BLAKE2B 96e8537a914531ffe116cf98900e3db6354834240d888e7d0f3206fefa39a911dede7f19585fc09eed34b212a2eb22eb444eb981b5d05275c7d19c3f78202de7 SHA512 38ea427606c212df9cb458c58acfccbe6d7e832cfd3dbbbe3052918ed7fe57b40516bb8f6975d2b390ade664a8a05bee43513884c4f174754d134642f0eb902c
+EBUILD gr-fosphor-9999.ebuild 1324 BLAKE2B fb6e43ec50f469d9fe71b1f2ab3e275c94e3f552f9a034ac86fe8253c09ecca22efb54390dabcd2570ad9484132d482d8805a836886fe56dac45db5963913421 SHA512 eeacf7ccb39e22fdb31e3b6035b57d68b151455ce4219ffde6dcbfc11a7280fa6253ea0fde990395212a38dc09bfd8e39a2a3b690168cf3d76ddaf4c7107dee6
 MISC metadata.xml 308 BLAKE2B 365c82d2c544f94f613bee62f13ab91dcbefd1652fccfec5222a616443714400c686eb5d77c892b44ab0c1badd1877b4bd0dcb9040c98720c13934d567482857 SHA512 cca3e1ffd2ee31e64dbea0f66093f3295b9e1ce2161b9b71dbd1d518a6a0ff83843c684c1c958bffb80b4f4fda9d5a272be8d6ab2ecf6f0fe57202a65a218df9
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index ca6af0c3aa21..0eceaac74e02 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ RDEPEND="qt5? (
 		dev-qt/qtopengl:5
 		dev-qt/qtwidgets:5
 	)
-	>=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}]
 	media-libs/freetype
 	dev-libs/boost:=
 	glfw? ( >=media-libs/glfw-3 )
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index feeaeac3b0ec..bba222949119 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -11,5 +11,5 @@ AUX gsad.logrotate 325 BLAKE2B 00fb4953308bbfb47f328a88541778adb2f8523108b72058e
 AUX gsad.service 434 BLAKE2B 43ac179a66d1f4ddeecddae1804ff9bbb48ddce7e7cd18feff6c5ca681ecd5f6401e1a26b94b6f5d5e83a9e59bcccf2f773edca50d1d2f9abca0934ac813fd40 SHA512 d842531486d852b710b512a631ddde75bdfaee1db097e024f0de439d9c8c3ed699f7116a685650f1acf23b1be982987d38bc16a0c3bd4c6405b16c8cffc5a476
 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-8.0.1-r1.ebuild 3249 BLAKE2B 4b5d19930f9f1156961b4f9fb82e8393193d752aea82212f3f5c7ad3044bc9a1b6a7ac5cfe5f6f7bed174a7092caf28435ab74a2a4e994066d5cde73a9ab943d SHA512 50d53ec5df7ec44cf5ee483072903a0885b84a5c6c5fba1d8e1dd76450f14782479599096ab61bc7b4d70aa4ae95454fe088e731d94f04b71918cdf43d2ac892
+EBUILD greenbone-security-assistant-8.0.1-r1.ebuild 3207 BLAKE2B bdf238bcecce4d580eb95a199c0f219eead7b792d7f602e449ccb6da83dfab74faa748e4ca96df323ab70234c0b697074a962fb7e7c2c2f298bdd1e8d1676321 SHA512 f383fc91f3fe1c150274bd51536f0b8759bde9b3184bda8af3c6d3566c45a501f591bd823aa8b8fbb3180d35f05679cfcb342f1acdac7e823d3f0f7304b47ec0
 MISC metadata.xml 961 BLAKE2B cd5edd05b4ebc657f40a20a5edf6d33e065ecd5ae6971c36c1640999b1f4e05382363f288cf57dd56ad8c4cdebd307cbaf86fb80b31ef478e278e03293dfe72a SHA512 a5d74e05d38115b2741f5d4f8a781a07a434976dbad9c427701f50a38efc5db5d18f03bd6e2eaf617c7e6c05c2616249babb0bc5dc857f16a509fff85598d3e4
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
index ed0bcabf18ff..d616891de50b 100644
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
@@ -85,7 +85,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 	)
diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest
index 43039e828b22..66916b72ba5d 100644
--- a/net-analyzer/gvm-libs/Manifest
+++ b/net-analyzer/gvm-libs/Manifest
@@ -1,4 +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 2316 BLAKE2B ed1550e7098886438d6523764907e9960577273d82e128013696b6870ce7cd26663ed41b092538223355424211990beb642de28a741fa9e05082d21a9f312ca4 SHA512 0b22bac05bfaceba7eb0526778c2ec9e2f7363e3bb7555a5261ad18e0708550654618a7098c2ac561f465add54a80963b811c3cc4c2926cd91f4ad11bcce2c0b
+EBUILD gvm-libs-10.0.1.ebuild 2274 BLAKE2B 59cf5e18a5a5cdb0fbcfed7ef8772abf9c33e86e1051c12dd3450993e6a4778967197e8bffdeaf7fdb8d4928bdb112889c7f7265cead065dea656e41113ca507 SHA512 0896c4be88d76dd7a08bfd79a5c5b185035779238545c8f0cdbb3ef207b8d537e0c086cba25c6c6a048696bdcb28d4c5362f3b312240c600ade1708436315428
 MISC metadata.xml 790 BLAKE2B c8eaf3364b9acd770faf586a9f1062da2efe28c42342a59ad60fc8d65f12c2f459d8f24e99f216fbf9c219b2444f72e4944a5c806cb1f5283d8965c258d7bb1e SHA512 267856946386f023fe1eaf42794652126891773f578bbe7c0a1d70bfc107f46e49bebfeae6e485def0104dd9ebcf17f890a4cfb59c3362f29badfd803d3eb06e
diff --git a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
index aa6cf0725a7c..ebcbd5996319 100644
--- a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
+++ b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
@@ -70,7 +70,6 @@ src_prepare() {
 
 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)
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index fe36dc3d38de..a34ec514eac1 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -9,5 +9,5 @@ AUX gvmd.init 598 BLAKE2B 92533371b043ff4752869d44702601f214233e4eddf0ecac74555c
 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 2938 BLAKE2B 2987e33ba66d99eec4f77ceb49f4e8a214d7dc32bc3f5c937e78d73bed550e0fa19f746109c6543c1fc5b04a31c659254fe5b3d8099fdd853417fdd77e952802 SHA512 027af07c0b11c5a10cbb2fa6f9d1ffaedfce94c4aad51b4e0d38ea67614ea6503acc994425a5aaafe5d929862e337cf63fa9d9d283ee43beefb3c2c0542fb191
+EBUILD gvmd-8.0.1.ebuild 2896 BLAKE2B b882c80f53ac49d1ed63f9666a124dd16c2f391587de6b23256e4105cab6549973b97dc83f0afdd24506b139059dd0c9cebd943845bc8db895291f78889c681e SHA512 527c8838fed46ee3b851b6edfdf62243e2b64c99dea52e84f345391f124e783266ba21656295b5b9688c1f2cfa2b732fffc7c34c6fdd0a010cf7a39daa17b7b8
 MISC metadata.xml 1051 BLAKE2B f0773c3dbf8eabb4823bb5f3f9b70c6374db7af731ec828a2d295faed6c4c587a64683661a915d92ddf1bd3e5f623706a036d5a702d8271e5a310234ba22da08 SHA512 efcf5992b893f1e2f5b1a905e4f331ea3bc1446e5c1a5482b4dffdafd1b6f3daf9847a9164d74588463740f4c87925f4db47722fbf87e6beda2909c1981bd339
diff --git a/net-analyzer/gvmd/gvmd-8.0.1.ebuild b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
index adb7ef65163d..7289dcd5f82a 100644
--- a/net-analyzer/gvmd/gvmd-8.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
@@ -69,7 +69,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 	)
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0b7aafb1f981..4beb158173b6 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -3,8 +3,8 @@ 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.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.2.ebuild 4717 BLAKE2B 8e38d240efc835a3c86d0b6886beb2bd557843dbb80ad749d984c90a9bbbe21104c8fed0f78e20c263bc486bab84706552344e7c20daa768d7ff2313f8bb0a87 SHA512 7ff4110d5da9291d332e32499c0076612cac2362a62f0922095c79d4cced1ffe33c7c9ad94c6d359729b577f2a1faa4f599da5c6183d5166c08b2413999821a0
-EBUILD icinga2-9999.ebuild 4750 BLAKE2B 4595a0f48310eecc9c20b579634e9bf8a33660aae2aec1e13befb4c58a3d78a1cdd1555fe71e44ec9a39eac3db87a933c215acd83857e132c0e961bfda21ffae SHA512 858f889623bdec040645878b8d95aadbfb9883e9490c792041eb7489223cd098a45c8c1f830cfb086c3b4bde3c9171bcbe1003c1407deb7f4d31ea966f5d6f8e
+EBUILD icinga2-2.10.5.ebuild 4709 BLAKE2B d0845090fef35d3cf81199828feb99c77280992819b54ab8ceda416ee804d6aeb0d2a4bf5e12a3afa4ce4355f1effb6d76855d423dad21de51af01ddb1b52351 SHA512 5e809bb80f71c37e4907aba356af2d9fef39097ad6d3fc781053bedde7c1d0aa056a7a1ebbcb894fe8c49e5be9eb676bc498d7d42bf17466bb1152ff471d29cf
+EBUILD icinga2-2.10.6.ebuild 4696 BLAKE2B cec7ded142d745732fbbe580a1d43edd3264b810d2741f60740934e0049c210d96e2068deec04103ed042d5b4d6f60a3dba4dc07fb53f1a415698916bbddfa2b SHA512 62c88a11858d7c4cfa0f4fddb975e98381c2dd8a04193ca9c88657d886ef2548cdf57459dacd10078cba2c4ace4c823c48fa70edfeca768807364a32031ac394
+EBUILD icinga2-2.11.2.ebuild 4687 BLAKE2B b26cf544dc247130e9b41bfb581bee80ba2278ea52aeb497526779ed054b66421edeb7ecbd0f2a97f24210596de81878b4c59c259de3739afa48ba6cecdd54dd SHA512 c9b4ee74dd75fc7c0a794b8c0cc9adc7cd154ab93883af0d2f332cc5c440b0b75d04bf82f635eef43bbc4e5ef3b4167ad5733565dc2ecc4ce92bf24baca0929b
+EBUILD icinga2-9999.ebuild 4720 BLAKE2B 47eb8721d739b6d4e8eb409b16714f81565e570feec237e5d51497978be39184c83e9a07ed9bbcc921edca30634b910cac31f63f3323d85d9f0b9e44ff081187 SHA512 ea0e5404fe519c7548fe915d64d1a10a50ec0163e90c7542131394c36d4736fa705e4ef0faf13c5dc6bd2d986075b0bbd7e1904775cd7e221a272e605874bb40
 MISC metadata.xml 834 BLAKE2B 49da117c90fdfa30311744b471933f1de2d106b74704e4daef5c33fa71f7aa99c6f05d5ca1345baf607b8e18f4036a9582f95487587f50bff90d6ac2d6c1ad48 SHA512 2e28e73e56153235ce7a69ee3f320cd6a8b9117ed6633deaf1095051d75c2c2fb499ff3748fa74262e84b340082dd6c6f08489549486d2dcba6b944d4cf460f5
diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
index 688e1fd1f38e..7ac8f150a99c 100644
--- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
@@ -63,7 +63,6 @@ src_configure() {
 		-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
diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
index d287bf41cefe..366f6b20e82d 100644
--- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
@@ -62,7 +62,6 @@ src_configure() {
 		-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
diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
index c01fcf4d1cd5..65f6fb4f7fbb 100644
--- a/net-analyzer/icinga2/icinga2-2.11.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
@@ -62,7 +62,6 @@ src_configure() {
 		-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
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 39558b4834ec..1f48b8612c0c 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -62,7 +62,6 @@ src_configure() {
 		-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
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
index 5f75ef3cde4d..c1250003b462 100644
--- a/net-analyzer/mk-livestatus/Manifest
+++ b/net-analyzer/mk-livestatus/Manifest
@@ -8,7 +8,7 @@ DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a387
 DIST mk-livestatus-1.2.8p26.tar.gz 453508 BLAKE2B 75338c65b2c323d4ef2637ef2507f6f213bd3b58a32c0bd377a3c0c0ead34c75394539eaec08d40ee9ea16ca2534158ee4c6823387f3fc3648a02a22d86e0395 SHA512 8afeb6e750d7eb310380153af91f9c6f889f6e350e26dc97f923a49b2e3cc6c0b866f893664ad5d9fd9c0e8671b0a69e1267e464e4de9faf75a2eb24536ae014
 DIST mk-livestatus-1.5.0p22.tar.gz 477418 BLAKE2B fcb33852fafd6ddbbae5fc2989dd694200dc046386e3add07afed0051c2299828afdd13c7e13a862edf10ecd25d522817d1248b05b0bc73cce4e6f4962ec0f1d SHA512 a689d20230651e4cc6708f678fda9c34a4834b68580bff3b012eb7ec7ff2bbd70dff85121e73665ab0266831f36338bd0976731f7d4a68a2595757dccbcac9b6
 EBUILD mk-livestatus-1.2.8_p10.ebuild 2680 BLAKE2B 728452886719f88780462c99d9f946028b5d19efeae9b9838bc4a65bc6b3d8237938cb7b6d7dd499c442ace03390aee0f93932409ab9f92afcf73c69abfa0bea SHA512 ccf4d955a9d2e250e4c6b2f1619ced6eb54486a45f4f19a47717eae2217d2372a177caa6e45b85de3711bd15c977700a2d6fc9860f1a640c1e3f049c07d78d8b
-EBUILD mk-livestatus-1.2.8_p16.ebuild 3422 BLAKE2B b74281fdd86bb819ead989d84c3feb3dbf3d7d24fdd4dd8ff723445dfe94e30b3cf3daf25acb8da3549d5c907524df1605cfe51679cf02d17fbc12b6552dfbc3 SHA512 af5de45ec84d07af5c10b47b74e2e4f752cb85a913981d3c4a0ed4202c781506148314959dc8e360d92c94d944dc956b5e5c2268f563d26e3432fc33c644edab
-EBUILD mk-livestatus-1.2.8_p26-r1.ebuild 3458 BLAKE2B 377a5248a9c79b7a5b372ca17fd3589c1a503c7bee8d0f6fd1c0fe7763be532d000aea495eecd9332db5000a220edb6f08997380b993fd8e59693d15ca381f2a SHA512 e4ebf2170393ca705be4defbd6a439b139bdde80e87bf357981b5cbef0283708f270b05f74e47bc6a42dd6bc385d4a4e6a7a09250d64d874280b497dc2a97126
+EBUILD mk-livestatus-1.2.8_p16.ebuild 3420 BLAKE2B 59775b2547e7ae149f6b7ae5dd67fe6605342be8d14aee7c4567c7126f474958e91f86fccc944fc293e49a75dc433618ac9b5705428317e043064b88ed083617 SHA512 8eb6c264497fa51c468056f5a9d18b8869f00e304613b44e23085473483c9e6da71f2dcb80f841e1a6ec501c396192235f2506bd2f2a97bb4b3c543afffb87f9
+EBUILD mk-livestatus-1.2.8_p26-r1.ebuild 3456 BLAKE2B 5aa345a5411a3fb01cc9a120f27bb19dd84c92f9c2ae26f4c11461baafdc86db14306b401bd44c2bf2dc5598afff21174ca84ed664c065020c485092ddad93bc SHA512 1af491259f2c8c6ad0cf1d2ad2414cab89a3df7dbb820ed2f80f61c1417fde1a099e4efd7cafd9b9c949fb9b20831e2f6d2bc9fe347bee2eb10b6131a709e2a5
 EBUILD mk-livestatus-1.5.0_p22-r1.ebuild 3562 BLAKE2B 26e5dbf7ab2d0fba9d357f55dbcf665d510f1a9f27aa2f2827711224d44524a462106b3e39aa091e8ab8009db1d404ed6a0a0e8e4fb8b526d182f8a5ce652d9c SHA512 0a7854b54d63c01473f07a01ab5888d3b0fa62288599ecb552142123a9154af15c5697deb7c36c7e13c8910f976e86f553f7bf65b19f9196965df4fce8dcc328
 MISC metadata.xml 764 BLAKE2B 6cdc02ae09a5f2ee8264648a31feaddce015eaa21824d2466462dc359ca4b9eff656d6714e6e7bed8b6312d10a8e89712287417fee55cd8bf1707f5837849298 SHA512 a113631d9036af5c65ecd6ab393ecd14af3c05511f8c99adac6106a7f54ec172c2bd86eaa5289021baebdb65c62d1f26e72a13ae47aab8245e4e4da8f19142e2
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
index 8c27e80b89bc..aa104dccbeaf 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
@@ -111,7 +111,7 @@ src_install() {
 	cat <<EOF >"${T}"/nagios.cfg
 # Ensure all data is set to event brokers
 event_broker_options=-1
-broker_module=${EPREFIX%/}/usr/$(get_libdir)/mk-livestatus/livestatus.o
+broker_module=${EPREFIX}/usr/$(get_libdir)/mk-livestatus/livestatus.o
 EOF
 	# same for icigna
 	cat <<EOF >"${T}"/icigna.cfg
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
index 481cb302ca67..071250a73b6b 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
@@ -113,7 +113,7 @@ src_install() {
 	cat <<EOF >"${T}"/nagios.cfg
 # Ensure all data is set to event brokers
 event_broker_options=-1
-broker_module=${EPREFIX%/}/usr/$(get_libdir)/${PN}/livestatus.o
+broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o
 EOF
 	# same for icigna
 	cat <<EOF >"${T}"/icigna.cfg
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 32ef375aee1f..d8e90e02f2f3 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -17,8 +17,11 @@ DIST munin-2.0.52-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051
 DIST munin-2.0.52.tar.gz 2266820 BLAKE2B 41233cd28ce4d682dfd47895061426404540c6b1c65798609a2d509d39ad5359b22087027662e7c03848e5676815843c34d078b782e3d0ab3a6a29b6a22e058b SHA512 7439ea10006a94227b71328d06411378f6855f23f17815a433b3a1c40ea23da5a25a366d48f911b9cfdc43c4b98f3bb9777b67db2b894441eb8941e84ede379c
 DIST munin-2.0.54-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.54.tar.gz 2270295 BLAKE2B d0f573a46eedf9e9a7de61428de6c2261f6c9fddd3aa5696966c2ffdaa82a432dca72d60cd2e4b75601f312ad07918090a9dd45a10e3c9c81371b97200e28b12 SHA512 b9a8c7403b34d393115d833ee41e3b5c325e072729b66f6b8b7fd3546ab4660e59e59c6f192eabb706e2bc9c73aea9c50c880c2c36826c5f2962bca46098e732
+DIST munin-2.0.56-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
+DIST munin-2.0.56.tar.gz 2271203 BLAKE2B f3df227b905ab794e2253637d367819eff2625f9e0f2355d23916b033b3b23d14bb64a78bf6a334f0c7a1859e60c227d1f754a2689bf291cc5f43a46986d35fe SHA512 111b9b8d88474f480eac1e304a92a52c2295d72a1c6709bb2942ff6ee0ba26a56d25dc5d0cf08ddb98a23d6d9693ad0cddb2185e10df83d553655d017d102b1d
 EBUILD munin-2.0.49.ebuild 12302 BLAKE2B f943778e48a625a0fc342ca5cc7d9323092ebbbd4d4fbce281d11d11f0d68425a734290ac2e63b3e221fed2fa6ce9b6a52dc99c4c0ac23c1fbecaaa599ce31f8 SHA512 fe270e67ff999c30c5f88b6b9ef4143de37b2f4e6708dac876ce35f44efd8cab7efec1fa08d49466e091e549020384676b2b6598d3a21f7811cb143fe3e89faf
 EBUILD munin-2.0.52-r1.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446
 EBUILD munin-2.0.52.ebuild 12389 BLAKE2B 4e1046e310948f97ed2469cb58f67c4c7cc6b66ef2fc401a409f2069c2c3b717a1b76d5b9f51add689c00e7daa6a555e927b98f9290ee7e24aac81202f17c557 SHA512 3f1edf0c2c9a35f17794003e143fbde255f60527e0f595a40233b63c1cfaf3bb00416902f6f45941c597987eb292d6b507cc8eb3720d2a17793607f9099ed823
 EBUILD munin-2.0.54.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446
+EBUILD munin-2.0.56.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446
 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/munin-2.0.56.ebuild b/net-analyzer/munin/munin-2.0.56.ebuild
new file mode 100644
index 000000000000..80f46fab8967
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.56.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	acct-user/munin
+	acct-user/munin-async
+	acct-group/munin
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/Date-Manip
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.5 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.5
+			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	echo ${PV} > RELEASE || die
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	dodir /usr/lib/tmpfiles.d
+	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			keepdir /var/cache/munin-cgi
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/cache/munin-cgi \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/cache/munin-cgi \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/nagios-check_mysql_health/Manifest b/net-analyzer/nagios-check_mysql_health/Manifest
index 0ad164b56437..2a3bb5882c53 100644
--- a/net-analyzer/nagios-check_mysql_health/Manifest
+++ b/net-analyzer/nagios-check_mysql_health/Manifest
@@ -1,3 +1,3 @@
 DIST check_mysql_health-2.2.2.tar.gz 140250 BLAKE2B 7bdbf5398ed2219ec9a254906c2e0b38160fe8914c218388a4c9f06c401636e500290dea42b420da7881e6dd35116e0f5b54bb448b304c84714bdee610c74d92 SHA512 027e47747aba524d8c7d168f6c440271434db2e152e59821eff06449d98919ab343a7840ecf73a1fcbc864799d6d3094088bb06f6b36b16989a5184676ae2628
-EBUILD nagios-check_mysql_health-2.2.2.ebuild 1137 BLAKE2B e34369c0b08ad6cb83b2ee77593fc56be7d47ca8af359c092b4bd4dee790420d3e111810f2b94bfabaf5fb8f2c2847548efb79b22e866b3211666c5b117d932e SHA512 ab5a5482464904588c9eb57c056c36aeca02dd05088728f644bc46dc292fb4219bc3436846e94f5c0d2197b017506231749c52370b92661e01840548408331fd
+EBUILD nagios-check_mysql_health-2.2.2.ebuild 1147 BLAKE2B dfadbabb0493c094740588f814b805233ff4ab4515b7073883a8132e610dacb7b70902c979a97e30bb932a508e76aeaf364021fbc88753a6884d6025cea673e9 SHA512 bd58c23c5200f5dc43441b954e7a1cc0a0badc1c1e996c87637db5ab92fef0b3333675a85b5978641c17341896987b725489f434eb541fdeb62c1543f3bf7115
 MISC metadata.xml 256 BLAKE2B 0a1246bd85dce1cf03b4bbd67a011b248c44282442dd65e9c7f24aa4f4c146708fb0894054418a5e42588a0ceebc455eba9518903cf764c1c5f3563666e44e35 SHA512 2c63ddb5d1254a9c4c14b6a41b12a2152d2230fe5c79fe7e7e2351dd23037c7422dcff80e1731259c6a233020bbd5d438ec1c2ad0fba114ec33ea97a4dc5826e
diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
index 1cdf11b0c497..cc1b881283a6 100644
--- a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
+++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN#nagios-}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A nagios plugin for checking MySQL server health"
-HOMEPAGE="https://labs.consol.de/nagios/${MY_PN}/"
+HOMEPAGE="https://labs.consol.de/nagios/check_mysql_health/"
 SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/net-analyzer/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index cc6c463970d3..668ec907caa0 100644
--- a/net-analyzer/nagios-icinga-openvpn/Manifest
+++ b/net-analyzer/nagios-icinga-openvpn/Manifest
@@ -1,3 +1,3 @@
 DIST nagios-icinga-openvpn-0.0.1.tar.gz 4637 BLAKE2B 365b6450cccd5f7f25348583eae45c0b15932ec1e858d375171911e4108dd2b7fc133559a35399ece8d2a349f05b2f51897cf9e271f498b6bbaa2c6bba3551a9 SHA512 0dae6c2df71a20e287720767aa4ba41d0568f3cd4bd2a6eb252f86d810d3de265ddc38397df15bb1b115ba35ac68aa6e18345dc4432d4d13b08b500483ffbb11
-EBUILD nagios-icinga-openvpn-0.0.1.ebuild 1152 BLAKE2B b72de1747493f07179be5b606c0f3a1ce1ca5ae861ad214a9cbf819b12fa91c824ddee0fd73485801f7060eb7e83783cbc7e812b995b44bd0bc372bd96c44098 SHA512 586c9ca186d75d2ebf6ab31b85caec3548029786c4eb15fbf92666ae1613651bff60966abd3b60055794106881941aeb1795d0f9a3efdfe37991a095072476d7
+EBUILD nagios-icinga-openvpn-0.0.1.ebuild 1168 BLAKE2B dd35d2ca317b19e750c56506d4b49082f7c6e6b61d176be0492d78abb0518658ce669f5db754fd36965cb6da4ea048f885daec50f6e332803597f67d666aabab SHA512 3c2e9bac65e33901ac4e1b3c1fcce21443c011cc6a701738ba5ca114f56140f19ccbbd8b1c322a724c341a69ba8d5e2be93ae828dab34fc55f276acb5b09d90f
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
index 3db3bf94712e..51d9e6928e57 100644
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_PN="check_openvpn"
 DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive"
-HOMEPAGE="https://github.com/liquidat/${PN}"
+HOMEPAGE="https://github.com/liquidat/nagios-icinga-openvpn"
 SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/net-analyzer/nast/Manifest b/net-analyzer/nast/Manifest
index f6e2c3c57fc3..2f301cb1406b 100644
--- a/net-analyzer/nast/Manifest
+++ b/net-analyzer/nast/Manifest
@@ -1,5 +1,5 @@
 AUX nast-0.2.0-gentoo.patch 3056 BLAKE2B e64a4e76fb4c9b0bb4e325f5addae07d740f8b4d6dc76a4011e16a9dddcff137f5a3fba013f8d29db342cd08b37228e2daf7e78b18607e385e71b9eb7b84a4c4 SHA512 9ce75c031dde2a8460d187ee082d182d9aa60524475ca1a5972dce5e4b20c68275c90dfc7a7fec5ae2585a5815ca4dc2a9e059ba31de64ad4f890f811cfea4c3
 DIST nast-0.2.0.tar.gz 147568 BLAKE2B f51a0b3cebfac04cb3aa57f627099aecf893722ca8552c0e6f7f67266e13729e5c54c533cd7599c6d7cfa50c89ad5181439d4c1bc5bba883438213b45b4221ee SHA512 fbf29f9c2ae783e38d40054577a697f631c6590075ef80aa970002f1133c681a4cc1fcd715bc6140cc361c609dcebe8c6bf74544e8710363d30649398b3e388c
 EBUILD nast-0.2.0-r1.ebuild 746 BLAKE2B 1ce039f23876bf15ca06f509a6ecfaa8fa60337f818b33074e2426b9fb27aaf337f3f8e787cffe6c47b09c8c0e884d367adffb2999c1942097a802c32d140d18 SHA512 a28997e6077a1fc61467289fbbd584a01343fb2ff7561b3c09941175bc7a8a84ad5812f382cc8b62283dcde0374913954cf7b1901b13efaf8bc9cb49e408aca8
-EBUILD nast-0.2.0-r2.ebuild 754 BLAKE2B 09ec474b2d1d620508804a6e8e2cdb970b8e8cfc0ea3ef8588165e97bb24b8d4419969f54a7f381a06043427de7af5440fa5eb40cec849aa1a09c5397391ff50 SHA512 29526619e81a3eaafd2dd618566abec177ab7aa12d9cc4a5313f719bb1b8bdd0b0963a02134c3f6311a2e079677e8d51d01a2c434d331abb9b1e60074b906785
+EBUILD nast-0.2.0-r2.ebuild 818 BLAKE2B 4e09a57133a58359fcbd250f512f98164b4df85eda000b8d0eaa047784446f16b33a8c2adafc0b4c784564145b14e2df113ee57eadcd314a96fb7ce4d2ce9202 SHA512 0d79ebdc8d3ab3f7e42d28e2177c07006ff47f963ff5d22463deb551a4899cccd6bdae354b8d20856f9e18d3fe2126891bd6ed5fdea004ca3e2db55cf03263f5
 MISC metadata.xml 362 BLAKE2B 71e940947887c3c558f6c84124909fef707dd02fd9fbaee18d58df8c0bcef64e01bb65731c64def6d619392b6ed35b2232054e31d63c3c3ab8a59e70c1a36276 SHA512 594d05be889c3a8d6019ee0762773f8abb71f4da276c3a546704ae4e073856fa404f5f9b466502b19423ac9e7f00ad8c2ef85d4adbfebf7fdd0184189e454148
diff --git a/net-analyzer/nast/nast-0.2.0-r2.ebuild b/net-analyzer/nast/nast-0.2.0-r2.ebuild
index 493d47ee9f4b..b2e8f7dd0342 100644
--- a/net-analyzer/nast/nast-0.2.0-r2.ebuild
+++ b/net-analyzer/nast/nast-0.2.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="NAST - Network Analyzer Sniffer Tool"
 HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"
@@ -30,6 +30,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	append-cflags -fcommon
+	default
+}
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}"
 }
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 68bdda192fa3..7d8474bb9658 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -14,9 +14,9 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.8.1.pre1.tar.gz 6630615 BLAKE2B 32ae7177fc08a773928da7f19cd06617feb1358c0dd21d39e08db460fa4267b6353f4afede1f5a500a628235a6a94d95700c84df6e85bda18b7a7a6e7bf3781f SHA512 e1ad421970abb67490a08fa735bbe9ff77a6fc5a19b8bf6942bef80f5b328f8038373cd5995970085177bcfe939dfa309019512b2abce0e8cf779e693f7d6dbd
 DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
-EBUILD net-snmp-5.8-r1.ebuild 5265 BLAKE2B 04d86f624987dd202722a37b61eb95a9fb0dbbf057ab116dbd1123f24c83051996a6f9f8bffad164134c5012bc935b27d40495bbba5493c64b3fb6e213973d8b SHA512 f321b8658d5d1ee8a0951b5588f9ad37c498676a1a839d4962c921d417a92026b21b795282f9f2ddc68219cfb75a6461224f3de1a8391d58b184ce5b59404a2e
-EBUILD net-snmp-5.8-r2.ebuild 5321 BLAKE2B 6518dc5b01b36a4a231186bdee13c955b9df155d06e16c3561df12625b3f5637467dc8daaf27acac2694a1b22f54b8d29669ee779de54e25a1b17cc57c3efdb9 SHA512 c1de2dd6516e2230203d085090790ab566d500975ab94c14c07afafe8c1822b3458f60dae6bb2c55bb576d5c5c5ed73c697d51fa5d8ce947cca6b0198cfa3461
-EBUILD net-snmp-5.8-r5.ebuild 5525 BLAKE2B 78ebeb7d3c888a68f268571154fac87df9fd93b75323ca67c5b4ce99f75bd66be9b4e77e91c762cacfae59fd693168e705f45347adfcb8c1eab10c3cb2210fbc SHA512 ea563da2076f4e4bc8801f70edbbfba08143d54a0edb6a718e34b84a555cae4bec1c5a8ac6606c997be1e1966c593eba80aa27ff67fb4d47069feb446a235f33
-EBUILD net-snmp-5.8.1_pre1.ebuild 5537 BLAKE2B 39899e3b6a102411899a2aa6f97333b7089fe7b57efc52f0f73480d9ec68f14eabda144014df20f18b1e622a3941f80d973f26534d73b30ee47c6ef3adfc194d SHA512 5c7700d10594a526198834b3e8c3ce2386c788174cd559b3f77f6cda54cc7b709d8379520e8b32be7c5e4dd98f0f71f9f14307b4f1b47811e254b96e6ca3797b
-EBUILD net-snmp-99999999.ebuild 5472 BLAKE2B 920488b2dc8c41825d2cb449910572efbe68e88ec5f59483604a2acfe72f3af9d8ded922a1a053d143422f099729b99ecd520b4c4023c19e0143e32746d8da84 SHA512 67db92f7224cfc45805f73197dc779569c11aae8bfed8b394a1e669281e96bf5d1ad88b85188090660e6be688c337578e44f5c65c97c08a9e3836e1f0a928de7
+EBUILD net-snmp-5.8-r3.ebuild 5303 BLAKE2B 72930d1e7bd0139f1d1a27f09fa3eda4e3b184153ceae7fe25222d3bcfd31839ed175008185b555780bd944c01a08733adf9599a84b77fa1503f7ed3c2f6a1ef SHA512 2f53ed6409b466a3e132a29aafde1381c4f9ca617e4d0a48015d966670e1947f828598c815e0f1c25133b0785d38b4ec5b3717e3d71eabf203e1c37e07cf5729
+EBUILD net-snmp-5.8-r4.ebuild 5359 BLAKE2B d5744ee2ae1c68fe865d24201d31b4f39102e3b0b89a864be7cf927fa422291784e8305e9c3b9623fdede4ab0cb157a9ec57a0b725b29059ab5eebef69cb898c SHA512 4e9b41e0d7c156cbe6735bfc2a956fa810f781613fd8e3124599ce2af01e55d64766530323a7a0d1c09186e84612cef0b31fe24fa1d06e44f17703bb3b81e97b
+EBUILD net-snmp-5.8-r5.ebuild 5563 BLAKE2B 82d54a0d14d4387e87981e3f4d2056de351008a9e85b98d03a3481708277b0329300f7ea8f926d00f23cc330d259749c17442ffa9adac25534b43497808fb96b SHA512 d7128fcd4f96959983d7b8c16bd3526ffed6707c37a8f4816e6afc9f786d55151947e154a6d942dbdb4b2675926c83fac53d81b2540a358ae381c80f48e55735
+EBUILD net-snmp-5.8.1_pre1-r1.ebuild 5575 BLAKE2B 8e0504e321bde15ddc3c2c7c9c01d0cab63c1095cbe5884b8ba43bdd450dc1fcd594a488f0d8bb55a461fbcddd8c5158819a234b5f667b7e9bf8e0c6d86cf226 SHA512 7f51fafbfb50c24d7d39c011aa82fefe73fb052f0bb1e97a6ee17a131fe4fe90f148621d13acb6f16842393ba45d493630b1942f214b1ce15dd44fa9a224c136
+EBUILD net-snmp-99999999.ebuild 5510 BLAKE2B aa096796017ff6c8a7adb6af2ea9afd22c4f7d98e64dcdca88a9fb26b39e3f41c2faa5916adffb71ca9577f251c074b6668f8640118c37239ea6bad91e3c37ce SHA512 d92b29f36a951e4a30384dac03b1cb8e30488310a33b376dbb6968af88564e963b834e99ff335dbac12978ac22ac7701914177ca982d17ee7a5b892af9e89bef
 MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
index 8c4fab7b6892..4906c15987c3 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,7 +40,9 @@ COMMON_DEPEND="
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	elf? ( dev-libs/elfutils )
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 	pci? ( sys-apps/pciutils )
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
index 119ec81687a2..2470f8472276 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,7 +40,9 @@ COMMON_DEPEND="
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	elf? ( dev-libs/elfutils )
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 	pci? ( sys-apps/pciutils )
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
index 2b3f66b5294d..e1fa13504cfd 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,9 @@ COMMON_DEPEND="
 	pci? ( sys-apps/pciutils )
 	perl? ( dev-lang/perl:= )
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 	rpm? (
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
index 0704a753212a..d853e1f035cd 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,7 +43,9 @@ COMMON_DEPEND="
 	pci? ( sys-apps/pciutils )
 	perl? ( dev-lang/perl:= )
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 	rpm? (
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 901356c5a939..12ca0cc534b3 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,7 +41,9 @@ COMMON_DEPEND="
 	pci? ( sys-apps/pciutils )
 	perl? ( dev-lang/perl:= )
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 	rpm? (
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 7edd9c67e2b9..bf1cc3c55489 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -13,7 +13,7 @@ AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
-EBUILD nmap-7.70.ebuild 4512 BLAKE2B 4fd051bb66fe938fa41a587ad79d68044cc9ee0b94f74030cab6c93f71c72a36ce4c4e15050517f8505823268fa8b92e8d119eb574fa1616630e068827b84d13 SHA512 9fddc38177a452869eb958577ed616a991d947578311d58d08db24ab35229e930724ef726f86e12e7178fe9bcaed019322e4e386d0da8db24476a8e0739d3720
-EBUILD nmap-7.80.ebuild 4404 BLAKE2B 5b14582a9f8ba7fb1872b18bc7e4f3a12f91cb46ec71a872947f004fc4b1cb018f65d0839cf06d5f153ccd0ab84c36b9ec549d2955cf5e90f5ef02a468f01c13 SHA512 0eadaa7891d91fe15355d0a24694eae1ef31c72899c841a436eb11e34a4200f61144e0916a05891e765fcee6120420b48378fff6e65407c94e00c5f33786baed
-EBUILD nmap-9999.ebuild 4314 BLAKE2B 17c2e9ce5472fbf6f0fae03648a6f4d95f6156e99844d8bebd913016a20b1a2fbfede0c4d4bb281f3b0204ae84df90cddb6772618c0ceeba9bb84f1f794bacdc SHA512 707c22d6849f3bb7c8fd7c46f88b3e6481613c714a00734279445a4608012a56ff3869b1131be70380410f46a2c5c5a2b4d077d59cad139018c301f09d6d0738
+EBUILD nmap-7.70-r1.ebuild 4550 BLAKE2B af45bdb8ada04592f4b8407110e7b5bebbe6e218035183f7557e1e9a7345901646f89be3a552577555915c91687c6bb5c2ec5e64bd4533f8b74d9a83a7853980 SHA512 669d93675f1d23264ad20e6044a3fe365121dc782da44b8e0b6f59354c45c7ad7306516fd59da6904aeba6086d82942a77451f5c56a2a8a3f5c86fc6a6d67b5d
+EBUILD nmap-7.80-r1.ebuild 4442 BLAKE2B d80731c4b11585f71c75df7ff637e360cbbd6aa77ce5a1d77e9805556ac20471865cdeb268a9307cd40e945cca566306bdbd7c6f01d82d29cf19c82a145d6ed4 SHA512 e098ef3d5e4d0847bc3c1dd1d1e562e0eead66d412b5185b73d5fd6c73c70431dea8ee5c8542efd5db75eb8bee831c2a5a4702216608b58fcd40efc600e8ad1f
+EBUILD nmap-9999.ebuild 4352 BLAKE2B 5301a8be69c471a295c719e41cc684c9f02d98264bdef33ac6b489b0c62fdbb6cd1b81a5ac2b0f415642550061bb3f60aad4a5d15c606a487b3d2cc5e9e3b4cd SHA512 26e536654f45be06d30a41b2f9ed858dec1ac3794d732bd1cf32cd693d683598929486fa6d38e3131f41521b84dfc067afd311073b724d7b277ecac0c7ce1e9e
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70-r1.ebuild
index 4dd557296213..f6b7e054ca37 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,7 +47,9 @@ RDEPEND="
 	)
 	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
 	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 "
diff --git a/net-analyzer/nmap/nmap-7.80.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index 3d1303bd82a8..a742c24a2323 100644
--- a/net-analyzer/nmap/nmap-7.80.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,7 +50,9 @@ RDEPEND="
 	)
 	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
 	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 "
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index e5440fa3e63e..7f9ceb695c1b 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -48,7 +48,9 @@ RDEPEND="
 	)
 	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
 	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 "
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 117009f24dda..1301ab87a059 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -8,5 +8,5 @@ AUX openvassd.logrotate 330 BLAKE2B faf900a6882bb23c29859080d0c140c9dde8dcab42f3
 AUX openvassd.service 472 BLAKE2B 528c25dbc32cd742753eb6b155a9221f0adde0e792b1e7af376b714831bcc210a228f5a87089f449f6f0e808f46f45d40fd68d9caed44530d57d99c37dbb8b0d SHA512 3497382e6540ddc341cf17e63f1c8d2250249bb51f8dbe379d48c1f90e81d00fdf03349a4dd08c6c6c2dc7336b385fa892b316ff2315a623952d8a2db33681bd
 AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64
 DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147
-EBUILD openvas-scanner-6.0.1.ebuild 3200 BLAKE2B f6b5b723f4946e4ad05fcf18b5355c9e6b3c1c268ebad6f0bb6dbfa2f54ac979321cdb75e86688b3304a5879aa29b5ae126d26c8e9217b6fdbdf882a03464bbc SHA512 84d003b3a6f0fa44dae6a7cefa3d154d750b81bbff392d6df7f7df6ae5587f4bf964c3ac1331bedc7ade2e13255c58536f2a4ae1272f4a69025d6ee2bdbac606
+EBUILD openvas-scanner-6.0.1.ebuild 3158 BLAKE2B f5f2c45f60642ccbcec6aa7ba4c8bb6f2078f4112cfed12f797a3e9883dd150fe01ffcceed52aaa34ce261671b37f0f7bc5652d480b5e1023db8b7739f12f8ff SHA512 9de0594e29d9e0d73a18ddd06f3a7f5d7247f5a721d62bd01555dadb69a914f0a31aadec6f834e01446c21d76584865a8c5807afb61ae87e8ce5dc0929904b86
 MISC metadata.xml 951 BLAKE2B 195ec0e9becddea6e9c08103473e7d26670d9fa766ed470a37f85d25a79d771654ec0305fe242d240e1255636657d086eb908f12e94fe934c7b7c66a59af7e50 SHA512 577b533837640c4131ca305e047dd6bbfc5456d19afcd91a71a8fd6b4c6cb4a464f346ac140b7e9505b2a5a4302d281616d762bc11eb123993d507cd0129b8a1
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
index aeedaa6e04f9..a1e0d34ebf61 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
@@ -73,7 +73,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 	)
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index d47fdf31ac49..be04304c7e92 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,6 +1,8 @@
-AUX packit-1.0-fno-common.patch 5729 BLAKE2B 6a7c516baf0bc455f493151268494ea6bc4f08ad577d1c2e4f904292345a8aee9182890c476d7749f75226be4c32d3030bdacddc467da5a4de9d81bb3a9ac81f SHA512 bbcb1dbb69a3b4cf31cc0533f2dacc0482e7ebd00cd157ee80430a3d085051fe2076e0208e7f64df1dfa216b9344c148624c687bcace6a4fe28faafdf76f000b
 AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3
+AUX packit-1.6.1-fno-common.patch 5729 BLAKE2B 6a7c516baf0bc455f493151268494ea6bc4f08ad577d1c2e4f904292345a8aee9182890c476d7749f75226be4c32d3030bdacddc467da5a4de9d81bb3a9ac81f SHA512 bbcb1dbb69a3b4cf31cc0533f2dacc0482e7ebd00cd157ee80430a3d085051fe2076e0208e7f64df1dfa216b9344c148624c687bcace6a4fe28faafdf76f000b
 DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2
-EBUILD packit-1.6.1.ebuild 696 BLAKE2B cf233f44a417f2316df16e8a888be45d81ec6e4718f976ac4a49f1fdb9b996571a760ddf02c74e7143d8c9dbaa8c0a4df97975c94a11b57faf3aa515ab797e7f SHA512 9deb152b0682d2d2cbe6043ffdda2dbe79bac4d96b7f58fd67f4776d0660c3ffa540d665808ab28c2e3692f94895ed3c6f461c922e7d6ef45f7ff9e902fc4ca4
+DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd
+EBUILD packit-1.6.1.ebuild 698 BLAKE2B 8faf26054fc9ed7274bb041c5670b8d032b11bdedbafc461e5bbb99b4a516bfd4df53b4c458422570ef0f2c9d135ea8870f45f798f335c0b60095a3ec72a04b5 SHA512 ac398634d37e1f9da624496574afe33d0fd0dc59a4a094106d91687355519aa929e694bade1d4681f57b52f98fb8f394b69db1a86d4011d62cf31cfdd769e754
+EBUILD packit-1.7.ebuild 656 BLAKE2B cfefd879b7e17b8d1b063c10681cece5f41a70504419db2cfddd6ddc87b4ee54388c98146862fa494bf6b4c6fdec1fd39f11165f6bd727bf08deee3ed3620665 SHA512 51d3649ad59e0f814c1d688966c8a09ca0647bafcc0a33c8dc015eb6277bb0071f506dcb7794fec45d6bee72e83b5ef2ecde94e75f16659ef57adf29e08742a6
 EBUILD packit-9999.ebuild 582 BLAKE2B a7015c50254810d82f6dcb12a2cdd05ca8893b39ef0de4d59acf8a54147b026821c23947228832d2303a128cea35c068f14b2da1cfa4e681fe2ee1647760baa4 SHA512 4d332811932801f9f330247ffc136b3c869d4c0788d7c1433be903cc3faf44916c0f219197e367cfe175829facd7bd988aab6307a5cbf9a27e034b607f44cb16
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/packit/files/packit-1.0-fno-common.patch b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
index f4813d868ab1..f4813d868ab1 100644
--- a/net-analyzer/packit/files/packit-1.0-fno-common.patch
+++ b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild
index 9a88e995d225..48ba4aeab1c9 100644
--- a/net-analyzer/packit/packit-1.6.1.ebuild
+++ b/net-analyzer/packit/packit-1.6.1.ebuild
@@ -18,8 +18,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-fno-common.patch
 	"${FILESDIR}"/${PN}-1.0-noopt.patch
+	"${FILESDIR}"/${PN}-1.6.1-fno-common.patch
 )
 
 src_prepare() {
diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild
new file mode 100644
index 000000000000..5059d8e159a0
--- /dev/null
+++ b/net-analyzer/packit/packit-1.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 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="https://github.com/resurrecting-open-source-projects/packit/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/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest
index 19fc6240d997..c09bd59df9da 100644
--- a/net-analyzer/ripe-atlas-tools/Manifest
+++ b/net-analyzer/ripe-atlas-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ripe.atlas.tools-1.2.3.tar.gz 86364 BLAKE2B de2aa0a57e135d463d1edb7e3277d21052353009d1dbcc2ead03d659c9736e61f36e95d102b5c3792448a1ea304e340f97856647f3c565fec9fcbbf0c414596a SHA512 f9e3b94ac9561faf0f6738099a0511b5aedb3b0d3230997a8033b8a1a804b885169891de8f408933ad90e3d4543375741657d9989fef09548d9cc8f0d9920e66
-EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1321 BLAKE2B 5167fd2e1c7527a4b098311f7d5674186b5d4f489206d2ff1e82622ac82f51b94259011188f1f5c90daedb2a1b73d939a4025f3a82834eebd3762a33acbb398d SHA512 0a2dc507a9efcf02cde69690d4e788d8f528b325df13bd787cabb3923342159a069a25a8a17f3129ee608ed42ab51b1abe5f98125fac7366c66ee6fcd6178254
+EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1311 BLAKE2B 0f04b1356156fa581576459b0432cadffd86fbbbf4173bf67fb0185a4b6090cb5a60ccc07d95e359f3d9c16897bdf826a13802ebc64ad9959a8fe2c8aca650e0 SHA512 4c9021f9a2c97fff338da9eb70f15d324073d29e4519297c4804c3c79d3600457e8f6811f00f66fbd2a62c2e727675e2e2bee14c21f74d00d0e6886ec30fc3e0
 MISC metadata.xml 245 BLAKE2B b9eb390672e4258c0f413eba0dbed731d0f8b2b65275669505e6c5ccdb034944856c212e564f307bc5567203f4897164654f047a2355b9d6f493e0633dce8192 SHA512 d4e3e22b2dde06b42ba712b048c38c8809da125ad6eacb06823f2013d5c9c9b82a4a0b5ffc104f0b786ef048700980c72bed9cabb90a1003db929d2ead0db9d5
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
index fe1fedc35fa3..736af6b37ae0 100644
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index c283b54c9c7d..cd10a60df82f 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -3,6 +3,6 @@ DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06
 DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede
 EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5
 EBUILD scapy-2.4.2.ebuild 1013 BLAKE2B 4af428aa0b92bd5c174fc79d8d5a7ef010b220049d5a3db9b9b204235629ad9711c42d57635905be3f3f50965b215f539086d6fc5bf8be047c98075f90158208 SHA512 0655992680d112db6c7dc5b9c88c5effca5cb274eaaa2f6e055a52162b995f28a29a436279900c7bf1cfe21452b8a10fddc76a43d9b7014eddce0e8fcf946a23
-EBUILD scapy-2.4.3.ebuild 1007 BLAKE2B 3283551001272acd470c718de2bca0ec10089a6d28e4c8f746f10422f9c09ae0a6195bdda98f6e5b22affec7b6cb35e321da78cbfe745918a78629742fea6584 SHA512 4af0b1feb54fe45bb7cd009ec2dd8f26c5c8aa601b33ad1abc67a4df0573a7b200ec2aba72b5555b73d6b108f6e67a353f1bd975380710cbdcf87c2b485bb6a7
+EBUILD scapy-2.4.3.ebuild 1005 BLAKE2B 43241ada322289f7fb8a7f987241dd4115aa0b5a30c575a84b990f2931ea30ede71f4bf2052403e4da4136b6a0a89bd7f1e0c05a351f2714570ede8f0bdd9255 SHA512 429aaeddb0535f18904c064bbd4e08ffba1a8d6519813cae285ab4917fbb78bafc24337eeb30384be8e4da205d5c1a041fb8b30db9075ac09921f4d5a15a7c78
 EBUILD scapy-9999.ebuild 969 BLAKE2B dbf38248cce514847dc8b3dd735c7aefef4a283327db74af9cf39591f543936c5fc91e213d522edbd8aaa0708dee682523ef2fcced676e11a5d272f3f3f97f22 SHA512 b9d85c1dab47372522248772444fe8530ca16dd9ac1c1f4e4419b247c66b102d7236bb3d3c7b58902b55e8c42dadae6b3378e357f97cba30720d9b7fe94fcf6f
 MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf
diff --git a/net-analyzer/scapy/scapy-2.4.3.ebuild b/net-analyzer/scapy/scapy-2.4.3.ebuild
index 01f3a461396c..2b9cea9f0d1f 100644
--- a/net-analyzer/scapy/scapy-2.4.3.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RDEPEND="
 	net-analyzer/tcpdump
 "
diff --git a/net-analyzer/siphon/Manifest b/net-analyzer/siphon/Manifest
index 980df9edd8fd..302379c87319 100644
--- a/net-analyzer/siphon/Manifest
+++ b/net-analyzer/siphon/Manifest
@@ -1,5 +1,7 @@
+AUX siphon-666-fno-common.patch 363 BLAKE2B 7c81ccf4a524693fc567b5d36938b5b6047fe30b9edfe2be14c3faed2ecc5b7ca58e67d7345e67a5d975fd66d9b62db43db97aa7f290d65a6b263cbbcaff2501 SHA512 41eba6e4537b56b58810e6a666640aac90046afa75a25fe995a6d7fc90dc7e69ba05f338655635ed167928398af20867b929417e3caad9eb42b31d3a287dbd62
 AUX siphon-666-gentoo.patch 441 BLAKE2B 048df4192f94c80047c95154a8404dee991993219f59123b4c96822e108094ee52299607988ea1311e25e2dd96843c92c03d92e1ab2ce18fc3a58539352d9807 SHA512 66fa0bc1deaa44bdda3d456e79bfacbe5a620365f5cecdb6d18da127d62b3111770a097c6b63e8d83efeb206f3f6577953028dbe49090ffc22e597bc2bf5d4c5
 AUX siphon-666-log.patch 1177 BLAKE2B 7f4e7c9428143558a5ba362526c882f59fac61c4ac4868b3577f9a500aa9ee17c3c1c7d12212dd089c669af1854ecf93c278871cd6f9e5ee9bd8c2124d989251 SHA512 3f82b38442b29083b95475fe26327d2da852dfed172182903adb7cb1dbf9045158462f70239500301d3c1f88005fb6308cddbd8ff48dc885dbc3dcbf355ba4ce
 DIST siphon-v.666.tar.gz 6951 BLAKE2B 8a37897aa52a73819a92422384252cac4cfecfacb4aedbb91af20592b6b831cd78af1dfc9f6da6f5d555c4d742fc9babe04ec446a3b0d214eab9b4cd0ea64883 SHA512 d355e80e7f102af13be9663d8e7cb28d3f3dc823d79192c287a5800e1239e4f37720b449a879605e5df0da1bb8accc3c70a605d94fc925788fe4a2e7bead650a
 EBUILD siphon-666-r1.ebuild 654 BLAKE2B caca1c290089a463d214b53a7bce9828d200d6ad139fd478a5286efb35a252154c629f5bfbe56849f14afce56ca22a96ac81a7d8ee9062b5cecef2b036d07823 SHA512 40a8e9874bd3b9e561f4b43ec39964fa2727caada35603b883edce7c4b4e9184340408b6a0154b0bad81bfd45b7120a26ac54c392aa5464b4ed381bd9878777e
+EBUILD siphon-666-r2.ebuild 660 BLAKE2B ac58988f23b5504a4ad52ec78098a3777f3309617807ecb21637ee656be16e2d1b4350bbe216aba08456898fa836c7f8bbf54da3fe2a070eb8c1c98b022a140c SHA512 91b95433aa67cec74724a630a05d78613036492b7707c71bae691ddde8ea566dbe7e62b87182847f2d5776064e983cb5e564d8072a145755d434dce05b538017
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/siphon/files/siphon-666-fno-common.patch b/net-analyzer/siphon/files/siphon-666-fno-common.patch
new file mode 100644
index 000000000000..c3b1addf1b04
--- /dev/null
+++ b/net-analyzer/siphon/files/siphon-666-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/main.c
++++ b/main.c
+@@ -12,6 +12,9 @@
+ 
+ #include <siphon.h>
+ 
++char *device, *logfile;
++int verbose, back;
++
+ void usage (char *);
+ void title(void);
+ 
+--- a/siphon.h
++++ b/siphon.h
+@@ -51,5 +51,5 @@
+ void *parse (void *);
+ void *siphon_log(void *);
+ 
+-char *device, *logfile;
+-int verbose, back;
++extern char *device, *logfile;
++extern int verbose, back;
diff --git a/net-analyzer/siphon/siphon-666-r2.ebuild b/net-analyzer/siphon/siphon-666-r2.ebuild
new file mode 100644
index 000000000000..7921c66b9a14
--- /dev/null
+++ b/net-analyzer/siphon/siphon-666-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+MY_P=${PN}-v.${PV}
+
+DESCRIPTION="A portable passive network mapping suite"
+HOMEPAGE="http://siphon.datanerds.net/"
+SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-log.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc
+	doins osprints.conf
+	dodoc README
+}
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index cba9b38d69d6..66928bfe6b05 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -11,7 +11,7 @@ DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482
 DIST snort-2.9.15.tar.gz 6704763 BLAKE2B adef13e3368dbbb9e023d79ec4f75c9652af8d26642b83f1f413e39faf966281b09713854e3a8aa385647b375102a667b10ee96d6f1cebb2f92c9fc7f29a2eb5 SHA512 21830dc4c9ce7b5bc96defa800f78de6ad24c1ab96dbeab0d79a7bf4298a81d6bdb4be8fd3bbec3b28b33aa7bb27cdc48a2a00b33c494f68d1649bc609928eea
 DIST snort-2.9.8.3.tar.gz 6244304 BLAKE2B cb77c80dde0b5b32ba0fe36cd07e1f6f465127e4be207ba6cd3b7c7dff75f4537c86c6a88d744a924b99d0b4ac864add2c9111c63e51dc4c7dc23f8d19a6c792 SHA512 2f3dfe46e14a5106a02ca60b2d334549f4924ff916de0804b2b7792cdd31e104fbb454b4b932855b5f25a861698db0f8988844782b12b0e5fa132d88d4a7a687
 EBUILD snort-2.9.12.ebuild 8872 BLAKE2B 84895cf9afb5ddf3079773ff50d730c56af2b01fc912c9d1fa74bead53fe30332d4971dde35cd3091057fadb06f32c25971823904c8d00caf185d9547ec32a63 SHA512 26ed8dc6c1d020a1fb73d1f12a81700a3d18103038340d00eb44d9891391eb49b2e8a611a3f46bf4d8423cb0586e8449933e7863e0184030f152b246e6696070
-EBUILD snort-2.9.15.1.ebuild 8322 BLAKE2B a30af887835e0d9c4205c323c1227402c444d31ad7fdb6a663932e4b885722f6e25b7c24bc9074c4573fe84facbb95790daa877267901d4dc5aa9a45ea2d0c1c SHA512 26fdf6db522b842641d3fef0ed7e16f1c2a8c1f260277769c8ae12566fad88337236231df2e2015cf8a7efeb04ed953c5edbc9ab8bbd9fe970919b896b3dc6d2
-EBUILD snort-2.9.15.ebuild 8847 BLAKE2B 0103540218a24cceb191285c4dac236621c25f140a4842c7bf70cd3e438afcdebdacf66d9a23de6319028b7f7d8e891f3f2e1eaf0230bc8b034dc1b2e3b34ea5 SHA512 52e5f4bd4f68bb5a85ce4bd27e8067d6ed16b9586fd92f4dce18ccf4380232a78c8249967dc85a9e181c68b70ac3d3d92aa402bf24b146051f465d47e84e2e89
+EBUILD snort-2.9.15.1.ebuild 8290 BLAKE2B a736c8a9d301ffdfca34d9ce0d5b8c7e8ffe07214a9c82a9981699dc40ee5061356b64124a1506b31aca773ff330af25ea6885be166555df349afaacd46e68a7 SHA512 acfef7c2b52430d2965c6d0ebb34b38c3075a291c8c5679d03e01466bde8ffb09a61281ae8c549c4f5fe3577d47af6f581ce45c0820f9c5de63aa0574ba59b12
+EBUILD snort-2.9.15.ebuild 8815 BLAKE2B 4771541a6a443235902d4d4a5a987445ae7289b7e88df69267719952a4dee392be35dfb0c7831a18bbc0dccf6871415f9d77659dd3e21e9a40cc6974ca2fd649 SHA512 bbe56fc788d6494299622106897d5c6835f279aacfd0e6fa98b773ad2ec2fe2d0f86da87b66d84128c13b6aa0b5f76a80d05a40f642c0c0378c1f4afef6412b2
 EBUILD snort-2.9.8.3-r2.ebuild 8505 BLAKE2B 82e9e4dbb2527f80ff87f3c95befb2b141e8ca55e1b097581b688c65e990c7cc0206388d98859f47e0f6b0a9ea52d2f6ff566ed67085de4f33c5023e7e4b86dc SHA512 8444c62e53db68fa39a85048b1ce01f30d16d636f4dd5eb3e51a1a5af3e393ca9bf0d4615c44b38bd57de050735b3666222c542c215b08f4f75c49613988a390
 MISC metadata.xml 4042 BLAKE2B 931c99e6b1aee3727e47f32dff6399dc821624fc9cc3be496ba711d480edb04920d2ffcdc9ce4fe6a253be2bbcd4bb45f56a34da530c6dd60140c77b5cc45856 SHA512 2ade0995e40052f3be40a073458a19ea380bb2f75e24905c06b45e88d8956b118db73fbb0a1062e5c0ca837e04d1805a54785a84283e701534ec47c320833b1f
diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild
index 21aba42de764..21bdbd512480 100644
--- a/net-analyzer/snort/snort-2.9.15.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.1.ebuild
@@ -150,42 +150,42 @@ src_install() {
 
 	# Sourcefire uses Makefiles to install docs causing Bug #297190.
 	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct rule location in the config
 	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct preprocessor/decoder rule location in the config
 	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Enable the preprocessor/decoder rules
 	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Just some clean up of trailing /'s in the config
 	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Make it clear in the config where these are...
 	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Disable all rule files by default.
 	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
@@ -205,17 +205,17 @@ src_install() {
 
 	# Set snort to run as snort:snort
 	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the default log dir
 	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct so_rule location in the config
 	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/snort/snort-2.9.15.ebuild b/net-analyzer/snort/snort-2.9.15.ebuild
index e9688b46d280..38037a16bb2c 100644
--- a/net-analyzer/snort/snort-2.9.15.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.ebuild
@@ -163,42 +163,42 @@ src_install() {
 
 	# Sourcefire uses Makefiles to install docs causing Bug #297190.
 	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct rule location in the config
 	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct preprocessor/decoder rule location in the config
 	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Enable the preprocessor/decoder rules
 	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Just some clean up of trailing /'s in the config
 	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Make it clear in the config where these are...
 	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Disable all rule files by default.
 	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
@@ -218,17 +218,17 @@ src_install() {
 
 	# Set snort to run as snort:snort
 	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the default log dir
 	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct so_rule location in the config
 	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 76ca33084ccf..58619a802783 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -5,5 +5,5 @@ AUX suricata-5.0.1_default-config.patch 813 BLAKE2B 5758447f2dc6fa50bb6a388c2c83
 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
 DIST suricata-5.0.1.tar.gz 23721536 BLAKE2B 529837e8e4d6c33d2093df8208bf03519e0d60deef92eadf9d0a44b7416eae2f900b2f72349815acb86d9bdd9d4253bbc5d7c4c1a34157f544982b0788291624 SHA512 db0797a7992abf0ddf170cb603fdac06b0ff92278bb91343860bccbbe029ea0e83131dfb9805ca44bcbbe3925502119259e350a17e94209b21d1f8b610d965a6
-EBUILD suricata-5.0.1.ebuild 6229 BLAKE2B 46d8b05dfb1d25c5efb6867872be88a2080b739805af87eac562c97613f01966179bdfacb78d0df59b945cebfafc5879830077478d077b29b77b781cf2f17ae1 SHA512 3d81c148662e8450676e4eaa481ba97003cd7db6b617e421b38828d4cacb371362d28f4177d2e9ce6faa19437feb05b5e11f83f26e9998ee78e21735619c52fd
+EBUILD suricata-5.0.1-r1.ebuild 6265 BLAKE2B e55ba367e62b811a2143a29f422b3f9562c491142887e72c6c336c8c28b8cb4835f9e0b836974ecd1fbcec7e8d6f5964ed107a3076487b510b5f35caa67964f6 SHA512 db261a8a1ee914f0e3708640023a13c53abc8b685c026652dac422cdaaa7c71f2676e53669bbc994f07f2fda4b78f6671dc332b8cdefacba170bd7e00cc1c5da
 MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5
diff --git a/net-analyzer/suricata/suricata-5.0.1.ebuild b/net-analyzer/suricata/suricata-5.0.1-r1.ebuild
index d09d4b1a9847..e74f32fee51a 100644
--- a/net-analyzer/suricata/suricata-5.0.1.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.1-r1.ebuild
@@ -31,7 +31,9 @@ CDEPEND="acct-group/suricata
 	net-libs/libnfnetlink
 	dev-libs/nspr
 	dev-libs/nss
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-libs/libhtp-0.5.32
 	net-libs/libpcap
 	sys-apps/file
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 3096679c61d6..77c4909a5057 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -2,5 +2,5 @@ AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
 EBUILD tcpdump-4.9.3-r1.ebuild 1930 BLAKE2B 27db7633b2afaf4d15024e1493d828a13a291ec94379a311173c2adef25f58b2dc207f3f665c4c7f7a54c006332bb94580f98d290d5508aafde63329e6b9ff78 SHA512 68c84a450281cfbcf079cc1b5087f8867632ae65754cf9d70d253ab2a68f45dfca2562edcb5f5e772dad0261644a1b2ae80e2531e10f3580109449688d910b1a
 EBUILD tcpdump-4.9.3.ebuild 1973 BLAKE2B 62eaae055f4efc70140710f2bf5a86aa7cca74f08da9fe2f2d8de0a555fee9a2ac16f0f1f13686157e05442ed704e98307958f1c26d8b9cad6f1aef4fb360379 SHA512 03c2b1f549fa25da311a19fef8a8deebb7a2fc378a75ccf0957dc0637dca581d4be65d53378b7413e81007e1b06c976cee1464498a2bfd711dce069dff922505
-EBUILD tcpdump-9999.ebuild 2243 BLAKE2B 2e86614481c991ecf8e087bfcdce3bf22f203589456a7279c38446d321efbd10bf3912845d0334175a296b762154d12ad510ce5b94c3facdf9778823e26e9cee SHA512 2a7dbdfdbb19b19e1f3d30da1f843a070a1d19f929a6509a99d843ebc8fd5c644cbb58f37b93c72e8ad8937938fddd1a893dfd3df526b5a1d0ad49a531746eb1
+EBUILD tcpdump-9999.ebuild 2271 BLAKE2B 6f81a6c411fdb6664110e6b4a0a5355c4d2e3dde6947cc65db3ed0ac999e22442debb58520390484a3541b69856eb515d1f126e491688384890a788734339578 SHA512 d51ca992cd8ec90db0dacf7516cb0d22b6299be304971ccfb95417ded360634910cff5ba8415e8588c87a6fdfa2f1ba47136fd17d43217e41fdf8f1924c728b5
 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 53e77a2204b0..cb1394377af7 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="A Tool for network monitoring and data acquisition"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 HOMEPAGE="
 	https://www.tcpdump.org/
-	${EGIT_REPO_URI}
+	https://github.com/the-tcpdump-group/tcpdump
 "
 
 LICENSE="BSD"
diff --git a/net-analyzer/telegraf/Manifest b/net-analyzer/telegraf/Manifest
index aba83b513961..fe1240417117 100644
--- a/net-analyzer/telegraf/Manifest
+++ b/net-analyzer/telegraf/Manifest
@@ -208,11 +208,14 @@ DIST telegraf-1.11.5-vendor.tar.gz 70214304 BLAKE2B 64cfaa9f207835e043f5df002d14
 DIST telegraf-1.11.5.tar.gz 1471311 BLAKE2B 7c5b7c2b835ee8c943baf01bb3515fb724b10b04682254e0fd501c7f066fe67a4ef18c0d3442b676448ccb8cd0430099e56ad0cc3970eee3f9d80d540271f4df SHA512 1e6001981693e4612ba34a680f1c3349c2f203d8ba2983f3841fad08b68251a942beef6cc462cb64b95eba1412ea6a35a863ff9426270896c50c83e6f177ca5d
 DIST telegraf-1.12.1-vendor.tar.gz 128021524 BLAKE2B f4db3e4d2998959c850a82ea77c1c02c5195e6bd5eef4d55521bbaa0e3355b21554e1a179585d57d8fce1fd061d8f157fddb2dde5091c15062811902c014b835 SHA512 2a501d9456a3a130a4202e87e2c0b44c9b2d5fefca12601f0a3fea6073c97fb7b40dd86546fe291b740b38ecf57843fff18a6f4280482af915b3be9e7270b597
 DIST telegraf-1.12.1.tar.gz 1561005 BLAKE2B 997e3deddc13acb6c0af41d5f622353facfd1c09e76640965c8ebe447e06a7cf5bb25753b8c67b2c7c1af7c3d50f787acc23e5b5a45253db943031a130c33d39 SHA512 8018d48482ec1cdada9d57bb6b8068a0758d58908a4c88deb089645282fde662191bd356e0081178b0e7bc1be6bb19cb2c29bba0039398b7d64f53de9fbf87d6
+DIST telegraf-1.13.3-vendor.tar.gz 142151740 BLAKE2B 9068835a6b75721732998ed50f23a6e6e90d92eee32c3ff1bb07fb19942e6f808289b459b34a6b83920c323c00063a91d2bb2e38d457a7a512b43715bc7d7dc0 SHA512 db56f4ecf1802a21405ae7db80281b5155b6f4922dd8e49aa48b554ff3bf179810fae3de3f6ea0e6ee661683e0e9f0536919fd912ea3de827f7c85aa314fff36
+DIST telegraf-1.13.3.tar.gz 1640358 BLAKE2B eda968676b42ddfd1f447326463feaabe0860425ea1688ccf19a248f652ec4828c5cae1c302a7129a62a6557eb2c0a206476bfc7082a89d4bffcd3113bad0e81 SHA512 ac71f054ffccf5f1d27db6e68989a2440b975087f91cce487b58df2bd6984378d86fb992f7a7f11aabf7b20937258d05893b74fb5d6f83a8db8449e80cf1d2fd
 DIST telegraf-1.5.3.tar.gz 911976 BLAKE2B 3e67a037eb22be88de700131f15120faa13b7a9bd8404f76c29376e3e4da630d84767fd8cbff45b3e14e6ce836dcc68a2a87b462eb91d398d57370c1112879c0 SHA512 48e80a4f3f00b5c18f584e28836c36abd7b7f9bacb33dd90ff569dbdc0a5bf69e29d38ae2d74a9c14ee6dc3400dda91e586dd31bc11522257c2206efb3e93348
 DIST telegraf-1.8.3.tar.gz 1205303 BLAKE2B 60579cca57863362cb4003f8da4326cef0d1bc4986d07d38f4b594556736ad79e0363098df41c13a2d10bbeeccce20fabcd0b07c7e187cbeecb5c561008d587e SHA512 367069b3578529307d5fa6eb14eabf78a44743d75e5df7c3860b35de212b5809c54cd1a7c791076137f60096d227774b4d5206606cd3fad08594721b4b49de4e
 EBUILD telegraf-1.10.4.ebuild 1350 BLAKE2B 4cd393ebb9c9afb4c9b381b9f9cd44c5af5c746022de949777697e75d30c69fb1b0f10db2216f4e765a26b160dbe6f65b7d60f6f1a7bf84537b60640293751ea SHA512 9ec1991dde6f6a1f88576e582b5e96e094f524c4e9b90ed3e7ab2e02cef8382b3f9573fdc48520d29099f8d7592656f65dd83c163e0c5da9cc7761869688c1fc
 EBUILD telegraf-1.11.5.ebuild 1322 BLAKE2B 14008a83e185b981e8f6c88976bb60f9c729290f22c3487bf4203144eba978492f7182d1fa2c38cd8cef62c937b2c6c8a0255caf5a5ca0709f5a2c5054552b9c SHA512 c61ea226f0d8f7154a50df3678235a8af0bb56e2b5dbc40dee8449ff5798f655a8c4ca3f924858ab900eaf759959c2dbca19b6869eb18ee3ed0e272c7cc76674
 EBUILD telegraf-1.12.1.ebuild 1322 BLAKE2B 2ea627b1fc2a03232b9411bc11108554d1d3b2954943fb2e833513fa833b633e5935182fc8024654513b3fa4b5469f0a4c7766b2cb93cbede2ebdc3855148760 SHA512 e3983382e9e04d63a0edb11039b526ff8ff0f0ee939811a556682cb800a9d389809aeb46d38ffad49b5e4abff2e40dc28928d95703abdd728bbc7376e97d62cf
+EBUILD telegraf-1.13.3.ebuild 1315 BLAKE2B efd7dad84f51b913b3d11017853b2d7e5fdc521ea8b62bec10724a5479bc95c960a81f221ed9dab16321510530c2ee83c32c9d2a4a66efa3f5f0e5584ebcf107 SHA512 da001910a5469f3db57c03e5a1661adf112806f1ba2a20821cce6fdb13f2b8552055d4d3eb708891be63a993b8e1c0147eb211f00a76a79700d452b99dd6044e
 EBUILD telegraf-1.5.3.ebuild 8161 BLAKE2B 53f9c9b2fc23e06e2d8cea9d11198fa0b8b91cd8c5721a7baaac36a300473da2b2494399f0786d9dbf022fa92093f9bf1eeb234a314ed97bdb97a48c6d6df730 SHA512 ecd1b258a0932732f4a738ef4baae5e7b7ae97eb076cc2d3ff6e824429e75b64d3c70385e843fe27daa1a09d8bb80a9977291bc8808922ea46100ab99f09e779
 EBUILD telegraf-1.8.3.ebuild 10888 BLAKE2B 84331e20f7ada3e7e1882a6a0e34ba3f2d764350265dc199edefb21a247e3e89be1bb9ae216782bb8b7e0af7bb160972be8084341ef86d37c2a101d1e89d2a52 SHA512 ab279f166ad698c7547a8c26a155ac2566829a71d01654df7f8bc4a9ee5f4278e5fb79da39ffae7dac949ee1181f53eb6ba94e9e28272fd918b92ed40e60400a
 MISC metadata.xml 397 BLAKE2B 2a5052554a207a61b00ce3997cd42292b00aaa7a434aee3361abc24057d705c0ec82885550a0515439775fec013319c325b911684bc351f9478adf4a0b7c26d1 SHA512 e27b2a6ed4fe38df2a3ab0d70fe4e82bbe874987be1cfa26df2ff5cdfa93a1fd55b19fa6c901ea1adda058fafc703d15438bdd3119023f4da0e2fd5cc915a52e
diff --git a/net-analyzer/telegraf/telegraf-1.13.3.ebuild b/net-analyzer/telegraf/telegraf-1.13.3.ebuild
new file mode 100644
index 000000000000..264ae05a70d3
--- /dev/null
+++ b/net-analyzer/telegraf/telegraf-1.13.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/influxdata/telegraf
+
+inherit systemd
+
+MY_PV="${PV/_rc/-rc.}"
+COMMIT=da364558
+
+DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics."
+HOMEPAGE="https://github.com/influxdata/telegraf"
+SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+BDEPEND="dev-lang/go"
+DEPEND="acct-group/telegraf
+	acct-user/telegraf"
+	RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	mv ../vendor .
+}
+
+src_compile() {
+	echo module ${EGO_PN} > go.mod
+	set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \
+		-ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \
+		cmd/telegraf/telegraf.go
+	echo "$@"
+	"$@" || die
+}
+
+src_install() {
+	dobin telegraf
+	insinto /etc/telegraf
+	doins etc/telegraf.conf
+	keepdir /etc/telegraf/telegraf.d
+
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/telegraf
+
+systemd_dounit scripts/telegraf.service
+	newconfd "${FILESDIR}"/telegraf.confd telegraf
+	newinitd "${FILESDIR}"/telegraf.rc telegraf
+
+	dodoc -r docs/*
+
+	keepdir /var/log/telegraf
+	fowners telegraf:telegraf /var/log/telegraf
+}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 21d0a8dce689..746ba58a445c 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,5 @@
-DIST testssl-2.9.5_p7.tar.gz 8955971 BLAKE2B 6ca3bc60445c9448c3dc24ee7262e57bc03a2c686bbeebcc1cc850edfa652538c1ba5365189c27e78f0cb977e68d2ea1a9f940d47cd0a53402d1fa9a31a33483 SHA512 35ab900b84db8a0a210cb9ce8bb794ff7e8cddd5c85a151083bc76eba834dce37597b29b6235fcf2ce37b004dd295b1756e01374a4943e1e2ed0d2a8cf8761f6
 DIST testssl-2.9.5_p8.tar.gz 8956035 BLAKE2B 692e08e6ff3dedf52dad5ba960291043740fa4e8e8f117b5dff93adfe1a620add3a34660fcbc1c68b53e23b0df5a0ff1862a33b12a50e78312c65791e0a55b42 SHA512 4c0fd1faa8978f85b46a6ae41471e16c8ab2d5651bdb6e009478aeed7b363a3648ff44e6e7689ccf421bd5e6374a2b5bfe9e5a13f7284c3a46371ed58ce4e5fb
-EBUILD testssl-2.9.5_p7.ebuild 1527 BLAKE2B 8dddf30b779034c519b25dc3c7b1951517ad2ed2623a3ba6b85d259521509032457206034735d80bc1f8475f80786594f9de11b3623c090bfcc1903afe497c1b SHA512 ae42c3b0397f7bbcb19dc1547c7d27cea64f4613482ed2b06df504533edc8b41d84ab2be9d486694d711d9c7019689cd28e1a7efa630aabb47cf3345bf0d752f
+DIST testssl-3.0.tar.gz 9207778 BLAKE2B 56f13cb58bc930e0c70ef1ff4734dd7e363f362397ebe354c446f1fd6e73a0774a6eb84326a405a5aab224b058754e03fcecda254617eee2fde4d9566ada4e15 SHA512 a5e65d3145bc422cf03b49087cc24cadca367206a06dda61d114b0a6afd7c4921204e23cdc3ade2f5d7e9ce4adf17b54691b9d33d46b75b296111663e9cf063a
 EBUILD testssl-2.9.5_p8.ebuild 1510 BLAKE2B 9103b39ff060c190ff809e9aa0023ef6a34afc41fe524f3473243b215bc3171d919fefcf3b1504952afe0413991694eb507f4df52b6a2b4367f14c462b1b3490 SHA512 15175ab1c822895d967e3ab186efcc93d423f50b6e201d80ae8235692cbbe89ebb0fa8135b442fcc2cb27eeefdd1e0d9841c8addbc6589198d3bf466b18155be
+EBUILD testssl-3.0.ebuild 1511 BLAKE2B 7bb402e6ecfa6ba7ec5a3b3f1411837c0fbbb35d014ce61fe80eb9eabf8fedd0375d1366019496ea4dd27bf7ee445d1e3c0203085e7dc912290f69246bf2b0fe SHA512 af622b997573b6b82392d4538dd1fb29dd0f72e05b5f1743b0b415d31638f72b73091216eb3b73f3010c5291a26af34aab57a9e28130896b11f6625ab87f4e17
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-2.9.5_p7.ebuild b/net-analyzer/testssl/testssl-3.0.ebuild
index 4398957f634b..8a2472e4e275 100644
--- a/net-analyzer/testssl/testssl-2.9.5_p7.ebuild
+++ b/net-analyzer/testssl/testssl-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,11 +8,11 @@ MY_PV="${PV/_p/-}"
 
 DESCRIPTION="Tool to check TLS/SSL cipher support"
 HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="bundled-openssl kerberos"
 
 RDEPEND="
@@ -59,8 +59,8 @@ src_prepare() {
 }
 
 src_install() {
-	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
-	dodoc openssl-rfc.mappping.html
+	dodoc CHANGELOG.md CREDITS.md Readme.md
+	dodoc openssl-iana.mapping.html
 
 	dobin ${PN}.sh
 
diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest
index 0adc21e4d8cb..bf23375592bf 100644
--- a/net-analyzer/traceroute-nanog/Manifest
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -1,5 +1,5 @@
 DIST traceroute-nanog_6.4.2-1.diff.gz 18417 BLAKE2B eec999aae1e728e9c255715042ee7be66bc32c19eff3ab32b85fecd281032d24eea27fa19d27793d9820b61539791ed82b0a0a7845636970a8d2433d0e3ba40a SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e
 DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 BLAKE2B 427a7af1f65271b1b4f46522d76da00628e1c6b877b576ff571dc09d7c1bd0232abd626296b46a16785cccaf091b086ea61b5081035572b846e04fff97d0dafb SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304
 EBUILD traceroute-nanog-6.4.2-r1.ebuild 908 BLAKE2B 410763ccd772317187ba9bab3b8d75f0c796fb229796294e8f6442a3eefcf2e1fc6ab8973687821f750e91828c49edb74a49670e8624781bea716aaf927f0095 SHA512 8c390c84866ba38e150ce73d3ad126bca4a327064ad9507a12630c1e4de36ec5b453cbc569d368aa92b9e8abeb7a0395cde1149a6945178dfe5d02b553d6a838
-EBUILD traceroute-nanog-6.4.2_p1.ebuild 945 BLAKE2B 3795c0fd471664504c14ff5081a67cad311ca096f2fd45926e67c799a06db6edb41aad3e33009a8b722441e9e92fc3d4c127316c5a12c972de1a690339c06635 SHA512 ea5f8470fc6b4c79c16b76102f89197773b5d5b556d0e2bad6bb5a9cb943b413501478c461002b65e8097851fe10201749afb8d09d4a92a129ef661c67113e2a
+EBUILD traceroute-nanog-6.4.2_p1.ebuild 962 BLAKE2B c5b817c817ab0a817f09b9afc76312d501966e325c5f325b638d54291bda504ce005bf50b6bf97c95f75e0532a5e873d081c1ade938d8d43951c420cdda39921 SHA512 4faeb0aefade3ba7e0036f1f3f6aa784e9dd94d8ca3614ff4d0b566758e685b2f58e60fbc023554c71e0fba063c227bfa9786680b2873fc04757205e05d1cd2a
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
index 975f26afff90..a87291d431d1 100644
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DEB_PL="1"
 DESCRIPTION="Traceroute with AS lookup, TOS support, MTU discovery and other features"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}_${PV/_p*}.orig.tar.gz
 	https://dev.gentoo.org/~jer/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index fd19b5cc544e..287b907d063c 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -29,10 +29,12 @@ DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340c
 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
+DIST zabbix-4.4.5.tar.gz 19284769 BLAKE2B e0c7b99c48128a2379c46d2125497816d484afc1d0e2b8d6d7da5ca93a494346980af0dc90a7f63f7ea5719b7aec6baa658f060fbdfaaddf5102883c2590da1f SHA512 b7971f3c25270c5e35861a0db8e810d8ffe6c59ffc935fa2df5b1fd5d591d577db60e04673ca0a6f158dd126245a6ee4cd4e84a3637c447c9b6f68f77848f114
 EBUILD zabbix-2.2.16-r1.ebuild 9374 BLAKE2B 51863c24bd87b2227e5e6ef2ea6dfd82a4ed7c5724984b05f6a3f65fc7a698a4e4f28348342a28392113cf741691ccc2bb2c3fae3494ed4d43cd49e6736fe2aa SHA512 c6dc8f51a438e0254442c06005daca4788b3b37f2695aa4a43c545f56aa415069c53f1d399fb14f648f9710b716143c44627932401a4f7bb1cef7a4929582041
 EBUILD zabbix-3.0.28.ebuild 9212 BLAKE2B 01d604dbdcbdbb6494382aab59a5d7ab10142c035ee023ce377a21ce17077585b048cec5cb18e844ddb8f83ca0b41b5396826d274ad70eaea1f4cf315fb19c68 SHA512 e64d401cf73217c3845baf23d4f869ba96474a98ea76a00dcd486349e83e5a7a07e2c65ed58e03772f72fc1fe187db682c5f5d16735827a3f8c9e5b9605d356c
 EBUILD zabbix-3.4.15.ebuild 9190 BLAKE2B 34f7fdb2eabc1b821c0480d3e5d6b3faa6038799d980fb4167c1ef606bc4208ba976b4a556a25ef6e9150413b8eb6618d75100feaeb82e2d35b5d93aaed78491 SHA512 1d7d17f1dbe723459776da9ff2b5d0fbe11e9c8a02cb4bd472147614d2e3e8e81b1988a46957108dda65b7f81177ab5c45cbc6208b504b3facdf16c0817fb986
 EBUILD zabbix-4.0.13.ebuild 9378 BLAKE2B a9561575c6a3f270b92026fa7f6568eb4e6b3233adf33304d262a59f16385073b44bb8689828460c0ef1d5625fb98525add993f462ea3222af48fd1dd09adafd SHA512 2ee7c7bebb9cc5c22b1042fdd40bb7b3173a97da818d8b52c600b708f98b56a8ccaf5025efa47c7a5658daf0861de874ee6e319709490907327442a35bf384e2
 EBUILD zabbix-4.2.7.ebuild 9517 BLAKE2B 596a6172a49b60a8fe225cc3827917f759875fe2f40b58487cd6b2dcb9139950a16ead08af86283ca2e87b99df6d9a5f75de439add860c9da179f16cf2cb8a7c SHA512 7001461570d7d7022742b3e49d894f8d8be125b0a644bcbeeb5ce29f2df8572b3fedcca0e4daf9854a85576f0353d867c9ef654289d6991b2c7a2b31a640ddb2
 EBUILD zabbix-4.4.0-r1.ebuild 9460 BLAKE2B 7d5e689fac185731cd79ffd6c8feee7a78c7b02d49bc9e72191cb0daa3828bd9638337be9a7356967c85a788ac70fd0f4377904d9f13a83997aaaacb6c9701f4 SHA512 d3154d91a3fe4fe69e6f99a69ee255ab5f95360d19597031c382dff6ab76a5f3c8e6c25e4115c484bf39c1400afb74496405f9f5645da40513b9cd417506b8da
+EBUILD zabbix-4.4.5.ebuild 9462 BLAKE2B e5b41d8aed5455e1f4cc4aa07c27a7df3b6182567ca4fc3ded111a4034875e5047bab175d4178376dff7932c58d5686847955b9859519f8afc1a0478439a250f SHA512 ffd234f5a352fa96ac592ae4e39ed0e6746f85b4003e897ebda7178623ac8efeba1b4a63099dc4dcf34b96a4373ea22ade4463c8d0a64f0037060edee13a65ac
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-4.4.5.ebuild b/net-analyzer/zabbix/zabbix-4.4.5.ebuild
new file mode 100644
index 000000000000..2ff7b0830d7d
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.4.5.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2020 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 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 )
+	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 )
+	server? ( dev-libs/libevent )
+	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 )
+	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] )
+	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 )
+	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 curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	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 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/
+		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
+		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"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	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
+		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
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /net-analyzer
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)